@livedesk/client 0.1.247 → 0.1.249

package/bin/livedesk-client.js

@@ -19,7 +19,8 @@ import {
     signalAgentTree
 } from '../src/runtime/agent-process-lifecycle.js';
 import { writeWindowsOwnedProcessManifest } from '../src/runtime/windows-owned-process-manifest.js';
-import { createHubWakeListener } from '../src/runtime/hub-wake-listener.js';
+import { createHubWakeListener } from '../src/runtime/hub-wake-listener.js';
+import { resolveSpawnablePackagedPath } from '../src/runtime/packaged-executable-path.js';
 import {
     inspectLinuxVideoAcceleration,
     installLinuxVideoAcceleration
@@ -587,7 +588,7 @@ export function resolveHubClientPort(env = process.env) {
     return normalizePort(env.REMOTE_HUB_PORT || env.LIVEDESK_HUB_REMOTE_PORT) || DEFAULT_HUB_CLIENT_PORT;
 }
 
-export function preflightHubClientPort(port = resolveHubClientPort()) {
+export function preflightHubClientPort(port = resolveHubClientPort()) {
     const normalizedPort = normalizePort(port);
     if (!normalizedPort) {
         return Promise.resolve({ ok: false, port: Number(port) || 0, code: 'invalid-hub-client-port' });
@@ -617,18 +618,46 @@ export function preflightHubClientPort(port = resolveHubClientPort()) {
                 finish({ ok: true, code: 'ok' });
             });
         });
-    });
-}
-
-function hubClientPortPreflightError(preflight) {
-    const port = Number(preflight?.port || resolveHubClientPort());
-    return {
-        ok: false,
-        code: String(preflight?.code || 'hub-client-port-unavailable'),
-        port,
-        error: preflight?.code === 'hub-client-port-in-use'
-            ? `LiveDesk cannot switch this computer to Hub because TCP ${port} is already in use. Change or stop the owning service, then try Switch to Hub again. The current Hub was not changed.`
-            : `LiveDesk cannot switch this computer to Hub because TCP ${port} is unavailable. Check the local port configuration, then try again. The current Hub was not changed.`
+    });
+}
+
+export async function recoverHubClientPortConflict(preflight, recoverPortOwner) {
+    if (preflight?.ok
+        || preflight?.code !== 'hub-client-port-in-use'
+        || typeof recoverPortOwner !== 'function') {
+        return preflight;
+    }
+
+    try {
+        await recoverPortOwner(Number(preflight.port || resolveHubClientPort()));
+    } catch (error) {
+        return {
+            ...preflight,
+            recoveryAttempted: true,
+            recoveryError: error instanceof Error ? error.message : String(error)
+        };
+    }
+
+    const verified = await preflightHubClientPort(preflight.port);
+    return {
+        ...verified,
+        recoveryAttempted: true,
+        recovered: verified.ok === true
+    };
+}
+
+function hubClientPortPreflightError(preflight) {
+    const port = Number(preflight?.port || resolveHubClientPort());
+    const recoveryError = String(preflight?.recoveryError || '').trim();
+    return {
+        ok: false,
+        code: String(preflight?.code || 'hub-client-port-unavailable'),
+        port,
+        error: recoveryError
+            ? `${recoveryError} The current Hub was not changed.`
+            : preflight?.code === 'hub-client-port-in-use'
+            ? `LiveDesk cannot switch this computer to Hub because TCP ${port} is already in use. Change or stop the owning service, then try Switch to Hub again. The current Hub was not changed.`
+            : `LiveDesk cannot switch this computer to Hub because TCP ${port} is unavailable. Check the local port configuration, then try again. The current Hub was not changed.`
     };
 }
 
@@ -3081,12 +3110,16 @@ async function startConnectionChoiceServer(supabase, options = {}) {
                         res.end(JSON.stringify({ ok: false, error: 'client-can-only-transition-to-hub' }));
                         return;
                     }
