Compare commits
17 Commits
v0.9.9
...
cc26ed9b2c
| Author | SHA1 | Date | |
|---|---|---|---|
| cc26ed9b2c | |||
| 52e3d680f7 | |||
| 00bccfa8b6 | |||
| aa3532dd83 | |||
| 4ec2351241 | |||
| 6480478167 | |||
| 3739e11016 | |||
| 132e02e06e | |||
| cc79685eaf | |||
| b20cf0a9d2 | |||
| eab212ea8d | |||
| 24685a5371 | |||
| 49e9ee771f | |||
| 69dc7febe2 | |||
| 7b8fc1d99b | |||
| 7a7d570852 | |||
| 3eb4b3f09f |
@@ -0,0 +1,11 @@
|
|||||||
|
.git
|
||||||
|
.env
|
||||||
|
*.log
|
||||||
|
data/*
|
||||||
|
!data/branding/
|
||||||
|
!data/branding/**
|
||||||
|
frontend/node_modules/
|
||||||
|
frontend/.next/
|
||||||
|
backend/__pycache__/
|
||||||
|
**/__pycache__/
|
||||||
|
**/*.pyc
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
.env
|
.env
|
||||||
.venv/
|
.venv/
|
||||||
data/
|
data/
|
||||||
|
!data/branding/
|
||||||
|
!data/branding/**
|
||||||
backend/__pycache__/
|
backend/__pycache__/
|
||||||
**/__pycache__/
|
**/__pycache__/
|
||||||
*.pyc
|
*.pyc
|
||||||
|
|||||||
@@ -1,8 +1,89 @@
|
|||||||
# Magent
|
# Magent
|
||||||
|
|
||||||
AI-powered request timeline for Jellyseerr + Arr stack.
|
Magent is a friendly, AI-assisted request tracker for Jellyseerr + Arr services. It shows a clear timeline of where a request is stuck, explains what is happening in plain English, and offers safe actions to help fix issues.
|
||||||
|
|
||||||
## Backend (FastAPI)
|
## How it works
|
||||||
|
|
||||||
|
1) Requests are pulled from Jellyseerr and stored locally.
|
||||||
|
2) Magent joins that request to Sonarr/Radarr, Prowlarr, qBittorrent, and Jellyfin using TMDB/TVDB IDs and download hashes.
|
||||||
|
3) A state engine normalizes noisy service statuses into a simple, user-friendly state.
|
||||||
|
4) The UI renders a timeline and a central status box for each request.
|
||||||
|
5) Optional AI triage summarizes the likely cause and safest next steps.
|
||||||
|
|
||||||
|
## Core features
|
||||||
|
|
||||||
|
- Request search by title/year or request ID.
|
||||||
|
- Recent requests list with posters and status.
|
||||||
|
- Timeline view across Jellyseerr, Arr, Prowlarr, qBittorrent, Jellyfin.
|
||||||
|
- Central status box with clear reason + next steps.
|
||||||
|
- Safe action buttons (search, resume, re-add, etc.).
|
||||||
|
- Admin settings for service URLs, API keys, profiles, and root folders.
|
||||||
|
- Health status for each service in the pipeline.
|
||||||
|
- Cache and sync controls (full sync, delta sync, scheduled syncs).
|
||||||
|
- Local database for speed and audit history.
|
||||||
|
- Users and access control (admin vs user, block access).
|
||||||
|
- Local account password changes via "My profile".
|
||||||
|
- Docker-first deployment for easy hosting.
|
||||||
|
|
||||||
|
## Quick start (Docker - primary)
|
||||||
|
|
||||||
|
Docker is the recommended way to run Magent. It includes the backend and frontend with sane defaults.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker compose up --build
|
||||||
|
```
|
||||||
|
|
||||||
|
Then open:
|
||||||
|
|
||||||
|
- Frontend: http://localhost:3000
|
||||||
|
- Backend: http://localhost:8000
|
||||||
|
|
||||||
|
### Docker setup steps
|
||||||
|
|
||||||
|
1) Create `.env` with your service URLs and API keys.
|
||||||
|
2) Run `docker compose up --build`.
|
||||||
|
3) Log in at http://localhost:3000.
|
||||||
|
4) Visit Settings to confirm service health.
|
||||||
|
|
||||||
|
### Docker environment variables (sample)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
JELLYSEERR_URL="http://localhost:5055"
|
||||||
|
JELLYSEERR_API_KEY="..."
|
||||||
|
SONARR_URL="http://localhost:8989"
|
||||||
|
SONARR_API_KEY="..."
|
||||||
|
SONARR_QUALITY_PROFILE_ID="1"
|
||||||
|
SONARR_ROOT_FOLDER="/tv"
|
||||||
|
RADARR_URL="http://localhost:7878"
|
||||||
|
RADARR_API_KEY="..."
|
||||||
|
RADARR_QUALITY_PROFILE_ID="1"
|
||||||
|
RADARR_ROOT_FOLDER="/movies"
|
||||||
|
PROWLARR_URL="http://localhost:9696"
|
||||||
|
PROWLARR_API_KEY="..."
|
||||||
|
QBIT_URL="http://localhost:8080"
|
||||||
|
QBIT_USERNAME="..."
|
||||||
|
QBIT_PASSWORD="..."
|
||||||
|
SQLITE_PATH="data/magent.db"
|
||||||
|
JWT_SECRET="replace-with-a-long-random-secret"
|
||||||
|
JWT_EXP_MINUTES="720"
|
||||||
|
ADMIN_USERNAME="set-a-real-admin-username"
|
||||||
|
ADMIN_PASSWORD="set-a-long-unique-admin-password"
|
||||||
|
```
|
||||||
|
|
||||||
|
## Screenshots
|
||||||
|
|
||||||
|
Add screenshots here once available:
|
||||||
|
|
||||||
|
- `docs/screenshots/home.png`
|
||||||
|
- `docs/screenshots/request-timeline.png`
|
||||||
|
- `docs/screenshots/settings.png`
|
||||||
|
- `docs/screenshots/profile.png`
|
||||||
|
|
||||||
|
## Local development (secondary)
|
||||||
|
|
||||||
|
Use this only when you need to modify code locally.
|
||||||
|
|
||||||
|
### Backend (FastAPI)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd backend
|
cd backend
|
||||||
@@ -31,13 +112,13 @@ $env:QBIT_URL="http://localhost:8080"
|
|||||||
$env:QBIT_USERNAME="..."
|
$env:QBIT_USERNAME="..."
|
||||||
$env:QBIT_PASSWORD="..."
|
$env:QBIT_PASSWORD="..."
|
||||||
$env:SQLITE_PATH="data/magent.db"
|
$env:SQLITE_PATH="data/magent.db"
|
||||||
$env:JWT_SECRET="change-me"
|
$env:JWT_SECRET="replace-with-a-long-random-secret"
|
||||||
$env:JWT_EXP_MINUTES="720"
|
$env:JWT_EXP_MINUTES="720"
|
||||||
$env:ADMIN_USERNAME="admin"
|
$env:ADMIN_USERNAME="set-a-real-admin-username"
|
||||||
$env:ADMIN_PASSWORD="adminadmin"
|
$env:ADMIN_PASSWORD="set-a-long-unique-admin-password"
|
||||||
```
|
```
|
||||||
|
|
||||||
## Frontend (Next.js)
|
### Frontend (Next.js)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
cd frontend
|
cd frontend
|
||||||
@@ -49,20 +130,11 @@ Open http://localhost:3000
|
|||||||
|
|
||||||
Admin panel: http://localhost:3000/admin
|
Admin panel: http://localhost:3000/admin
|
||||||
|
|
||||||
Login uses the admin credentials above (or any other user you create in SQLite).
|
Login uses the admin credentials above (or any other local user you create in SQLite).
|
||||||
|
|
||||||
## Docker (Testing)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
docker compose up --build
|
|
||||||
```
|
|
||||||
|
|
||||||
Backend: http://localhost:8000
|
|
||||||
Frontend: http://localhost:3000
|
|
||||||
|
|
||||||
## Public Hosting Notes
|
## Public Hosting Notes
|
||||||
|
|
||||||
The frontend now proxies `/api/*` to the backend container. Set:
|
The frontend proxies `/api/*` to the backend container. Set:
|
||||||
|
|
||||||
- `NEXT_PUBLIC_API_BASE=/api` (browser uses same-origin)
|
- `NEXT_PUBLIC_API_BASE=/api` (browser uses same-origin)
|
||||||
- `BACKEND_INTERNAL_URL=http://backend:8000` (container-to-container)
|
- `BACKEND_INTERNAL_URL=http://backend:8000` (container-to-container)
|
||||||
@@ -73,3 +145,25 @@ If you prefer the browser to call the backend directly, set `NEXT_PUBLIC_API_BAS
|
|||||||
|
|
||||||
- `GET /requests/{id}/history?limit=10` recent snapshots
|
- `GET /requests/{id}/history?limit=10` recent snapshots
|
||||||
- `GET /requests/{id}/actions?limit=10` recent action logs
|
- `GET /requests/{id}/actions?limit=10` recent action logs
|
||||||
|
|
||||||
|
## Troubleshooting
|
||||||
|
|
||||||
|
### Login fails
|
||||||
|
|
||||||
|
- Make sure `ADMIN_USERNAME` and `ADMIN_PASSWORD` are set in `.env`.
|
||||||
|
- Confirm the backend is reachable: `http://localhost:8000/health` (or see container logs).
|
||||||
|
|
||||||
|
### Services show as down
|
||||||
|
|
||||||
|
- Check the URLs and API keys in Settings.
|
||||||
|
- Verify containers can reach each service (network/DNS).
|
||||||
|
|
||||||
|
### No recent requests
|
||||||
|
|
||||||
|
- Confirm Jellyseerr credentials in Settings.
|
||||||
|
- Run a full sync from Settings -> Requests.
|
||||||
|
|
||||||
|
### Docker images not updating
|
||||||
|
|
||||||
|
- Run `docker compose up --build` again.
|
||||||
|
- If needed, run `docker compose down` first, then rebuild.
|
||||||
|
|||||||
+3
-2
@@ -5,10 +5,11 @@ WORKDIR /app
|
|||||||
ENV PYTHONDONTWRITEBYTECODE=1 \
|
ENV PYTHONDONTWRITEBYTECODE=1 \
|
||||||
PYTHONUNBUFFERED=1
|
PYTHONUNBUFFERED=1
|
||||||
|
|
||||||
COPY requirements.txt .
|
COPY backend/requirements.txt .
|
||||||
RUN pip install --no-cache-dir -r requirements.txt
|
RUN pip install --no-cache-dir -r requirements.txt
|
||||||
|
|
||||||
COPY app ./app
|
COPY backend/app ./app
|
||||||
|
COPY data/branding /app/data/branding
|
||||||
|
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
|
|
||||||
|
|||||||
@@ -56,6 +56,9 @@ class QBittorrentClient(ApiClient):
|
|||||||
async def get_torrents_by_hashes(self, hashes: str) -> Optional[Any]:
|
async def get_torrents_by_hashes(self, hashes: str) -> Optional[Any]:
|
||||||
return await self._get("/api/v2/torrents/info", params={"hashes": hashes})
|
return await self._get("/api/v2/torrents/info", params={"hashes": hashes})
|
||||||
|
|
||||||
|
async def get_torrents_by_category(self, category: str) -> Optional[Any]:
|
||||||
|
return await self._get("/api/v2/torrents/info", params={"category": category})
|
||||||
|
|
||||||
async def get_app_version(self) -> Optional[Any]:
|
async def get_app_version(self) -> Optional[Any]:
|
||||||
return await self._get_text("/api/v2/app/version")
|
return await self._get_text("/api/v2/app/version")
|
||||||
|
|
||||||
@@ -67,3 +70,9 @@ class QBittorrentClient(ApiClient):
|
|||||||
await self._post_form("/api/v2/torrents/start", data={"hashes": hashes})
|
await self._post_form("/api/v2/torrents/start", data={"hashes": hashes})
|
||||||
return
|
return
|
||||||
raise
|
raise
|
||||||
|
|
||||||
|
async def add_torrent_url(self, url: str, category: Optional[str] = None) -> None:
|
||||||
|
data: Dict[str, Any] = {"urls": url}
|
||||||
|
if category:
|
||||||
|
data["category"] = category
|
||||||
|
await self._post_form("/api/v2/torrents/add", data=data)
|
||||||
|
|||||||
@@ -8,10 +8,10 @@ class Settings(BaseSettings):
|
|||||||
app_name: str = "Magent"
|
app_name: str = "Magent"
|
||||||
cors_allow_origin: str = "http://localhost:3000"
|
cors_allow_origin: str = "http://localhost:3000"
|
||||||
sqlite_path: str = Field(default="data/magent.db", validation_alias=AliasChoices("SQLITE_PATH"))
|
sqlite_path: str = Field(default="data/magent.db", validation_alias=AliasChoices("SQLITE_PATH"))
|
||||||
jwt_secret: str = Field(default="change-me", validation_alias=AliasChoices("JWT_SECRET"))
|
jwt_secret: Optional[str] = Field(default=None, validation_alias=AliasChoices("JWT_SECRET"))
|
||||||
jwt_exp_minutes: int = Field(default=720, validation_alias=AliasChoices("JWT_EXP_MINUTES"))
|
jwt_exp_minutes: int = Field(default=720, validation_alias=AliasChoices("JWT_EXP_MINUTES"))
|
||||||
admin_username: str = Field(default="admin", validation_alias=AliasChoices("ADMIN_USERNAME"))
|
admin_username: Optional[str] = Field(default=None, validation_alias=AliasChoices("ADMIN_USERNAME"))
|
||||||
admin_password: str = Field(default="adminadmin", validation_alias=AliasChoices("ADMIN_PASSWORD"))
|
admin_password: Optional[str] = Field(default=None, validation_alias=AliasChoices("ADMIN_PASSWORD"))
|
||||||
log_level: str = Field(default="INFO", validation_alias=AliasChoices("LOG_LEVEL"))
|
log_level: str = Field(default="INFO", validation_alias=AliasChoices("LOG_LEVEL"))
|
||||||
log_file: str = Field(default="data/magent.log", validation_alias=AliasChoices("LOG_FILE"))
|
log_file: str = Field(default="data/magent.log", validation_alias=AliasChoices("LOG_FILE"))
|
||||||
requests_sync_ttl_minutes: int = Field(
|
requests_sync_ttl_minutes: int = Field(
|
||||||
@@ -101,5 +101,10 @@ class Settings(BaseSettings):
|
|||||||
default=None, validation_alias=AliasChoices("QBIT_PASSWORD", "QBITTORRENT_PASSWORD")
|
default=None, validation_alias=AliasChoices("QBIT_PASSWORD", "QBITTORRENT_PASSWORD")
|
||||||
)
|
)
|
||||||
|
|
||||||
|
discord_webhook_url: Optional[str] = Field(
|
||||||
|
default=None,
|
||||||
|
validation_alias=AliasChoices("DISCORD_WEBHOOK_URL"),
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
settings = Settings()
|
settings = Settings()
|
||||||
|
|||||||
+42
-7
@@ -331,6 +331,8 @@ def verify_user_password(username: str, password: str) -> Optional[Dict[str, Any
|
|||||||
user = get_user_by_username(username)
|
user = get_user_by_username(username)
|
||||||
if not user:
|
if not user:
|
||||||
return None
|
return None
|
||||||
|
if user.get("auth_provider") != "local":
|
||||||
|
return None
|
||||||
if not verify_password(password, user["password_hash"]):
|
if not verify_password(password, user["password_hash"]):
|
||||||
return None
|
return None
|
||||||
return user
|
return user
|
||||||
@@ -458,7 +460,7 @@ def get_request_cache_by_id(request_id: int) -> Optional[Dict[str, Any]]:
|
|||||||
with _connect() as conn:
|
with _connect() as conn:
|
||||||
row = conn.execute(
|
row = conn.execute(
|
||||||
"""
|
"""
|
||||||
SELECT request_id, updated_at
|
SELECT request_id, updated_at, title
|
||||||
FROM requests_cache
|
FROM requests_cache
|
||||||
WHERE request_id = ?
|
WHERE request_id = ?
|
||||||
""",
|
""",
|
||||||
@@ -468,7 +470,7 @@ def get_request_cache_by_id(request_id: int) -> Optional[Dict[str, Any]]:
|
|||||||
logger.debug("requests_cache miss: request_id=%s", request_id)
|
logger.debug("requests_cache miss: request_id=%s", request_id)
|
||||||
return None
|
return None
|
||||||
logger.debug("requests_cache hit: request_id=%s updated_at=%s", row[0], row[1])
|
logger.debug("requests_cache hit: request_id=%s updated_at=%s", row[0], row[1])
|
||||||
return {"request_id": row[0], "updated_at": row[1]}
|
return {"request_id": row[0], "updated_at": row[1], "title": row[2]}
|
||||||
|
|
||||||
|
|
||||||
def get_request_cache_payload(request_id: int) -> Optional[Dict[str, Any]]:
|
def get_request_cache_payload(request_id: int) -> Optional[Dict[str, Any]]:
|
||||||
@@ -500,7 +502,7 @@ def get_cached_requests(
|
|||||||
since_iso: Optional[str] = None,
|
since_iso: Optional[str] = None,
|
||||||
) -> list[Dict[str, Any]]:
|
) -> list[Dict[str, Any]]:
|
||||||
query = """
|
query = """
|
||||||
SELECT request_id, media_id, media_type, status, title, year, requested_by, created_at
|
SELECT request_id, media_id, media_type, status, title, year, requested_by, created_at, payload_json
|
||||||
FROM requests_cache
|
FROM requests_cache
|
||||||
"""
|
"""
|
||||||
params: list[Any] = []
|
params: list[Any] = []
|
||||||
@@ -525,14 +527,33 @@ def get_cached_requests(
|
|||||||
)
|
)
|
||||||
results: list[Dict[str, Any]] = []
|
results: list[Dict[str, Any]] = []
|
||||||
for row in rows:
|
for row in rows:
|
||||||
|
title = row[4]
|
||||||
|
year = row[5]
|
||||||
|
if (not title or not year) and row[8]:
|
||||||
|
try:
|
||||||
|
payload = json.loads(row[8])
|
||||||
|
if isinstance(payload, dict):
|
||||||
|
media = payload.get("media") or {}
|
||||||
|
if not title:
|
||||||
|
title = (
|
||||||
|
(media.get("title") if isinstance(media, dict) else None)
|
||||||
|
or (media.get("name") if isinstance(media, dict) else None)
|
||||||
|
or payload.get("title")
|
||||||
|
or payload.get("name")
|
||||||
|
)
|
||||||
|
if not year:
|
||||||
|
year = media.get("year") if isinstance(media, dict) else None
|
||||||
|
year = year or payload.get("year")
|
||||||
|
except json.JSONDecodeError:
|
||||||
|
pass
|
||||||
results.append(
|
results.append(
|
||||||
{
|
{
|
||||||
"request_id": row[0],
|
"request_id": row[0],
|
||||||
"media_id": row[1],
|
"media_id": row[1],
|
||||||
"media_type": row[2],
|
"media_type": row[2],
|
||||||
"status": row[3],
|
"status": row[3],
|
||||||
"title": row[4],
|
"title": title,
|
||||||
"year": row[5],
|
"year": year,
|
||||||
"requested_by": row[6],
|
"requested_by": row[6],
|
||||||
"created_at": row[7],
|
"created_at": row[7],
|
||||||
}
|
}
|
||||||
@@ -545,7 +566,7 @@ def get_request_cache_overview(limit: int = 50) -> list[Dict[str, Any]]:
|
|||||||
with _connect() as conn:
|
with _connect() as conn:
|
||||||
rows = conn.execute(
|
rows = conn.execute(
|
||||||
"""
|
"""
|
||||||
SELECT request_id, media_id, media_type, status, title, year, requested_by, created_at, updated_at
|
SELECT request_id, media_id, media_type, status, title, year, requested_by, created_at, updated_at, payload_json
|
||||||
FROM requests_cache
|
FROM requests_cache
|
||||||
ORDER BY updated_at DESC, request_id DESC
|
ORDER BY updated_at DESC, request_id DESC
|
||||||
LIMIT ?
|
LIMIT ?
|
||||||
@@ -554,13 +575,27 @@ def get_request_cache_overview(limit: int = 50) -> list[Dict[str, Any]]:
|
|||||||
).fetchall()
|
).fetchall()
|
||||||
results: list[Dict[str, Any]] = []
|
results: list[Dict[str, Any]] = []
|
||||||
for row in rows:
|
for row in rows:
|
||||||
|
title = row[4]
|
||||||
|
if not title and row[9]:
|
||||||
|
try:
|
||||||
|
payload = json.loads(row[9])
|
||||||
|
if isinstance(payload, dict):
|
||||||
|
media = payload.get("media") or {}
|
||||||
|
title = (
|
||||||
|
(media.get("title") if isinstance(media, dict) else None)
|
||||||
|
or (media.get("name") if isinstance(media, dict) else None)
|
||||||
|
or payload.get("title")
|
||||||
|
or payload.get("name")
|
||||||
|
)
|
||||||
|
except json.JSONDecodeError:
|
||||||
|
title = row[4]
|
||||||
results.append(
|
results.append(
|
||||||
{
|
{
|
||||||
"request_id": row[0],
|
"request_id": row[0],
|
||||||
"media_id": row[1],
|
"media_id": row[1],
|
||||||
"media_type": row[2],
|
"media_type": row[2],
|
||||||
"status": row[3],
|
"status": row[3],
|
||||||
"title": row[4],
|
"title": title,
|
||||||
"year": row[5],
|
"year": row[5],
|
||||||
"requested_by": row[6],
|
"requested_by": row[6],
|
||||||
"created_at": row[7],
|
"created_at": row[7],
|
||||||
|
|||||||
+45
-12
@@ -1,4 +1,5 @@
|
|||||||
import asyncio
|
import asyncio
|
||||||
|
from contextlib import asynccontextmanager
|
||||||
|
|
||||||
from fastapi import FastAPI
|
from fastapi import FastAPI
|
||||||
from fastapi.middleware.cors import CORSMiddleware
|
from fastapi.middleware.cors import CORSMiddleware
|
||||||
@@ -17,11 +18,53 @@ from .routers.admin import router as admin_router
|
|||||||
from .routers.images import router as images_router
|
from .routers.images import router as images_router
|
||||||
from .routers.branding import router as branding_router
|
from .routers.branding import router as branding_router
|
||||||
from .routers.status import router as status_router
|
from .routers.status import router as status_router
|
||||||
|
from .routers.feedback import router as feedback_router
|
||||||
from .services.jellyfin_sync import run_daily_jellyfin_sync
|
from .services.jellyfin_sync import run_daily_jellyfin_sync
|
||||||
from .logging_config import configure_logging
|
from .logging_config import configure_logging
|
||||||
from .runtime import get_runtime_settings
|
from .runtime import get_runtime_settings
|
||||||
|
|
||||||
app = FastAPI(title=settings.app_name)
|
|
||||||
|
def validate_security_settings() -> None:
|
||||||
|
issues = []
|
||||||
|
jwt_secret = (settings.jwt_secret or "").strip()
|
||||||
|
admin_username = (settings.admin_username or "").strip()
|
||||||
|
admin_password = (settings.admin_password or "").strip()
|
||||||
|
if not jwt_secret:
|
||||||
|
issues.append("JWT_SECRET is required")
|
||||||
|
if not admin_username:
|
||||||
|
issues.append("ADMIN_USERNAME is required")
|
||||||
|
if not admin_password:
|
||||||
|
issues.append("ADMIN_PASSWORD is required")
|
||||||
|
if jwt_secret == "change-me":
|
||||||
|
issues.append("JWT_SECRET must not use the default placeholder")
|
||||||
|
if admin_password == "adminadmin":
|
||||||
|
issues.append("ADMIN_PASSWORD must not use the default placeholder")
|
||||||
|
if issues:
|
||||||
|
raise RuntimeError("Unsafe Magent security configuration: " + "; ".join(issues))
|
||||||
|
|
||||||
|
|
||||||
|
@asynccontextmanager
|
||||||
|
async def lifespan(_: FastAPI):
|
||||||
|
validate_security_settings()
|
||||||
|
init_db()
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
configure_logging(runtime.log_level, runtime.log_file)
|
||||||
|
background_tasks = [
|
||||||
|
asyncio.create_task(run_daily_jellyfin_sync(), name="daily-jellyfin-sync"),
|
||||||
|
asyncio.create_task(startup_warmup_requests_cache(), name="startup-warmup-requests-cache"),
|
||||||
|
asyncio.create_task(run_requests_delta_loop(), name="requests-delta-loop"),
|
||||||
|
asyncio.create_task(run_daily_requests_full_sync(), name="daily-requests-full-sync"),
|
||||||
|
asyncio.create_task(run_daily_db_cleanup(), name="daily-db-cleanup"),
|
||||||
|
]
|
||||||
|
try:
|
||||||
|
yield
|
||||||
|
finally:
|
||||||
|
for task in background_tasks:
|
||||||
|
task.cancel()
|
||||||
|
await asyncio.gather(*background_tasks, return_exceptions=True)
|
||||||
|
|
||||||
|
|
||||||
|
app = FastAPI(title=settings.app_name, lifespan=lifespan)
|
||||||
|
|
||||||
app.add_middleware(
|
app.add_middleware(
|
||||||
CORSMiddleware,
|
CORSMiddleware,
|
||||||
@@ -36,17 +79,6 @@ app.add_middleware(
|
|||||||
async def health() -> dict:
|
async def health() -> dict:
|
||||||
return {"status": "ok"}
|
return {"status": "ok"}
|
||||||
|
|
||||||
@app.on_event("startup")
|
|
||||||
async def startup() -> None:
|
|
||||||
init_db()
|
|
||||||
runtime = get_runtime_settings()
|
|
||||||
configure_logging(runtime.log_level, runtime.log_file)
|
|
||||||
asyncio.create_task(run_daily_jellyfin_sync())
|
|
||||||
asyncio.create_task(startup_warmup_requests_cache())
|
|
||||||
asyncio.create_task(run_requests_delta_loop())
|
|
||||||
asyncio.create_task(run_daily_requests_full_sync())
|
|
||||||
asyncio.create_task(run_daily_db_cleanup())
|
|
||||||
|
|
||||||
|
|
||||||
app.include_router(requests_router)
|
app.include_router(requests_router)
|
||||||
app.include_router(auth_router)
|
app.include_router(auth_router)
|
||||||
@@ -54,3 +86,4 @@ app.include_router(admin_router)
|
|||||||
app.include_router(images_router)
|
app.include_router(images_router)
|
||||||
app.include_router(branding_router)
|
app.include_router(branding_router)
|
||||||
app.include_router(status_router)
|
app.include_router(status_router)
|
||||||
|
app.include_router(feedback_router)
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
from secrets import token_urlsafe
|
||||||
|
|
||||||
from fastapi import APIRouter, HTTPException, status, Depends
|
from fastapi import APIRouter, HTTPException, status, Depends
|
||||||
from fastapi.security import OAuth2PasswordRequestForm
|
from fastapi.security import OAuth2PasswordRequestForm
|
||||||
|
|
||||||
@@ -21,6 +23,12 @@ router = APIRouter(prefix="/auth", tags=["auth"])
|
|||||||
async def login(form_data: OAuth2PasswordRequestForm = Depends()) -> dict:
|
async def login(form_data: OAuth2PasswordRequestForm = Depends()) -> dict:
|
||||||
user = verify_user_password(form_data.username, form_data.password)
|
user = verify_user_password(form_data.username, form_data.password)
|
||||||
if not user:
|
if not user:
|
||||||
|
existing = get_user_by_username(form_data.username)
|
||||||
|
if existing and existing.get("auth_provider") != "local":
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_403_FORBIDDEN,
|
||||||
|
detail=f"Use the {existing.get('auth_provider')} sign-in flow for this account",
|
||||||
|
)
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid credentials")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid credentials")
|
||||||
if user.get("is_blocked"):
|
if user.get("is_blocked"):
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
||||||
@@ -45,10 +53,12 @@ async def jellyfin_login(form_data: OAuth2PasswordRequestForm = Depends()) -> di
|
|||||||
raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=str(exc)) from exc
|
raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=str(exc)) from exc
|
||||||
if not isinstance(response, dict) or not response.get("User"):
|
if not isinstance(response, dict) or not response.get("User"):
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyfin credentials")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyfin credentials")
|
||||||
create_user_if_missing(form_data.username, "jellyfin-user", role="user", auth_provider="jellyfin")
|
create_user_if_missing(form_data.username, token_urlsafe(32), role="user", auth_provider="jellyfin")
|
||||||
user = get_user_by_username(form_data.username)
|
user = get_user_by_username(form_data.username)
|
||||||
if user and user.get("is_blocked"):
|
if user and user.get("is_blocked"):
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
||||||
|
if user and user.get("auth_provider") == "jellyfin":
|
||||||
|
set_user_password(form_data.username, token_urlsafe(32))
|
||||||
try:
|
try:
|
||||||
users = await client.get_users()
|
users = await client.get_users()
|
||||||
if isinstance(users, list):
|
if isinstance(users, list):
|
||||||
@@ -57,7 +67,7 @@ async def jellyfin_login(form_data: OAuth2PasswordRequestForm = Depends()) -> di
|
|||||||
continue
|
continue
|
||||||
name = user.get("Name")
|
name = user.get("Name")
|
||||||
if isinstance(name, str) and name:
|
if isinstance(name, str) and name:
|
||||||
create_user_if_missing(name, "jellyfin-user", role="user", auth_provider="jellyfin")
|
create_user_if_missing(name, token_urlsafe(32), role="user", auth_provider="jellyfin")
|
||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
token = create_access_token(form_data.username, "user")
|
token = create_access_token(form_data.username, "user")
|
||||||
@@ -78,10 +88,12 @@ async def jellyseerr_login(form_data: OAuth2PasswordRequestForm = Depends()) ->
|
|||||||
raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=str(exc)) from exc
|
raise HTTPException(status_code=status.HTTP_502_BAD_GATEWAY, detail=str(exc)) from exc
|
||||||
if not isinstance(response, dict):
|
if not isinstance(response, dict):
|
||||||
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyseerr credentials")
|
raise HTTPException(status_code=status.HTTP_401_UNAUTHORIZED, detail="Invalid Jellyseerr credentials")
|
||||||
create_user_if_missing(form_data.username, "jellyseerr-user", role="user", auth_provider="jellyseerr")
|
create_user_if_missing(form_data.username, token_urlsafe(32), role="user", auth_provider="jellyseerr")
|
||||||
user = get_user_by_username(form_data.username)
|
user = get_user_by_username(form_data.username)
|
||||||
if user and user.get("is_blocked"):
|
if user and user.get("is_blocked"):
|
||||||
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="User is blocked")
|
||||||
|
if user and user.get("auth_provider") == "jellyseerr":
|
||||||
|
set_user_password(form_data.username, token_urlsafe(32))
|
||||||
token = create_access_token(form_data.username, "user")
|
token = create_access_token(form_data.username, "user")
|
||||||
set_last_login(form_data.username)
|
set_last_login(form_data.username)
|
||||||
return {"access_token": token, "token_type": "bearer", "user": {"username": form_data.username, "role": "user"}}
|
return {"access_token": token, "token_type": "bearer", "user": {"username": form_data.username, "role": "user"}}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ from typing import Any, Dict
|
|||||||
|
|
||||||
from fastapi import APIRouter, HTTPException, UploadFile, File
|
from fastapi import APIRouter, HTTPException, UploadFile, File
|
||||||
from fastapi.responses import FileResponse
|
from fastapi.responses import FileResponse
|
||||||
from PIL import Image
|
from PIL import Image, ImageDraw, ImageFont
|
||||||
|
|
||||||
router = APIRouter(prefix="/branding", tags=["branding"])
|
router = APIRouter(prefix="/branding", tags=["branding"])
|
||||||
|
|
||||||
@@ -23,8 +23,52 @@ def _resize_image(image: Image.Image, max_size: int = 300) -> Image.Image:
|
|||||||
return image
|
return image
|
||||||
|
|
||||||
|
|
||||||
|
def _load_font(size: int) -> ImageFont.ImageFont:
|
||||||
|
candidates = [
|
||||||
|
"/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf",
|
||||||
|
"/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf",
|
||||||
|
]
|
||||||
|
for path in candidates:
|
||||||
|
if os.path.exists(path):
|
||||||
|
try:
|
||||||
|
return ImageFont.truetype(path, size)
|
||||||
|
except OSError:
|
||||||
|
continue
|
||||||
|
return ImageFont.load_default()
|
||||||
|
|
||||||
|
|
||||||
|
def _ensure_default_branding() -> None:
|
||||||
|
if os.path.exists(_LOGO_PATH) and os.path.exists(_FAVICON_PATH):
|
||||||
|
return
|
||||||
|
_ensure_branding_dir()
|
||||||
|
if not os.path.exists(_LOGO_PATH):
|
||||||
|
image = Image.new("RGBA", (300, 300), (12, 18, 28, 255))
|
||||||
|
draw = ImageDraw.Draw(image)
|
||||||
|
font = _load_font(160)
|
||||||
|
text = "M"
|
||||||
|
box = draw.textbbox((0, 0), text, font=font)
|
||||||
|
text_w = box[2] - box[0]
|
||||||
|
text_h = box[3] - box[1]
|
||||||
|
draw.text(
|
||||||
|
((300 - text_w) / 2, (300 - text_h) / 2 - 6),
|
||||||
|
text,
|
||||||
|
font=font,
|
||||||
|
fill=(255, 255, 255, 255),
|
||||||
|
)
|
||||||
|
image.save(_LOGO_PATH, format="PNG")
|
||||||
|
if not os.path.exists(_FAVICON_PATH):
|
||||||
|
favicon = Image.open(_LOGO_PATH).copy()
|
||||||
|
favicon.thumbnail((64, 64))
|
||||||
|
try:
|
||||||
|
favicon.save(_FAVICON_PATH, format="ICO", sizes=[(32, 32), (64, 64)])
|
||||||
|
except OSError:
|
||||||
|
favicon.save(_FAVICON_PATH, format="ICO")
|
||||||
|
|
||||||
|
|
||||||
@router.get("/logo.png")
|
@router.get("/logo.png")
|
||||||
async def branding_logo() -> FileResponse:
|
async def branding_logo() -> FileResponse:
|
||||||
|
if not os.path.exists(_LOGO_PATH):
|
||||||
|
_ensure_default_branding()
|
||||||
if not os.path.exists(_LOGO_PATH):
|
if not os.path.exists(_LOGO_PATH):
|
||||||
raise HTTPException(status_code=404, detail="Logo not found")
|
raise HTTPException(status_code=404, detail="Logo not found")
|
||||||
headers = {"Cache-Control": "public, max-age=300"}
|
headers = {"Cache-Control": "public, max-age=300"}
|
||||||
@@ -33,6 +77,8 @@ async def branding_logo() -> FileResponse:
|
|||||||
|
|
||||||
@router.get("/favicon.ico")
|
@router.get("/favicon.ico")
|
||||||
async def branding_favicon() -> FileResponse:
|
async def branding_favicon() -> FileResponse:
|
||||||
|
if not os.path.exists(_FAVICON_PATH):
|
||||||
|
_ensure_default_branding()
|
||||||
if not os.path.exists(_FAVICON_PATH):
|
if not os.path.exists(_FAVICON_PATH):
|
||||||
raise HTTPException(status_code=404, detail="Favicon not found")
|
raise HTTPException(status_code=404, detail="Favicon not found")
|
||||||
headers = {"Cache-Control": "public, max-age=300"}
|
headers = {"Cache-Control": "public, max-age=300"}
|
||||||
|
|||||||
@@ -0,0 +1,38 @@
|
|||||||
|
from typing import Any, Dict
|
||||||
|
import httpx
|
||||||
|
from fastapi import APIRouter, Depends, HTTPException
|
||||||
|
|
||||||
|
from ..auth import get_current_user
|
||||||
|
from ..runtime import get_runtime_settings
|
||||||
|
|
||||||
|
router = APIRouter(prefix="/feedback", tags=["feedback"], dependencies=[Depends(get_current_user)])
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("")
|
||||||
|
async def send_feedback(payload: Dict[str, Any], user: Dict[str, str] = Depends(get_current_user)) -> dict:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
webhook_url = runtime.discord_webhook_url
|
||||||
|
if not webhook_url:
|
||||||
|
raise HTTPException(status_code=400, detail="Discord webhook not configured")
|
||||||
|
|
||||||
|
feedback_type = str(payload.get("type") or "").strip().lower()
|
||||||
|
if feedback_type not in {"bug", "feature"}:
|
||||||
|
raise HTTPException(status_code=400, detail="Invalid feedback type")
|
||||||
|
|
||||||
|
message = str(payload.get("message") or "").strip()
|
||||||
|
if not message:
|
||||||
|
raise HTTPException(status_code=400, detail="Message is required")
|
||||||
|
if len(message) > 2000:
|
||||||
|
raise HTTPException(status_code=400, detail="Message is too long")
|
||||||
|
|
||||||
|
username = user.get("username") or "unknown"
|
||||||
|
content = f"**{feedback_type.title()}** from **{username}**\n{message}"
|
||||||
|
|
||||||
|
try:
|
||||||
|
async with httpx.AsyncClient(timeout=10.0) as client:
|
||||||
|
response = await client.post(webhook_url, json={"content": content})
|
||||||
|
response.raise_for_status()
|
||||||
|
except httpx.HTTPStatusError as exc:
|
||||||
|
raise HTTPException(status_code=502, detail=str(exc)) from exc
|
||||||
|
|
||||||
|
return {"status": "ok"}
|
||||||
+196
-60
@@ -9,6 +9,7 @@ from datetime import datetime, timezone, timedelta
|
|||||||
from fastapi import APIRouter, HTTPException, Depends
|
from fastapi import APIRouter, HTTPException, Depends
|
||||||
|
|
||||||
from ..clients.jellyseerr import JellyseerrClient
|
from ..clients.jellyseerr import JellyseerrClient
|
||||||
|
from ..clients.jellyfin import JellyfinClient
|
||||||
from ..clients.qbittorrent import QBittorrentClient
|
from ..clients.qbittorrent import QBittorrentClient
|
||||||
from ..clients.radarr import RadarrClient
|
from ..clients.radarr import RadarrClient
|
||||||
from ..clients.sonarr import SonarrClient
|
from ..clients.sonarr import SonarrClient
|
||||||
@@ -265,6 +266,16 @@ async def _hydrate_title_from_tmdb(
|
|||||||
return None, None
|
return None, None
|
||||||
|
|
||||||
|
|
||||||
|
async def _hydrate_media_details(client: JellyseerrClient, media_id: Optional[int]) -> Optional[Dict[str, Any]]:
|
||||||
|
if not media_id:
|
||||||
|
return None
|
||||||
|
try:
|
||||||
|
details = await client.get_media(int(media_id))
|
||||||
|
except httpx.HTTPStatusError:
|
||||||
|
return None
|
||||||
|
return details if isinstance(details, dict) else None
|
||||||
|
|
||||||
|
|
||||||
async def _hydrate_artwork_from_tmdb(
|
async def _hydrate_artwork_from_tmdb(
|
||||||
client: JellyseerrClient, media_type: Optional[str], tmdb_id: Optional[int]
|
client: JellyseerrClient, media_type: Optional[str], tmdb_id: Optional[int]
|
||||||
) -> tuple[Optional[str], Optional[str]]:
|
) -> tuple[Optional[str], Optional[str]]:
|
||||||
@@ -389,6 +400,28 @@ async def _sync_all_requests(client: JellyseerrClient) -> int:
|
|||||||
if isinstance(details, dict):
|
if isinstance(details, dict):
|
||||||
payload = _parse_request_payload(details)
|
payload = _parse_request_payload(details)
|
||||||
item = details
|
item = details
|
||||||
|
if not payload.get("title") and payload.get("media_id"):
|
||||||
|
media_details = await _hydrate_media_details(client, payload.get("media_id"))
|
||||||
|
if isinstance(media_details, dict):
|
||||||
|
media_title = media_details.get("title") or media_details.get("name")
|
||||||
|
if media_title:
|
||||||
|
payload["title"] = media_title
|
||||||
|
if not payload.get("year") and media_details.get("year"):
|
||||||
|
payload["year"] = media_details.get("year")
|
||||||
|
if not payload.get("tmdb_id") and media_details.get("tmdbId"):
|
||||||
|
payload["tmdb_id"] = media_details.get("tmdbId")
|
||||||
|
if not payload.get("media_type") and media_details.get("mediaType"):
|
||||||
|
payload["media_type"] = media_details.get("mediaType")
|
||||||
|
if isinstance(item, dict):
|
||||||
|
existing_media = item.get("media")
|
||||||
|
if isinstance(existing_media, dict):
|
||||||
|
merged = dict(media_details)
|
||||||
|
for key, value in existing_media.items():
|
||||||
|
if value is not None:
|
||||||
|
merged[key] = value
|
||||||
|
item["media"] = merged
|
||||||
|
else:
|
||||||
|
item["media"] = media_details
|
||||||
poster_path, backdrop_path = _extract_artwork_paths(item)
|
poster_path, backdrop_path = _extract_artwork_paths(item)
|
||||||
if cache_mode == "cache" and not (poster_path or backdrop_path):
|
if cache_mode == "cache" and not (poster_path or backdrop_path):
|
||||||
details = await _get_request_details(client, request_id)
|
details = await _get_request_details(client, request_id)
|
||||||
@@ -483,13 +516,35 @@ async def _sync_delta_requests(client: JellyseerrClient) -> int:
|
|||||||
if isinstance(request_id, int):
|
if isinstance(request_id, int):
|
||||||
cached = get_request_cache_by_id(request_id)
|
cached = get_request_cache_by_id(request_id)
|
||||||
incoming_updated = payload.get("updated_at")
|
incoming_updated = payload.get("updated_at")
|
||||||
if cached and incoming_updated and cached.get("updated_at") == incoming_updated:
|
if cached and incoming_updated and cached.get("updated_at") == incoming_updated and cached.get("title"):
|
||||||
continue
|
continue
|
||||||
if not payload.get("title") or not payload.get("media_id"):
|
if not payload.get("title") or not payload.get("media_id"):
|
||||||
details = await _get_request_details(client, request_id)
|
details = await _get_request_details(client, request_id)
|
||||||
if isinstance(details, dict):
|
if isinstance(details, dict):
|
||||||
payload = _parse_request_payload(details)
|
payload = _parse_request_payload(details)
|
||||||
item = details
|
item = details
|
||||||
|
if not payload.get("title") and payload.get("media_id"):
|
||||||
|
media_details = await _hydrate_media_details(client, payload.get("media_id"))
|
||||||
|
if isinstance(media_details, dict):
|
||||||
|
media_title = media_details.get("title") or media_details.get("name")
|
||||||
|
if media_title:
|
||||||
|
payload["title"] = media_title
|
||||||
|
if not payload.get("year") and media_details.get("year"):
|
||||||
|
payload["year"] = media_details.get("year")
|
||||||
|
if not payload.get("tmdb_id") and media_details.get("tmdbId"):
|
||||||
|
payload["tmdb_id"] = media_details.get("tmdbId")
|
||||||
|
if not payload.get("media_type") and media_details.get("mediaType"):
|
||||||
|
payload["media_type"] = media_details.get("mediaType")
|
||||||
|
if isinstance(item, dict):
|
||||||
|
existing_media = item.get("media")
|
||||||
|
if isinstance(existing_media, dict):
|
||||||
|
merged = dict(media_details)
|
||||||
|
for key, value in existing_media.items():
|
||||||
|
if value is not None:
|
||||||
|
merged[key] = value
|
||||||
|
item["media"] = merged
|
||||||
|
else:
|
||||||
|
item["media"] = media_details
|
||||||
poster_path, backdrop_path = _extract_artwork_paths(item)
|
poster_path, backdrop_path = _extract_artwork_paths(item)
|
||||||
if cache_mode == "cache" and not (poster_path or backdrop_path):
|
if cache_mode == "cache" and not (poster_path or backdrop_path):
|
||||||
details = await _get_request_details(client, request_id)
|
details = await _get_request_details(client, request_id)
|
||||||
@@ -884,15 +939,15 @@ async def _ensure_request_access(
|
|||||||
) -> None:
|
) -> None:
|
||||||
if user.get("role") == "admin":
|
if user.get("role") == "admin":
|
||||||
return
|
return
|
||||||
runtime = get_runtime_settings()
|
|
||||||
mode = (runtime.requests_data_source or "prefer_cache").lower()
|
|
||||||
cached = get_request_cache_payload(request_id)
|
cached = get_request_cache_payload(request_id)
|
||||||
if mode != "always_js" and cached is not None:
|
if cached is not None:
|
||||||
logger.debug("access cache hit: request_id=%s mode=%s", request_id, mode)
|
logger.debug("access cache hit: request_id=%s", request_id)
|
||||||
if _request_matches_user(cached, user.get("username", "")):
|
if _request_matches_user(cached, user.get("username", "")):
|
||||||
return
|
return
|
||||||
raise HTTPException(status_code=403, detail="Request not accessible for this user")
|
raise HTTPException(status_code=403, detail="Request not accessible for this user")
|
||||||
logger.debug("access cache miss: request_id=%s mode=%s", request_id, mode)
|
if not client.configured():
|
||||||
|
raise HTTPException(status_code=403, detail="Request access cannot be verified")
|
||||||
|
logger.debug("access cache miss: request_id=%s", request_id)
|
||||||
details = await _get_request_details(client, request_id)
|
details = await _get_request_details(client, request_id)
|
||||||
if details is None or not _request_matches_user(details, user.get("username", "")):
|
if details is None or not _request_matches_user(details, user.get("username", "")):
|
||||||
raise HTTPException(status_code=403, detail="Request not accessible for this user")
|
raise HTTPException(status_code=403, detail="Request not accessible for this user")
|
||||||
@@ -1012,8 +1067,7 @@ async def _resolve_root_folder_path(client: Any, root_folder: str, service_name:
|
|||||||
async def get_snapshot(request_id: str, user: Dict[str, str] = Depends(get_current_user)) -> Snapshot:
|
async def get_snapshot(request_id: str, user: Dict[str, str] = Depends(get_current_user)) -> Snapshot:
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
if client.configured():
|
await _ensure_request_access(client, int(request_id), user)
|
||||||
await _ensure_request_access(client, int(request_id), user)
|
|
||||||
return await build_snapshot(request_id)
|
return await build_snapshot(request_id)
|
||||||
|
|
||||||
|
|
||||||
@@ -1047,6 +1101,38 @@ async def recent_requests(
|
|||||||
allow_remote = mode == "always_js"
|
allow_remote = mode == "always_js"
|
||||||
allow_title_hydrate = mode == "prefer_cache"
|
allow_title_hydrate = mode == "prefer_cache"
|
||||||
allow_artwork_hydrate = allow_remote or allow_title_hydrate
|
allow_artwork_hydrate = allow_remote or allow_title_hydrate
|
||||||
|
jellyfin = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
||||||
|
jellyfin_cache: Dict[str, bool] = {}
|
||||||
|
|
||||||
|
async def _jellyfin_available(
|
||||||
|
title_value: Optional[str], year_value: Optional[int], media_type_value: Optional[str]
|
||||||
|
) -> bool:
|
||||||
|
if not jellyfin.configured() or not title_value:
|
||||||
|
return False
|
||||||
|
cache_key = f"{media_type_value or ''}:{title_value.lower()}:{year_value or ''}"
|
||||||
|
cached_value = jellyfin_cache.get(cache_key)
|
||||||
|
if cached_value is not None:
|
||||||
|
return cached_value
|
||||||
|
types = ["Movie"] if media_type_value == "movie" else ["Series"]
|
||||||
|
try:
|
||||||
|
search = await jellyfin.search_items(title_value, types)
|
||||||
|
except Exception:
|
||||||
|
jellyfin_cache[cache_key] = False
|
||||||
|
return False
|
||||||
|
if isinstance(search, dict):
|
||||||
|
items = search.get("Items") or search.get("items") or []
|
||||||
|
for item in items:
|
||||||
|
if not isinstance(item, dict):
|
||||||
|
continue
|
||||||
|
name = item.get("Name") or item.get("title")
|
||||||
|
year = item.get("ProductionYear") or item.get("Year")
|
||||||
|
if name and name.strip().lower() == title_value.strip().lower():
|
||||||
|
if year_value and year and int(year) != int(year_value):
|
||||||
|
continue
|
||||||
|
jellyfin_cache[cache_key] = True
|
||||||
|
return True
|
||||||
|
jellyfin_cache[cache_key] = False
|
||||||
|
return False
|
||||||
results = []
|
results = []
|
||||||
for row in rows:
|
for row in rows:
|
||||||
status = row.get("status")
|
status = row.get("status")
|
||||||
@@ -1138,6 +1224,11 @@ async def recent_requests(
|
|||||||
updated_at=payload.get("updated_at"),
|
updated_at=payload.get("updated_at"),
|
||||||
payload_json=json.dumps(details, ensure_ascii=True),
|
payload_json=json.dumps(details, ensure_ascii=True),
|
||||||
)
|
)
|
||||||
|
status_label = _status_label(status)
|
||||||
|
if status_label == "Working on it":
|
||||||
|
is_available = await _jellyfin_available(title, year, row.get("media_type"))
|
||||||
|
if is_available:
|
||||||
|
status_label = "Available"
|
||||||
results.append(
|
results.append(
|
||||||
{
|
{
|
||||||
"id": row.get("request_id"),
|
"id": row.get("request_id"),
|
||||||
@@ -1145,7 +1236,7 @@ async def recent_requests(
|
|||||||
"year": year,
|
"year": year,
|
||||||
"type": row.get("media_type"),
|
"type": row.get("media_type"),
|
||||||
"status": status,
|
"status": status,
|
||||||
"statusLabel": _status_label(status),
|
"statusLabel": status_label,
|
||||||
"mediaId": row.get("media_id"),
|
"mediaId": row.get("media_id"),
|
||||||
"artwork": {
|
"artwork": {
|
||||||
"poster_url": _artwork_url(poster_path, "w185", cache_mode),
|
"poster_url": _artwork_url(poster_path, "w185", cache_mode),
|
||||||
@@ -1235,8 +1326,7 @@ async def search_requests(
|
|||||||
async def ai_triage(request_id: str, user: Dict[str, str] = Depends(get_current_user)) -> TriageResult:
|
async def ai_triage(request_id: str, user: Dict[str, str] = Depends(get_current_user)) -> TriageResult:
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
if client.configured():
|
await _ensure_request_access(client, int(request_id), user)
|
||||||
await _ensure_request_access(client, int(request_id), user)
|
|
||||||
snapshot = await build_snapshot(request_id)
|
snapshot = await build_snapshot(request_id)
|
||||||
return triage_snapshot(snapshot)
|
return triage_snapshot(snapshot)
|
||||||
|
|
||||||
@@ -1245,25 +1335,42 @@ async def ai_triage(request_id: str, user: Dict[str, str] = Depends(get_current_
|
|||||||
async def action_search(request_id: str, user: Dict[str, str] = Depends(get_current_user)) -> dict:
|
async def action_search(request_id: str, user: Dict[str, str] = Depends(get_current_user)) -> dict:
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
if client.configured():
|
await _ensure_request_access(client, int(request_id), user)
|
||||||
await _ensure_request_access(client, int(request_id), user)
|
snapshot = await build_snapshot(request_id)
|
||||||
|
prowlarr_results: List[Dict[str, Any]] = []
|
||||||
|
prowlarr = ProwlarrClient(runtime.prowlarr_base_url, runtime.prowlarr_api_key)
|
||||||
|
if not prowlarr.configured():
|
||||||
|
raise HTTPException(status_code=400, detail="Prowlarr not configured")
|
||||||
|
query = snapshot.title
|
||||||
|
if snapshot.year:
|
||||||
|
query = f"{query} {snapshot.year}"
|
||||||
|
try:
|
||||||
|
results = await prowlarr.search(query=query)
|
||||||
|
prowlarr_results = _filter_prowlarr_results(results, snapshot.request_type)
|
||||||
|
except httpx.HTTPStatusError:
|
||||||
|
prowlarr_results = []
|
||||||
|
|
||||||
|
await asyncio.to_thread(
|
||||||
|
save_action,
|
||||||
|
request_id,
|
||||||
|
"search_releases",
|
||||||
|
"Search and choose a download",
|
||||||
|
"ok",
|
||||||
|
f"Found {len(prowlarr_results)} releases.",
|
||||||
|
)
|
||||||
|
return {"status": "ok", "releases": prowlarr_results}
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/{request_id}/actions/search_auto")
|
||||||
|
async def action_search_auto(request_id: str, user: Dict[str, str] = Depends(get_current_user)) -> dict:
|
||||||
|
runtime = get_runtime_settings()
|
||||||
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
|
await _ensure_request_access(client, int(request_id), user)
|
||||||
snapshot = await build_snapshot(request_id)
|
snapshot = await build_snapshot(request_id)
|
||||||
arr_item = snapshot.raw.get("arr", {}).get("item")
|
arr_item = snapshot.raw.get("arr", {}).get("item")
|
||||||
if not isinstance(arr_item, dict):
|
if not isinstance(arr_item, dict):
|
||||||
raise HTTPException(status_code=404, detail="Item not found in Sonarr/Radarr")
|
raise HTTPException(status_code=404, detail="Item not found in Sonarr/Radarr")
|
||||||
|
|
||||||
prowlarr_results: List[Dict[str, Any]] = []
|
|
||||||
prowlarr = ProwlarrClient(runtime.prowlarr_base_url, runtime.prowlarr_api_key)
|
|
||||||
if prowlarr.configured():
|
|
||||||
query = snapshot.title
|
|
||||||
if snapshot.year:
|
|
||||||
query = f"{query} {snapshot.year}"
|
|
||||||
try:
|
|
||||||
results = await prowlarr.search(query=query)
|
|
||||||
prowlarr_results = _filter_prowlarr_results(results, snapshot.request_type)
|
|
||||||
except httpx.HTTPStatusError:
|
|
||||||
prowlarr_results = []
|
|
||||||
|
|
||||||
if snapshot.request_type.value == "tv":
|
if snapshot.request_type.value == "tv":
|
||||||
client = SonarrClient(runtime.sonarr_base_url, runtime.sonarr_api_key)
|
client = SonarrClient(runtime.sonarr_base_url, runtime.sonarr_api_key)
|
||||||
if not client.configured():
|
if not client.configured():
|
||||||
@@ -1271,12 +1378,11 @@ async def action_search(request_id: str, user: Dict[str, str] = Depends(get_curr
|
|||||||
episodes = await client.get_episodes(int(arr_item["id"]))
|
episodes = await client.get_episodes(int(arr_item["id"]))
|
||||||
missing_by_season = _missing_episode_ids_by_season(episodes)
|
missing_by_season = _missing_episode_ids_by_season(episodes)
|
||||||
if not missing_by_season:
|
if not missing_by_season:
|
||||||
return {
|
message = "No missing monitored episodes found."
|
||||||
"status": "ok",
|
await asyncio.to_thread(
|
||||||
"message": "No missing monitored episodes found",
|
save_action, request_id, "search_auto", "Search and auto-download", "ok", message
|
||||||
"searched": [],
|
)
|
||||||
"releases": prowlarr_results,
|
return {"status": "ok", "message": message, "searched": []}
|
||||||
}
|
|
||||||
responses = []
|
responses = []
|
||||||
for season_number in sorted(missing_by_season.keys()):
|
for season_number in sorted(missing_by_season.keys()):
|
||||||
episode_ids = missing_by_season[season_number]
|
episode_ids = missing_by_season[season_number]
|
||||||
@@ -1285,41 +1391,30 @@ async def action_search(request_id: str, user: Dict[str, str] = Depends(get_curr
|
|||||||
responses.append(
|
responses.append(
|
||||||
{"season": season_number, "episodeCount": len(episode_ids), "response": response}
|
{"season": season_number, "episodeCount": len(episode_ids), "response": response}
|
||||||
)
|
)
|
||||||
result = {"status": "ok", "searched": responses, "releases": prowlarr_results}
|
message = "Search sent to Sonarr."
|
||||||
await asyncio.to_thread(
|
await asyncio.to_thread(
|
||||||
save_action,
|
save_action, request_id, "search_auto", "Search and auto-download", "ok", message
|
||||||
request_id,
|
|
||||||
"search",
|
|
||||||
"Re-run search in Sonarr/Radarr",
|
|
||||||
"ok",
|
|
||||||
f"Found {len(prowlarr_results)} releases.",
|
|
||||||
)
|
)
|
||||||
return result
|
return {"status": "ok", "message": message, "searched": responses}
|
||||||
elif snapshot.request_type.value == "movie":
|
if snapshot.request_type.value == "movie":
|
||||||
client = RadarrClient(runtime.radarr_base_url, runtime.radarr_api_key)
|
client = RadarrClient(runtime.radarr_base_url, runtime.radarr_api_key)
|
||||||
if not client.configured():
|
if not client.configured():
|
||||||
raise HTTPException(status_code=400, detail="Radarr not configured")
|
raise HTTPException(status_code=400, detail="Radarr not configured")
|
||||||
response = await client.search(int(arr_item["id"]))
|
response = await client.search(int(arr_item["id"]))
|
||||||
result = {"status": "ok", "response": response, "releases": prowlarr_results}
|
message = "Search sent to Radarr."
|
||||||
await asyncio.to_thread(
|
await asyncio.to_thread(
|
||||||
save_action,
|
save_action, request_id, "search_auto", "Search and auto-download", "ok", message
|
||||||
request_id,
|
|
||||||
"search",
|
|
||||||
"Re-run search in Sonarr/Radarr",
|
|
||||||
"ok",
|
|
||||||
f"Found {len(prowlarr_results)} releases.",
|
|
||||||
)
|
)
|
||||||
return result
|
return {"status": "ok", "message": message, "response": response}
|
||||||
else:
|
|
||||||
raise HTTPException(status_code=400, detail="Unknown request type")
|
raise HTTPException(status_code=400, detail="Unknown request type")
|
||||||
|
|
||||||
|
|
||||||
@router.post("/{request_id}/actions/qbit/resume")
|
@router.post("/{request_id}/actions/qbit/resume")
|
||||||
async def action_resume(request_id: str, user: Dict[str, str] = Depends(get_current_user)) -> dict:
|
async def action_resume(request_id: str, user: Dict[str, str] = Depends(get_current_user)) -> dict:
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
if client.configured():
|
await _ensure_request_access(client, int(request_id), user)
|
||||||
await _ensure_request_access(client, int(request_id), user)
|
|
||||||
snapshot = await build_snapshot(request_id)
|
snapshot = await build_snapshot(request_id)
|
||||||
queue = snapshot.raw.get("arr", {}).get("queue")
|
queue = snapshot.raw.get("arr", {}).get("queue")
|
||||||
download_ids = _download_ids(_queue_records(queue))
|
download_ids = _download_ids(_queue_records(queue))
|
||||||
@@ -1365,8 +1460,7 @@ async def action_resume(request_id: str, user: Dict[str, str] = Depends(get_curr
|
|||||||
async def action_readd(request_id: str, user: Dict[str, str] = Depends(get_current_user)) -> dict:
|
async def action_readd(request_id: str, user: Dict[str, str] = Depends(get_current_user)) -> dict:
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
if client.configured():
|
await _ensure_request_access(client, int(request_id), user)
|
||||||
await _ensure_request_access(client, int(request_id), user)
|
|
||||||
snapshot = await build_snapshot(request_id)
|
snapshot = await build_snapshot(request_id)
|
||||||
jelly = snapshot.raw.get("jellyseerr") or {}
|
jelly = snapshot.raw.get("jellyseerr") or {}
|
||||||
media = jelly.get("media") or {}
|
media = jelly.get("media") or {}
|
||||||
@@ -1478,8 +1572,7 @@ async def request_history(
|
|||||||
) -> dict:
|
) -> dict:
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
if client.configured():
|
await _ensure_request_access(client, int(request_id), user)
|
||||||
await _ensure_request_access(client, int(request_id), user)
|
|
||||||
snapshots = await asyncio.to_thread(get_recent_snapshots, request_id, limit)
|
snapshots = await asyncio.to_thread(get_recent_snapshots, request_id, limit)
|
||||||
return {"snapshots": snapshots}
|
return {"snapshots": snapshots}
|
||||||
|
|
||||||
@@ -1490,8 +1583,7 @@ async def request_actions(
|
|||||||
) -> dict:
|
) -> dict:
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
if client.configured():
|
await _ensure_request_access(client, int(request_id), user)
|
||||||
await _ensure_request_access(client, int(request_id), user)
|
|
||||||
actions = await asyncio.to_thread(get_recent_actions, request_id, limit)
|
actions = await asyncio.to_thread(get_recent_actions, request_id, limit)
|
||||||
return {"actions": actions}
|
return {"actions": actions}
|
||||||
|
|
||||||
@@ -1502,11 +1594,11 @@ async def action_grab(
|
|||||||
) -> dict:
|
) -> dict:
|
||||||
runtime = get_runtime_settings()
|
runtime = get_runtime_settings()
|
||||||
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
client = JellyseerrClient(runtime.jellyseerr_base_url, runtime.jellyseerr_api_key)
|
||||||
if client.configured():
|
await _ensure_request_access(client, int(request_id), user)
|
||||||
await _ensure_request_access(client, int(request_id), user)
|
|
||||||
snapshot = await build_snapshot(request_id)
|
snapshot = await build_snapshot(request_id)
|
||||||
guid = payload.get("guid")
|
guid = payload.get("guid")
|
||||||
indexer_id = payload.get("indexerId")
|
indexer_id = payload.get("indexerId")
|
||||||
|
download_url = payload.get("downloadUrl")
|
||||||
if not guid or not indexer_id:
|
if not guid or not indexer_id:
|
||||||
raise HTTPException(status_code=400, detail="Missing guid or indexerId")
|
raise HTTPException(status_code=400, detail="Missing guid or indexerId")
|
||||||
|
|
||||||
@@ -1518,6 +1610,28 @@ async def action_grab(
|
|||||||
try:
|
try:
|
||||||
response = await client.grab_release(str(guid), int(indexer_id))
|
response = await client.grab_release(str(guid), int(indexer_id))
|
||||||
except httpx.HTTPStatusError as exc:
|
except httpx.HTTPStatusError as exc:
|
||||||
|
status_code = exc.response.status_code if exc.response is not None else 502
|
||||||
|
if status_code == 404 and download_url:
|
||||||
|
qbit = QBittorrentClient(
|
||||||
|
runtime.qbittorrent_base_url,
|
||||||
|
runtime.qbittorrent_username,
|
||||||
|
runtime.qbittorrent_password,
|
||||||
|
)
|
||||||
|
if not qbit.configured():
|
||||||
|
raise HTTPException(status_code=400, detail="qBittorrent not configured")
|
||||||
|
try:
|
||||||
|
await qbit.add_torrent_url(str(download_url), category=f"magent-{request_id}")
|
||||||
|
except httpx.HTTPStatusError as qbit_exc:
|
||||||
|
raise HTTPException(status_code=502, detail=str(qbit_exc)) from qbit_exc
|
||||||
|
await asyncio.to_thread(
|
||||||
|
save_action,
|
||||||
|
request_id,
|
||||||
|
"grab",
|
||||||
|
"Grab release",
|
||||||
|
"ok",
|
||||||
|
"Sent to qBittorrent via Prowlarr.",
|
||||||
|
)
|
||||||
|
return {"status": "ok", "message": "Sent to qBittorrent.", "via": "qbittorrent"}
|
||||||
raise HTTPException(status_code=502, detail=str(exc)) from exc
|
raise HTTPException(status_code=502, detail=str(exc)) from exc
|
||||||
await asyncio.to_thread(
|
await asyncio.to_thread(
|
||||||
save_action, request_id, "grab", "Grab release", "ok", "Grab sent to Sonarr."
|
save_action, request_id, "grab", "Grab release", "ok", "Grab sent to Sonarr."
|
||||||
@@ -1530,6 +1644,28 @@ async def action_grab(
|
|||||||
try:
|
try:
|
||||||
response = await client.grab_release(str(guid), int(indexer_id))
|
response = await client.grab_release(str(guid), int(indexer_id))
|
||||||
except httpx.HTTPStatusError as exc:
|
except httpx.HTTPStatusError as exc:
|
||||||
|
status_code = exc.response.status_code if exc.response is not None else 502
|
||||||
|
if status_code == 404 and download_url:
|
||||||
|
qbit = QBittorrentClient(
|
||||||
|
runtime.qbittorrent_base_url,
|
||||||
|
runtime.qbittorrent_username,
|
||||||
|
runtime.qbittorrent_password,
|
||||||
|
)
|
||||||
|
if not qbit.configured():
|
||||||
|
raise HTTPException(status_code=400, detail="qBittorrent not configured")
|
||||||
|
try:
|
||||||
|
await qbit.add_torrent_url(str(download_url), category=f"magent-{request_id}")
|
||||||
|
except httpx.HTTPStatusError as qbit_exc:
|
||||||
|
raise HTTPException(status_code=502, detail=str(qbit_exc)) from qbit_exc
|
||||||
|
await asyncio.to_thread(
|
||||||
|
save_action,
|
||||||
|
request_id,
|
||||||
|
"grab",
|
||||||
|
"Grab release",
|
||||||
|
"ok",
|
||||||
|
"Sent to qBittorrent via Prowlarr.",
|
||||||
|
)
|
||||||
|
return {"status": "ok", "message": "Sent to qBittorrent.", "via": "qbittorrent"}
|
||||||
raise HTTPException(status_code=502, detail=str(exc)) from exc
|
raise HTTPException(status_code=502, detail=str(exc)) from exc
|
||||||
await asyncio.to_thread(
|
await asyncio.to_thread(
|
||||||
save_action, request_id, "grab", "Grab release", "ok", "Grab sent to Radarr."
|
save_action, request_id, "grab", "Grab release", "ok", "Grab sent to Radarr."
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import asyncio
|
||||||
from typing import Any, Dict
|
from typing import Any, Dict
|
||||||
import httpx
|
import httpx
|
||||||
from fastapi import APIRouter, Depends
|
from fastapi import APIRouter, Depends
|
||||||
@@ -38,53 +39,45 @@ async def services_status() -> Dict[str, Any]:
|
|||||||
)
|
)
|
||||||
jellyfin = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
jellyfin = JellyfinClient(runtime.jellyfin_base_url, runtime.jellyfin_api_key)
|
||||||
|
|
||||||
services = []
|
checks = [
|
||||||
services.append(
|
_check(
|
||||||
await _check(
|
|
||||||
"Jellyseerr",
|
"Jellyseerr",
|
||||||
jellyseerr.configured(),
|
jellyseerr.configured(),
|
||||||
lambda: jellyseerr.get_recent_requests(take=1, skip=0),
|
lambda: jellyseerr.get_recent_requests(take=1, skip=0),
|
||||||
)
|
),
|
||||||
)
|
_check(
|
||||||
services.append(
|
|
||||||
await _check(
|
|
||||||
"Sonarr",
|
"Sonarr",
|
||||||
sonarr.configured(),
|
sonarr.configured(),
|
||||||
sonarr.get_system_status,
|
sonarr.get_system_status,
|
||||||
)
|
),
|
||||||
)
|
_check(
|
||||||
services.append(
|
|
||||||
await _check(
|
|
||||||
"Radarr",
|
"Radarr",
|
||||||
radarr.configured(),
|
radarr.configured(),
|
||||||
radarr.get_system_status,
|
radarr.get_system_status,
|
||||||
)
|
),
|
||||||
)
|
_check(
|
||||||
prowlarr_status = await _check(
|
"Prowlarr",
|
||||||
"Prowlarr",
|
prowlarr.configured(),
|
||||||
prowlarr.configured(),
|
prowlarr.get_health,
|
||||||
prowlarr.get_health,
|
),
|
||||||
)
|
_check(
|
||||||
|
"qBittorrent",
|
||||||
|
qbittorrent.configured(),
|
||||||
|
qbittorrent.get_app_version,
|
||||||
|
),
|
||||||
|
_check(
|
||||||
|
"Jellyfin",
|
||||||
|
jellyfin.configured(),
|
||||||
|
jellyfin.get_system_info,
|
||||||
|
),
|
||||||
|
]
|
||||||
|
services = await asyncio.gather(*checks)
|
||||||
|
prowlarr_status = next(service for service in services if service["name"] == "Prowlarr")
|
||||||
if prowlarr_status.get("status") == "up":
|
if prowlarr_status.get("status") == "up":
|
||||||
health = prowlarr_status.get("detail")
|
health = prowlarr_status.get("detail")
|
||||||
if isinstance(health, list) and health:
|
if isinstance(health, list) and health:
|
||||||
prowlarr_status["status"] = "degraded"
|
prowlarr_status["status"] = "degraded"
|
||||||
prowlarr_status["message"] = "Health warnings"
|
prowlarr_status["message"] = "Health warnings"
|
||||||
services.append(prowlarr_status)
|
|
||||||
services.append(
|
|
||||||
await _check(
|
|
||||||
"qBittorrent",
|
|
||||||
qbittorrent.configured(),
|
|
||||||
qbittorrent.get_app_version,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
services.append(
|
|
||||||
await _check(
|
|
||||||
"Jellyfin",
|
|
||||||
jellyfin.configured(),
|
|
||||||
jellyfin.get_system_info,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
overall = "up"
|
overall = "up"
|
||||||
if any(s.get("status") == "down" for s in services):
|
if any(s.get("status") == "down" for s in services):
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ def verify_password(plain_password: str, hashed_password: str) -> bool:
|
|||||||
|
|
||||||
|
|
||||||
def create_access_token(subject: str, role: str, expires_minutes: Optional[int] = None) -> str:
|
def create_access_token(subject: str, role: str, expires_minutes: Optional[int] = None) -> str:
|
||||||
|
if not settings.jwt_secret:
|
||||||
|
raise ValueError("JWT_SECRET is not configured")
|
||||||
minutes = expires_minutes or settings.jwt_exp_minutes
|
minutes = expires_minutes or settings.jwt_exp_minutes
|
||||||
expires = datetime.now(timezone.utc) + timedelta(minutes=minutes)
|
expires = datetime.now(timezone.utc) + timedelta(minutes=minutes)
|
||||||
payload: Dict[str, Any] = {"sub": subject, "role": role, "exp": expires}
|
payload: Dict[str, Any] = {"sub": subject, "role": role, "exp": expires}
|
||||||
@@ -26,6 +28,8 @@ def create_access_token(subject: str, role: str, expires_minutes: Optional[int]
|
|||||||
|
|
||||||
|
|
||||||
def decode_token(token: str) -> Dict[str, Any]:
|
def decode_token(token: str) -> Dict[str, Any]:
|
||||||
|
if not settings.jwt_secret:
|
||||||
|
raise ValueError("JWT_SECRET is not configured")
|
||||||
return jwt.decode(token, settings.jwt_secret, algorithms=[_ALGORITHM])
|
return jwt.decode(token, settings.jwt_secret, algorithms=[_ALGORITHM])
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -465,9 +465,14 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
try:
|
try:
|
||||||
download_ids = _download_ids(_queue_records(arr_queue))
|
download_ids = _download_ids(_queue_records(arr_queue))
|
||||||
torrent_list: List[Dict[str, Any]] = []
|
torrent_list: List[Dict[str, Any]] = []
|
||||||
if download_ids and qbittorrent.configured():
|
if qbittorrent.configured():
|
||||||
torrents = await qbittorrent.get_torrents_by_hashes("|".join(download_ids))
|
if download_ids:
|
||||||
torrent_list = torrents if isinstance(torrents, list) else []
|
torrents = await qbittorrent.get_torrents_by_hashes("|".join(download_ids))
|
||||||
|
torrent_list = torrents if isinstance(torrents, list) else []
|
||||||
|
else:
|
||||||
|
category = f"magent-{request_id}"
|
||||||
|
torrents = await qbittorrent.get_torrents_by_category(category)
|
||||||
|
torrent_list = torrents if isinstance(torrents, list) else []
|
||||||
summary = _summarize_qbit(torrent_list)
|
summary = _summarize_qbit(torrent_list)
|
||||||
qbit_state = summary.get("state")
|
qbit_state = summary.get("state")
|
||||||
qbit_message = summary.get("message")
|
qbit_message = summary.get("message")
|
||||||
@@ -550,8 +555,15 @@ async def build_snapshot(request_id: str) -> Snapshot:
|
|||||||
elif arr_item and arr_state != "available":
|
elif arr_item and arr_state != "available":
|
||||||
actions.append(
|
actions.append(
|
||||||
ActionOption(
|
ActionOption(
|
||||||
id="search",
|
id="search_auto",
|
||||||
label="Search again for releases",
|
label="Search and auto-download",
|
||||||
|
risk="low",
|
||||||
|
)
|
||||||
|
)
|
||||||
|
actions.append(
|
||||||
|
ActionOption(
|
||||||
|
id="search_releases",
|
||||||
|
label="Search and choose a download",
|
||||||
risk="low",
|
risk="low",
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 4.8 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 38 KiB |
@@ -0,0 +1,19 @@
|
|||||||
|
services:
|
||||||
|
backend:
|
||||||
|
image: rephl3xnz/magent-backend:latest
|
||||||
|
env_file:
|
||||||
|
- ./.env
|
||||||
|
ports:
|
||||||
|
- "8000:8000"
|
||||||
|
volumes:
|
||||||
|
- ./data:/app/data
|
||||||
|
|
||||||
|
frontend:
|
||||||
|
image: rephl3xnz/magent-frontend:latest
|
||||||
|
environment:
|
||||||
|
- NEXT_PUBLIC_API_BASE=/api
|
||||||
|
- BACKEND_INTERNAL_URL=http://backend:8000
|
||||||
|
ports:
|
||||||
|
- "3000:3000"
|
||||||
|
depends_on:
|
||||||
|
- backend
|
||||||
+2
-2
@@ -1,8 +1,8 @@
|
|||||||
services:
|
services:
|
||||||
backend:
|
backend:
|
||||||
build:
|
build:
|
||||||
context: ./backend
|
context: .
|
||||||
dockerfile: Dockerfile
|
dockerfile: backend/Dockerfile
|
||||||
env_file:
|
env_file:
|
||||||
- ./.env
|
- ./.env
|
||||||
ports:
|
ports:
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ COPY package.json ./
|
|||||||
RUN npm install
|
RUN npm install
|
||||||
|
|
||||||
COPY app ./app
|
COPY app ./app
|
||||||
|
COPY public ./public
|
||||||
COPY next-env.d.ts ./next-env.d.ts
|
COPY next-env.d.ts ./next-env.d.ts
|
||||||
COPY next.config.js ./next.config.js
|
COPY next.config.js ./next.config.js
|
||||||
COPY tsconfig.json ./tsconfig.json
|
COPY tsconfig.json ./tsconfig.json
|
||||||
@@ -22,6 +23,7 @@ ENV NEXT_TELEMETRY_DISABLED=1 \
|
|||||||
NODE_ENV=production
|
NODE_ENV=production
|
||||||
|
|
||||||
COPY --from=builder /app/.next ./.next
|
COPY --from=builder /app/.next ./.next
|
||||||
|
COPY --from=builder /app/public ./public
|
||||||
COPY --from=builder /app/node_modules ./node_modules
|
COPY --from=builder /app/node_modules ./node_modules
|
||||||
COPY --from=builder /app/package.json ./package.json
|
COPY --from=builder /app/package.json ./package.json
|
||||||
COPY --from=builder /app/next.config.js ./next.config.js
|
COPY --from=builder /app/next.config.js ./next.config.js
|
||||||
|
|||||||
@@ -2,7 +2,14 @@
|
|||||||
|
|
||||||
import { useEffect, useMemo, useState } from 'react'
|
import { useEffect, useMemo, useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
import {
|
||||||
|
authFetch,
|
||||||
|
authFetchOrThrow,
|
||||||
|
ForbiddenError,
|
||||||
|
getApiBase,
|
||||||
|
getToken,
|
||||||
|
UnauthorizedError,
|
||||||
|
} from '../lib/auth'
|
||||||
import AdminShell from '../ui/AdminShell'
|
import AdminShell from '../ui/AdminShell'
|
||||||
|
|
||||||
type AdminSetting = {
|
type AdminSetting = {
|
||||||
@@ -109,17 +116,8 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
|
|
||||||
const loadSettings = async () => {
|
const loadSettings = async () => {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/admin/settings`)
|
const response = await authFetchOrThrow(`${baseUrl}/admin/settings`)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
if (response.status === 401) {
|
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (response.status === 403) {
|
|
||||||
router.push('/')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
throw new Error('Failed to load settings')
|
throw new Error('Failed to load settings')
|
||||||
}
|
}
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
@@ -199,6 +197,14 @@ export default function SettingsPage({ section }: SettingsPageProps) {
|
|||||||
await loadArtworkPrefetchStatus()
|
await loadArtworkPrefetchStatus()
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
if (err instanceof UnauthorizedError) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (err instanceof ForbiddenError) {
|
||||||
|
router.push('/')
|
||||||
|
return
|
||||||
|
}
|
||||||
console.error(err)
|
console.error(err)
|
||||||
setStatus('Could not load admin settings.')
|
setStatus('Could not load admin settings.')
|
||||||
} finally {
|
} finally {
|
||||||
|
|||||||
@@ -0,0 +1,121 @@
|
|||||||
|
'use client'
|
||||||
|
|
||||||
|
import { useEffect, useState } from 'react'
|
||||||
|
import { useRouter } from 'next/navigation'
|
||||||
|
import { authFetchOrThrow, getApiBase, getToken, UnauthorizedError } from '../lib/auth'
|
||||||
|
|
||||||
|
type Profile = {
|
||||||
|
username?: string
|
||||||
|
}
|
||||||
|
|
||||||
|
export default function FeedbackPage() {
|
||||||
|
const router = useRouter()
|
||||||
|
const [profile, setProfile] = useState<Profile | null>(null)
|
||||||
|
const [category, setCategory] = useState('bug')
|
||||||
|
const [message, setMessage] = useState('')
|
||||||
|
const [status, setStatus] = useState<string | null>(null)
|
||||||
|
const [submitting, setSubmitting] = useState(false)
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!getToken()) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
const load = async () => {
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetchOrThrow(`${baseUrl}/auth/me`)
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error('Could not load profile.')
|
||||||
|
}
|
||||||
|
const data = await response.json()
|
||||||
|
setProfile({ username: data?.username })
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof UnauthorizedError) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
console.error(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
void load()
|
||||||
|
}, [router])
|
||||||
|
|
||||||
|
const submit = async (event: React.FormEvent<HTMLFormElement>) => {
|
||||||
|
event.preventDefault()
|
||||||
|
setStatus(null)
|
||||||
|
if (!message.trim()) {
|
||||||
|
setStatus('Please write a short message before sending.')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
setSubmitting(true)
|
||||||
|
try {
|
||||||
|
const baseUrl = getApiBase()
|
||||||
|
const response = await authFetchOrThrow(`${baseUrl}/feedback`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
type: category,
|
||||||
|
message: message.trim(),
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
if (!response.ok) {
|
||||||
|
const text = await response.text()
|
||||||
|
throw new Error(text || `Request failed: ${response.status}`)
|
||||||
|
}
|
||||||
|
setMessage('')
|
||||||
|
setStatus('Thanks! Your message has been sent.')
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof UnauthorizedError) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
console.error(error)
|
||||||
|
setStatus('That did not send. Please try again.')
|
||||||
|
} finally {
|
||||||
|
setSubmitting(false)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<main className="card">
|
||||||
|
<header className="how-hero">
|
||||||
|
<p className="eyebrow">Send feedback</p>
|
||||||
|
<h1>Help us improve Magent</h1>
|
||||||
|
<p className="lede">
|
||||||
|
Found a problem or have an idea? Send it here and we will see it right away.
|
||||||
|
</p>
|
||||||
|
</header>
|
||||||
|
|
||||||
|
<form className="auth-form" onSubmit={submit}>
|
||||||
|
<label htmlFor="feedback-user">Your username</label>
|
||||||
|
<input id="feedback-user" value={profile?.username ?? ''} readOnly />
|
||||||
|
|
||||||
|
<label htmlFor="feedback-type">What is this about?</label>
|
||||||
|
<select
|
||||||
|
id="feedback-type"
|
||||||
|
value={category}
|
||||||
|
onChange={(event) => setCategory(event.target.value)}
|
||||||
|
>
|
||||||
|
<option value="bug">Bug (something is broken)</option>
|
||||||
|
<option value="feature">Feature idea (new option)</option>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<label htmlFor="feedback-message">Tell us what happened</label>
|
||||||
|
<textarea
|
||||||
|
id="feedback-message"
|
||||||
|
rows={6}
|
||||||
|
value={message}
|
||||||
|
onChange={(event) => setMessage(event.target.value)}
|
||||||
|
placeholder="Write the details here..."
|
||||||
|
/>
|
||||||
|
|
||||||
|
{status && <div className="status-banner">{status}</div>}
|
||||||
|
|
||||||
|
<button type="submit" disabled={submitting}>
|
||||||
|
{submitting ? 'Sending...' : 'Send feedback'}
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</main>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -108,7 +108,7 @@ body {
|
|||||||
grid-column: 1 / -1;
|
grid-column: 1 / -1;
|
||||||
grid-row: 2 / 3;
|
grid-row: 2 / 3;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: flex-end;
|
justify-content: flex-start;
|
||||||
}
|
}
|
||||||
|
|
||||||
.brand {
|
.brand {
|
||||||
@@ -130,6 +130,7 @@ body {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.header-actions a {
|
.header-actions a {
|
||||||
@@ -162,6 +163,18 @@ body {
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.header-actions .header-cta {
|
||||||
|
background: linear-gradient(120deg, rgba(255, 107, 43, 0.95), rgba(255, 168, 75, 0.95));
|
||||||
|
color: #151515;
|
||||||
|
border: 1px solid rgba(255, 140, 60, 0.7);
|
||||||
|
box-shadow: 0 12px 24px rgba(255, 107, 43, 0.35);
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.header-actions .header-cta--left {
|
||||||
|
margin-right: auto;
|
||||||
|
}
|
||||||
|
|
||||||
.signed-in {
|
.signed-in {
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
@@ -332,6 +345,17 @@ select option {
|
|||||||
color: var(--ink);
|
color: var(--ink);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
textarea {
|
||||||
|
padding: 14px 16px;
|
||||||
|
border-radius: 16px;
|
||||||
|
border: 1px solid var(--border);
|
||||||
|
font-size: 16px;
|
||||||
|
background: var(--input-bg);
|
||||||
|
color: var(--input-ink);
|
||||||
|
font-family: inherit;
|
||||||
|
resize: vertical;
|
||||||
|
}
|
||||||
|
|
||||||
button {
|
button {
|
||||||
padding: 12px 18px;
|
padding: 12px 18px;
|
||||||
border-radius: 999px;
|
border-radius: 999px;
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ export default function HowItWorksPage() {
|
|||||||
<p className="eyebrow">How this works</p>
|
<p className="eyebrow">How this works</p>
|
||||||
<h1>Your request, step by step</h1>
|
<h1>Your request, step by step</h1>
|
||||||
<p className="lede">
|
<p className="lede">
|
||||||
Think of Magent as a status tracker. It checks a few helper apps that do different jobs,
|
Magent is a friendly status checker. It looks at a few helper apps, then shows you where
|
||||||
then tells you where your request is stuck and what you can safely try next.
|
your request is and what you can safely do next.
|
||||||
</p>
|
</p>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
@@ -17,32 +17,36 @@ export default function HowItWorksPage() {
|
|||||||
<h2>Jellyseerr</h2>
|
<h2>Jellyseerr</h2>
|
||||||
<p className="how-title">The request box</p>
|
<p className="how-title">The request box</p>
|
||||||
<p>
|
<p>
|
||||||
This is where you ask for a movie or show. It records your request and keeps track of
|
This is where you ask for a movie or show. It keeps the request and whether it is
|
||||||
approvals.
|
approved.
|
||||||
</p>
|
</p>
|
||||||
</article>
|
</article>
|
||||||
<article className="how-card">
|
<article className="how-card">
|
||||||
<h2>Sonarr / Radarr</h2>
|
<h2>Sonarr / Radarr</h2>
|
||||||
<p className="how-title">The librarian</p>
|
<p className="how-title">The library manager</p>
|
||||||
<p>
|
<p>
|
||||||
These apps add the item to the library, decide what quality to grab, and look for the
|
These add the request to the library list and decide what quality to look for.
|
||||||
files that match your request.
|
|
||||||
</p>
|
</p>
|
||||||
</article>
|
</article>
|
||||||
<article className="how-card">
|
<article className="how-card">
|
||||||
<h2>Prowlarr</h2>
|
<h2>Prowlarr</h2>
|
||||||
<p className="how-title">The search helper</p>
|
<p className="how-title">The search helper</p>
|
||||||
<p>
|
<p>
|
||||||
This one checks your torrent sources and reports back what it found, or if nothing is
|
This checks your search sources and reports back what it finds.
|
||||||
available yet.
|
|
||||||
</p>
|
</p>
|
||||||
</article>
|
</article>
|
||||||
<article className="how-card">
|
<article className="how-card">
|
||||||
<h2>qBittorrent</h2>
|
<h2>qBittorrent</h2>
|
||||||
<p className="how-title">The downloader</p>
|
<p className="how-title">The downloader</p>
|
||||||
<p>
|
<p>
|
||||||
If a file is found, this app downloads it. Magent can tell if it is actively
|
This downloads the file. Magent can tell if it is downloading, paused, or finished.
|
||||||
downloading, stalled, or finished.
|
</p>
|
||||||
|
</article>
|
||||||
|
<article className="how-card">
|
||||||
|
<h2>Jellyfin</h2>
|
||||||
|
<p className="how-title">The place you watch</p>
|
||||||
|
<p>
|
||||||
|
When the file is ready, Jellyfin shows it in your library so you can watch it.
|
||||||
</p>
|
</p>
|
||||||
</article>
|
</article>
|
||||||
</section>
|
</section>
|
||||||
@@ -54,13 +58,13 @@ export default function HowItWorksPage() {
|
|||||||
<strong>You request a title</strong> in Jellyseerr.
|
<strong>You request a title</strong> in Jellyseerr.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<strong>Sonarr/Radarr adds it</strong> to the library list and asks Prowlarr to search.
|
<strong>Sonarr/Radarr adds it</strong> to the library list.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<strong>Prowlarr looks for sources</strong> and sends results back.
|
<strong>Prowlarr looks for sources</strong> and sends results back.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<strong>qBittorrent downloads</strong> the best match.
|
<strong>qBittorrent downloads</strong> the match.
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<strong>Sonarr/Radarr imports</strong> it into your library.
|
<strong>Sonarr/Radarr imports</strong> it into your library.
|
||||||
@@ -72,11 +76,10 @@ export default function HowItWorksPage() {
|
|||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section className="how-callout">
|
<section className="how-callout">
|
||||||
<h2>Why Magent sometimes says "waiting"</h2>
|
<h2>Why Magent sometimes says “waiting”</h2>
|
||||||
<p>
|
<p>
|
||||||
If the search helper cannot find a match yet, Magent will say there is nothing to grab.
|
If the search helper cannot find a match yet, Magent will say there is nothing to grab.
|
||||||
This does not mean something is broken. It usually means the release is not available
|
That does not mean it is broken. It usually means the release is not available yet.
|
||||||
yet or your search sources do not have it.
|
|
||||||
</p>
|
</p>
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
|
|||||||
@@ -23,3 +23,37 @@ export const authFetch = (input: RequestInfo | URL, init?: RequestInit) => {
|
|||||||
}
|
}
|
||||||
return fetch(input, { ...init, headers })
|
return fetch(input, { ...init, headers })
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class UnauthorizedError extends Error {
|
||||||
|
constructor() {
|
||||||
|
super('Unauthorized')
|
||||||
|
this.name = 'UnauthorizedError'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export class ForbiddenError extends Error {
|
||||||
|
constructor() {
|
||||||
|
super('Forbidden')
|
||||||
|
this.name = 'ForbiddenError'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export const authFetchOrThrow = async (input: RequestInfo | URL, init?: RequestInit) => {
|
||||||
|
const response = await authFetch(input, init)
|
||||||
|
if (response.status === 401) {
|
||||||
|
clearToken()
|
||||||
|
throw new UnauthorizedError()
|
||||||
|
}
|
||||||
|
if (response.status === 403) {
|
||||||
|
throw new ForbiddenError()
|
||||||
|
}
|
||||||
|
return response
|
||||||
|
}
|
||||||
|
|
||||||
|
export const readResponseText = async (response: Response) => {
|
||||||
|
try {
|
||||||
|
return (await response.text()).trim()
|
||||||
|
} catch {
|
||||||
|
return ''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
+36
-26
@@ -2,7 +2,13 @@
|
|||||||
|
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { authFetch, getApiBase, getToken, clearToken } from './lib/auth'
|
import {
|
||||||
|
authFetchOrThrow,
|
||||||
|
ForbiddenError,
|
||||||
|
getApiBase,
|
||||||
|
getToken,
|
||||||
|
UnauthorizedError,
|
||||||
|
} from './lib/auth'
|
||||||
|
|
||||||
export default function HomePage() {
|
export default function HomePage() {
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
@@ -52,13 +58,8 @@ export default function HomePage() {
|
|||||||
setRecentError(null)
|
setRecentError(null)
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const meResponse = await authFetch(`${baseUrl}/auth/me`)
|
const meResponse = await authFetchOrThrow(`${baseUrl}/auth/me`)
|
||||||
if (!meResponse.ok) {
|
if (!meResponse.ok) {
|
||||||
if (meResponse.status === 401) {
|
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
throw new Error(`Auth failed: ${meResponse.status}`)
|
throw new Error(`Auth failed: ${meResponse.status}`)
|
||||||
}
|
}
|
||||||
const me = await meResponse.json()
|
const me = await meResponse.json()
|
||||||
@@ -66,15 +67,10 @@ export default function HomePage() {
|
|||||||
setRole(userRole)
|
setRole(userRole)
|
||||||
setAuthReady(true)
|
setAuthReady(true)
|
||||||
const take = userRole === 'admin' ? 50 : 6
|
const take = userRole === 'admin' ? 50 : 6
|
||||||
const response = await authFetch(
|
const response = await authFetchOrThrow(
|
||||||
`${baseUrl}/requests/recent?take=${take}&days=${recentDays}`
|
`${baseUrl}/requests/recent?take=${take}&days=${recentDays}`
|
||||||
)
|
)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
if (response.status === 401) {
|
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
throw new Error(`Recent requests failed: ${response.status}`)
|
throw new Error(`Recent requests failed: ${response.status}`)
|
||||||
}
|
}
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
@@ -99,6 +95,14 @@ export default function HomePage() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
if (error instanceof UnauthorizedError) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (error instanceof ForbiddenError) {
|
||||||
|
router.push('/')
|
||||||
|
return
|
||||||
|
}
|
||||||
console.error(error)
|
console.error(error)
|
||||||
setRecentError('Recent requests are not available right now.')
|
setRecentError('Recent requests are not available right now.')
|
||||||
} finally {
|
} finally {
|
||||||
@@ -107,7 +111,7 @@ export default function HomePage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
load()
|
load()
|
||||||
}, [recentDays])
|
}, [recentDays, router])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!authReady) {
|
if (!authReady) {
|
||||||
@@ -118,18 +122,21 @@ export default function HomePage() {
|
|||||||
setServicesError(null)
|
setServicesError(null)
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/status/services`)
|
const response = await authFetchOrThrow(`${baseUrl}/status/services`)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
if (response.status === 401) {
|
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
throw new Error(`Service status failed: ${response.status}`)
|
throw new Error(`Service status failed: ${response.status}`)
|
||||||
}
|
}
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
setServicesStatus(data)
|
setServicesStatus(data)
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
if (error instanceof UnauthorizedError) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (error instanceof ForbiddenError) {
|
||||||
|
router.push('/')
|
||||||
|
return
|
||||||
|
}
|
||||||
console.error(error)
|
console.error(error)
|
||||||
setServicesError('Service status is not available right now.')
|
setServicesError('Service status is not available right now.')
|
||||||
} finally {
|
} finally {
|
||||||
@@ -145,13 +152,8 @@ export default function HomePage() {
|
|||||||
const runSearch = async (term: string) => {
|
const runSearch = async (term: string) => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/requests/search?query=${encodeURIComponent(term)}`)
|
const response = await authFetchOrThrow(`${baseUrl}/requests/search?query=${encodeURIComponent(term)}`)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
if (response.status === 401) {
|
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
throw new Error(`Search failed: ${response.status}`)
|
throw new Error(`Search failed: ${response.status}`)
|
||||||
}
|
}
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
@@ -168,6 +170,14 @@ export default function HomePage() {
|
|||||||
setSearchError(null)
|
setSearchError(null)
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
if (error instanceof UnauthorizedError) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (error instanceof ForbiddenError) {
|
||||||
|
router.push('/')
|
||||||
|
return
|
||||||
|
}
|
||||||
console.error(error)
|
console.error(error)
|
||||||
setSearchError('Search failed. Try a request ID instead.')
|
setSearchError('Search failed. Try a request ID instead.')
|
||||||
setSearchResults([])
|
setSearchResults([])
|
||||||
|
|||||||
@@ -2,7 +2,13 @@
|
|||||||
|
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
import {
|
||||||
|
authFetchOrThrow,
|
||||||
|
getApiBase,
|
||||||
|
getToken,
|
||||||
|
readResponseText,
|
||||||
|
UnauthorizedError,
|
||||||
|
} from '../lib/auth'
|
||||||
|
|
||||||
type ProfileInfo = {
|
type ProfileInfo = {
|
||||||
username: string
|
username: string
|
||||||
@@ -26,9 +32,8 @@ export default function ProfilePage() {
|
|||||||
const load = async () => {
|
const load = async () => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/auth/me`)
|
const response = await authFetchOrThrow(`${baseUrl}/auth/me`)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
router.push('/login')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -39,6 +44,10 @@ export default function ProfilePage() {
|
|||||||
auth_provider: data?.auth_provider ?? 'local',
|
auth_provider: data?.auth_provider ?? 'local',
|
||||||
})
|
})
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
if (err instanceof UnauthorizedError) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
console.error(err)
|
console.error(err)
|
||||||
setStatus('Could not load your profile.')
|
setStatus('Could not load your profile.')
|
||||||
} finally {
|
} finally {
|
||||||
@@ -57,7 +66,7 @@ export default function ProfilePage() {
|
|||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/auth/password`, {
|
const response = await authFetchOrThrow(`${baseUrl}/auth/password`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
headers: { 'Content-Type': 'application/json' },
|
headers: { 'Content-Type': 'application/json' },
|
||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
@@ -66,13 +75,17 @@ export default function ProfilePage() {
|
|||||||
}),
|
}),
|
||||||
})
|
})
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
const text = await response.text()
|
const text = await readResponseText(response)
|
||||||
throw new Error(text || 'Update failed')
|
throw new Error(text || 'Update failed')
|
||||||
}
|
}
|
||||||
setCurrentPassword('')
|
setCurrentPassword('')
|
||||||
setNewPassword('')
|
setNewPassword('')
|
||||||
setStatus('Password updated.')
|
setStatus('Password updated.')
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
if (err instanceof UnauthorizedError) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
console.error(err)
|
console.error(err)
|
||||||
setStatus('Could not update password. Check your current password.')
|
setStatus('Could not update password. Check your current password.')
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,15 @@
|
|||||||
|
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../../lib/auth'
|
import {
|
||||||
|
authFetch,
|
||||||
|
authFetchOrThrow,
|
||||||
|
clearToken,
|
||||||
|
getApiBase,
|
||||||
|
getToken,
|
||||||
|
readResponseText,
|
||||||
|
UnauthorizedError,
|
||||||
|
} from '../../lib/auth'
|
||||||
|
|
||||||
type TimelineHop = {
|
type TimelineHop = {
|
||||||
service: string
|
service: string
|
||||||
@@ -34,6 +42,7 @@ type ReleaseOption = {
|
|||||||
leechers?: number
|
leechers?: number
|
||||||
protocol?: string
|
protocol?: string
|
||||||
infoUrl?: string
|
infoUrl?: string
|
||||||
|
downloadUrl?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
type SnapshotHistory = {
|
type SnapshotHistory = {
|
||||||
@@ -484,7 +493,8 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
}
|
}
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const actionMap: Record<string, string> = {
|
const actionMap: Record<string, string> = {
|
||||||
search: 'actions/search',
|
search_releases: 'actions/search',
|
||||||
|
search_auto: 'actions/search_auto',
|
||||||
resume_torrent: 'actions/qbit/resume',
|
resume_torrent: 'actions/qbit/resume',
|
||||||
readd_to_arr: 'actions/readd',
|
readd_to_arr: 'actions/readd',
|
||||||
}
|
}
|
||||||
@@ -493,27 +503,22 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
setActionMessage('This action is not wired yet.')
|
setActionMessage('This action is not wired yet.')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (action.id === 'search') {
|
if (action.id === 'search_releases') {
|
||||||
setActionMessage(null)
|
setActionMessage(null)
|
||||||
setReleaseOptions([])
|
setReleaseOptions([])
|
||||||
setSearchRan(false)
|
setSearchRan(false)
|
||||||
setModalMessage(null)
|
setModalMessage(null)
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
const response = await authFetch(`${baseUrl}/requests/${snapshot.request_id}/${path}`, {
|
const response = await authFetchOrThrow(`${baseUrl}/requests/${snapshot.request_id}/${path}`, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
})
|
})
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
if (response.status === 401) {
|
const text = await readResponseText(response)
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const text = await response.text()
|
|
||||||
throw new Error(text || `Request failed: ${response.status}`)
|
throw new Error(text || `Request failed: ${response.status}`)
|
||||||
}
|
}
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
if (action.id === 'search') {
|
if (action.id === 'search_releases') {
|
||||||
if (Array.isArray(data.releases)) {
|
if (Array.isArray(data.releases)) {
|
||||||
setReleaseOptions(data.releases)
|
setReleaseOptions(data.releases)
|
||||||
}
|
}
|
||||||
@@ -526,12 +531,20 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
setModalMessage('Search complete. Pick an option below if you want to download.')
|
setModalMessage('Search complete. Pick an option below if you want to download.')
|
||||||
}
|
}
|
||||||
setActionMessage(`${action.label} started.`)
|
setActionMessage(`${action.label} started.`)
|
||||||
|
} else if (action.id === 'search_auto') {
|
||||||
|
const message = data?.message ?? 'Search sent to Sonarr/Radarr.'
|
||||||
|
setActionMessage(message)
|
||||||
|
setModalMessage(message)
|
||||||
} else {
|
} else {
|
||||||
const message = data?.message ?? `${action.label} started.`
|
const message = data?.message ?? `${action.label} started.`
|
||||||
setActionMessage(message)
|
setActionMessage(message)
|
||||||
setModalMessage(message)
|
setModalMessage(message)
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
if (error instanceof UnauthorizedError) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
console.error(error)
|
console.error(error)
|
||||||
const message = `${action.label} failed. Check the backend logs.`
|
const message = `${action.label} failed. Check the backend logs.`
|
||||||
setActionMessage(message)
|
setActionMessage(message)
|
||||||
@@ -565,6 +578,7 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
<span>{release.seeders ?? 0} seeders · {formatBytes(release.size)}</span>
|
<span>{release.seeders ?? 0} seeders · {formatBytes(release.size)}</span>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
|
disabled={!release.guid || !release.indexerId}
|
||||||
onClick={async () => {
|
onClick={async () => {
|
||||||
if (!snapshot || !release.guid || !release.indexerId) {
|
if (!snapshot || !release.guid || !release.indexerId) {
|
||||||
setActionMessage('Missing details to start the download.')
|
setActionMessage('Missing details to start the download.')
|
||||||
@@ -575,7 +589,7 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
if (!ok) return
|
if (!ok) return
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
try {
|
try {
|
||||||
const response = await authFetch(
|
const response = await authFetchOrThrow(
|
||||||
`${baseUrl}/requests/${snapshot.request_id}/actions/grab`,
|
`${baseUrl}/requests/${snapshot.request_id}/actions/grab`,
|
||||||
{
|
{
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@@ -583,21 +597,21 @@ export default function RequestTimelinePage({ params }: { params: { id: string }
|
|||||||
body: JSON.stringify({
|
body: JSON.stringify({
|
||||||
guid: release.guid,
|
guid: release.guid,
|
||||||
indexerId: release.indexerId,
|
indexerId: release.indexerId,
|
||||||
|
downloadUrl: release.downloadUrl,
|
||||||
}),
|
}),
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
if (response.status === 401) {
|
const text = await readResponseText(response)
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
const text = await response.text()
|
|
||||||
throw new Error(text || `Request failed: ${response.status}`)
|
throw new Error(text || `Request failed: ${response.status}`)
|
||||||
}
|
}
|
||||||
setActionMessage('Download sent to Sonarr/Radarr.')
|
setActionMessage('Download sent to Sonarr/Radarr.')
|
||||||
setModalMessage('Download sent to Sonarr/Radarr.')
|
setModalMessage('Download sent to Sonarr/Radarr.')
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
if (error instanceof UnauthorizedError) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
console.error(error)
|
console.error(error)
|
||||||
const message = 'Download failed. Check the logs.'
|
const message = 'Download failed. Check the logs.'
|
||||||
setActionMessage(message)
|
setActionMessage(message)
|
||||||
|
|||||||
@@ -1,17 +1,10 @@
|
|||||||
'use client'
|
'use client'
|
||||||
|
|
||||||
import { useEffect } from 'react'
|
import { useEffect } from 'react'
|
||||||
import { getApiBase } from '../lib/auth'
|
|
||||||
|
|
||||||
const STORAGE_KEY = 'branding_version'
|
|
||||||
|
|
||||||
export default function BrandingFavicon() {
|
export default function BrandingFavicon() {
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const baseUrl = getApiBase()
|
const href = '/api/branding/favicon.ico'
|
||||||
const version =
|
|
||||||
(typeof window !== 'undefined' && window.localStorage.getItem(STORAGE_KEY)) || ''
|
|
||||||
const versionSuffix = version ? `?v=${encodeURIComponent(version)}` : ''
|
|
||||||
const href = `${baseUrl}/branding/favicon.ico${versionSuffix}`
|
|
||||||
let link = document.querySelector("link[rel='icon']") as HTMLLinkElement | null
|
let link = document.querySelector("link[rel='icon']") as HTMLLinkElement | null
|
||||||
if (!link) {
|
if (!link) {
|
||||||
link = document.createElement('link')
|
link = document.createElement('link')
|
||||||
|
|||||||
@@ -1,36 +1,14 @@
|
|||||||
'use client'
|
|
||||||
|
|
||||||
import { useEffect, useState } from 'react'
|
|
||||||
import { getApiBase } from '../lib/auth'
|
|
||||||
|
|
||||||
const STORAGE_KEY = 'branding_version'
|
|
||||||
|
|
||||||
type BrandingLogoProps = {
|
type BrandingLogoProps = {
|
||||||
className?: string
|
className?: string
|
||||||
alt?: string
|
alt?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function BrandingLogo({ className, alt = 'Magent logo' }: BrandingLogoProps) {
|
export default function BrandingLogo({ className, alt = 'Magent logo' }: BrandingLogoProps) {
|
||||||
const [src, setSrc] = useState<string | null>(null)
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const version =
|
|
||||||
(typeof window !== 'undefined' && window.localStorage.getItem(STORAGE_KEY)) || ''
|
|
||||||
const versionSuffix = version ? `?v=${encodeURIComponent(version)}` : ''
|
|
||||||
setSrc(`${baseUrl}/branding/logo.png${versionSuffix}`)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
if (!src) {
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<img
|
<img
|
||||||
className={className}
|
className={className}
|
||||||
src={src}
|
src="/api/branding/logo.png"
|
||||||
alt={alt}
|
alt={alt}
|
||||||
onError={() => setSrc(null)}
|
|
||||||
/>
|
/>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,19 +40,20 @@ export default function HeaderActions() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!signedIn) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="header-actions">
|
<div className="header-actions">
|
||||||
|
<a className="header-cta header-cta--left" href="/feedback">Send feedback</a>
|
||||||
<a href="/">Requests</a>
|
<a href="/">Requests</a>
|
||||||
<a href="/how-it-works">How it works</a>
|
<a href="/how-it-works">How it works</a>
|
||||||
{signedIn && <a href="/profile">My profile</a>}
|
<a href="/profile">My profile</a>
|
||||||
{role === 'admin' && <a href="/admin">Settings</a>}
|
{role === 'admin' && <a href="/admin">Settings</a>}
|
||||||
{signedIn ? (
|
<button type="button" className="header-link" onClick={signOut}>
|
||||||
<button type="button" className="header-link" onClick={signOut}>
|
Sign out
|
||||||
Sign out
|
</button>
|
||||||
</button>
|
|
||||||
) : (
|
|
||||||
<a href="/login">Sign in</a>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
'use client'
|
'use client'
|
||||||
|
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
import { authFetchOrThrow, getApiBase, getToken, UnauthorizedError } from '../lib/auth'
|
||||||
|
|
||||||
export default function HeaderIdentity() {
|
export default function HeaderIdentity() {
|
||||||
const [identity, setIdentity] = useState<string | null>(null)
|
const [identity, setIdentity] = useState<string | null>(null)
|
||||||
@@ -16,9 +16,8 @@ export default function HeaderIdentity() {
|
|||||||
const load = async () => {
|
const load = async () => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/auth/me`)
|
const response = await authFetchOrThrow(`${baseUrl}/auth/me`)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
clearToken()
|
|
||||||
setIdentity(null)
|
setIdentity(null)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -27,6 +26,10 @@ export default function HeaderIdentity() {
|
|||||||
setIdentity(`${data.username}${data.role ? ` (${data.role})` : ''}`)
|
setIdentity(`${data.username}${data.role ? ` (${data.role})` : ''}`)
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
if (err instanceof UnauthorizedError) {
|
||||||
|
setIdentity(null)
|
||||||
|
return
|
||||||
|
}
|
||||||
console.error(err)
|
console.error(err)
|
||||||
setIdentity(null)
|
setIdentity(null)
|
||||||
}
|
}
|
||||||
|
|||||||
+34
-72
@@ -2,7 +2,13 @@
|
|||||||
|
|
||||||
import { useEffect, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { authFetch, clearToken, getApiBase, getToken } from '../lib/auth'
|
import {
|
||||||
|
authFetchOrThrow,
|
||||||
|
ForbiddenError,
|
||||||
|
getApiBase,
|
||||||
|
getToken,
|
||||||
|
UnauthorizedError,
|
||||||
|
} from '../lib/auth'
|
||||||
import AdminShell from '../ui/AdminShell'
|
import AdminShell from '../ui/AdminShell'
|
||||||
|
|
||||||
type AdminUser = {
|
type AdminUser = {
|
||||||
@@ -25,23 +31,12 @@ export default function UsersPage() {
|
|||||||
const [users, setUsers] = useState<AdminUser[]>([])
|
const [users, setUsers] = useState<AdminUser[]>([])
|
||||||
const [error, setError] = useState<string | null>(null)
|
const [error, setError] = useState<string | null>(null)
|
||||||
const [loading, setLoading] = useState(true)
|
const [loading, setLoading] = useState(true)
|
||||||
const [passwordInputs, setPasswordInputs] = useState<Record<string, string>>({})
|
|
||||||
const [passwordStatus, setPasswordStatus] = useState<Record<string, string>>({})
|
|
||||||
|
|
||||||
const loadUsers = async () => {
|
const loadUsers = async () => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(`${baseUrl}/admin/users`)
|
const response = await authFetchOrThrow(`${baseUrl}/admin/users`)
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
if (response.status === 401) {
|
|
||||||
clearToken()
|
|
||||||
router.push('/login')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (response.status === 403) {
|
|
||||||
router.push('/')
|
|
||||||
return
|
|
||||||
}
|
|
||||||
throw new Error('Could not load users.')
|
throw new Error('Could not load users.')
|
||||||
}
|
}
|
||||||
const data = await response.json()
|
const data = await response.json()
|
||||||
@@ -60,6 +55,14 @@ export default function UsersPage() {
|
|||||||
}
|
}
|
||||||
setError(null)
|
setError(null)
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
if (err instanceof UnauthorizedError) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (err instanceof ForbiddenError) {
|
||||||
|
router.push('/')
|
||||||
|
return
|
||||||
|
}
|
||||||
console.error(err)
|
console.error(err)
|
||||||
setError('Could not load user list.')
|
setError('Could not load user list.')
|
||||||
} finally {
|
} finally {
|
||||||
@@ -70,7 +73,7 @@ export default function UsersPage() {
|
|||||||
const toggleUserBlock = async (username: string, blocked: boolean) => {
|
const toggleUserBlock = async (username: string, blocked: boolean) => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(
|
const response = await authFetchOrThrow(
|
||||||
`${baseUrl}/admin/users/${encodeURIComponent(username)}/${blocked ? 'block' : 'unblock'}`,
|
`${baseUrl}/admin/users/${encodeURIComponent(username)}/${blocked ? 'block' : 'unblock'}`,
|
||||||
{ method: 'POST' }
|
{ method: 'POST' }
|
||||||
)
|
)
|
||||||
@@ -79,6 +82,14 @@ export default function UsersPage() {
|
|||||||
}
|
}
|
||||||
await loadUsers()
|
await loadUsers()
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
if (err instanceof UnauthorizedError) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (err instanceof ForbiddenError) {
|
||||||
|
router.push('/')
|
||||||
|
return
|
||||||
|
}
|
||||||
console.error(err)
|
console.error(err)
|
||||||
setError('Could not update user access.')
|
setError('Could not update user access.')
|
||||||
}
|
}
|
||||||
@@ -87,7 +98,7 @@ export default function UsersPage() {
|
|||||||
const updateUserRole = async (username: string, role: string) => {
|
const updateUserRole = async (username: string, role: string) => {
|
||||||
try {
|
try {
|
||||||
const baseUrl = getApiBase()
|
const baseUrl = getApiBase()
|
||||||
const response = await authFetch(
|
const response = await authFetchOrThrow(
|
||||||
`${baseUrl}/admin/users/${encodeURIComponent(username)}/role`,
|
`${baseUrl}/admin/users/${encodeURIComponent(username)}/role`,
|
||||||
{
|
{
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
@@ -100,47 +111,19 @@ export default function UsersPage() {
|
|||||||
}
|
}
|
||||||
await loadUsers()
|
await loadUsers()
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
|
if (err instanceof UnauthorizedError) {
|
||||||
|
router.push('/login')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (err instanceof ForbiddenError) {
|
||||||
|
router.push('/')
|
||||||
|
return
|
||||||
|
}
|
||||||
console.error(err)
|
console.error(err)
|
||||||
setError('Could not update user role.')
|
setError('Could not update user role.')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const updateUserPassword = async (username: string) => {
|
|
||||||
const newPassword = passwordInputs[username] || ''
|
|
||||||
if (!newPassword || newPassword.length < 8) {
|
|
||||||
setPasswordStatus((current) => ({
|
|
||||||
...current,
|
|
||||||
[username]: 'Password must be at least 8 characters.',
|
|
||||||
}))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
const baseUrl = getApiBase()
|
|
||||||
const response = await authFetch(
|
|
||||||
`${baseUrl}/admin/users/${encodeURIComponent(username)}/password`,
|
|
||||||
{
|
|
||||||
method: 'POST',
|
|
||||||
headers: { 'Content-Type': 'application/json' },
|
|
||||||
body: JSON.stringify({ password: newPassword }),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
if (!response.ok) {
|
|
||||||
const text = await response.text()
|
|
||||||
throw new Error(text || 'Update failed')
|
|
||||||
}
|
|
||||||
setPasswordInputs((current) => ({ ...current, [username]: '' }))
|
|
||||||
setPasswordStatus((current) => ({
|
|
||||||
...current,
|
|
||||||
[username]: 'Password updated.',
|
|
||||||
}))
|
|
||||||
} catch (err) {
|
|
||||||
console.error(err)
|
|
||||||
setPasswordStatus((current) => ({
|
|
||||||
...current,
|
|
||||||
[username]: 'Could not update password.',
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (!getToken()) {
|
if (!getToken()) {
|
||||||
@@ -197,27 +180,6 @@ export default function UsersPage() {
|
|||||||
{user.isBlocked ? 'Allow access' : 'Block access'}
|
{user.isBlocked ? 'Allow access' : 'Block access'}
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
{user.authProvider === 'local' && (
|
|
||||||
<div className="user-actions">
|
|
||||||
<input
|
|
||||||
type="password"
|
|
||||||
placeholder="New password (min 8 chars)"
|
|
||||||
value={passwordInputs[user.username] || ''}
|
|
||||||
onChange={(event) =>
|
|
||||||
setPasswordInputs((current) => ({
|
|
||||||
...current,
|
|
||||||
[user.username]: event.target.value,
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
<button type="button" onClick={() => updateUserPassword(user.username)}>
|
|
||||||
Set password
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{passwordStatus[user.username] && (
|
|
||||||
<div className="meta">{passwordStatus[user.username]}</div>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Vendored
+3
@@ -1,2 +1,5 @@
|
|||||||
/// <reference types="next" />
|
/// <reference types="next" />
|
||||||
/// <reference types="next/image-types/global" />
|
/// <reference types="next/image-types/global" />
|
||||||
|
|
||||||
|
// NOTE: This file should not be edited
|
||||||
|
// see https://nextjs.org/docs/basic-features/typescript for more information.
|
||||||
|
|||||||
@@ -0,0 +1,13 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
|
||||||
|
<defs>
|
||||||
|
<linearGradient id="magentIconGlow" x1="0" y1="0" x2="1" y2="1">
|
||||||
|
<stop offset="0%" stop-color="#ff6b2b"/>
|
||||||
|
<stop offset="100%" stop-color="#ffa84b"/>
|
||||||
|
</linearGradient>
|
||||||
|
</defs>
|
||||||
|
<rect width="64" height="64" rx="14" fill="#0e1624"/>
|
||||||
|
<path
|
||||||
|
d="M18 50V14h8l6 11 6-11h8v36h-8V32l-6 10-6-10v18h-8z"
|
||||||
|
fill="url(#magentIconGlow)"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 457 B |
@@ -0,0 +1,14 @@
|
|||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="300" height="300" viewBox="0 0 300 300">
|
||||||
|
<defs>
|
||||||
|
<linearGradient id="magentGlow" x1="0" y1="0" x2="1" y2="1">
|
||||||
|
<stop offset="0%" stop-color="#ff6b2b"/>
|
||||||
|
<stop offset="100%" stop-color="#ffa84b"/>
|
||||||
|
</linearGradient>
|
||||||
|
</defs>
|
||||||
|
<rect width="300" height="300" rx="56" fill="#0e1624"/>
|
||||||
|
<rect x="24" y="24" width="252" height="252" rx="44" fill="#121d31"/>
|
||||||
|
<path
|
||||||
|
d="M80 220V80h28l42 70 42-70h28v140h-28v-88l-42 66-42-66v88H80z"
|
||||||
|
fill="url(#magentGlow)"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 537 B |
+20
-4
@@ -1,7 +1,11 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "ES2019",
|
"target": "ES2019",
|
||||||
"lib": ["dom", "dom.iterable", "esnext"],
|
"lib": [
|
||||||
|
"dom",
|
||||||
|
"dom.iterable",
|
||||||
|
"esnext"
|
||||||
|
],
|
||||||
"allowJs": false,
|
"allowJs": false,
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"strict": true,
|
"strict": true,
|
||||||
@@ -12,8 +16,20 @@
|
|||||||
"resolveJsonModule": true,
|
"resolveJsonModule": true,
|
||||||
"isolatedModules": true,
|
"isolatedModules": true,
|
||||||
"jsx": "preserve",
|
"jsx": "preserve",
|
||||||
"incremental": true
|
"incremental": true,
|
||||||
|
"plugins": [
|
||||||
|
{
|
||||||
|
"name": "next"
|
||||||
|
}
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
|
"include": [
|
||||||
"exclude": ["node_modules"]
|
"next-env.d.ts",
|
||||||
|
"**/*.ts",
|
||||||
|
"**/*.tsx",
|
||||||
|
".next/types/**/*.ts"
|
||||||
|
],
|
||||||
|
"exclude": [
|
||||||
|
"node_modules"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user