livedesk 0.1.434 → 0.1.436

package/bin/livedesk.js

@@ -576,6 +576,59 @@ function isKnownLiveDeskLauncherProcess(processName, commandLine) {
     && /(?:^|\/)bin\/livedesk\.js(?:\s|["']|$)/i.test(normalizedCommandLine);
 }
 
+function existingRuntimeProbePorts() {
+  return [...new Set([
+    process.env.LIVEDESK_CLIENT_RUNTIME_PORT,
+    process.env.LIVEDESK_HUB_HTTP_PORT,
+    DEFAULT_MANAGER_HTTP_PORT
+  ]
+    .map(value => normalizePort(value, 0))
+    .filter(port => port > 0))];
+}
+
+async function probeExistingRuntimeIdentity(existing) {
+  const processId = Number(existing?.pid);
+  const expectedRole = String(existing?.role || '').trim().toLowerCase();
+  if (!Number.isInteger(processId) || processId <= 1 || !expectedRole) {
+    return null;
+  }
+
+  for (const port of existingRuntimeProbePorts()) {
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), 1200);
+    try {
+      const baseUrl = `http://127.0.0.1:${port}`;
+      const [healthResponse, statusResponse] = await Promise.all([
+        fetch(`${baseUrl}/api/health`, { cache: 'no-store', signal: controller.signal }),
+        fetch(`${baseUrl}/api/runtime/status`, { cache: 'no-store', signal: controller.signal })
+      ]);
+      if (!healthResponse.ok || !statusResponse.ok) {
+        continue;
+      }
+      const [health, status] = await Promise.all([
+        healthResponse.json(),
+        statusResponse.json()
+      ]);
+      if (health?.ok === true
+        && health?.product === 'LiveDesk'
+        && status?.ok === true
+        && Number(status?.runtimePid) === processId
+        && String(status?.role || '').trim().toLowerCase() === expectedRole) {
+        return {
+          port,
+          role: expectedRole,
+          appVersion: String(status?.appVersion || '')
+        };
+      }
+    } catch {
+      // A non-LiveDesk, stopping, or unreachable owner is not runtime proof.
+    } finally {
+      clearTimeout(timer);
+    }
+  }
+  return null;
+}
+
 async function getProcessDetails(pid) {
   const processId = Number(pid);
   if (!Number.isInteger(processId) || processId <= 1) {
@@ -633,13 +686,20 @@ async function stopExistingRuntime(existing) {
 
   const details = await getProcessDetails(processId);
   if (!details) {
-    return;
+    return null;
   }
-  if (!isKnownLiveDeskLauncherProcess(details.processName, details.commandLine)) {
+  const commandLineConfirmed = isKnownLiveDeskLauncherProcess(details.processName, details.commandLine);
+  const runtimeProof = commandLineConfirmed
+    ? null
+    : await probeExistingRuntimeIdentity(existing);
+  if (!commandLineConfirmed && !runtimeProof) {
     throw new Error(`Existing runtime pid ${processId} is not a confirmed LiveDesk launcher; it was preserved.`);
   }
 
-  console.log(`[LiveDesk] Stopping existing ${existing?.role || 'runtime'} launcher pid ${processId} before starting a fresh runtime.`);
+  const identityProof = commandLineConfirmed
+    ? 'command-line'
+    : `runtime-api:${runtimeProof.port}:${runtimeProof.appVersion || 'unknown'}`;
+  console.log(`[LiveDesk] Stopping existing ${existing?.role || 'runtime'} launcher pid ${processId} before starting a fresh runtime (identity=${identityProof}).`);
   if (os.platform() === 'win32') {
     await runQuiet('taskkill.exe', ['/PID', String(processId), '/T', '/F']);
   } else {
@@ -648,14 +708,17 @@ async function stopExistingRuntime(existing) {
     }
   }
   await waitForProcessExit(processId);
+  return runtimeProof;
 }
 
 async function restartExistingRuntime(existing, role) {
-  await stopExistingRuntime(existing);
+  const runtimeProof = await stopExistingRuntime(existing);
+  const runtimePort = Number(runtimeProof?.port || existingRuntimeProbePorts()[0] || DEFAULT_MANAGER_HTTP_PORT);
   if (role === 'hub' || String(existing?.role || '').trim().toLowerCase() === 'hub') {
-    await stopProcessesOnPorts([DEFAULT_MANAGER_HTTP_PORT, DEFAULT_REMOTE_HUB_PORT]);
+    const remotePort = normalizePort(process.env.REMOTE_HUB_PORT, DEFAULT_REMOTE_HUB_PORT);
+    await stopProcessesOnPorts([runtimePort, remotePort]);
   } else {
-    await stopProcessesOnPorts([DEFAULT_MANAGER_HTTP_PORT]);
+    await stopProcessesOnPorts([runtimePort]);
   }
 }
 

package/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.191",
+  "version": "0.1.192",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -41,10 +41,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.398",
-    "@livedesk/fast-osx-arm64": "0.1.398",
-    "@livedesk/fast-osx-x64": "0.1.398",
-    "@livedesk/fast-win-x64": "0.1.398"
+    "@livedesk/fast-linux-x64": "0.1.399",
+    "@livedesk/fast-osx-arm64": "0.1.399",
+    "@livedesk/fast-osx-x64": "0.1.399",
+    "@livedesk/fast-win-x64": "0.1.399"
   },
   "publishConfig": {
     "access": "public"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "livedesk",
-  "version": "0.1.434",
-  "livedeskClientVersion": "0.1.191",
+  "version": "0.1.436",
+  "livedeskClientVersion": "0.1.192",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
@@ -50,10 +50,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.398",
-    "@livedesk/fast-osx-arm64": "0.1.398",
-    "@livedesk/fast-osx-x64": "0.1.398",
-    "@livedesk/fast-win-x64": "0.1.398"
+    "@livedesk/fast-linux-x64": "0.1.399",
+    "@livedesk/fast-osx-arm64": "0.1.399",
+    "@livedesk/fast-osx-x64": "0.1.399",
+    "@livedesk/fast-win-x64": "0.1.399"
   },
   "publishConfig": {
     "access": "public"