livedesk 0.1.248 → 0.1.250

package/README.md

@@ -13,6 +13,14 @@ This starts the LiveDesk Hub, opens the local screen wall, and accepts clients.
 The Hub UI/API listens on `127.0.0.1` by default while the client endpoint
 continues to listen on the LAN.
 
+On startup, the launcher finds stale processes whose command line identifies
+them as a LiveDesk Hub, even if the old Hub is still starting and has not
+finished binding its ports. It also checks the Hub ports (`5179` and `5197`),
+waits for the old process and both ports to be released, and then starts the
+new Hub. An unrelated process is preserved and reported instead of being
+terminated; use `--port`, `--remote-port`, or stop that process manually. Pass
+`--no-clean` to disable the startup cleanup explicitly.
+
 ## Client
 
 ```powershell

package/bin/livedesk.js

@@ -222,21 +222,77 @@ async function stopProcessesOnPorts(ports) {
     const script = [
       '$ErrorActionPreference = "SilentlyContinue";',
       `$ports = @(${uniquePorts.join(',')});`,
-      '$owners = foreach ($port in $ports) {',
-      '  Get-NetTCPConnection -LocalPort $port -ErrorAction SilentlyContinue | Select-Object -ExpandProperty OwningProcess -Unique',
+      `$currentNodePid = ${process.pid};`,
+      "      $hubProcessPattern = '(?i)(?:livedesk|@livedesk).*hub[\\\\/].*server\\.js';",
+      '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 }',
+      '    }',
+      '  }',
+      '}',
+      '$records = foreach ($port in $ports) {',
+      '  $connections = @(Get-ListenConnections $port | Where-Object { $_.OwningProcess -and $_.OwningProcess -ne $currentNodePid });',
+      '  foreach ($connection in $connections) {',
+      '    $owner = [int]$connection.OwningProcess;',
+      '    $proc = Get-CimInstance Win32_Process -Filter "ProcessId = $owner" -ErrorAction SilentlyContinue;',
+      '    $processName = if ($proc) { [string]$proc.Name } else { "" };',
+      '    $commandLine = if ($proc) { [string]$proc.CommandLine } else { "" };',
+      '    $knownLiveDesk = $commandLine -match "(?i)(?:livedesk|@livedesk).*hub[\\\\/].*server\\.js";',
+      '    [pscustomobject]@{ Port = [int]$port; Pid = $owner; ProcessName = $processName; CommandLine = $commandLine; KnownLiveDesk = [bool]$knownLiveDesk; Action = "preserved"; PortAvailable = $false; ProcessGone = $false }',
+      '  }',
       '}',
-      '$owners = $owners | Where-Object { $_ -and $_ -ne $PID } | Sort-Object -Unique;',
-      'foreach ($owner in $owners) {',
-      '  $proc = Get-Process -Id $owner -ErrorAction SilentlyContinue;',
-      '  if ($proc) {',
-      '    Write-Output "$($proc.Id):$($proc.ProcessName)";',
-      '    Stop-Process -Id $owner -Force -ErrorAction SilentlyContinue;',
+      '$records = @($records | Sort-Object Port,Pid -Unique);',
+      '$hubProcesses = @(Get-CimInstance Win32_Process -ErrorAction SilentlyContinue | Where-Object { $_.ProcessId -and $_.ProcessId -ne $currentNodePid -and ([string]$_.Name) -ieq "node.exe" -and ([string]$_.CommandLine) -match $hubProcessPattern });',
+      'foreach ($proc in $hubProcesses) {',
+      '  if (-not (@($records | Where-Object { $_.Pid -eq [int]$proc.ProcessId }).Count)) {',
+      '    $records += [pscustomobject]@{ Port = 0; Pid = [int]$proc.ProcessId; ProcessName = [string]$proc.Name; CommandLine = [string]$proc.CommandLine; KnownLiveDesk = $true; Action = "preserved"; PortAvailable = $false; ProcessGone = $false }',
       '  }',
-      '}'
+      '}',
+      'foreach ($record in @($records | Where-Object { $_.KnownLiveDesk })) {',
+      '  Stop-Process -Id $record.Pid -Force -ErrorAction SilentlyContinue;',
+      '  $record.Action = "stopped";',
+      '}',
+      '$deadline = (Get-Date).ToUniversalTime().AddMilliseconds(3000);',
+      'do {',
+      '  $busyPorts = @($ports | ForEach-Object { Get-ListenConnections $_ });',
+      '  $busyHubPids = @($records | Where-Object { $_.KnownLiveDesk } | ForEach-Object { Get-Process -Id $_.Pid -ErrorAction SilentlyContinue });',
+      '  if (($busyPorts.Count -eq 0 -and $busyHubPids.Count -eq 0) -or (Get-Date).ToUniversalTime() -ge $deadline) { break }',
+      '  Start-Sleep -Milliseconds 100;',
+      '} while ($true);',
+      '$busyPortNumbers = @($busyPorts | Select-Object -ExpandProperty LocalPort -Unique);',
+      'foreach ($record in $records) {',
+      '  $record.PortAvailable = $busyPortNumbers -notcontains $record.Port;',
+      '  $record.ProcessGone = -not (Get-Process -Id $record.Pid -ErrorAction SilentlyContinue);',
+      '}',
+      '$records | ConvertTo-Json -Compress'
     ].join(' ');
     const result = await runQuiet('powershell.exe', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command', script]);
+    if (!result.ok && !result.stdout) {
+      throw new Error(`Could not inspect existing LiveDesk Hub ports: ${result.stderr || result.error?.message || 'PowerShell failed'}`);
+    }
+    let records = [];
     if (result.stdout) {
-      console.log(`Restarting LiveDesk Hub. Cleared port owner(s): ${result.stdout.replace(/\r?\n/g, ', ')}`);
+      try {
+        const parsed = JSON.parse(result.stdout);
+        records = Array.isArray(parsed) ? parsed : [parsed];
+      } catch {
+        throw new Error(`Could not parse existing LiveDesk Hub port state: ${result.stdout}`);
+      }
+    }
+    const stopped = records.filter(record => record?.Action === 'stopped');
+    if (stopped.length > 0) {
+      const summary = stopped.map(record => `${record.Pid}:${record.ProcessName || 'node'}${record.Port ? `@${record.Port}` : ''}`).join(', ');
+      console.log(`Restarting LiveDesk Hub. Stopped stale LiveDesk owner(s): ${summary}`);
+    }
+    const blocked = records.filter(record => record?.PortAvailable !== true || (record?.Port === 0 && record?.ProcessGone !== true));
+    if (blocked.length > 0) {
+      const summary = blocked.map(record => `${record.Pid}:${record.ProcessName || 'unknown'}@${record.Port}[port-free=${record.PortAvailable === true},process-gone=${record.ProcessGone === true}]`).join(', ');
+      throw new Error(`LiveDesk Hub startup cleanup could not release port/process owner(s): ${summary}. If this is an unrelated process, use --port/--remote-port or stop it manually.`);
     }
     return;
   }

package/package.json

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