Compare commits
No commits in common. "f828a871e2c2a16be43b5d1897b22d2a94943fe5" and "09d757782fc94886ca881e5308027f904cddc781" have entirely different histories.
f828a871e2
...
09d757782f
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "real-debrid-downloader",
|
"name": "real-debrid-downloader",
|
||||||
"version": "1.7.52",
|
"version": "1.7.51",
|
||||||
"description": "Desktop downloader",
|
"description": "Desktop downloader",
|
||||||
"main": "build/main/main/main.js",
|
"main": "build/main/main/main.js",
|
||||||
"author": "Sucukdeluxe",
|
"author": "Sucukdeluxe",
|
||||||
|
|||||||
@ -7009,14 +7009,6 @@ export class DownloadManager extends EventEmitter {
|
|||||||
item.fullStatus = `Range-Konflikt (HTTP 416), starte neu ${attempt}/${retryDisplayLimit}`;
|
item.fullStatus = `Range-Konflikt (HTTP 416), starte neu ${attempt}/${retryDisplayLimit}`;
|
||||||
item.updatedAt = nowMs();
|
item.updatedAt = nowMs();
|
||||||
this.emitState();
|
this.emitState();
|
||||||
if (item.provider === "debridlink") {
|
|
||||||
logAttemptEvent("WARN", "Debrid-Link HTTP 416: Direktlink sofort verwerfen", {
|
|
||||||
attempt,
|
|
||||||
existingBytes,
|
|
||||||
expectedTotal: expectedTotal || null
|
|
||||||
});
|
|
||||||
throw new Error("direct_link_retry_exhausted:HTTP 416");
|
|
||||||
}
|
|
||||||
if (attempt < maxAttempts) {
|
if (attempt < maxAttempts) {
|
||||||
item.retries += 1;
|
item.retries += 1;
|
||||||
await sleep(retryDelayWithJitter(attempt, 200));
|
await sleep(retryDelayWithJitter(attempt, 200));
|
||||||
|
|||||||
@ -735,13 +735,4 @@ describe("buildAutoRenameBaseNameFromFolders", () => {
|
|||||||
);
|
);
|
||||||
expect(result).toBe("Burning.Promise.S01E03.GERMAN.DL.720p.WEB.H264-WvF");
|
expect(result).toBe("Burning.Promise.S01E03.GERMAN.DL.720p.WEB.H264-WvF");
|
||||||
});
|
});
|
||||||
|
|
||||||
it("renames abbreviated 4SF source amilllt.de.dl.web.7p-s03e10 via season folder", () => {
|
|
||||||
const result = buildAutoRenameBaseNameFromFoldersWithOptions(
|
|
||||||
["A.Million.Little.Things.S03.GERMAN.DL.720p.WEB.H264-4SF"],
|
|
||||||
"4sf-amilllt.de.dl.web.7p-s03e10",
|
|
||||||
{ forceEpisodeForSeasonFolder: true }
|
|
||||||
);
|
|
||||||
expect(result).toBe("A.Million.Little.Things.S03E10.GERMAN.DL.720p.WEB.H264-4SF");
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
|
|||||||
@ -685,83 +685,6 @@ describe("download manager", () => {
|
|||||||
expect(fs.statSync(item.targetPath).size).toBe(binary.length);
|
expect(fs.statSync(item.targetPath).size).toBe(binary.length);
|
||||||
});
|
});
|
||||||
|
|
||||||
it("retries HTTP 416 in-session when using Debrid-Link API and then completes", async () => {
|
|
||||||
const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
|
|
||||||
tempDirs.push(root);
|
|
||||||
const binary = Buffer.alloc(160 * 1024, 57);
|
|
||||||
let unrestrictCalls = 0;
|
|
||||||
let downloadCalls = 0;
|
|
||||||
|
|
||||||
globalThis.fetch = async (input: RequestInfo | URL): Promise<Response> => {
|
|
||||||
const url = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
|
|
||||||
if (url.includes("debrid-link.com/api/v2/downloader/add")) {
|
|
||||||
unrestrictCalls += 1;
|
|
||||||
return new Response(
|
|
||||||
JSON.stringify({
|
|
||||||
success: true,
|
|
||||||
value: {
|
|
||||||
downloadUrl: `https://dummy/debridlink-direct-${unrestrictCalls}`,
|
|
||||||
name: "debridlink-416-retry.mkv",
|
|
||||||
size: binary.length
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
{
|
|
||||||
status: 200,
|
|
||||||
headers: { "Content-Type": "application/json" }
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
throw new Error(`unexpected fetch ${url}`);
|
|
||||||
};
|
|
||||||
|
|
||||||
const manager = new DownloadManager(
|
|
||||||
{
|
|
||||||
...defaultSettings(),
|
|
||||||
debridLinkApiKeys: "dl-test-key",
|
|
||||||
providerOrder: ["debridlink"],
|
|
||||||
providerPrimary: "debridlink",
|
|
||||||
providerSecondary: "none",
|
|
||||||
providerTertiary: "none",
|
|
||||||
outputDir: path.join(root, "downloads"),
|
|
||||||
extractDir: path.join(root, "extract"),
|
|
||||||
retryLimit: 2,
|
|
||||||
autoExtract: false
|
|
||||||
},
|
|
||||||
emptySession(),
|
|
||||||
createStoragePaths(path.join(root, "state"))
|
|
||||||
);
|
|
||||||
|
|
||||||
(manager as any).downloadToFile = async (_active: unknown, _directUrl: string, targetPath: string) => {
|
|
||||||
downloadCalls += 1;
|
|
||||||
if (downloadCalls === 1) {
|
|
||||||
throw new Error("direct_link_retry_exhausted:HTTP 416");
|
|
||||||
}
|
|
||||||
fs.mkdirSync(path.dirname(targetPath), { recursive: true });
|
|
||||||
fs.writeFileSync(targetPath, binary);
|
|
||||||
const item = Object.values((manager as any).session.items)[0] as { downloadedBytes: number; totalBytes: number; progressPercent: number } | undefined;
|
|
||||||
if (item) {
|
|
||||||
item.downloadedBytes = binary.length;
|
|
||||||
item.totalBytes = binary.length;
|
|
||||||
item.progressPercent = 100;
|
|
||||||
}
|
|
||||||
return { resumable: true };
|
|
||||||
};
|
|
||||||
|
|
||||||
manager.addPackages([{ name: "debridlink-416-retry", links: ["https://dummy/debridlink-416-retry"] }]);
|
|
||||||
await manager.start();
|
|
||||||
await waitFor(() => !manager.getSnapshot().session.running, 12000);
|
|
||||||
|
|
||||||
const item = Object.values(manager.getSnapshot().session.items)[0];
|
|
||||||
expect(item?.status).toBe("completed");
|
|
||||||
expect(item?.provider).toBe("debridlink");
|
|
||||||
expect(item?.progressPercent).toBe(100);
|
|
||||||
expect(item?.downloadedBytes).toBe(binary.length);
|
|
||||||
expect(unrestrictCalls).toBe(2);
|
|
||||||
expect(downloadCalls).toBe(2);
|
|
||||||
expect(fs.existsSync(item.targetPath)).toBe(true);
|
|
||||||
expect(fs.statSync(item.targetPath).size).toBe(binary.length);
|
|
||||||
});
|
|
||||||
|
|
||||||
it("restarts from zero after repeated resume underflow on fresh direct links", async () => {
|
it("restarts from zero after repeated resume underflow on fresh direct links", 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);
|
||||||
@ -2036,159 +1959,6 @@ describe("download manager", () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
it("refreshes Debrid-Link API direct links immediately after HTTP 416 instead of retrying the same link", async () => {
|
|
||||||
const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
|
|
||||||
tempDirs.push(root);
|
|
||||||
const binary = Buffer.alloc(256 * 1024, 29);
|
|
||||||
const pkgDir = path.join(root, "downloads", "debridlink-range-reset");
|
|
||||||
fs.mkdirSync(pkgDir, { recursive: true });
|
|
||||||
const existingTargetPath = path.join(pkgDir, "debridlink-range-reset.mkv");
|
|
||||||
const partialSize = 96 * 1024;
|
|
||||||
fs.writeFileSync(existingTargetPath, binary.subarray(0, partialSize));
|
|
||||||
|
|
||||||
let unrestrictCalls = 0;
|
|
||||||
let badCalls = 0;
|
|
||||||
let goodCalls = 0;
|
|
||||||
|
|
||||||
const server = http.createServer((req, res) => {
|
|
||||||
const route = req.url || "";
|
|
||||||
const range = String(req.headers.range || "");
|
|
||||||
const match = range.match(/bytes=(\d+)-/i);
|
|
||||||
const start = match ? Number(match[1]) : 0;
|
|
||||||
|
|
||||||
if (route === "/bad-416") {
|
|
||||||
badCalls += 1;
|
|
||||||
res.statusCode = 416;
|
|
||||||
res.setHeader("Content-Range", `bytes */${partialSize - 1024}`);
|
|
||||||
res.end("");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (route === "/good") {
|
|
||||||
goodCalls += 1;
|
|
||||||
const chunk = binary.subarray(start);
|
|
||||||
if (start > 0) {
|
|
||||||
res.statusCode = 206;
|
|
||||||
res.setHeader("Content-Range", `bytes ${start}-${binary.length - 1}/${binary.length}`);
|
|
||||||
} else {
|
|
||||||
res.statusCode = 200;
|
|
||||||
}
|
|
||||||
res.setHeader("Accept-Ranges", "bytes");
|
|
||||||
res.setHeader("Content-Length", String(chunk.length));
|
|
||||||
res.end(chunk);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
res.statusCode = 404;
|
|
||||||
res.end("not-found");
|
|
||||||
});
|
|
||||||
|
|
||||||
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 badUrl = `http://127.0.0.1:${address.port}/bad-416`;
|
|
||||||
const goodUrl = `http://127.0.0.1:${address.port}/good`;
|
|
||||||
|
|
||||||
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("debrid-link.com/api/v2/downloader/add")) {
|
|
||||||
unrestrictCalls += 1;
|
|
||||||
return new Response(
|
|
||||||
JSON.stringify({
|
|
||||||
success: true,
|
|
||||||
value: {
|
|
||||||
downloadUrl: unrestrictCalls === 1 ? badUrl : goodUrl,
|
|
||||||
name: "debridlink-range-reset.mkv",
|
|
||||||
size: binary.length
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
{
|
|
||||||
status: 200,
|
|
||||||
headers: { "Content-Type": "application/json" }
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return originalFetch(input, init);
|
|
||||||
};
|
|
||||||
|
|
||||||
try {
|
|
||||||
const session = emptySession();
|
|
||||||
const packageId = "debridlink-range-reset-pkg";
|
|
||||||
const itemId = "debridlink-range-reset-item";
|
|
||||||
const createdAt = Date.now() - 10_000;
|
|
||||||
|
|
||||||
session.packageOrder = [packageId];
|
|
||||||
session.packages[packageId] = {
|
|
||||||
id: packageId,
|
|
||||||
name: "debridlink-range-reset",
|
|
||||||
outputDir: pkgDir,
|
|
||||||
extractDir: path.join(root, "extract", "debridlink-range-reset"),
|
|
||||||
status: "queued",
|
|
||||||
itemIds: [itemId],
|
|
||||||
cancelled: false,
|
|
||||||
enabled: true,
|
|
||||||
createdAt,
|
|
||||||
updatedAt: createdAt
|
|
||||||
};
|
|
||||||
session.items[itemId] = {
|
|
||||||
id: itemId,
|
|
||||||
packageId,
|
|
||||||
url: "https://dummy/debridlink-range-reset",
|
|
||||||
provider: "debridlink",
|
|
||||||
status: "queued",
|
|
||||||
retries: 0,
|
|
||||||
speedBps: 0,
|
|
||||||
downloadedBytes: partialSize,
|
|
||||||
totalBytes: binary.length,
|
|
||||||
progressPercent: Math.floor((partialSize / binary.length) * 100),
|
|
||||||
fileName: "debridlink-range-reset.mkv",
|
|
||||||
targetPath: existingTargetPath,
|
|
||||||
resumable: true,
|
|
||||||
attempts: 0,
|
|
||||||
lastError: "",
|
|
||||||
fullStatus: "Wartet",
|
|
||||||
createdAt,
|
|
||||||
updatedAt: createdAt
|
|
||||||
};
|
|
||||||
|
|
||||||
const manager = new DownloadManager(
|
|
||||||
{
|
|
||||||
...defaultSettings(),
|
|
||||||
debridLinkApiKeys: "dl-test-key",
|
|
||||||
providerOrder: ["debridlink"],
|
|
||||||
providerPrimary: "debridlink",
|
|
||||||
providerSecondary: "none",
|
|
||||||
providerTertiary: "none",
|
|
||||||
outputDir: path.join(root, "downloads"),
|
|
||||||
extractDir: path.join(root, "extract"),
|
|
||||||
retryLimit: 2,
|
|
||||||
autoExtract: false
|
|
||||||
},
|
|
||||||
session,
|
|
||||||
createStoragePaths(path.join(root, "state"))
|
|
||||||
);
|
|
||||||
|
|
||||||
await manager.start();
|
|
||||||
await waitFor(() => !manager.getSnapshot().session.running, 25000);
|
|
||||||
|
|
||||||
const item = manager.getSnapshot().session.items[itemId];
|
|
||||||
expect(item?.status).toBe("completed");
|
|
||||||
expect(item?.provider).toBe("debridlink");
|
|
||||||
expect(item?.downloadedBytes).toBe(binary.length);
|
|
||||||
expect(unrestrictCalls).toBe(2);
|
|
||||||
expect(badCalls).toBe(1);
|
|
||||||
expect(goodCalls).toBeGreaterThanOrEqual(1);
|
|
||||||
expect(fs.statSync(existingTargetPath).size).toBe(binary.length);
|
|
||||||
} finally {
|
|
||||||
server.close();
|
|
||||||
await once(server, "close");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
it("recovers from HTTP 416 by restarting download from zero", async () => {
|
it("recovers from HTTP 416 by restarting download from zero", 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