Fix: Teildatei wird beim Entfernen eines laufenden Downloads gelöscht (kein Datei-Waise)
Wurde ein gerade herunterladendes Item entfernt (removeItem), brach der Abbruch zwar den Stream ab, aber die angefangene Teildatei blieb für immer auf der Platte: removeItem löscht das Item synchron aus der Session, und der danach laufende processItem-catch stieg in der allerersten Zeile (Session-Mitglied- schaftsprüfung `session.items[id] !== item`) per return aus — also VOR dem Cancel-Zweig, der die geclaimte Teildatei via fs.rmSync entfernt. Folge: verwaiste Bytes, die kein Item mehr referenziert, plus beim erneuten Hinzufügen desselben Links eine stille Duplikat-Benennung "Name (1)". Fix: Im catch wird vor dem frühen return — wenn das Item nicht mehr in der Session ist und der Abbruchgrund "cancel" war — die geclaimte Teildatei (claimedTargetPathByItem bzw. item.targetPath) gelöscht. Das passiert im catch, also NACH dem Schließen des Streams (kein Race mit dem noch offenen Write- Stream). releaseTargetPath/dropItemContribution laufen wie bisher (finally bzw. removeItem). Eng auf cancel+entferntes-Item begrenzt → keine Auswirkung auf normale/laufende Items. Test: held-Connection hält den Download aktiv, removeItem mitten im Stream; die Teildatei ist danach weg. Ohne den Fix bleibt sie liegen (rot bewiesen, Timeout).
This commit is contained in:
parent
1a33fc2573
commit
2b639b7267
@ -9032,6 +9032,15 @@ export class DownloadManager extends EventEmitter {
|
|||||||
return;
|
return;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (this.session.items[item.id] !== item) {
|
if (this.session.items[item.id] !== item) {
|
||||||
|
if (active.abortReason === "cancel") {
|
||||||
|
const orphanClaimedPath = this.claimedTargetPathByItem.get(item.id) || item.targetPath || "";
|
||||||
|
if (orphanClaimedPath) {
|
||||||
|
try {
|
||||||
|
fs.rmSync(orphanClaimedPath, { force: true });
|
||||||
|
} catch {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const reason = active.abortReason;
|
const reason = active.abortReason;
|
||||||
|
|||||||
@ -865,6 +865,89 @@ describe("download manager", () => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("deletes the orphaned partial file when a downloading item is removed mid-stream", async () => {
|
||||||
|
const root = fs.mkdtempSync(path.join(os.tmpdir(), "rd-dm-"));
|
||||||
|
tempDirs.push(root);
|
||||||
|
const binary = Buffer.alloc(512 * 1024, 7);
|
||||||
|
|
||||||
|
let destroyHeld: () => void = () => {};
|
||||||
|
const server = http.createServer((req, res) => {
|
||||||
|
if ((req.url || "") !== "/direct") {
|
||||||
|
res.statusCode = 404;
|
||||||
|
res.end("not-found");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
res.statusCode = 200;
|
||||||
|
res.setHeader("Accept-Ranges", "bytes");
|
||||||
|
res.setHeader("Content-Length", String(binary.length));
|
||||||
|
res.write(binary.subarray(0, 64 * 1024));
|
||||||
|
destroyHeld = () => {
|
||||||
|
try { res.socket?.destroy(); } catch { }
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
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}/direct`;
|
||||||
|
|
||||||
|
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: "held.mkv", filesize: binary.length }),
|
||||||
|
{ status: 200, headers: { "Content-Type": "application/json" } }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return originalFetch(input, init);
|
||||||
|
};
|
||||||
|
|
||||||
|
try {
|
||||||
|
const manager = new DownloadManager(
|
||||||
|
{
|
||||||
|
...defaultSettings(),
|
||||||
|
token: "rd-token",
|
||||||
|
outputDir: path.join(root, "downloads"),
|
||||||
|
extractDir: path.join(root, "extract"),
|
||||||
|
autoExtract: false,
|
||||||
|
autoReconnect: false,
|
||||||
|
retryLimit: 0
|
||||||
|
},
|
||||||
|
emptySession(),
|
||||||
|
createStoragePaths(path.join(root, "state"))
|
||||||
|
);
|
||||||
|
|
||||||
|
manager.addPackages([{ name: "held", links: ["https://dummy/held"] }]);
|
||||||
|
await manager.start();
|
||||||
|
|
||||||
|
let targetPath = "";
|
||||||
|
await waitFor(() => {
|
||||||
|
const it = Object.values(manager.getSnapshot().session.items)[0];
|
||||||
|
if (it && it.status === "downloading" && it.targetPath && fs.existsSync(it.targetPath)) {
|
||||||
|
targetPath = it.targetPath;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}, 20000);
|
||||||
|
|
||||||
|
const itemId = Object.values(manager.getSnapshot().session.items)[0].id;
|
||||||
|
expect(fs.existsSync(targetPath)).toBe(true);
|
||||||
|
|
||||||
|
manager.removeItem(itemId);
|
||||||
|
destroyHeld();
|
||||||
|
|
||||||
|
await waitFor(() => !fs.existsSync(targetPath), 20000);
|
||||||
|
expect(fs.existsSync(targetPath)).toBe(false);
|
||||||
|
} finally {
|
||||||
|
destroyHeld();
|
||||||
|
server.close();
|
||||||
|
await once(server, "close");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
it("rewinds resumed range after terminated streams so corrupted tail bytes are replaced", async () => {
|
it("rewinds resumed range after terminated streams so corrupted tail bytes are replaced", 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