livedesk 0.1.398 → 0.1.399

package/bootstrap/legacy-client-update.js

@@ -243,8 +243,18 @@ function readConfig(env = process.env) {
       cleanVersion(env.LIVEDESK_CLIENT_UPDATE_CURRENT_PRODUCT_VERSION)
       || cleanVersion(env.LIVEDESK_NPM_LAUNCHER_VERSION),
     currentAgentVersion: cleanVersion(env.LIVEDESK_CLIENT_UPDATE_CURRENT_AGENT_VERSION),
-    launcherPid: positivePid(env.LIVEDESK_CLIENT_PARENT_PID),
-    agentPid: positivePid(env.LIVEDESK_CLIENT_UPDATE_AGENT_PID),
+    // Dedicated RemoteFast and Node Agent handoffs freeze the owned process
+    // tree under UPDATE_WAIT_PID / UPDATE_AGENT_PID. The Hub-owned bridge for
+    // older Agents uses the CLIENT_* aliases. Accept both contracts so the
+    // exact target package can always prove and stop the same old runtime.
+    launcherPid: positivePid(
+      env.LIVEDESK_UPDATE_WAIT_PID
+      || env.LIVEDESK_CLIENT_PARENT_PID
+    ),
+    agentPid: positivePid(
+      env.LIVEDESK_UPDATE_AGENT_PID
+      || env.LIVEDESK_CLIENT_UPDATE_AGENT_PID
+    ),
     starterPid: positivePid(env.LIVEDESK_UPDATE_STARTER_PID),
     updateDeadlineEpochMs: Number(env.LIVEDESK_CLIENT_UPDATE_DEADLINE_EPOCH_MS),
     runtimePort: normalizePort(env.LIVEDESK_CLIENT_RUNTIME_PORT || env.LIVEDESK_LOCAL_RUNTIME_PORT),
@@ -1528,15 +1538,20 @@ export async function runLegacyClientUpdateSupervisor(options = {}) {
   ));
 
   log(`started operation=${config.operationId || 'unknown'} target=${config.targetProductVersion}/${config.targetVersion} current=${config.currentProductVersion || 'unknown'} device=${config.deviceId}`);
-  if (!config.operationId
-    || !config.deviceId
-    || !config.targetProductVersion
-    || !config.targetVersion
-    || !config.currentProductVersion
-    || !config.currentAgentVersion
-    || config.launcherPid <= 1
-    || config.agentPid <= 1) {
-    throw new Error('legacy update configuration is incomplete');
+  const missingConfiguration = [
+    ['operationId', config.operationId],
+    ['deviceId', config.deviceId],
+    ['targetProductVersion', config.targetProductVersion],
+    ['targetVersion', config.targetVersion],
+    ['currentProductVersion', config.currentProductVersion],
+    ['currentAgentVersion', config.currentAgentVersion],
+    ['launcherPid', config.launcherPid > 1],
+    ['agentPid', config.agentPid > 1]
+  ].filter(([, value]) => !value).map(([name]) => name);
+  if (missingConfiguration.length > 0) {
+    throw new Error(
+      `legacy update configuration is incomplete: missing ${missingConfiguration.join(', ')}`
+    );
   }
   ensureDeadline('configuration validation');
   if (cleanVersion(productManifest.version) !== config.targetProductVersion) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.398",
+  "version": "0.1.399",
   "livedeskClientVersion": "0.1.173",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",