Release v1.4.4 with visible retries and HTTP 416 progress reset
Some checks are pending
Build and Release / build (push) Waiting to run
Some checks are pending
Build and Release / build (push) Waiting to run
This commit is contained in:
parent
53212f45e3
commit
6a33e61c38
4
package-lock.json
generated
4
package-lock.json
generated
@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "real-debrid-downloader",
|
"name": "real-debrid-downloader",
|
||||||
"version": "1.4.3",
|
"version": "1.4.4",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "real-debrid-downloader",
|
"name": "real-debrid-downloader",
|
||||||
"version": "1.4.3",
|
"version": "1.4.4",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"adm-zip": "^0.5.16",
|
"adm-zip": "^0.5.16",
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "real-debrid-downloader",
|
"name": "real-debrid-downloader",
|
||||||
"version": "1.4.3",
|
"version": "1.4.4",
|
||||||
"description": "Real-Debrid Downloader Desktop (Electron + React + TypeScript)",
|
"description": "Real-Debrid Downloader Desktop (Electron + React + TypeScript)",
|
||||||
"main": "build/main/main/main.js",
|
"main": "build/main/main/main.js",
|
||||||
"author": "Sucukdeluxe",
|
"author": "Sucukdeluxe",
|
||||||
|
|||||||
@ -1543,7 +1543,7 @@ export class DownloadManager extends EventEmitter {
|
|||||||
try {
|
try {
|
||||||
const unrestricted = await this.debridService.unrestrictLink(item.url);
|
const unrestricted = await this.debridService.unrestrictLink(item.url);
|
||||||
item.provider = unrestricted.provider;
|
item.provider = unrestricted.provider;
|
||||||
item.retries = unrestricted.retriesUsed;
|
item.retries += unrestricted.retriesUsed;
|
||||||
item.fileName = sanitizeFilename(unrestricted.fileName || filenameFromUrl(item.url));
|
item.fileName = sanitizeFilename(unrestricted.fileName || filenameFromUrl(item.url));
|
||||||
fs.mkdirSync(pkg.outputDir, { recursive: true });
|
fs.mkdirSync(pkg.outputDir, { recursive: true });
|
||||||
const existingTargetPath = String(item.targetPath || "").trim();
|
const existingTargetPath = String(item.targetPath || "").trim();
|
||||||
@ -1562,11 +1562,9 @@ export class DownloadManager extends EventEmitter {
|
|||||||
|
|
||||||
const maxAttempts = REQUEST_RETRIES;
|
const maxAttempts = REQUEST_RETRIES;
|
||||||
let done = false;
|
let done = false;
|
||||||
let downloadRetries = 0;
|
|
||||||
while (!done && item.attempts < maxAttempts) {
|
while (!done && item.attempts < maxAttempts) {
|
||||||
item.attempts += 1;
|
item.attempts += 1;
|
||||||
const result = await this.downloadToFile(active, unrestricted.directUrl, item.targetPath, item.totalBytes);
|
const result = await this.downloadToFile(active, unrestricted.directUrl, item.targetPath, item.totalBytes);
|
||||||
downloadRetries += result.retriesUsed;
|
|
||||||
active.resumable = result.resumable;
|
active.resumable = result.resumable;
|
||||||
if (!active.resumable && !active.nonResumableCounted) {
|
if (!active.resumable && !active.nonResumableCounted) {
|
||||||
active.nonResumableCounted = true;
|
active.nonResumableCounted = true;
|
||||||
@ -1603,8 +1601,6 @@ export class DownloadManager extends EventEmitter {
|
|||||||
|
|
||||||
done = true;
|
done = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
item.retries += downloadRetries;
|
|
||||||
item.status = "completed";
|
item.status = "completed";
|
||||||
item.fullStatus = `Fertig (${humanSize(item.downloadedBytes)})`;
|
item.fullStatus = `Fertig (${humanSize(item.downloadedBytes)})`;
|
||||||
item.progressPercent = 100;
|
item.progressPercent = 100;
|
||||||
@ -1656,6 +1652,7 @@ export class DownloadManager extends EventEmitter {
|
|||||||
} else if (reason === "stall") {
|
} else if (reason === "stall") {
|
||||||
stallRetries += 1;
|
stallRetries += 1;
|
||||||
if (stallRetries <= 2) {
|
if (stallRetries <= 2) {
|
||||||
|
item.retries += 1;
|
||||||
item.status = "queued";
|
item.status = "queued";
|
||||||
item.speedBps = 0;
|
item.speedBps = 0;
|
||||||
item.fullStatus = `Keine Daten empfangen, Retry ${stallRetries}/2`;
|
item.fullStatus = `Keine Daten empfangen, Retry ${stallRetries}/2`;
|
||||||
@ -1690,6 +1687,7 @@ export class DownloadManager extends EventEmitter {
|
|||||||
}
|
}
|
||||||
if (shouldFreshRetry) {
|
if (shouldFreshRetry) {
|
||||||
freshRetryUsed = true;
|
freshRetryUsed = true;
|
||||||
|
item.retries += 1;
|
||||||
try {
|
try {
|
||||||
fs.rmSync(item.targetPath, { force: true });
|
fs.rmSync(item.targetPath, { force: true });
|
||||||
} catch {
|
} catch {
|
||||||
@ -1713,6 +1711,7 @@ export class DownloadManager extends EventEmitter {
|
|||||||
|
|
||||||
if (genericErrorRetries < maxGenericErrorRetries) {
|
if (genericErrorRetries < maxGenericErrorRetries) {
|
||||||
genericErrorRetries += 1;
|
genericErrorRetries += 1;
|
||||||
|
item.retries += 1;
|
||||||
item.status = "queued";
|
item.status = "queued";
|
||||||
item.fullStatus = `Fehler erkannt, Auto-Retry ${genericErrorRetries}/${maxGenericErrorRetries}`;
|
item.fullStatus = `Fehler erkannt, Auto-Retry ${genericErrorRetries}/${maxGenericErrorRetries}`;
|
||||||
item.lastError = errorText;
|
item.lastError = errorText;
|
||||||
@ -1746,7 +1745,7 @@ export class DownloadManager extends EventEmitter {
|
|||||||
directUrl: string,
|
directUrl: string,
|
||||||
targetPath: string,
|
targetPath: string,
|
||||||
knownTotal: number | null
|
knownTotal: number | null
|
||||||
): Promise<{ retriesUsed: number; resumable: boolean }> {
|
): Promise<{ resumable: boolean }> {
|
||||||
const item = this.session.items[active.itemId];
|
const item = this.session.items[active.itemId];
|
||||||
if (!item) {
|
if (!item) {
|
||||||
throw new Error("Download-Item fehlt");
|
throw new Error("Download-Item fehlt");
|
||||||
@ -1781,6 +1780,7 @@ export class DownloadManager extends EventEmitter {
|
|||||||
}
|
}
|
||||||
lastError = compactErrorText(error);
|
lastError = compactErrorText(error);
|
||||||
if (attempt < REQUEST_RETRIES) {
|
if (attempt < REQUEST_RETRIES) {
|
||||||
|
item.retries += 1;
|
||||||
item.fullStatus = `Verbindungsfehler, retry ${attempt + 1}/${REQUEST_RETRIES}`;
|
item.fullStatus = `Verbindungsfehler, retry ${attempt + 1}/${REQUEST_RETRIES}`;
|
||||||
this.emitState();
|
this.emitState();
|
||||||
await sleep(300 * attempt);
|
await sleep(300 * attempt);
|
||||||
@ -1793,13 +1793,13 @@ export class DownloadManager extends EventEmitter {
|
|||||||
if (response.status === 416 && existingBytes > 0) {
|
if (response.status === 416 && existingBytes > 0) {
|
||||||
const rangeTotal = parseContentRangeTotal(response.headers.get("content-range"));
|
const rangeTotal = parseContentRangeTotal(response.headers.get("content-range"));
|
||||||
const expectedTotal = knownTotal && knownTotal > 0 ? knownTotal : rangeTotal;
|
const expectedTotal = knownTotal && knownTotal > 0 ? knownTotal : rangeTotal;
|
||||||
if (expectedTotal && existingBytes >= expectedTotal) {
|
if (expectedTotal && existingBytes === expectedTotal) {
|
||||||
item.totalBytes = expectedTotal;
|
item.totalBytes = expectedTotal;
|
||||||
item.downloadedBytes = existingBytes;
|
item.downloadedBytes = existingBytes;
|
||||||
item.progressPercent = 100;
|
item.progressPercent = 100;
|
||||||
item.speedBps = 0;
|
item.speedBps = 0;
|
||||||
item.updatedAt = nowMs();
|
item.updatedAt = nowMs();
|
||||||
return { retriesUsed: attempt - 1, resumable: true };
|
return { resumable: true };
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@ -1815,16 +1815,22 @@ export class DownloadManager extends EventEmitter {
|
|||||||
item.updatedAt = nowMs();
|
item.updatedAt = nowMs();
|
||||||
this.emitState();
|
this.emitState();
|
||||||
if (attempt < REQUEST_RETRIES) {
|
if (attempt < REQUEST_RETRIES) {
|
||||||
|
item.retries += 1;
|
||||||
await sleep(280 * attempt);
|
await sleep(280 * attempt);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const text = await response.text();
|
const text = await response.text();
|
||||||
lastError = compactErrorText(text || `HTTP ${response.status}`);
|
lastError = `HTTP ${response.status}`;
|
||||||
|
const responseText = compactErrorText(text || "");
|
||||||
|
if (responseText && responseText !== "Unbekannter Fehler" && !/(^|\b)http\s*\d{3}\b/i.test(responseText)) {
|
||||||
|
lastError = `HTTP ${response.status}: ${responseText}`;
|
||||||
|
}
|
||||||
if (this.settings.autoReconnect && [429, 503].includes(response.status)) {
|
if (this.settings.autoReconnect && [429, 503].includes(response.status)) {
|
||||||
this.requestReconnect(`HTTP ${response.status}`);
|
this.requestReconnect(`HTTP ${response.status}`);
|
||||||
}
|
}
|
||||||
if (attempt < REQUEST_RETRIES) {
|
if (attempt < REQUEST_RETRIES) {
|
||||||
|
item.retries += 1;
|
||||||
item.fullStatus = `Serverfehler ${response.status}, retry ${attempt + 1}/${REQUEST_RETRIES}`;
|
item.fullStatus = `Serverfehler ${response.status}, retry ${attempt + 1}/${REQUEST_RETRIES}`;
|
||||||
this.emitState();
|
this.emitState();
|
||||||
await sleep(350 * attempt);
|
await sleep(350 * attempt);
|
||||||
@ -2008,13 +2014,14 @@ export class DownloadManager extends EventEmitter {
|
|||||||
item.progressPercent = item.totalBytes ? Math.max(0, Math.min(100, Math.floor((written / item.totalBytes) * 100))) : 100;
|
item.progressPercent = item.totalBytes ? Math.max(0, Math.min(100, Math.floor((written / item.totalBytes) * 100))) : 100;
|
||||||
item.speedBps = 0;
|
item.speedBps = 0;
|
||||||
item.updatedAt = nowMs();
|
item.updatedAt = nowMs();
|
||||||
return { retriesUsed: attempt - 1, resumable };
|
return { resumable };
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (active.abortController.signal.aborted || String(error).includes("aborted:")) {
|
if (active.abortController.signal.aborted || String(error).includes("aborted:")) {
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
lastError = compactErrorText(error);
|
lastError = compactErrorText(error);
|
||||||
if (attempt < REQUEST_RETRIES) {
|
if (attempt < REQUEST_RETRIES) {
|
||||||
|
item.retries += 1;
|
||||||
item.fullStatus = `Downloadfehler, retry ${attempt + 1}/${REQUEST_RETRIES}`;
|
item.fullStatus = `Downloadfehler, retry ${attempt + 1}/${REQUEST_RETRIES}`;
|
||||||
this.emitState();
|
this.emitState();
|
||||||
await sleep(350 * attempt);
|
await sleep(350 * attempt);
|
||||||
|
|||||||
@ -896,6 +896,123 @@ describe("download manager", () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("counts retries and resets stale 100% progress on persistent HTTP 416", async () => {
|
||||||
|
const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
|
||||||
|
tempDirs.push(root);
|
||||||
|
const staleBinary = Buffer.alloc(64 * 1024, 9);
|
||||||
|
const pkgDir = path.join(root, "downloads", "range-416-fail");
|
||||||
|
fs.mkdirSync(pkgDir, { recursive: true });
|
||||||
|
const existingTargetPath = path.join(pkgDir, "broken.part3.rar");
|
||||||
|
fs.writeFileSync(existingTargetPath, staleBinary);
|
||||||
|
let directCalls = 0;
|
||||||
|
|
||||||
|
const server = http.createServer((req, res) => {
|
||||||
|
if ((req.url || "") !== "/range-416-fail") {
|
||||||
|
res.statusCode = 404;
|
||||||
|
res.end("not-found");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
directCalls += 1;
|
||||||
|
res.statusCode = 416;
|
||||||
|
res.setHeader("Content-Range", "bytes */32768");
|
||||||
|
res.end("");
|
||||||
|
});
|
||||||
|
|
||||||
|
server.listen(0, "127.0.0.1");
|
||||||
|
await once(server, "listening");
|
||||||
|
|
||||||
|
const address = server.address();
|
||||||
|
if (!address || typeof address === "string") {
|
||||||
|
throw new Error("server address unavailable");
|
||||||
|
}
|
||||||
|
const directUrl = `http://127.0.0.1:${address.port}/range-416-fail`;
|
||||||
|
|
||||||
|
globalThis.fetch = async (input: RequestInfo | URL, init?: RequestInit): Promise<Response> => {
|
||||||
|
const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
|
||||||
|
if (url.includes("/unrestrict/link")) {
|
||||||
|
return new Response(
|
||||||
|
JSON.stringify({
|
||||||
|
download: directUrl,
|
||||||
|
filename: "broken.part3.rar",
|
||||||
|
filesize: 32768
|
||||||
|
}),
|
||||||
|
{
|
||||||
|
status: 200,
|
||||||
|
headers: { "Content-Type": "application/json" }
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return originalFetch(input, init);
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
const session = emptySession();
|
||||||
|
const packageId = "range-416-fail-pkg";
|
||||||
|
const itemId = "range-416-fail-item";
|
||||||
|
const createdAt = Date.now() - 10_000;
|
||||||
|
|
||||||
|
session.packageOrder = [packageId];
|
||||||
|
session.packages[packageId] = {
|
||||||
|
id: packageId,
|
||||||
|
name: "range-416-fail",
|
||||||
|
outputDir: pkgDir,
|
||||||
|
extractDir: path.join(root, "extract", "range-416-fail"),
|
||||||
|
status: "queued",
|
||||||
|
itemIds: [itemId],
|
||||||
|
cancelled: false,
|
||||||
|
enabled: true,
|
||||||
|
createdAt,
|
||||||
|
updatedAt: createdAt
|
||||||
|
};
|
||||||
|
session.items[itemId] = {
|
||||||
|
id: itemId,
|
||||||
|
packageId,
|
||||||
|
url: "https://dummy/range-416-fail",
|
||||||
|
provider: null,
|
||||||
|
status: "queued",
|
||||||
|
retries: 0,
|
||||||
|
speedBps: 0,
|
||||||
|
downloadedBytes: staleBinary.length,
|
||||||
|
totalBytes: staleBinary.length,
|
||||||
|
progressPercent: 100,
|
||||||
|
fileName: "broken.part3.rar",
|
||||||
|
targetPath: existingTargetPath,
|
||||||
|
resumable: true,
|
||||||
|
attempts: 0,
|
||||||
|
lastError: "",
|
||||||
|
fullStatus: "Wartet",
|
||||||
|
createdAt,
|
||||||
|
updatedAt: createdAt
|
||||||
|
};
|
||||||
|
|
||||||
|
const manager = new DownloadManager(
|
||||||
|
{
|
||||||
|
...defaultSettings(),
|
||||||
|
token: "rd-token",
|
||||||
|
outputDir: path.join(root, "downloads"),
|
||||||
|
extractDir: path.join(root, "extract"),
|
||||||
|
autoExtract: false
|
||||||
|
},
|
||||||
|
session,
|
||||||
|
createStoragePaths(path.join(root, "state"))
|
||||||
|
);
|
||||||
|
|
||||||
|
manager.start();
|
||||||
|
await waitFor(() => !manager.getSnapshot().session.running, 45000);
|
||||||
|
|
||||||
|
const item = manager.getSnapshot().session.items[itemId];
|
||||||
|
expect(item?.status).toBe("failed");
|
||||||
|
expect(item?.retries).toBeGreaterThan(0);
|
||||||
|
expect(item?.progressPercent).toBe(0);
|
||||||
|
expect(item?.downloadedBytes).toBe(0);
|
||||||
|
expect(item?.lastError).toContain("416");
|
||||||
|
expect(directCalls).toBeGreaterThanOrEqual(3);
|
||||||
|
} finally {
|
||||||
|
server.close();
|
||||||
|
await once(server, "close");
|
||||||
|
}
|
||||||
|
}, 30000);
|
||||||
|
|
||||||
it("retries non-retriable HTTP statuses and eventually succeeds", async () => {
|
it("retries non-retriable HTTP statuses and eventually succeeds", async () => {
|
||||||
const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
|
const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
|
||||||
tempDirs.push(root);
|
tempDirs.push(root);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user