livedesk 0.1.272 → 0.1.274

package/bin/livedesk.js

@@ -578,6 +578,10 @@ async function runManager(args) {
     try {
       const request = JSON.parse(readFileSync(updateRequestPath, 'utf8'));
       rmSync(updateRequestPath, { force: true });
+      if (request?.continueClientUpdate === true) {
+        process.env.LIVEDESK_UPDATE_CONTINUE = '1';
+        process.env.LIVEDESK_UPDATE_CONTINUE_TARGET_VERSION = String(request.latestClientVersion || '');
+      }
       if (request?.pid && Number(request.pid) !== Number(activeChild?.pid || 0)) {
         restartRequested = true;
         console.log(`[LiveDesk Hub] Restart requested for update ${request.operationId || 'unknown'}.`);

package/hub/src/live-desk-update.js

@@ -64,22 +64,26 @@ function buildUnixLegacyUpdateCommand({ manager, pair, name, slot, targetVersion
   const script = [
     'const { execFileSync, spawn } = require("node:child_process");',
     'const fs = require("node:fs");',
-    'const os = require("node:os");',
     'const path = require("node:path");',
-    'const self = process.pid;',
     'const parentOf = pid => { try { return Number(execFileSync("ps", ["-o", "ppid=", "-p", String(pid)], { encoding: "utf8" }).trim()) || 0; } catch { return 0; } };',
     'const commandOf = pid => { try { return execFileSync("ps", ["-o", "command=", "-p", String(pid)], { encoding: "utf8" }); } catch { return ""; } };',
-    'let cursor = parentOf(self); let launcherPid = 0;',
+    'const isAlive = pid => { try { process.kill(pid, 0); return true; } catch { return false; } };',
+    'const configuredLauncherPid = Number(process.env.LIVEDESK_CLIENT_PARENT_PID || 0);',
+    'let launcherPid = Number.isInteger(configuredLauncherPid) && configuredLauncherPid > 1 && isAlive(configuredLauncherPid) ? configuredLauncherPid : 0;',
+    'let cursor = parentOf(process.pid);',
     'for (let depth = 0; depth < 12 && cursor; depth++) { const command = commandOf(cursor); if (/livedesk-client\\.js|livedesk\\.js/i.test(command)) { launcherPid = cursor; break; } cursor = parentOf(cursor); }',
-    'if (!launcherPid) throw new Error("LiveDesk client launcher process was not found.");',
+    'const waitPid = launcherPid > 1 ? launcherPid : process.pid;',
     `process.env.LIVEDESK_CLIENT_MANAGER = ${JSON.stringify(String(manager || ''))};`,
     `process.env.LIVEDESK_CLIENT_PAIR_TOKEN = ${JSON.stringify(String(pair || ''))};`,
     `process.env.LIVEDESK_CLIENT_NAME = ${JSON.stringify(String(name || ''))};`,
     `process.env.LIVEDESK_CLIENT_SLOT = ${JSON.stringify(String(slot || ''))};`,
     `process.env.LIVEDESK_CLIENT_UPDATE_TARGET_VERSION = ${JSON.stringify(String(targetVersion || ''))};`,
-    'const updater = spawn("npx", ["-y", "--prefer-online", "livedesk@latest", "client", "--no-login", "--update-wait-pid", String(launcherPid)], { detached: true, stdio: "ignore" });',
-    'updater.unref();',
-    'setTimeout(() => { try { process.kill(launcherPid, "SIGTERM"); } catch {} }, 500);',
+    'const nodeDir = path.dirname(process.execPath);',
+    'const npxCandidates = [process.env.LIVEDESK_NPX_EXECUTABLE, path.join(nodeDir, process.platform === "win32" ? "npx.cmd" : "npx"), process.platform === "win32" ? "npx.cmd" : "npx"].filter(Boolean);',
+    'const npx = npxCandidates.find(candidate => !path.isAbsolute(candidate) || fs.existsSync(candidate)) || npxCandidates[npxCandidates.length - 1];',
+    'const updater = spawn(npx, ["-y", "--prefer-online", "livedesk@latest", "client", "--no-login", "--update-wait-pid", String(waitPid)], { detached: true, stdio: "ignore", env: process.env });',
+    'updater.once("error", error => { console.error(`LiveDesk updater failed to start: ${error.message}`); process.exitCode = 1; });',
+    'updater.once("spawn", () => { updater.unref(); if (waitPid !== process.pid) setTimeout(() => { try { process.kill(waitPid, "SIGTERM"); } catch {} }, 500); });',
     ''
   ].join('\n');
   return `node -e ${JSON.stringify(script)}`;

package/hub/src/server.js

@@ -285,6 +285,7 @@ function requestHubRestart(request = {}) {
     const temporaryPath = `${requestPath}.${process.pid}.tmp`;
     writeFileSync(temporaryPath, JSON.stringify({
       ...request,
+      continueClientUpdate: true,
       pid: process.pid,
       requestedAt: new Date().toISOString()
     }), 'utf8');
@@ -302,7 +303,45 @@ liveDeskUpdateManager = createLiveDeskUpdateManager({
   restartSupported: !!String(process.env.LIVEDESK_HUB_UPDATE_REQUEST_PATH || '').trim(),
   requestHubRestart
 });
-const agentMcpSessions = new Map();
+
+if (process.env.LIVEDESK_UPDATE_CONTINUE === '1') {
+  let continueUpdateInFlight = false;
+  let continueUpdateAttempts = 0;
+  const continueUpdateTimer = setInterval(async () => {
+    if (continueUpdateInFlight || continueUpdateAttempts >= 90) {
+      if (continueUpdateAttempts >= 90) clearInterval(continueUpdateTimer);
+      return;
+    }
+    const connectedDevices = remoteHub.listDevices({ includeDataUrl: false })
+      .filter(device => device.connected === true && device.synthetic !== true);
+    if (connectedDevices.length === 0) return;
+    continueUpdateAttempts += 1;
+    continueUpdateInFlight = true;
+    try {
+      await liveDeskUpdateManager.checkLatest();
+      const updateStatus = liveDeskUpdateManager.getStatus();
+      if (!updateStatus.updateAvailable) {
+        clearInterval(continueUpdateTimer);
+        return;
+      }
+      if (updateStatus.outdatedClientCount <= 0 && !updateStatus.clientPackageUpdateAvailable) {
+        clearInterval(continueUpdateTimer);
+        return;
+      }
+      const result = await liveDeskUpdateManager.startUpdate();
+      if (result?.ok === false || ['waiting-for-clients', 'clients-updated', 'hub-restart-requested'].includes(String(result?.state || ''))) {
+        clearInterval(continueUpdateTimer);
+      }
+    } catch (error) {
+      console.warn(`[LiveDesk Hub] automatic client update continuation failed: ${error instanceof Error ? error.message : String(error)}`);
+      clearInterval(continueUpdateTimer);
+    } finally {
+      continueUpdateInFlight = false;
+    }
+  }, 1000);
+  continueUpdateTimer.unref?.();
+}
+const agentMcpSessions = new Map();
 const agentMcpRunBatches = new Map();
 const agentMcpRunCleanupTimers = new Map();
 const AGENT_MCP_RUN_TTL_MS = 60 * 60 * 1000;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.272",
+  "version": "0.1.274",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {