livedesk 0.1.279 → 0.1.280

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

@@ -1,7 +1,7 @@
 import { randomUUID } from 'node:crypto';
 
 export const LIVE_DESK_UPDATE_COMMAND = 'livedesk.client-update';
-export const LIVE_DESK_DEDICATED_CLIENT_UPDATE_MIN_VERSION = '0.1.138';
+export const LIVE_DESK_DEDICATED_CLIENT_UPDATE_MIN_VERSION = '0.1.141';
 export const LIVE_DESK_UPDATE_TIMEOUT_MS = 120_000;
 export const LIVE_DESK_UPDATE_CHECK_INTERVAL_MS = 60_000;
 
@@ -54,13 +54,16 @@ function buildWindowsLegacyUpdateCommand({ manager, pair, name, slot, targetVers
     `$env:LIVEDESK_CLIENT_NAME = ${quotePowerShell(name)}`,
     `$env:LIVEDESK_CLIENT_SLOT = ${quotePowerShell(slot || '')}`,
     `$env:LIVEDESK_CLIENT_UPDATE_TARGET_VERSION = ${quotePowerShell(targetVersion)}`,
-    '$npx = [string]$env:LIVEDESK_NPX_EXECUTABLE',
-    'if ($npx -and -not (Test-Path -LiteralPath $npx -PathType Leaf)) { $npx = "" }',
-    'if (-not $npx) { $node = [string]$env:LIVEDESK_NODE_EXECUTABLE; if ($node -and (Test-Path -LiteralPath $node -PathType Leaf)) { $npx = Join-Path (Split-Path -Parent $node) "npx.cmd" } }',
-    'if (-not $npx) { $npx = (Get-Command npx.cmd -ErrorAction SilentlyContinue).Source }',
-    'if (-not $npx) { throw "LiveDesk npx executable was not found." }',
-    'Start-Process -FilePath $npx -ArgumentList @("-y", "--prefer-online", "livedesk@latest", "client", "--no-login", "--update-wait-pid", [string]$launcherPid) -WindowStyle Hidden',
-    'Start-Sleep -Milliseconds 500',
+    '$node = [string]$env:LIVEDESK_NODE_EXECUTABLE',
+    'if ($node -and -not (Test-Path -LiteralPath $node -PathType Leaf)) { $node = "" }',
+    'if (-not $node) { $node = (Get-Command node.exe -ErrorAction SilentlyContinue).Source }',
+    'if (-not $node) { throw "LiveDesk node executable was not found." }',
+    `$env:LIVEDESK_UPDATE_BOOTSTRAP_BASE64 = ${quotePowerShell(Buffer.from(buildUnixClientUpdateBootstrapScript(), 'utf8').toString('base64'))}`,
+    '$env:LIVEDESK_UPDATE_WAIT_PID = [string]$launcherPid',
+    '$env:LIVEDESK_UPDATE_AGENT_PID = "0"',
+    '$bootstrapRunner = "eval(Buffer.from(process.env.LIVEDESK_UPDATE_BOOTSTRAP_BASE64, \'base64\').toString(\'utf8\'))"',
+    'Start-Process -FilePath $node -ArgumentList @("-e", $bootstrapRunner) -WindowStyle Hidden',
+    'Start-Sleep -Milliseconds 750',
     'Start-Process -FilePath "taskkill.exe" -ArgumentList @("/PID", [string]$launcherPid, "/T", "/F") -WindowStyle Hidden',
     ''
   ].join('\r\n');
@@ -78,10 +81,12 @@ function buildUnixClientUpdateBootstrapScript() {
     'const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));',
     'const waitForExit = async pid => { for (let attempt = 0; attempt < 360 && pid > 1; attempt += 1) { if (!isAlive(pid)) return; await sleep(500); } if (pid > 1 && isAlive(pid)) throw new Error("LiveDesk client process did not exit before update installation."); };',
     'const nodeDir = path.dirname(process.execPath);',
-    'const npxCandidates = [process.env.LIVEDESK_NPX_EXECUTABLE, path.join(nodeDir, "npx"), "npx"].filter(Boolean);',
+    'const npxCandidates = process.platform === "win32" ? [process.env.LIVEDESK_NPX_EXECUTABLE, path.join(nodeDir, "npx.cmd"), path.join(nodeDir, "npx.exe"), "npx.cmd"] : [process.env.LIVEDESK_NPX_EXECUTABLE, path.join(nodeDir, "npx"), "npx"];',
     'const npx = npxCandidates.find(candidate => !path.isAbsolute(candidate) || fs.existsSync(candidate)) || npxCandidates[npxCandidates.length - 1];',
     'const npxArgs = ["-y", "--prefer-online", "livedesk@latest", "client", "--no-login"];',
-    '(async () => { await waitForExit(waitPid); await waitForExit(agentPid); const updater = spawn(npx, npxArgs, { 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()); })().catch(error => { console.error("LiveDesk updater failed: " + error.message); process.exitCode = 1; });',
+    'const command = process.platform === "win32" ? (process.env.ComSpec || "cmd.exe") : npx;',
+    'const commandArgs = process.platform === "win32" ? ["/d", "/s", "/c", "call \\"" + npx + "\\" " + npxArgs.join(" ")] : npxArgs;',
+    '(async () => { await waitForExit(waitPid); await waitForExit(agentPid); const updater = spawn(command, commandArgs, { detached: true, stdio: "ignore", windowsHide: true, env: process.env }); updater.once("error", error => { console.error("LiveDesk updater failed to start: " + error.message); process.exitCode = 1; }); updater.once("spawn", () => updater.unref()); })().catch(error => { console.error("LiveDesk updater failed: " + error.message); process.exitCode = 1; });',
     ''
   ].join('\n');
 }
@@ -98,7 +103,7 @@ function buildUnixLegacyUpdateCommand({ manager, pair, name, slot, targetVersion
     'let launcherPid = Number.isInteger(configuredLauncherPid) && configuredLauncherPid > 1 && isAlive(configuredLauncherPid) ? configuredLauncherPid : 0;',
     'let agentPid = Number(process.env.LIVEDESK_CLIENT_AGENT_PID || 0);',
     'let cursor = parentOf(process.pid);',
-    'for (let depth = 0; depth < 12 && cursor; depth++) { const command = commandOf(cursor); if (!agentPid && /livedesk-client-node\\.js/i.test(command)) agentPid = cursor; if (!launcherPid && /livedesk-client\\.js|livedesk\\.js/i.test(command)) launcherPid = cursor; cursor = parentOf(cursor); }',
+    'for (let depth = 0; depth < 12 && cursor; depth++) { const command = commandOf(cursor); if (!agentPid && /livedesk-client-node\\.js|livedesk-client-fast|RemoteAgent\\.Fast/i.test(command)) agentPid = cursor; if (!launcherPid && /livedesk-client\\.js|livedesk\\.js/i.test(command)) launcherPid = cursor; cursor = parentOf(cursor); }',
     'if (launcherPid <= 1) throw new Error("LiveDesk client launcher process was not found.");',
     'const waitPid = launcherPid;',
     `process.env.LIVEDESK_CLIENT_MANAGER = ${JSON.stringify(String(manager || ''))};`,

package/package.json

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