livedesk 0.1.252 → 0.1.254

package/README.md

@@ -13,15 +13,13 @@ 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 stale LiveDesk processes to exit, and then starts the new Hub. The
-client endpoint remains fixed at TCP `5197` by default so firewall rules,
-router forwarding, and direct clients keep a stable contract. An unrelated
-process is preserved and reported instead of being terminated; stop it or use
-an explicit `--remote-port` value. Pass `--no-clean` to disable the startup
-cleanup explicitly.
+On startup, the launcher checks the Hub ports (`5179` and `5197`), stops every
+process listening on those configured ports, waits for the ports to be released,
+and then starts the new Hub. The client endpoint remains fixed at TCP `5197` by
+default so firewall rules, router forwarding, and direct clients keep a stable
+contract. If a process cannot be stopped or the port remains occupied, startup
+fails with the owning PID and command line. Pass `--no-clean` to disable the
+startup cleanup explicitly.
 
 ## Client
 

package/bin/livedesk.js

@@ -223,7 +223,6 @@ async function stopProcessesOnPorts(ports) {
       '$ErrorActionPreference = "SilentlyContinue";',
       `$ports = @(${uniquePorts.join(',')});`,
       `$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 }',
@@ -236,38 +235,29 @@ async function stopProcessesOnPorts(ports) {
       '  }',
       '}',
       '$records = foreach ($port in $ports) {',
-      '  $connections = @(Get-ListenConnections $port | Where-Object { $_.OwningProcess -and $_.OwningProcess -ne $currentNodePid });',
+      '  $connections = @(Get-ListenConnections $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" -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 }',
+      '    [pscustomobject]@{ Port = [int]$port; Pid = $owner; ProcessName = $processName; CommandLine = $commandLine; Action = "preserved"; PortAvailable = $false }',
       '  }',
       '}',
       '$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 })) {',
+      'foreach ($record in $records) {',
       '  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 }',
+      '  $busyConnections = @($ports | ForEach-Object { Get-ListenConnections $_ });',
+      '  if ($busyConnections.Count -eq 0 -or (Get-Date).ToUniversalTime() -ge $deadline) { break }',
       '  Start-Sleep -Milliseconds 100;',
       '} while ($true);',
-      '$busyPortNumbers = @($busyPorts | Select-Object -ExpandProperty LocalPort -Unique);',
+      '$busyPortNumbers = @($busyConnections | 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(' ');
@@ -287,12 +277,12 @@ async function stopProcessesOnPorts(ports) {
     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}`);
+      console.log(`Restarting LiveDesk Hub. Stopped Hub port owner(s): ${summary}`);
     }
-    const blocked = records.filter(record => record?.PortAvailable !== true || (record?.Port === 0 && record?.ProcessGone !== true));
+    const blocked = records.filter(record => record?.PortAvailable !== 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}. LiveDesk keeps the configured port fixed; stop that process or choose an explicit --port/--remote-port value.`);
+      const summary = blocked.map(record => `${record.Pid}:${record.ProcessName || 'unknown'}@${record.Port}[port-free=${record.PortAvailable === true},cmd=${String(record.CommandLine || 'unavailable').replace(/\s+/g, ' ').slice(0, 240)}]`).join(', ');
+      throw new Error(`LiveDesk Hub startup cleanup could not release port/process owner(s): ${summary}. Stop that process manually or choose an explicit --port/--remote-port value.`);
     }
     return;
   }

package/package.json

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