-                    const portPreflight = await preflightHubClientPort();
-                    if (!portPreflight.ok) {
-                        res.writeHead(409, { 'Content-Type': 'application/json; charset=utf-8', 'Access-Control-Allow-Origin': '*' });
-                        res.end(JSON.stringify(hubClientPortPreflightError(portPreflight)));
-                        return;
-                    }
+                    const portPreflight = await preflightHubClientPort();
+                    const readyPortPreflight = await recoverHubClientPortConflict(
+                        portPreflight,
+                        options.recoverHubClientPort
+                    );
+                    if (!readyPortPreflight.ok) {
+                        res.writeHead(409, { 'Content-Type': 'application/json; charset=utf-8', 'Access-Control-Allow-Origin': '*' });
+                        res.end(JSON.stringify(hubClientPortPreflightError(readyPortPreflight)));
+                        return;
+                    }
                     const session = await refreshSessionIfNeeded(supabase);
                     const expectedRoleVersion = Number(dashboardState.roleVersion || 0);
                     const { data, error } = await supabase.rpc('set_livedesk_device_role', {
@@ -3402,10 +3435,14 @@ async function chooseClientConnection(supabase, options = {}) {
                 if (!activeSupabase) {
                     return { ok: false, error: 'supabase-session-required' };
                 }
-                const portPreflight = await preflightHubClientPort();
-                if (!portPreflight.ok) {
-                    return hubClientPortPreflightError(portPreflight);
-                }
+                const portPreflight = await preflightHubClientPort();
+                const readyPortPreflight = await recoverHubClientPortConflict(
+                    portPreflight,
+                    options.recoverHubClientPort
+                );
+                if (!readyPortPreflight.ok) {
+                    return hubClientPortPreflightError(readyPortPreflight);
+                }
                 const session = await refreshSessionIfNeeded(activeSupabase);
                 if (!session?.access_token) {
                     return { ok: false, error: 'supabase-session-required' };
@@ -4428,14 +4465,14 @@ function getFastRuntime() {
     const arch = os.arch();
     const resolvePackagedRuntime = (packageName, rid, executableName) => {
         try {
-            const packagePath = require.resolve(`${packageName}/package.json`);
-            const fastRoot = join(dirname(packagePath), 'fast');
-            return {
-                rid,
-                packageName,
-                executable: join(fastRoot, executableName),
-                dll: join(fastRoot, 'livedesk-client-fast.dll')
-            };
+            const packagePath = require.resolve(`${packageName}/package.json`);
+            const fastRoot = join(dirname(packagePath), 'fast');
+            return {
+                rid,
+                packageName,
+                executable: resolveSpawnablePackagedPath(join(fastRoot, executableName)),
+                dll: resolveSpawnablePackagedPath(join(fastRoot, 'livedesk-client-fast.dll'))
+            };
         } catch {
             return {
                 rid,
@@ -4570,13 +4607,15 @@ function clearFastPreflightCache() {
     }
 }
 
-function resolveBundledFfmpegPaths() {
-    const paths = [];
-    const addPath = (candidate) => {
-        const ffmpegPath = String(candidate || '').trim();
-        if (ffmpegPath && existsSync(ffmpegPath) && !paths.includes(ffmpegPath)) {
-            paths.push(ffmpegPath);
-        }
+function resolveBundledFfmpegPaths() {
+    const paths = [];
+    const addPath = (candidate) => {
+        // Electron can resolve ffmpeg-static through app.asar, but RemoteFast
+        // is a native process and must receive the physical unpacked path.
+        const ffmpegPath = resolveSpawnablePackagedPath(String(candidate || '').trim());
+        if (ffmpegPath && existsSync(ffmpegPath) && !paths.includes(ffmpegPath)) {
+            paths.push(ffmpegPath);
+        }
     };
 
     const addFfmpegInstaller = () => {
@@ -5082,9 +5121,10 @@ export async function runClientRuntime(argv = process.argv.slice(2), runtimeOpti
             savedSession: null,
             loadSavedSession: false,
             savedPin: null,
-            allowRelayFallback: transportAllowsRelay(parsed.transport),
-            relayEndpoint: parsed.relay,
-            openBrowser: parsed.openBrowserOnStart,
+            allowRelayFallback: transportAllowsRelay(parsed.transport),
+            relayEndpoint: parsed.relay,
+            recoverHubClientPort: runtimeOptions.recoverHubClientPort,
+            openBrowser: parsed.openBrowserOnStart,
             onStarted: page => {
                 connectionPage = page;
                 resolveStarted(page);

package/package.json

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

package/src/runtime/packaged-executable-path.js

@@ -0,0 +1,23 @@
+import { existsSync } from 'node:fs';
+
+const ASAR_PATH_SEGMENT = /([\\/])app\.asar([\\/])/i;
+
+/**
+ * Electron's Node loader can read JavaScript through the virtual app.asar
+ * path, but the operating system cannot spawn an executable from that virtual
+ * archive. electron-builder places executable payloads in the matching
+ * app.asar.unpacked tree, so only spawn targets cross that boundary.
+ */
+export function resolveSpawnablePackagedPath(value, pathExists = existsSync) {
+    const candidate = String(value || '');
+    if (!candidate || !ASAR_PATH_SEGMENT.test(candidate)) {
+        return candidate;
+    }
+
+    const unpacked = candidate.replace(ASAR_PATH_SEGMENT, '$1app.asar.unpacked$2');
+    try {
+        return pathExists(unpacked) ? unpacked : candidate;
+    } catch {
+        return candidate;
+    }
+}