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

Release v1.6.22

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Sucukdeluxe
2026-03-04 19:04:53 +01:00
co-authored by Claude Opus 4.6
parent 1ed13f7f88
commit 9cceaacd14
5 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/debrid.ts
+8 -8
View File
@@ -449,7 +449,7 @@ async function resolveRapidgatorFilename(link: string, signal?: AbortSignal): Pr
return "";
} catch (error) {
const errorText = compactErrorText(error);
if (/aborted/i.test(errorText)) {
if (signal?.aborted || (/aborted/i.test(errorText) && !/timeout/i.test(errorText))) {
throw error;
}
if (attempt >= REQUEST_RETRIES + 2 || !isRetryableErrorText(errorText)) {
@@ -530,7 +530,7 @@ export async function checkRapidgatorOnline(
break;
} catch (error) {
const errorText = compactErrorText(error);
if (/aborted/i.test(errorText)) throw error;
if (signal?.aborted || (/aborted/i.test(errorText) && !/timeout/i.test(errorText))) throw error;
if (attempt > REQUEST_RETRIES || !isRetryableErrorText(errorText)) {
break; // fall through to GET
}
@@ -583,7 +583,7 @@ export async function checkRapidgatorOnline(
return { online: true, fileName, fileSize };
} catch (error) {
const errorText = compactErrorText(error);
if (/aborted/i.test(errorText)) throw error;
if (signal?.aborted || (/aborted/i.test(errorText) && !/timeout/i.test(errorText))) throw error;
if (attempt > REQUEST_RETRIES || !isRetryableErrorText(errorText)) {
return null;
}
@@ -734,7 +734,7 @@ class BestDebridClient {
throw new Error("BestDebrid Antwort ohne Download-Link");
} catch (error) {
lastError = compactErrorText(error);
if (signal?.aborted || /aborted/i.test(lastError)) {
if (signal?.aborted || (/aborted/i.test(lastError) && !/timeout/i.test(lastError))) {
break;
}
if (attempt >= REQUEST_RETRIES || !isRetryableErrorText(lastError)) {
@@ -828,7 +828,7 @@ class AllDebridClient {
break;
} catch (error) {
const errorText = compactErrorText(error);
if (signal?.aborted || /aborted/i.test(errorText)) {
if (signal?.aborted || (/aborted/i.test(errorText) && !/timeout/i.test(errorText))) {
throw error;
}
if (attempt >= REQUEST_RETRIES || !isRetryableErrorText(errorText)) {
@@ -940,7 +940,7 @@ class AllDebridClient {
};
} catch (error) {
lastError = compactErrorText(error);
if (signal?.aborted || /aborted/i.test(lastError)) {
if (signal?.aborted || (/aborted/i.test(lastError) && !/timeout/i.test(lastError))) {
break;
}
if (attempt >= REQUEST_RETRIES || !isRetryableErrorText(lastError)) {
@@ -1002,7 +1002,7 @@ export class DebridService {
}
} catch (error) {
const errorText = compactErrorText(error);
if (signal?.aborted || /aborted/i.test(errorText)) {
if (signal?.aborted || (/aborted/i.test(errorText) && !/timeout/i.test(errorText))) {
throw error;
}
// ignore and continue with host page fallback
@@ -1077,7 +1077,7 @@ export class DebridService {
};
} catch (error) {
const errorText = compactErrorText(error);
if (signal?.aborted || /aborted/i.test(errorText)) {
if (signal?.aborted || (/aborted/i.test(errorText) && !/timeout/i.test(errorText))) {
throw error;
}
attempts.push(`${PROVIDER_LABELS[provider]}: ${compactErrorText(error)}`);
src/main/download-manager.ts
+17 -7
View File
@@ -1019,6 +1019,7 @@ export class DownloadManager extends EventEmitter {
}
this.session.totalDownloadedBytes = 0;
this.sessionDownloadedBytes = 0;
this.session.runStartedAt = 0;
this.lastGlobalProgressBytes = 0;
this.lastGlobalProgressAt = nowMs();
@@ -1483,8 +1484,8 @@ export class DownloadManager extends EventEmitter {
}
const active = this.activeTasks.get(itemId);
if (active) {
active.abortReason = "cancel";
active.abortController.abort("cancel");
active.abortReason = "reset";
active.abortController.abort("reset");
}
this.releaseTargetPath(itemId);
item.status = "queued";
@@ -1623,9 +1624,14 @@ export class DownloadManager extends EventEmitter {
continue;
}
const result = await checkRapidgatorOnline(url);
checkedUrls.set(url, result);
this.applyRapidgatorCheckResult(item, result);
try {
const result = await checkRapidgatorOnline(url);
checkedUrls.set(url, result);
this.applyRapidgatorCheckResult(item, result);
} catch (err) {
logger.warn(`checkRapidgatorOnline Fehler für ${url}: ${compactErrorText(err)}`);
item.onlineStatus = undefined;
}
this.emitState();
}
@@ -3468,6 +3474,7 @@ export class DownloadManager extends EventEmitter {
const contributed = this.itemContributedBytes.get(itemId) || 0;
if (contributed > 0) {
this.session.totalDownloadedBytes = Math.max(0, this.session.totalDownloadedBytes - contributed);
this.sessionDownloadedBytes = Math.max(0, this.sessionDownloadedBytes - contributed);
}
this.itemContributedBytes.delete(itemId);
}
@@ -6692,9 +6699,12 @@ export class DownloadManager extends EventEmitter {
}
if (policy === "immediate") {
const item = this.session.items[itemId];
if (!item || item.status !== "completed") {
return;
}
if (this.settings.autoExtract) {
const item = this.session.items[itemId];
const extracted = item ? isExtractedLabel(item.fullStatus || "") : false;
const extracted = isExtractedLabel(item.fullStatus || "");
if (!extracted) {
return;
}
src/main/realdebrid.ts
+1 -1
View File
@@ -176,7 +176,7 @@ export class RealDebridClient {
};
} catch (error) {
lastError = compactErrorText(error);
if (signal?.aborted || /aborted/i.test(lastError)) {
if (signal?.aborted || (/aborted/i.test(lastError) && !/timeout/i.test(lastError))) {
break;
}
if (attempt >= REQUEST_RETRIES || !isRetryableErrorText(lastError)) {