@livedesk/client 0.1.248 → 0.1.250

package/bin/livedesk-client.js

@@ -20,6 +20,7 @@ import {
 } 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 { resolveSpawnablePackagedPath } from '../src/runtime/packaged-executable-path.js';
 import {
     inspectLinuxVideoAcceleration,
     installLinuxVideoAcceleration
@@ -620,13 +621,41 @@ export function preflightHubClientPort(port = resolveHubClientPort()) {
     });
 }
 
+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: preflight?.code === 'hub-client-port-in-use'
+        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.`
     };
@@ -3082,9 +3111,13 @@ async function startConnectionChoiceServer(supabase, options = {}) {
                         return;
                     }
                     const portPreflight = await preflightHubClientPort();
-                    if (!portPreflight.ok) {
+                    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(portPreflight)));
+                        res.end(JSON.stringify(hubClientPortPreflightError(readyPortPreflight)));
                         return;
                     }
                     const session = await refreshSessionIfNeeded(supabase);
@@ -3403,8 +3436,12 @@ async function chooseClientConnection(supabase, options = {}) {
                     return { ok: false, error: 'supabase-session-required' };
                 }
                 const portPreflight = await preflightHubClientPort();
-                if (!portPreflight.ok) {
-                    return hubClientPortPreflightError(portPreflight);
+                const readyPortPreflight = await recoverHubClientPortConflict(
+                    portPreflight,
+                    options.recoverHubClientPort
+                );
+                if (!readyPortPreflight.ok) {
+                    return hubClientPortPreflightError(readyPortPreflight);
                 }
                 const session = await refreshSessionIfNeeded(activeSupabase);
                 if (!session?.access_token) {
@@ -4433,8 +4470,8 @@ function getFastRuntime() {
             return {
                 rid,
                 packageName,
-                executable: join(fastRoot, executableName),
-                dll: join(fastRoot, 'livedesk-client-fast.dll')
+                executable: resolveSpawnablePackagedPath(join(fastRoot, executableName)),
+                dll: resolveSpawnablePackagedPath(join(fastRoot, 'livedesk-client-fast.dll'))
             };
         } catch {
             return {
@@ -4573,7 +4610,9 @@ function clearFastPreflightCache() {
 function resolveBundledFfmpegPaths() {
     const paths = [];
     const addPath = (candidate) => {
-        const ffmpegPath = String(candidate || '').trim();
+        // 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);
         }
@@ -5084,6 +5123,7 @@ export async function runClientRuntime(argv = process.argv.slice(2), runtimeOpti
             savedPin: null,
             allowRelayFallback: transportAllowsRelay(parsed.transport),
             relayEndpoint: parsed.relay,
+            recoverHubClientPort: runtimeOptions.recoverHubClientPort,
             openBrowser: parsed.openBrowserOnStart,
             onStarted: page => {
                 connectionPage = page;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.248",
+  "version": "0.1.250",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -42,10 +42,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@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"
+    "@livedesk/fast-linux-x64": "0.1.446",
+    "@livedesk/fast-osx-arm64": "0.1.446",
+    "@livedesk/fast-osx-x64": "0.1.446",
+    "@livedesk/fast-win-x64": "0.1.446"
   },
   "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;
+    }
+}