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

Fix JVM daemon restart loop causing 25-30s gaps between extractions

Browse Source 
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Sucukdeluxe 2026-03-05 13:49:20 +01:00
parent 72642351d0
commit 6e00bbab53
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "real-debrid-downloader", "name": "real-debrid-downloader",
"version": "1.6.55", "version": "1.6.56",
"description": "Desktop downloader", "description": "Desktop downloader",
"main": "build/main/main/main.js", "main": "build/main/main/main.js",
"author": "Sucukdeluxe", "author": "Sucukdeluxe",

36
src/main/extractor.ts
View File

@ -1087,6 +1087,8 @@ function handleDaemonLine(line: string): void {
function startDaemon(layout: JvmExtractorLayout): boolean { function startDaemon(layout: JvmExtractorLayout): boolean {
if (daemonProcess && daemonReady) return true; if (daemonProcess && daemonReady) return true;
// Don't kill a daemon that's still booting — it will become ready soon
if (daemonProcess) return false;
shutdownDaemon(); shutdownDaemon();
const jvmTmpDir = path.join(os.tmpdir(), `rd-extract-daemon-${crypto.randomUUID()}`); const jvmTmpDir = path.join(os.tmpdir(), `rd-extract-daemon-${crypto.randomUUID()}`);
@ -1182,6 +1184,22 @@ function isDaemonAvailable(layout: JvmExtractorLayout): boolean {
return Boolean(daemonProcess && daemonReady && !daemonBusy); return Boolean(daemonProcess && daemonReady && !daemonBusy);
} }
/** Wait for the daemon to become ready (boot phase) or free (busy phase), with timeout. */
function waitForDaemonReady(maxWaitMs: number, signal?: AbortSignal): Promise<boolean> {
return new Promise((resolve) => {
const start = Date.now();
const check = () => {
if (signal?.aborted) { resolve(false); return; }
if (daemonProcess && daemonReady && !daemonBusy) { resolve(true); return; }
// Daemon died while we were waiting
if (!daemonProcess) { resolve(false); return; }
if (Date.now() - start >= maxWaitMs) { resolve(false); return; }
setTimeout(check, 50);
};
check();
});
}
function sendDaemonRequest( function sendDaemonRequest(
archivePath: string, archivePath: string,
targetDir: string, targetDir: string,
@ -1256,7 +1274,7 @@ function sendDaemonRequest(
}); });
} }
function runJvmExtractCommand( async function runJvmExtractCommand(
layout: JvmExtractorLayout, layout: JvmExtractorLayout,
archivePath: string, archivePath: string,
targetDir: string, targetDir: string,
@ -1285,8 +1303,20 @@ function runJvmExtractCommand(
return sendDaemonRequest(archivePath, targetDir, conflictMode, passwordCandidates, onArchiveProgress, signal, timeoutMs); return sendDaemonRequest(archivePath, targetDir, conflictMode, passwordCandidates, onArchiveProgress, signal, timeoutMs);
} }
// Fallback: spawn a new JVM process (daemon busy or not available) // Daemon exists but is still booting or busy — wait up to 15s for it
logger.info(`JVM Spawn: Neuer Prozess für ${path.basename(archivePath)}${daemonBusy ? " (Daemon busy)" : ""}`); if (daemonProcess) {
const reason = !daemonReady ? "booting" : "busy";
logger.info(`JVM Daemon: Warte auf ${reason} Daemon für ${path.basename(archivePath)}...`);
const ready = await waitForDaemonReady(15_000, signal);
if (ready) {
logger.info(`JVM Daemon: Bereit — sende Request für ${path.basename(archivePath)}`);
return sendDaemonRequest(archivePath, targetDir, conflictMode, passwordCandidates, onArchiveProgress, signal, timeoutMs);
}
logger.warn(`JVM Daemon: Timeout beim Warten — Fallback auf neuen Prozess für ${path.basename(archivePath)}`);
}
// Fallback: spawn a new JVM process (daemon not available after waiting)
logger.info(`JVM Spawn: Neuer Prozess für ${path.basename(archivePath)}`);
const mode = effectiveConflictMode(conflictMode); const mode = effectiveConflictMode(conflictMode);
// Each JVM process needs its own temp dir so parallel SevenZipJBinding // Each JVM process needs its own temp dir so parallel SevenZipJBinding