@livedesk/client 0.1.139 → 0.1.141

package/bin/livedesk-client-node.js

@@ -4,7 +4,7 @@ import net from 'net';
 import os from 'os';
 import path from 'path';
 import crypto from 'crypto';
-import { promises as fs, statfsSync } from 'fs';
+import { existsSync, promises as fs, statfsSync } from 'fs';
 import { spawn } from 'child_process';
 import { createRequire } from 'node:module';
 
@@ -1310,6 +1310,27 @@ function remotePolicyAllows(options, command) {
     return denied ? { ok: false, error: `${denied}-blocked-by-settings` } : { ok: true };
 }
 
+function buildClientUpdateBootstrapScript() {
+    return [
+        'const { spawn } = require("node:child_process");',
+        'const fs = require("node:fs");',
+        'const path = require("node:path");',
+        'const waitPid = Number(process.env.LIVEDESK_UPDATE_WAIT_PID || 0);',
+        'const isAlive = pid => { try { process.kill(pid, 0); return true; } catch (error) { return error?.code !== "ESRCH"; } };',
+        '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 launcher did not exit before update installation."); };',
+        'const nodeDir = path.dirname(process.execPath);',
+        '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 => candidate && (!path.isAbsolute(candidate) || fs.existsSync(candidate)));',
+        'if (!npx) throw new Error("LiveDesk npx executable was not found.");',
+        'const npxArgs = ["-y", "--prefer-online", "livedesk@latest", "client", "--no-login"];',
+        '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); 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');
+}
+
 function scheduleClientUpdate(options, payload = {}) {
     const configuredParentPid = Number(process.env.LIVEDESK_CLIENT_PARENT_PID || process.ppid);
     const parentPid = Number.isInteger(configuredParentPid) && configuredParentPid > 1
@@ -1318,19 +1339,21 @@ function scheduleClientUpdate(options, payload = {}) {
     if (!Number.isInteger(parentPid) || parentPid <= 1) {
         return Promise.reject(new Error('LiveDesk client launcher process id is unavailable.'));
     }
-    const command = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+    const nodeBinDir = path.dirname(process.execPath);
+    const npxCandidates = process.platform === 'win32'
+        ? [process.env.LIVEDESK_NPX_EXECUTABLE, path.join(nodeBinDir, 'npx.cmd'), path.join(nodeBinDir, 'npx.exe'), 'npx.cmd']
+        : [process.env.LIVEDESK_NPX_EXECUTABLE, path.join(nodeBinDir, 'npx'), 'npx'];
+    const command = npxCandidates.find(candidate => candidate && (!path.isAbsolute(candidate) || existsSync(candidate)));
+    if (!command) {
+        return Promise.reject(new Error('LiveDesk npx executable was not found.'));
+    }
     return new Promise((resolve, reject) => {
-        const child = spawn(command, [
-            '-y',
-            '--prefer-online',
-            'livedesk@latest',
-            'client',
-            '--no-login',
-            '--update-wait-pid',
-            String(parentPid)
-        ], {
+        const child = spawn(process.execPath, ['-e', buildClientUpdateBootstrapScript()], {
             env: {
                 ...process.env,
+                LIVEDESK_NODE_EXECUTABLE: process.execPath,
+                LIVEDESK_NPX_EXECUTABLE: command,
+                LIVEDESK_UPDATE_WAIT_PID: String(parentPid),
                 LIVEDESK_CLIENT_UPDATE_TARGET_VERSION: String(payload.targetVersion || process.env.LIVEDESK_CLIENT_UPDATE_TARGET_VERSION || '')
             },
             detached: true,

package/bin/livedesk-client.js

@@ -2526,6 +2526,18 @@ function resolveBundledFfmpegPaths() {
 function buildClientAgentEnvironment(prepared) {
     const env = { ...process.env };
     env.LIVEDESK_CLIENT_PARENT_PID = String(process.pid);
+    // The client can be started by Explorer, a startup shortcut, or a GUI shell
+    // with a PATH that does not contain the Node installation. Update commands
+    // must therefore receive the exact Node tool paths used by this launcher.
+    env.LIVEDESK_NODE_EXECUTABLE = process.execPath;
+    const nodeBinDir = dirname(process.execPath);
+    const npxCandidates = process.platform === 'win32'
+        ? [env.LIVEDESK_NPX_EXECUTABLE, join(nodeBinDir, 'npx.cmd'), join(nodeBinDir, 'npx.exe')]
+        : [env.LIVEDESK_NPX_EXECUTABLE, join(nodeBinDir, 'npx')];
+    const npxExecutable = npxCandidates.find(candidate => candidate && existsSync(candidate));
+    if (npxExecutable) {
+        env.LIVEDESK_NPX_EXECUTABLE = npxExecutable;
+    }
     env.LIVEDESK_CLIENT_MANAGER = String(prepared?.manager || env.LIVEDESK_CLIENT_MANAGER || '');
     env.LIVEDESK_CLIENT_PAIR_TOKEN = String(prepared?.pair || env.LIVEDESK_CLIENT_PAIR_TOKEN || '');
     env.LIVEDESK_CLIENT_NAME = String(prepared?.name || env.LIVEDESK_CLIENT_NAME || '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.139",
+  "version": "0.1.141",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {