Felix Förtsch
cc418e5874
All checks were successful
Build and Push Docker Image / build (push) Successful in 31s
When I switched the settings UI to read result.saved to decide whether the
'✓ Saved & connected' / '⚠ Saved, but connection test failed' / '✗ error'
states should appear, I only updated the Radarr and Sonarr endpoints to
return that shape. Jellyfin still returned bare { ok: true } so the UI
saw saved=undefined and showed '✗ Save failed' even on a perfectly
successful save — making it look like Jellyfin had stopped working.
Bring Jellyfin in line:
- Save the URL+API key (and setup_complete) BEFORE running testConnection
so the input survives a failed probe (same fix as Radarr/Sonarr).
- Only do the admin-user discovery on test success.
- Return { ok, saved, testError }.
115 lines
3.9 KiB
TypeScript
115 lines
3.9 KiB
TypeScript
import { Hono } from "hono";
|
|
import { getAllConfig, getDb, getEnvLockedKeys, setConfig } from "../db/index";
|
|
import { getUsers, testConnection as testJellyfin } from "../services/jellyfin";
|
|
import { testConnection as testRadarr } from "../services/radarr";
|
|
import { testConnection as testSonarr } from "../services/sonarr";
|
|
|
|
const app = new Hono();
|
|
|
|
app.get("/", (c) => {
|
|
const config = getAllConfig();
|
|
const envLocked = Array.from(getEnvLockedKeys());
|
|
return c.json({ config, envLocked });
|
|
});
|
|
|
|
app.post("/jellyfin", async (c) => {
|
|
const body = await c.req.json<{ url: string; api_key: string }>();
|
|
const url = body.url?.replace(/\/$/, "");
|
|
const apiKey = body.api_key;
|
|
|
|
if (!url || !apiKey) return c.json({ ok: false, error: "URL and API key are required" }, 400);
|
|
|
|
// Save first so the user's input is never silently dropped on a test
|
|
// failure (matches the Radarr/Sonarr pattern). The frontend reads the
|
|
// { ok, saved, testError } shape to decide what message to show.
|
|
setConfig("jellyfin_url", url);
|
|
setConfig("jellyfin_api_key", apiKey);
|
|
setConfig("setup_complete", "1");
|
|
|
|
const result = await testJellyfin({ url, apiKey });
|
|
|
|
// Best-effort admin discovery only when the connection works; ignore failures.
|
|
if (result.ok) {
|
|
try {
|
|
const users = await getUsers({ url, apiKey });
|
|
const admin = users.find((u) => u.Name === "admin") ?? users[0];
|
|
if (admin?.Id) setConfig("jellyfin_user_id", admin.Id);
|
|
} catch {
|
|
/* ignore */
|
|
}
|
|
}
|
|
|
|
return c.json({ ok: result.ok, saved: true, testError: result.ok ? undefined : result.error });
|
|
});
|
|
|
|
// Persist values BEFORE testing the connection. The previous behaviour
|
|
// silently dropped what the user typed when the test failed (e.g. Sonarr
|
|
// not yet reachable), making the field appear to "forget" the input on
|
|
// reload. Save first, surface the test result as a warning the UI can show.
|
|
app.post("/radarr", async (c) => {
|
|
const body = await c.req.json<{ url?: string; api_key?: string }>();
|
|
const url = body.url?.replace(/\/$/, "");
|
|
const apiKey = body.api_key;
|
|
|
|
if (!url || !apiKey) {
|
|
setConfig("radarr_enabled", "0");
|
|
return c.json({ ok: false, error: "URL and API key are required" }, 400);
|
|
}
|
|
|
|
setConfig("radarr_url", url);
|
|
setConfig("radarr_api_key", apiKey);
|
|
setConfig("radarr_enabled", "1");
|
|
|
|
const result = await testRadarr({ url, apiKey });
|
|
return c.json({ ok: result.ok, saved: true, testError: result.ok ? undefined : result.error });
|
|
});
|
|
|
|
app.post("/sonarr", async (c) => {
|
|
const body = await c.req.json<{ url?: string; api_key?: string }>();
|
|
const url = body.url?.replace(/\/$/, "");
|
|
const apiKey = body.api_key;
|
|
|
|
if (!url || !apiKey) {
|
|
setConfig("sonarr_enabled", "0");
|
|
return c.json({ ok: false, error: "URL and API key are required" }, 400);
|
|
}
|
|
|
|
setConfig("sonarr_url", url);
|
|
setConfig("sonarr_api_key", apiKey);
|
|
setConfig("sonarr_enabled", "1");
|
|
|
|
const result = await testSonarr({ url, apiKey });
|
|
return c.json({ ok: result.ok, saved: true, testError: result.ok ? undefined : result.error });
|
|
});
|
|
|
|
app.post("/subtitle-languages", async (c) => {
|
|
const body = await c.req.json<{ langs: string[] }>();
|
|
if (body.langs?.length > 0) {
|
|
setConfig("subtitle_languages", JSON.stringify(body.langs));
|
|
}
|
|
return c.json({ ok: true });
|
|
});
|
|
|
|
app.post("/audio-languages", async (c) => {
|
|
const body = await c.req.json<{ langs: string[] }>();
|
|
setConfig("audio_languages", JSON.stringify(body.langs ?? []));
|
|
return c.json({ ok: true });
|
|
});
|
|
|
|
app.post("/clear-scan", (c) => {
|
|
const db = getDb();
|
|
// Delete children first to avoid slow cascade deletes
|
|
db.transaction(() => {
|
|
db.prepare("DELETE FROM stream_decisions").run();
|
|
db.prepare("DELETE FROM jobs").run();
|
|
db.prepare("DELETE FROM subtitle_files").run();
|
|
db.prepare("DELETE FROM review_plans").run();
|
|
db.prepare("DELETE FROM media_streams").run();
|
|
db.prepare("DELETE FROM media_items").run();
|
|
db.prepare("UPDATE config SET value = '0' WHERE key = 'scan_running'").run();
|
|
})();
|
|
return c.json({ ok: true });
|
|
});
|
|
|
|
export default app;
|