livedesk 0.1.276 → 0.1.277

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

@@ -37,12 +37,16 @@ function buildWindowsLegacyUpdateCommand({ manager, pair, name, slot, targetVers
     '$ErrorActionPreference = "Stop"',
     '$cursor = Get-CimInstance Win32_Process -Filter ("ProcessId={0}" -f $PID)',
     '$launcherPid = 0',
-    'for ($depth = 0; $depth -lt 12 -and $cursor; $depth++) {',
-    '  $parent = Get-CimInstance Win32_Process -Filter ("ProcessId={0}" -f [int]$cursor.ParentProcessId)',
-    '  if (-not $parent) { break }',
-    '  $commandLine = [string]$parent.CommandLine',
-    '  if ($commandLine -match "(?i)(livedesk-client\\.js|livedesk\\.js)") { $launcherPid = [int]$parent.ProcessId; break }',
-    '  $cursor = $parent',
+    '$configuredLauncherPid = 0',
+    'if ([int]::TryParse([string]$env:LIVEDESK_CLIENT_PARENT_PID, [ref]$configuredLauncherPid) -and $configuredLauncherPid -gt 1) { try { Get-Process -Id $configuredLauncherPid -ErrorAction Stop | Out-Null; $launcherPid = $configuredLauncherPid } catch {} }',
+    'if ($launcherPid -le 0) {',
+    '  for ($depth = 0; $depth -lt 12 -and $cursor; $depth++) {',
+    '    $parent = Get-CimInstance Win32_Process -Filter ("ProcessId={0}" -f [int]$cursor.ParentProcessId)',
+    '    if (-not $parent) { break }',
+    '    $commandLine = [string]$parent.CommandLine',
+    '    if ($commandLine -match "(?i)(livedesk-client\\.js|livedesk\\.js)") { $launcherPid = [int]$parent.ProcessId; break }',
+    '    $cursor = $parent',
+    '  }',
     '}',
     'if ($launcherPid -le 0) { throw "LiveDesk client launcher process was not found." }',
     `$env:LIVEDESK_CLIENT_MANAGER = ${quotePowerShell(manager)}`,
@@ -50,8 +54,11 @@ 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 = (Get-Command npx.cmd -ErrorAction SilentlyContinue).Source',
-    'if (-not $npx) { $npx = "npx.cmd" }',
+    '$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',
     'Start-Process -FilePath "taskkill.exe" -ArgumentList @("/PID", [string]$launcherPid, "/T", "/F") -WindowStyle Hidden',
@@ -86,7 +93,10 @@ function buildUnixLegacyUpdateCommand({ manager, pair, name, slot, targetVersion
     '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)}`;
+  return [
+    'if [ -n "$LIVEDESK_NODE_EXECUTABLE" ]; then node_bin="$LIVEDESK_NODE_EXECUTABLE"; else node_bin="node"; fi',
+    `"$node_bin" -e ${JSON.stringify(script)}`
+  ].join('\n');
 }
 
 function buildLegacyUpdateCommand(device, credentials, targetVersion) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.276",
+  "version": "0.1.277",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@ffmpeg-installer/ffmpeg": "^1.1.0",
-    "@livedesk/client": "0.1.139",
+    "@livedesk/client": "0.1.140",
     "@openai/codex-sdk": "0.144.5",
     "cors": "^2.8.5",
     "express": "^4.21.2",