livedesk 0.1.385 → 0.1.386

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

@@ -1,9 +1,10 @@
 import { randomUUID } from 'node:crypto';
 
 export const LIVE_DESK_UPDATE_COMMAND = 'livedesk.client-update';
-// 0.1.143 contains the launcher-PID-aware updater. Older clients use the
-// Hub-generated legacy command so they can still be upgraded safely.
-export const LIVE_DESK_DEDICATED_CLIENT_UPDATE_MIN_VERSION = '0.1.143';
+// 0.1.170 contains the exact-version, identity-preserving supervised updater.
+// Older dedicated handlers can spawn the new package but cannot prove that the
+// same device returned, so the Hub-owned compatibility bridge upgrades them.
+export const LIVE_DESK_DEDICATED_CLIENT_UPDATE_MIN_VERSION = '0.1.170';
 export const LIVE_DESK_UPDATE_CLIENT_BATCH_SIZE = 5;
 export const LIVE_DESK_UPDATE_TARGET_TIMEOUT_MS = 300_000;
 export const LIVE_DESK_UPDATE_TIMEOUT_MS = 60 * 60_000;
@@ -68,7 +69,7 @@ function quotePowerShell(value) {
   return `'${String(value ?? '').replaceAll("'", "''")}'`;
 }
 
-function buildWindowsLegacyUpdateCommand({ manager, pair, name, slot, targetVersion, targetProductVersion }) {
+function buildWindowsLegacyUpdateCommand({ manager, pair, name, deviceId, slot, targetVersion, targetProductVersion }) {
   const script = [
     '$ErrorActionPreference = "Stop"',
     '$cursor = Get-CimInstance Win32_Process -Filter ("ProcessId={0}" -f $PID)',
@@ -86,8 +87,9 @@ function buildWindowsLegacyUpdateCommand({ manager, pair, name, slot, targetVers
     '}',
     'if ($launcherPid -le 0) { throw "LiveDesk client launcher process was not found." }',
     `$env:LIVEDESK_CLIENT_MANAGER = ${quotePowerShell(manager)}`,
-    `$env:LIVEDESK_CLIENT_PAIR_TOKEN = ${quotePowerShell(pair)}`,
-    `$env:LIVEDESK_CLIENT_NAME = ${quotePowerShell(name)}`,
+    `$env:LIVEDESK_CLIENT_PAIR_TOKEN = ${quotePowerShell(pair)}`,
+    `$env:LIVEDESK_CLIENT_NAME = ${quotePowerShell(name)}`,
+    `$env:LIVEDESK_DEVICE_ID = ${quotePowerShell(deviceId)}`,
     `$env:LIVEDESK_CLIENT_SLOT = ${quotePowerShell(slot || '')}`,
     `$env:LIVEDESK_CLIENT_UPDATE_TARGET_VERSION = ${quotePowerShell(targetVersion)}`,
     `$env:LIVEDESK_CLIENT_UPDATE_TARGET_PRODUCT_VERSION = ${quotePowerShell(targetProductVersion)}`,
@@ -126,6 +128,8 @@ function buildUnixClientUpdateBootstrapScript() {
     'const targetProductVersion = String(process.env.LIVEDESK_CLIENT_UPDATE_TARGET_PRODUCT_VERSION || "").trim();',
     'const packageSpec = /^\\d+\\.\\d+\\.\\d+(?:[-+][0-9A-Za-z.-]+)?$/.test(targetProductVersion) ? "livedesk@" + targetProductVersion : "livedesk@latest";',
     'const npxArgs = ["-y", "--prefer-online", packageSpec, "--force-role", "client", "--no-login", "--no-open"];',
+    'const preservedDeviceId = String(process.env.LIVEDESK_DEVICE_ID || "").trim();',
+    'if (preservedDeviceId) npxArgs.push("--device-id", preservedDeviceId);',
     'const command = npxCli ? process.execPath : (process.platform === "win32" ? (process.env.ComSpec || "cmd.exe") : npx);',
     'const commandArgs = npxCli ? [npxCli, ...npxArgs] : (process.platform === "win32" ? ["/d", "/s", "/c", "call \\"" + npx + "\\" " + npxArgs.join(" ")] : npxArgs);',
     'process.env.LIVEDESK_SKIP_BROWSER_OPEN = "1";',
@@ -134,7 +138,7 @@ function buildUnixClientUpdateBootstrapScript() {
   ].join('\n');
 }
 
-function buildUnixLegacyUpdateCommand({ manager, pair, name, slot, targetVersion, targetProductVersion }) {
+function buildUnixLegacyUpdateCommand({ manager, pair, name, deviceId, slot, targetVersion, targetProductVersion }) {
   const script = [
     'const { execFileSync, spawn } = require("node:child_process");',
     'const fs = require("node:fs");',
@@ -150,8 +154,9 @@ function buildUnixLegacyUpdateCommand({ manager, pair, name, slot, targetVersion
     '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 || ''))};`,
-    `process.env.LIVEDESK_CLIENT_PAIR_TOKEN = ${JSON.stringify(String(pair || ''))};`,
-    `process.env.LIVEDESK_CLIENT_NAME = ${JSON.stringify(String(name || ''))};`,
+    `process.env.LIVEDESK_CLIENT_PAIR_TOKEN = ${JSON.stringify(String(pair || ''))};`,
+    `process.env.LIVEDESK_CLIENT_NAME = ${JSON.stringify(String(name || ''))};`,
+    `process.env.LIVEDESK_DEVICE_ID = ${JSON.stringify(String(deviceId || ''))};`,
     `process.env.LIVEDESK_CLIENT_SLOT = ${JSON.stringify(String(slot || ''))};`,
     `process.env.LIVEDESK_CLIENT_UPDATE_TARGET_VERSION = ${JSON.stringify(String(targetVersion || ''))};`,
     `process.env.LIVEDESK_CLIENT_UPDATE_TARGET_PRODUCT_VERSION = ${JSON.stringify(String(targetProductVersion || ''))};`,
@@ -171,9 +176,10 @@ function buildUnixLegacyUpdateCommand({ manager, pair, name, slot, targetVersion
 function buildLegacyUpdateCommand(device, credentials, targetVersion, targetProductVersion) {
   const payload = {
     manager: credentials.agentEndpoint || credentials.manager,
-    pair: credentials.pairToken,
-    name: device.deviceName || device.hostname || '',
-    slot: device.slotNumber || '',
+    pair: credentials.pairToken,
+    name: device.deviceName || device.hostname || '',
+    deviceId: device.deviceId || '',
+    slot: device.slotNumber || '',
     targetVersion,
     targetProductVersion
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.385",
+  "version": "0.1.386",
   "livedeskClientVersion": "0.1.170",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",