livedesk 0.1.285 → 0.1.287

package/bin/livedesk.js

@@ -518,6 +518,20 @@ function quoteWindowsCommandArg(value) {
   return `"${text.replaceAll('"', '\\"')}"`;
 }
 
+function buildHubRestartBootstrapScript() {
+  return [
+    'const { spawn } = require("node:child_process");',
+    'const waitPid = Number(process.env.LIVEDESK_RESTART_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 < 240 && pid > 1; attempt += 1) { if (!isAlive(pid)) return; await sleep(250); } if (pid > 1 && isAlive(pid)) throw new Error("Previous LiveDesk Hub launcher did not exit before restart."); };',
+    'const command = process.env.LIVEDESK_RESTART_COMMAND || "";',
+    'const args = JSON.parse(Buffer.from(process.env.LIVEDESK_RESTART_ARGS_BASE64 || "", "base64").toString("utf8"));',
+    '(async () => { await waitForExit(waitPid); if (!command || !Array.isArray(args)) throw new Error("LiveDesk Hub restart command is unavailable."); const next = spawn(command, args, { cwd: process.env.LIVEDESK_RESTART_CWD || process.cwd(), env: process.env, detached: true, stdio: "ignore", windowsHide: true }); next.once("error", error => { console.error("LiveDesk Hub restart failed to start: " + error.message); process.exitCode = 1; }); next.once("spawn", () => next.unref()); })().catch(error => { console.error("LiveDesk Hub restart bootstrap failed: " + error.message); process.exitCode = 1; });',
+    ''
+  ].join('\n');
+}
+
 async function runManager(args) {
   const options = parseManagerArgs(args);
   const httpPort = normalizePort(
@@ -572,21 +586,23 @@ async function runManager(args) {
     const commandArgs = process.platform === 'win32'
       ? ['/d', '/s', '/c', `call ${quoteWindowsCommandArg(npxCommand)} ${nextArgs.map(quoteWindowsCommandArg).join(' ')}`]
       : nextArgs;
-    const next = spawn(command, commandArgs, {
+    const restartBootstrap = spawn(process.execPath, ['-e', buildHubRestartBootstrapScript()], {
       env: {
         ...process.env,
-        LIVEDESK_NODE_EXECUTABLE: process.execPath,
-        LIVEDESK_NPX_EXECUTABLE: npxCommand
+        LIVEDESK_RESTART_WAIT_PID: String(process.pid),
+        LIVEDESK_RESTART_COMMAND: command,
+        LIVEDESK_RESTART_ARGS_BASE64: Buffer.from(JSON.stringify(commandArgs), 'utf8').toString('base64'),
+        LIVEDESK_RESTART_CWD: process.cwd()
       },
-      stdio: 'inherit',
+      stdio: 'ignore',
       detached: true,
-      windowsHide: false
+      windowsHide: true
     });
-    next.once('error', error => {
-      console.error(`Failed to relaunch LiveDesk Hub from npm: ${error.message}`);
+    restartBootstrap.once('error', error => {
+      console.error(`Failed to prepare LiveDesk Hub restart: ${error.message}`);
     });
-    next.unref();
-    console.log('[LiveDesk Hub] Update approved. The latest Hub launcher is starting.');
+    restartBootstrap.once('spawn', () => restartBootstrap.unref());
+    console.log('[LiveDesk Hub] Update approved. The current Hub launcher is exiting and the latest Hub will start automatically.');
     setTimeout(() => process.exit(0), 100);
   };
 

package/hub/src/transport/udp-hub-transport.js

@@ -99,7 +99,7 @@ export function createHubUdpTransport({ env = process.env, logEvent = () => {},
 
     function onRendezvousPeer(message, rinfo) {
         const session = [...sessions.values()].find(item => item.sessionId === safeText(message.roomId, 160));
-        if (!session || !rendezvousHost || rinfo.address !== rendezvousHost) return;
+        if (!session || !rendezvousHost || Number(rinfo.port) !== rendezvousPort) return;
         const address = safeText(message.host, 128);
         const port = Number(message.port);
         if (!address || !Number.isInteger(port) || port < 1 || port > 65535) return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.285",
+  "version": "0.1.287",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {