@livedesk/client 0.1.238 → 0.1.240

package/bin/livedesk-client-node.js

@@ -251,7 +251,7 @@ async function waitForClientUpdateShutdownSignal(
     return { ready: false, error };
 }
 
-function markClientUpdateConnected() {
+function markClientUpdateConnected() {
     const operationId = String(process.env.LIVEDESK_CLIENT_UPDATE_OPERATION_ID || '').trim();
     if (!operationId) return;
     void writeClientUpdateState('connected', {
@@ -262,8 +262,59 @@ function markClientUpdateConnected() {
         error: ''
     }).catch(error => {
         console.error(`LiveDesk client update diagnostics could not be persisted: ${error?.message || error}`);
-    });
-}
+    });
+}
+
+async function publishClientUpdateSupervisorProof(socket) {
+    const operationId = String(process.env.LIVEDESK_CLIENT_UPDATE_OPERATION_ID || '').trim();
+    const attemptId = String(process.env.LIVEDESK_CLIENT_UPDATE_ATTEMPT_ID || '').trim();
+    const expectedLauncherPid = Number(process.env.LIVEDESK_CLIENT_PARENT_PID || 0);
+    if (!operationId || !attemptId || !Number.isInteger(expectedLauncherPid) || expectedLauncherPid <= 1) return;
+    const deadline = Date.now() + 60_000;
+    while (Date.now() < deadline && !socket.destroyed) {
+        try {
+            const state = JSON.parse(await fs.readFile(getClientUpdateStatePath(), 'utf8'));
+            if (String(state?.operationId || '') !== operationId
+                || String(state?.attemptId || '') !== attemptId) {
+                await wait(100);
+                continue;
+            }
+            if (['failed', 'restored', 'cancelled'].includes(String(state.stage || ''))) return;
+            const launcherPid = Number(state.launcherPid || 0);
+            const agentPid = Number(state.agentPid || 0);
+            const supervisorPid = Number(state.supervisorPid || 0);
+            const completedAt = String(state.completedAt || '').trim();
+            const exactSupervisorCompletion = state.stage === 'connected'
+                && state.restartVerified === true
+                && Number.isFinite(Date.parse(completedAt))
+                && launcherPid === expectedLauncherPid
+                && agentPid === process.pid
+                && Number.isInteger(supervisorPid)
+                && supervisorPid > 1
+                && String(state.productVersion || '') === PRODUCT_VERSION
+                && String(state.agentVersion || '') === AGENT_VERSION
+                && String(state.targetProductVersion || '') === PRODUCT_VERSION
+                && String(state.targetAgentVersion || state.targetVersion || '') === AGENT_VERSION;
+            if (exactSupervisorCompletion) {
+                writeJsonLine(socket, {
+                    type: 'client.update.verified',
+                    operationId,
+                    attemptId,
+                    launcherPid,
+                    agentPid,
+                    supervisorPid,
+                    productVersion: PRODUCT_VERSION,
+                    agentVersion: AGENT_VERSION,
+                    completedAt
+                });
+                return;
+            }
+        } catch {
+            // The exact package supervisor may be replacing the atomic state file.
+        }
+        await wait(100);
+    }
+}
 
 function printHelp() {
     console.log(`
@@ -1972,9 +2023,10 @@ function connectOnce(options, deviceId) {
                     remoteFiles: true,
                     fileTransferMaxBytes: MAX_FILE_TRANSFER_BYTES,
                     computerAgent: options.taskEnabled,
-                    taskDispatch: options.taskEnabled,
-                    clientUpdate: true,
-                    productVersion: PRODUCT_VERSION,
+                    taskDispatch: options.taskEnabled,
+                    clientUpdate: true,
+                    clientUpdateVerifiedProof: true,
+                    productVersion: PRODUCT_VERSION,
                     agentApproval: options.taskEnabled,
                     agentAudit: options.taskEnabled,
                     agentTools: [...NODE_AGENT_OPERATIONS],
@@ -2000,8 +2052,13 @@ function connectOnce(options, deviceId) {
                     options.effectivePolicy = message.effectivePolicy && typeof message.effectivePolicy === 'object'
                         ? message.effectivePolicy
                         : null;
-                    console.log(`Connected to LiveDesk Hub as ${options.name} (${deviceId})`);
-                    markClientUpdateConnected();
+                    console.log(`Connected to LiveDesk Hub as ${options.name} (${deviceId})`);
+                    markClientUpdateConnected();
+                    void publishClientUpdateSupervisorProof(socket).catch(error => {
+                        if (!socket.destroyed) {
+                            console.error(`LiveDesk client update verification proof failed: ${error?.message || error}`);
+                        }
+                    });
                     writeJsonLine(socket, {
                         type: 'status',
                         status: getStatus(options)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.238",
+  "version": "0.1.240",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -42,10 +42,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.436",
-    "@livedesk/fast-osx-arm64": "0.1.436",
-    "@livedesk/fast-osx-x64": "0.1.436",
-    "@livedesk/fast-win-x64": "0.1.436"
+    "@livedesk/fast-linux-x64": "0.1.439",
+    "@livedesk/fast-osx-arm64": "0.1.439",
+    "@livedesk/fast-osx-x64": "0.1.439",
+    "@livedesk/fast-win-x64": "0.1.439"
   },
   "publishConfig": {
     "access": "public"

package/src/runtime/client-runtime-server.js

@@ -1022,10 +1022,9 @@ function isLoopbackRequest(req) {
   return address === '127.0.0.1' || address === '::1' || address === 'localhost' || !address;
 }
 
-function isTrustedApiOrigin(value, trustedWebOrigins) {
-  const rawOrigin = normalizeString(value, 300);
-  if (rawOrigin === 'null') return true;
-  const origin = normalizeOrigin(rawOrigin);
+function isTrustedApiOrigin(value, trustedWebOrigins) {
+  const rawOrigin = normalizeString(value, 300);
+  const origin = normalizeOrigin(rawOrigin);
   if (!origin) return false;
   if (trustedWebOrigins.has(origin)) return true;
   try {
@@ -1049,11 +1048,10 @@ function isTrustedLocalRequest(req, host, port, options = {}) {
   const requestHost = normalizeString(req.headers.host, 300).split(':')[0].toLowerCase();
   if (requestHost && requestHost !== host.toLowerCase() && requestHost !== 'localhost' && requestHost !== '127.0.0.1') return false;
 
-  // Chromium can mark modulepreload/stylesheet requests as cross-site, or
-  // send Origin: null when the page was opened from a local shell. Static
-  // assets are not privileged, and the local shell still needs to read the
-  // loopback runtime API to determine the active role. Mutating API routes
-  // remain protected by the CSRF token check below.
+  // Chromium can mark modulepreload/stylesheet requests as cross-site. Static
+  // assets are not privileged. An opaque Origin (`null`) is never accepted for
+  // an API route because it cannot distinguish the LiveDesk shell from an
+  // attacker-controlled file, sandbox, or data page.
   if (options.allowStaticCrossSite === true) {
     return true;
   }
@@ -1073,10 +1071,9 @@ function isTrustedLocalRequest(req, host, port, options = {}) {
     || fetchSite === 'none';
 }
 
-function resolveCorsOrigin(requestOrigin, port, trustedWebOrigins) {
-  const origin = normalizeString(requestOrigin, 300);
-  if (origin === 'null') return 'null';
-  return origin && isTrustedApiOrigin(origin, trustedWebOrigins)
+function resolveCorsOrigin(requestOrigin, port, trustedWebOrigins) {
+  const origin = normalizeString(requestOrigin, 300);
+  return origin && isTrustedApiOrigin(origin, trustedWebOrigins)
     ? normalizeOrigin(origin)
     : `http://127.0.0.1:${port}`;
 }