@livedesk/client 0.1.197 → 0.1.199

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.197",
+  "version": "0.1.199",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -41,10 +41,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.404",
-    "@livedesk/fast-osx-arm64": "0.1.404",
-    "@livedesk/fast-osx-x64": "0.1.404",
-    "@livedesk/fast-win-x64": "0.1.404"
+    "@livedesk/fast-linux-x64": "0.1.406",
+    "@livedesk/fast-osx-arm64": "0.1.406",
+    "@livedesk/fast-osx-x64": "0.1.406",
+    "@livedesk/fast-win-x64": "0.1.406"
   },
   "publishConfig": {
     "access": "public"

package/src/runtime/agent-process-lifecycle.js

@@ -33,6 +33,18 @@ function isOwnedUnixProcessGroupAlive(child, platform, signalProcess) {
     }
 }
 
+function isProcessIdAlive(processId, signalProcess) {
+    if (!Number.isInteger(processId) || processId <= 1) {
+        return false;
+    }
+    try {
+        signalProcess(processId, 0);
+        return true;
+    } catch (error) {
+        return error?.code === 'EPERM';
+    }
+}
+
 function signalAgentTree(child, signal, platform, signalProcess) {
     const processId = Number(child?.pid || 0);
     if (platform !== 'win32'
@@ -56,6 +68,9 @@ export function installAgentTerminationHandlers({
     platform = process.platform,
     signalProcess = (pid, signal) => process.kill(pid, signal),
     terminateWindowsTree = terminateWindowsProcessTree,
+    windowsTerminateAttemptLimit = 3,
+    windowsTerminateRetryMs = 100,
+    reportTerminationFailure = message => console.error(message),
     exitProcess = code => hostProcess.exit(code)
 } = {}) {
     if (typeof getAgentProcess !== 'function') {
@@ -79,12 +94,14 @@ export function installAgentTerminationHandlers({
             let poll = null;
             let timeout = null;
             let hardStop = null;
+            let windowsRetryTimer = null;
             const finish = () => {
                 if (finished) return;
                 finished = true;
                 if (poll) clearInterval(poll);
                 if (timeout) clearTimeout(timeout);
                 if (hardStop) clearTimeout(hardStop);
+                if (windowsRetryTimer) clearTimeout(windowsRetryTimer);
                 exitProcess(exitCode);
             };
             const processId = Number(child?.pid || 0);
@@ -99,16 +116,52 @@ export function installAgentTerminationHandlers({
                 // alive until taskkill has completed against this exact,
                 // launcher-owned process tree. Never search for or terminate
                 // unrelated ffmpeg.exe processes globally.
-                let treeTermination;
-                try {
-                    treeTermination = terminateWindowsTree(processId);
-                } catch {
-                    finish();
-                    return;
-                }
-                Promise.resolve(treeTermination)
-                    .catch(() => null)
-                    .finally(finish);
+                const attemptLimit = Math.max(1, Number(windowsTerminateAttemptLimit) || 3);
+                const retryMs = Math.max(25, Number(windowsTerminateRetryMs) || 100);
+                let attempt = 0;
+                let failureReported = false;
+                const terminateOwnedTree = () => {
+                    if (finished) return;
+                    attempt += 1;
+                    let treeTermination;
+                    try {
+                        treeTermination = terminateWindowsTree(processId);
+                    } catch (error) {
+                        treeTermination = { ok: false, error };
+                    }
+                    Promise.resolve(treeTermination)
+                        .catch(error => ({ ok: false, error }))
+                        .then(result => {
+                            if (finished) return;
+                            if (result?.ok !== false) {
+                                finish();
+                                return;
+                            }
+                            if (!isProcessIdAlive(processId, signalProcess)) {
+                                finish();
+                                return;
+                            }
+
+                            const burstExhausted = attempt >= attemptLimit;
+                            if (burstExhausted && !failureReported) {
+                                failureReported = true;
+                                const reason = result?.error?.message || 'taskkill returned an error';
+                                reportTerminationFailure(
+                                    `[LiveDesk Client] Agent tree pid=${processId} is still alive after `
+                                    + `${attemptLimit} exact-PID taskkill attempts (${reason}). `
+                                    + 'The launcher will remain alive and keep retrying so capture descendants are not orphaned.'
+                                );
+                            }
+                            if (burstExhausted) {
+                                attempt = 0;
+                            }
+                            windowsRetryTimer = setTimeout(
+                                terminateOwnedTree,
+                                burstExhausted ? Math.max(1000, retryMs) : retryMs
+                            );
+                        });
+                };
+                terminateOwnedTree();
                 return;
             }
             const finishWhenTreeStops = () => {