livedesk 0.1.563 → 0.1.565

package/bin/livedesk.js

@@ -1616,9 +1616,9 @@ function isPortConflictOutput(output) {
   return /\bEADDRINUSE\b|address already in use|requires client endpoint TCP \d+/i.test(String(output || ''));
 }
 
-function formatPortOwner(record) {
-  return `${record?.Pid || 'unknown'}:${record?.ProcessName || 'unknown'} cmd=${String(record?.CommandLine || 'unavailable').replace(/\s+/g, ' ').slice(0, 240)}`;
-}
+function formatPortOwner(record) {
+  return `${record?.Pid || 'unknown'}:${record?.ProcessName || 'unknown'} state=${record?.State || 'unknown'} cmd=${String(record?.CommandLine || 'unavailable').replace(/\s+/g, ' ').slice(0, 240)}`;
+}
 
 function assertPortCleanupReady(finalRecords, portStates) {
   const blockedPorts = portStates.filter(port => port?.Ready !== true);
@@ -1640,35 +1640,37 @@ async function collectWindowsPortRecords(ports) {
     '$ErrorActionPreference = "SilentlyContinue";',
     `$ports = @(${ports.join(',')});`,
     `$currentNodePid = ${process.pid};`,
-    'function Get-ListenConnections($port) {',
-    '  $connections = @(Get-NetTCPConnection -LocalPort $port -State Listen -ErrorAction SilentlyContinue);',
-    '  if ($connections.Count -gt 0) { return $connections }',
-    '  $pattern = "^\\s*TCP\\s+\\S+:" + $port + "\\s+\\S+\\s+LISTENING\\s+(\\d+)\\s*$";',
-    '  foreach ($line in @(netstat -ano -p tcp)) {',
-    '    $match = [regex]::Match([string]$line, $pattern);',
-    '    if ($match.Success) {',
-    '      [pscustomobject]@{ LocalPort = [int]$port; OwningProcess = [int]$match.Groups[1].Value }',
-    '    }',
-    '  }',
+    'function Get-PortConnections($port) {',
+    '  $connections = @(Get-NetTCPConnection -LocalPort $port -ErrorAction SilentlyContinue);',
+    '  if ($connections.Count -gt 0) { return $connections }',
+    '  $pattern = "^\\s*TCP\\s+\\S+:" + $port + "\\s+\\S+\\s+(\\S+)\\s+(\\d+)\\s*$";',
+    '  foreach ($line in @(netstat -ano -p tcp)) {',
+    '    $match = [regex]::Match([string]$line, $pattern);',
+    '    if ($match.Success) {',
+    '      [pscustomobject]@{ LocalPort = [int]$port; State = [string]$match.Groups[1].Value; OwningProcess = [int]$match.Groups[2].Value }',
+    '    }',
+    '  }',
     '}',
-    '$records = @();',
-    'foreach ($port in $ports) {',
-    '  $connections = @(Get-ListenConnections $port | Where-Object { $_.OwningProcess -and $_.OwningProcess -ne $currentNodePid -and $_.OwningProcess -ne $PID });',
-    '  foreach ($connection in $connections) {',
-    '    $owner = [int]$connection.OwningProcess;',
+    '$records = @();',
+    'foreach ($port in $ports) {',
+    '  $connections = @(Get-PortConnections $port | Where-Object { $_.OwningProcess -and $_.OwningProcess -ne $currentNodePid -and $_.OwningProcess -ne $PID });',
+    '  foreach ($connection in $connections) {',
+    '    $owner = [int]$connection.OwningProcess;',
     '    $proc = Get-CimInstance Win32_Process -Filter "ProcessId = $owner" -Property ProcessId,Name,CommandLine,CreationDate -ErrorAction SilentlyContinue;',
     '    $processName = if ($proc) { [string]$proc.Name } else { "" };',
     '    $commandLine = if ($proc) { [string]$proc.CommandLine } else { "" };',
     '    $creationUtcTicks = if ($proc -and $proc.CreationDate) { [string]$proc.CreationDate.ToUniversalTime().Ticks } else { "" };',
     '    $isNodeProcess = $processName -match "(?i)^node(?:\\.exe)?$";',
     '    $hasKnownLiveDeskHubPath = $commandLine -match "(?i)(?:packages[\\\\/](?:livedesk[\\\\/])?hub|node_modules[\\\\/]@?livedesk[\\\\/]hub)[\\\\/]src[\\\\/]server\\.js";',
-    '    $hasUnifiedLauncherPath = $commandLine -match "(?i)(?:node_modules[\\\\/]livedesk|packages[\\\\/]livedesk)[\\\\/]bin[\\\\/]livedesk\\.js";',
-    '    $hasLegacyClientPath = $commandLine -match "(?i)(?:node_modules[\\\\/]@livedesk[\\\\/]client|packages[\\\\/]client|packages[\\\\/]livedesk[\\\\/]client)[\\\\/]bin[\\\\/]livedesk-client\\.js";',
-    '    $knownLiveDesk = [bool]($isNodeProcess -and ($hasKnownLiveDeskHubPath -or $hasUnifiedLauncherPath -or $hasLegacyClientPath));',
-    '    $records += [pscustomobject]@{ Port = [int]$port; Pid = $owner; ProcessName = $processName; CommandLine = $commandLine; CreationUtcTicks = $creationUtcTicks; KnownLiveDesk = $knownLiveDesk; Action = "preserved"; KillAttempted = $false };',
-    '  }',
-    '}',
-    '$records = @($records | Sort-Object Port,Pid -Unique);',
+    '    $hasUnifiedLauncherPath = $commandLine -match "(?i)(?:node_modules[\\\\/]livedesk|packages[\\\\/]livedesk)[\\\\/]bin[\\\\/]livedesk\\.js";',
+    '    $hasLegacyClientPath = $commandLine -match "(?i)(?:node_modules[\\\\/]@livedesk[\\\\/]client|packages[\\\\/]client|packages[\\\\/]livedesk[\\\\/]client)[\\\\/]bin[\\\\/]livedesk-client\\.js";',
+    '    $knownLiveDesk = [bool]($isNodeProcess -and ($hasKnownLiveDeskHubPath -or $hasUnifiedLauncherPath -or $hasLegacyClientPath));',
+    '    $state = [string]$connection.State;',
+    '    $isListener = $state -match "^(?i:Listen|Listening)$";',
+    '    $records += [pscustomobject]@{ Port = [int]$port; Pid = $owner; ProcessName = $processName; CommandLine = $commandLine; CreationUtcTicks = $creationUtcTicks; State = $state; IsListener = [bool]$isListener; KnownLiveDesk = $knownLiveDesk; Action = "preserved"; KillAttempted = $false };',
+    '  }',
+    '}',
+    '$records = @($records | Sort-Object Port,Pid,State -Unique);',
     '[pscustomobject]@{ Records = $records } | ConvertTo-Json -Compress -Depth 5'
   ].join(' ');
   const result = await runQuiet(
@@ -1701,8 +1703,9 @@ async function terminateExactWindowsPortOwners(records) {
   for (const record of Array.isArray(records) ? records : []) {
     const pid = Number(record?.Pid || 0);
     const startOrder = String(record?.CreationUtcTicks || '').trim();
-    if (record?.KnownLiveDesk !== true
-        || !Number.isInteger(pid)
+    if (record?.KnownLiveDesk !== true
+        || record?.IsListener !== true
+        || !Number.isInteger(pid)
         || pid <= 1
         || !/^\d+$/.test(startOrder)
         || seenRoots.has(`${pid}:${startOrder}`)) {
@@ -1839,7 +1842,7 @@ async function terminateExactWindowsPortOwners(records) {
 
 async function stopWindowsProcessesOnPorts(ports) {
   const records = await collectWindowsPortRecords(ports);
-  const killable = records.filter(record => record?.KnownLiveDesk === true);
+  const killable = records.filter(record => record?.KnownLiveDesk === true && record?.IsListener === true);
   if (killable.length > 0) {
     await terminateExactWindowsPortOwners(killable);
     for (const record of killable) {
@@ -3186,7 +3189,15 @@ async function runClient(args, resolvedRole = null, runtimeLock = null) {
     await new Promise(() => undefined);
   });
   try {
-    await clientModule.runClientRuntime(clientArgs);
+    await clientModule.runClientRuntime(clientArgs, {
+      recoverHubClientPort: async port => {
+        const normalizedPort = normalizePort(port, 0);
+        if (!normalizedPort) {
+          throw new Error(`LiveDesk cannot recover an invalid Hub client port: ${port}.`);
+        }
+        await stopProcessesOnPorts([normalizedPort]);
+      }
+    });
   } finally {
     runtimeShutdownWatcher?.stop();
   }

package/client/bin/livedesk-client.js

@@ -588,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' });
@@ -618,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.`
     };
 }
 
@@ -3082,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', {
@@ -3403,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' };
@@ -5085,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/client/package.json

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "livedesk",
-  "version": "0.1.563",
-  "livedeskClientVersion": "0.1.248",
+  "version": "0.1.565",
+  "livedeskClientVersion": "0.1.249",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",