Administrator/Multi-Debrid-Downloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 596 Wiki Activity

Fix: Per-Account-Timeout in Account-Rotation (Mega-Debrid + Debrid-Link)

Browse Source 
Kernbug (User-Log, v1.7.168): "Unrestrict Timeout nach 60s" — Account 1 hing die
volle Zeit, acc2/acc3 wurden NIE versucht. Ursache: die gesamte Account-Rotation
lief unter EINEM geteilten ~60s-Signal (download-manager wickelt den ganzen
unrestrictLink in getUnrestrictTimeoutMs()); haengt acc1 bis es feuert, bricht die
ganze Rotation ab.

Fix (debrid.ts): jeder Account/Key bekommt im Rotations-Loop sein EIGENES Timeout
(PER_ACCOUNT_ATTEMPT_TIMEOUT_MS=25s, env RD_PER_ACCOUNT_TIMEOUT_MS, clamp 8-45s) via
AbortController + AbortSignal.any([global, attempt]). Catch: globaler signal.aborted
-> throw (Rotation stoppen); nur attemptController.signal.aborted -> 30s-Cooldown +
naechster Account. Ueber die Retry-Zyklen werden mit den Cooldowns alle Accounts erreicht.

Test: "aborts Mega web unrestrict when caller signal is cancelled" pruefte vorher
Objekt-Identitaet (.toBe(controller.signal)); der Per-Account-Timeout wrappt das Signal
aber zwingend (AbortSignal.any), die gereichte Instanz ist daher absichtlich nicht mehr
identisch. Umgestellt auf VERHALTEN: gereichtes Signal ist eine AbortSignal-Instanz und
propagiert das Caller-Cancel (aborted=true).

Recovered aus dem reset-weggesetzten Commit ae3ee1f (der andere Chat committete den Fix,
der Test brach, er resettete + hing). 641 Tests gruen, tsc unveraendert (9 pre-existing).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Sucukdeluxe
2026-05-30 23:37:16 +02:00
co-authored by Claude Opus 4.8
parent 2448ae5c7a
commit c4a49d99ed
2 changed files with 57 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/debrid.ts
+48 -4
View File
@@ -10,6 +10,13 @@ import { isMegaFileUrl, resolveMegaFilename } from "./mega-public-api";
import { compactErrorText, filenameFromUrl, looksLikeOpaqueFilename, sleep } from "./utils";
const API_TIMEOUT_MS = 30000;
/** Per-account/key attempt timeout for the rotation loops. Bounds a SINGLE
* account's unrestrict so a hanging account no longer eats the whole shared
* unrestrict budget (the download-manager wraps the entire rotation in one
* ~60s signal). Without this, account 1 hanging for 60s meant accounts 2/3
* were never tried. With it, a hang fails this account (temporary cooldown)
* and the loop moves on to the next. */
const PER_ACCOUNT_ATTEMPT_TIMEOUT_MS = Math.max(8000, Math.min(45000, Number(process.env.RD_PER_ACCOUNT_TIMEOUT_MS) || 25000));
const DEBRID_USER_AGENT = `RD-Node-Downloader/${APP_VERSION}`;
const RAPIDGATOR_SCAN_MAX_BYTES = 512 * 1024;
@@ -1977,9 +1984,17 @@ class MegaDebridClient {
const testStartedAt = Date.now();
usableAccountSeen = true;
// Per-account timeout: a hang on THIS account must not consume the whole
// shared unrestrict budget — otherwise the loop never reaches the next.
const attemptController = new AbortController();
const attemptTimer = setTimeout(() => attemptController.abort(), PER_ACCOUNT_ATTEMPT_TIMEOUT_MS);
const attemptSignal = signal
? AbortSignal.any([signal, attemptController.signal])
: attemptController.signal;
try {
const client = new MegaDebridClient(account.login, account.password, mode, allowApiFallback, megaWebUnrestrict);
const result = await client.unrestrictLink(link, signal);
const result = await client.unrestrictLink(link, attemptSignal);
clearTimeout(attemptTimer);
clearMegaDebridAccountCooldownState(cooldownKey);
const elapsedMs = Date.now() - testStartedAt;
logger.info(`Mega-Debrid${accountLabel}: Unrestrict OK nach ${elapsedMs}ms -> ${result.fileName || "?"}`);
@@ -1995,7 +2010,19 @@ class MegaDebridClient {
sourceAccountLabel: account.label
};
} catch (error) {
const failure = MegaDebridClient.classifyAccountFailure(error);
clearTimeout(attemptTimer);
// If the GLOBAL signal aborted (user stop / overall unrestrict budget),
// stop the whole rotation — don't keep hammering the next account.
if (signal?.aborted) {
throw error;
}
// If only THIS account's own timeout fired, treat it as a temporary
// failure (short cooldown) and move on to the next account — instead of
// letting it be misclassified as a fatal abort.
const perAccountTimedOut = attemptController.signal.aborted;
const failure = perAccountTimedOut
? { fatal: false, cooldownMs: 30000, message: `Account-Timeout nach ${Math.ceil(PER_ACCOUNT_ATTEMPT_TIMEOUT_MS / 1000)}s`, category: "temporary" as MegaDebridCooldownCategory }
: MegaDebridClient.classifyAccountFailure(error);
const elapsedMs = Date.now() - testStartedAt;
failures.push(`Mega-Debrid${accountLabel}: ${failure.message}`);
if (failure.cooldownMs > 0) {
@@ -2640,8 +2667,16 @@ class DebridLinkClient {
const testStartedAt = Date.now();
usableKeySeen = true;
// Per-key timeout: a hang on THIS key must not consume the whole shared
// unrestrict budget — otherwise the loop never reaches the next key.
const attemptController = new AbortController();
const attemptTimer = setTimeout(() => attemptController.abort(), PER_ACCOUNT_ATTEMPT_TIMEOUT_MS);
const attemptSignal = signal
? AbortSignal.any([signal, attemptController.signal])
: attemptController.signal;
try {
const result = await this.unrestrictWithKey(apiKey, link, signal);
const result = await this.unrestrictWithKey(apiKey, link, attemptSignal);
clearTimeout(attemptTimer);
clearDebridLinkKeyCooldownState(apiKey.id);
setDebridLinkKeyRuntimeStatus(apiKey.id, "ready", "Unrestrict erfolgreich");
const elapsedMs = Date.now() - testStartedAt;
@@ -2658,7 +2693,16 @@ class DebridLinkClient {
sourceAccountLabel: apiKey.label
};
} catch (error) {
const failure = await this.classifyKeyFailure(error, apiKey, link, signal);
clearTimeout(attemptTimer);
// Global abort (user stop / overall budget) → stop the whole rotation.
if (signal?.aborted) {
throw error;
}
// Only THIS key's own timeout fired → temporary failure, try the next key.
const perKeyTimedOut = attemptController.signal.aborted;
const failure = perKeyTimedOut
? { fatal: false, cooldownMs: 30000, message: `Key-Timeout nach ${Math.ceil(PER_ACCOUNT_ATTEMPT_TIMEOUT_MS / 1000)}s`, category: "temporary" as DebridLinkCooldownCategory }
: await this.classifyKeyFailure(error, apiKey, link, signal);
const elapsedMs = Date.now() - testStartedAt;
attemptedKeyFailures.push({
message: `Debrid-Link${keyLabel}: ${failure.message}`,