Administrator/real-debrid-downloader
1
0
Fork 0
Code Issues Pull Requests Actions 132 Packages Projects Releases 238 Wiki Activity

Fix extraction progress caching and JVM tuning

Browse Source 
- Replace Map-based archive item cache with plain Object.create(null)
  to work around mysterious Map.has() returning false despite set()
  being called with the same key — this caused resolveArchiveItems
  to run on every 1.1s pulse instead of being cached, preventing
  extraction progress (Entpacken X%) from ever showing in the UI
- Apply same fix to both hybrid and full extraction paths
- Increase JVM heap from 512MB to 1GB for better extraction throughput
- Use SerialGC for faster JVM startup on short-lived extract processes
- Add download lifecycle logging (package add + item download start)

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Sucukdeluxe 2026-03-05 05:42:23 +01:00
parent d80483adc2
commit 30d216c7ca
2 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/download-manager.ts
View File

@ -6366,9 +6366,11 @@ export class DownloadManager extends EventEmitter {
const resolveArchiveItems = (archiveName: string): DownloadItem[] => const resolveArchiveItems = (archiveName: string): DownloadItem[] =>
resolveArchiveItemsFromList(archiveName, items); resolveArchiveItemsFromList(archiveName, items);
// Track multiple active archives for parallel hybrid extraction // Track multiple active archives for parallel hybrid extraction.
const activeHybridArchiveMap = new Map<string, DownloadItem[]>(); // Using plain object instead of Map — Map.has() was mysteriously
const hybridArchiveStartTimes = new Map<string, number>(); // returning false despite Map.set() being called with the same key.
const resolvedItemsCache: Record<string, DownloadItem[]> = Object.create(null);
const archiveStartTimesCache: Record<string, number> = Object.create(null);
let hybridLastEmitAt = 0; let hybridLastEmitAt = 0;
// Mark items based on whether their archive is actually ready for extraction. // Mark items based on whether their archive is actually ready for extraction.
@ -6417,18 +6419,18 @@ export class DownloadManager extends EventEmitter {
if (progress.phase === "done") { if (progress.phase === "done") {
// Do NOT mark remaining archives as "Done" here — some may have // Do NOT mark remaining archives as "Done" here — some may have
// failed. The post-extraction code (result.failed check) will // failed. The post-extraction code (result.failed check) will
// assign the correct label. Only clear the tracking maps. // assign the correct label. Only clear the tracking caches.
activeHybridArchiveMap.clear(); for (const key of Object.keys(resolvedItemsCache)) delete resolvedItemsCache[key];
hybridArchiveStartTimes.clear(); for (const key of Object.keys(archiveStartTimesCache)) delete archiveStartTimesCache[key];
return; return;
} }
if (progress.archiveName) { if (progress.archiveName) {
// Resolve items for this archive if not yet tracked // Resolve items for this archive if not yet tracked
if (!activeHybridArchiveMap.has(progress.archiveName)) { if (!(progress.archiveName in resolvedItemsCache)) {
const resolved = resolveArchiveItems(progress.archiveName); const resolved = resolveArchiveItems(progress.archiveName);
activeHybridArchiveMap.set(progress.archiveName, resolved); resolvedItemsCache[progress.archiveName] = resolved;
hybridArchiveStartTimes.set(progress.archiveName, nowMs()); archiveStartTimesCache[progress.archiveName] = nowMs();
if (resolved.length === 0) { if (resolved.length === 0) {
logger.warn(`resolveArchiveItems (hybrid): KEINE Items gefunden für archiveName="${progress.archiveName}", items.length=${items.length}, itemNames=[${items.slice(0, 5).map((i) => path.basename(i.targetPath || i.fileName || "?")).join(", ")}]`); logger.warn(`resolveArchiveItems (hybrid): KEINE Items gefunden für archiveName="${progress.archiveName}", items.length=${items.length}, itemNames=[${items.slice(0, 5).map((i) => path.basename(i.targetPath || i.fileName || "?")).join(", ")}]`);
} else { } else {
@ -6447,12 +6449,12 @@ export class DownloadManager extends EventEmitter {
this.emitState(true); this.emitState(true);
} }
} }
const archItems = activeHybridArchiveMap.get(progress.archiveName)!; const archItems = resolvedItemsCache[progress.archiveName] || [];
// If archive is at 100%, mark its items as done and remove from active // If archive is at 100%, mark its items as done and remove from active
if (Number(progress.archivePercent ?? 0) >= 100) { if (Number(progress.archivePercent ?? 0) >= 100) {
const doneAt = nowMs(); const doneAt = nowMs();
const startedAt = hybridArchiveStartTimes.get(progress.archiveName) || doneAt; const startedAt = archiveStartTimesCache[progress.archiveName] || doneAt;
const doneLabel = formatExtractDone(doneAt - startedAt); const doneLabel = formatExtractDone(doneAt - startedAt);
for (const entry of archItems) { for (const entry of archItems) {
if (!isExtractedLabel(entry.fullStatus)) { if (!isExtractedLabel(entry.fullStatus)) {
@ -6460,8 +6462,8 @@ export class DownloadManager extends EventEmitter {
entry.updatedAt = doneAt; entry.updatedAt = doneAt;
} }
} }
activeHybridArchiveMap.delete(progress.archiveName); delete resolvedItemsCache[progress.archiveName];
hybridArchiveStartTimes.delete(progress.archiveName); delete archiveStartTimesCache[progress.archiveName];
// Show transitional label while next archive initializes // Show transitional label while next archive initializes
const done = progress.current + 1; const done = progress.current + 1;
if (done < progress.total) { if (done < progress.total) {
@ -6753,9 +6755,10 @@ export class DownloadManager extends EventEmitter {
} }
}, extractTimeoutMs); }, extractTimeoutMs);
try { try {
// Track multiple active archives for parallel extraction // Track multiple active archives for parallel extraction.
const activeArchiveItemsMap = new Map<string, DownloadItem[]>(); // Using plain object — Map.has() had a mysterious caching failure.
const archiveStartTimes = new Map<string, number>(); const fullResolvedCache: Record<string, DownloadItem[]> = Object.create(null);
const fullStartTimesCache: Record<string, number> = Object.create(null);
const result = await extractPackageArchives({ const result = await extractPackageArchives({
packageDir: pkg.outputDir, packageDir: pkg.outputDir,
@ -6781,19 +6784,19 @@ export class DownloadManager extends EventEmitter {
if (progress.phase === "done") { if (progress.phase === "done") {
// Do NOT mark remaining archives as "Done" here — some may have // Do NOT mark remaining archives as "Done" here — some may have
// failed. The post-extraction code (result.failed check) will // failed. The post-extraction code (result.failed check) will
// assign the correct label. Only clear the tracking maps. // assign the correct label. Only clear the tracking caches.
activeArchiveItemsMap.clear(); for (const key of Object.keys(fullResolvedCache)) delete fullResolvedCache[key];
archiveStartTimes.clear(); for (const key of Object.keys(fullStartTimesCache)) delete fullStartTimesCache[key];
emitExtractStatus("Entpacken 100%", true); emitExtractStatus("Entpacken 100%", true);
return; return;
} }
if (progress.archiveName) { if (progress.archiveName) {
// Resolve items for this archive if not yet tracked // Resolve items for this archive if not yet tracked
if (!activeArchiveItemsMap.has(progress.archiveName)) { if (!(progress.archiveName in fullResolvedCache)) {
const resolved = resolveArchiveItems(progress.archiveName); const resolved = resolveArchiveItems(progress.archiveName);
activeArchiveItemsMap.set(progress.archiveName, resolved); fullResolvedCache[progress.archiveName] = resolved;
archiveStartTimes.set(progress.archiveName, nowMs()); fullStartTimesCache[progress.archiveName] = nowMs();
if (resolved.length === 0) { if (resolved.length === 0) {
logger.warn(`resolveArchiveItems (full): KEINE Items für archiveName="${progress.archiveName}", completedItems=${completedItems.length}, names=[${completedItems.slice(0, 5).map((i) => path.basename(i.targetPath || i.fileName || "?")).join(", ")}]`); logger.warn(`resolveArchiveItems (full): KEINE Items für archiveName="${progress.archiveName}", completedItems=${completedItems.length}, names=[${completedItems.slice(0, 5).map((i) => path.basename(i.targetPath || i.fileName || "?")).join(", ")}]`);
} else { } else {
@ -6810,12 +6813,12 @@ export class DownloadManager extends EventEmitter {
emitExtractStatus(`Entpacken ${progress.percent}% · ${progress.archiveName}`, true); emitExtractStatus(`Entpacken ${progress.percent}% · ${progress.archiveName}`, true);
} }
} }
const archiveItems = activeArchiveItemsMap.get(progress.archiveName)!; const archiveItems = fullResolvedCache[progress.archiveName] || [];
// If archive is at 100%, mark its items as done and remove from active // If archive is at 100%, mark its items as done and remove from active
if (Number(progress.archivePercent ?? 0) >= 100) { if (Number(progress.archivePercent ?? 0) >= 100) {
const doneAt = nowMs(); const doneAt = nowMs();
const startedAt = archiveStartTimes.get(progress.archiveName) || doneAt; const startedAt = fullStartTimesCache[progress.archiveName] || doneAt;
const doneLabel = formatExtractDone(doneAt - startedAt); const doneLabel = formatExtractDone(doneAt - startedAt);
for (const entry of archiveItems) { for (const entry of archiveItems) {
if (!isExtractedLabel(entry.fullStatus)) { if (!isExtractedLabel(entry.fullStatus)) {
@ -6823,8 +6826,8 @@ export class DownloadManager extends EventEmitter {
entry.updatedAt = doneAt; entry.updatedAt = doneAt;
} }
} }
activeArchiveItemsMap.delete(progress.archiveName); delete fullResolvedCache[progress.archiveName];
archiveStartTimes.delete(progress.archiveName); delete fullStartTimesCache[progress.archiveName];
// Show transitional label while next archive initializes // Show transitional label while next archive initializes
const done = progress.current + 1; const done = progress.current + 1;
if (done < progress.total) { if (done < progress.total) {

5
src/main/extractor.ts
View File

@ -1019,8 +1019,9 @@ function runJvmExtractCommand(
const args = [ const args = [
"-Dfile.encoding=UTF-8", "-Dfile.encoding=UTF-8",
`-Djava.io.tmpdir=${jvmTmpDir}`, `-Djava.io.tmpdir=${jvmTmpDir}`,
"-Xms32m", "-Xms64m",
"-Xmx512m", "-Xmx1g",
"-XX:+UseSerialGC",
"-cp", "-cp",
layout.classPath, layout.classPath,
JVM_EXTRACTOR_MAIN_CLASS, JVM_EXTRACTOR_MAIN_CLASS,