fix(realdebrid): persist web status and report relevant provider errors

Check Real-Debrid API and browser sessions through the account status flow, retain the service status across settings updates, and refresh the account row when a browser login is detected. Exclude unavailable providers that were never attempted from conversion failures and prevent aggregated fallback text from being mislabeled as a Debrid-Link terminal error. Bump the development version to 2.0.37 and add focused regression coverage.
This commit is contained in:
Sucukdeluxe
2026-08-14 21:02:30 +02:00
parent c2d5dbaeb3
commit b80209a10f
20 changed files with 556 additions and 81 deletions
+122 -9
View File
@@ -5,10 +5,24 @@ import { logger } from "./logger";
import { compactErrorText } from "./utils";
const MEGA_DEBRID_API = "https://www.mega-debrid.eu/api.php";
const DEBRID_LINK_API = "https://debrid-link.com/api/v2";
const DEBRID_LINK_API = "https://debrid-link.com/api/v2";
const REAL_DEBRID_USER_API = "https://api.real-debrid.com/rest/1.0/user";
const CHECK_USER_AGENT =
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0 Safari/537.36";
const CHECK_TIMEOUT_MS = 20000;
const CHECK_TIMEOUT_MS = 20000;
export const REAL_DEBRID_STATUS_ID = "svc-realdebrid";
export interface RealDebridSessionProbeResult {
valid: boolean;
isPremium?: boolean;
premiumUntilMs?: number | null;
username?: string;
email?: string;
message?: string;
}
export type RealDebridSessionProbe = (signal?: AbortSignal) => Promise<RealDebridSessionProbeResult>;
function timeoutSignal(signal: AbortSignal | undefined, ms: number): AbortSignal {
const timeout = AbortSignal.timeout(ms);
@@ -24,7 +38,7 @@ function parseJsonSafe(text: string): Record<string, unknown> | null {
}
}
function formatRemaining(premiumUntilMs: number | null, now: number): string {
function formatRemaining(premiumUntilMs: number | null, now: number): string {
if (premiumUntilMs == null) {
return "Premium-Status unbekannt";
}
@@ -41,7 +55,102 @@ function formatRemaining(premiumUntilMs: number | null, now: number): string {
}
const hours = Math.max(1, Math.floor(remainingMs / (60 * 60 * 1000)));
return `Premium noch ${hours} Std`;
}
}
function maskSecret(value: string): string {
const trimmed = value.trim();
if (!trimmed) {
return "";
}
if (trimmed.length <= 6) {
return "*".repeat(trimmed.length);
}
return `${trimmed.slice(0, 3)}${"*".repeat(Math.max(4, trimmed.length - 6))}${trimmed.slice(-3)}`;
}
export async function checkRealDebridAccount(
settings: AppSettings,
signal?: AbortSignal,
now = Date.now(),
probeWebSession?: RealDebridSessionProbe
): Promise<DebridAccountStatus> {
const token = String(settings.token || "").trim();
const useWebLogin = Boolean(settings.realDebridUseWebLogin);
const base: DebridAccountStatus = {
accountId: REAL_DEBRID_STATUS_ID,
provider: "realdebrid",
label: "Real-Debrid",
maskedLogin: useWebLogin ? "Browser-Login" : maskSecret(token),
valid: false,
isPremium: false,
premiumUntilMs: null,
message: "",
checkedAt: now
};
if (useWebLogin) {
if (!probeWebSession) {
return { ...base, message: "Browser-Sitzung ist nicht prüfbar" };
}
try {
const result = await probeWebSession(signal);
if (!result.valid) {
return { ...base, message: result.message || "Browser-Sitzung abgelaufen" };
}
const premiumUntilMs = typeof result.premiumUntilMs === "number" ? result.premiumUntilMs : null;
return {
...base,
valid: true,
isPremium: Boolean(result.isPremium),
premiumUntilMs,
email: String(result.email || result.username || "").trim() || undefined,
message: result.message || (result.isPremium ? formatRemaining(premiumUntilMs, now) : "Kein Premium (Free)")
};
} catch (error) {
const errText = compactErrorText(error);
const aborted = signal?.aborted || /aborted/i.test(errText);
return { ...base, message: aborted ? "Prüfung abgebrochen" : `Prüfung fehlgeschlagen: ${errText}` };
}
}
if (!token) {
return { ...base, message: "Kein API-Token hinterlegt" };
}
try {
const response = await fetch(REAL_DEBRID_USER_API, {
headers: {
Authorization: `Bearer ${token}`,
"User-Agent": CHECK_USER_AGENT
},
signal: timeoutSignal(signal, CHECK_TIMEOUT_MS)
});
const text = await response.text();
const payload = parseJsonSafe(text);
if (!response.ok || !payload) {
if (response.status === 401 || response.status === 403) {
return { ...base, message: "Ungültiger API-Token" };
}
return { ...base, message: `Prüfung fehlgeschlagen (HTTP ${response.status})` };
}
const expiration = Date.parse(String(payload.expiration || ""));
const premiumUntilMs = Number.isFinite(expiration) ? expiration : null;
const isPremium = String(payload.type || "").toLowerCase() === "premium"
&& (premiumUntilMs == null || premiumUntilMs > now);
return {
...base,
valid: true,
isPremium,
premiumUntilMs,
email: String(payload.email || payload.username || "").trim() || undefined,
message: isPremium ? formatRemaining(premiumUntilMs, now) : "Kein Premium (Free)"
};
} catch (error) {
const errText = compactErrorText(error);
const aborted = signal?.aborted || /aborted/i.test(errText);
return { ...base, message: aborted ? "Prüfung abgebrochen" : `Prüfung fehlgeschlagen: ${errText}` };
}
}
export async function checkMegaDebridAccount(
account: MegaDebridAccountEntry,
@@ -158,15 +267,19 @@ export async function checkDebridLinkKey(
}
}
export async function checkAllDebridAccounts(
settings: AppSettings,
signal?: AbortSignal
): Promise<DebridAccountStatus[]> {
export async function checkAllDebridAccounts(
settings: AppSettings,
signal?: AbortSignal,
probeRealDebridWebSession?: RealDebridSessionProbe
): Promise<DebridAccountStatus[]> {
const now = Date.now();
const megaAccounts = parseMegaDebridAccounts(settings.megaCredentials || "", settings.megaPassword || "");
const debridLinkKeys = parseDebridLinkApiKeys(settings.debridLinkApiKeys || "");
const taskFns: Array<() => Promise<DebridAccountStatus>> = [
const taskFns: Array<() => Promise<DebridAccountStatus>> = [
...(settings.realDebridUseWebLogin || String(settings.token || "").trim()
? [() => checkRealDebridAccount(settings, signal, now, probeRealDebridWebSession)]
: []),
...megaAccounts.map((account) => () => checkMegaDebridAccount(account, signal, now)),
...debridLinkKeys.map((key) => () => checkDebridLinkKey(key, signal, now))
];