livedesk 0.1.252 → 0.1.253

package/bin/livedesk.js

@@ -223,7 +223,19 @@ async function stopProcessesOnPorts(ports) {
       '$ErrorActionPreference = "SilentlyContinue";',
       `$ports = @(${uniquePorts.join(',')});`,
       `$currentNodePid = ${process.pid};`,
-      "      $hubProcessPattern = '(?i)(?:livedesk|@livedesk).*hub[\\\\/].*server\\.js';",
+      '      $liveDeskProcessPattern = "(?i)(?:livedesk|@livedesk)";',
+      '      $hubServerProcessPattern = "(?i)(?:hub[\\\\/].*server\\.js|server\\.js)";',
+      'function Get-ProcessCommandChain($proc) {',
+      '  $chain = @();',
+      '  $current = $proc;',
+      '  for ($depth = 0; $current -and $depth -lt 8; $depth++) {',
+      '    $chain += [string]$current.CommandLine;',
+      '    $parentId = [int]$current.ParentProcessId;',
+      '    if ($parentId -le 0) { break }',
+      '    $current = Get-CimInstance Win32_Process -Filter "ProcessId = $parentId" -ErrorAction SilentlyContinue;',
+      '  }',
+      '  return ($chain -join " ");',
+      '}',
       'function Get-ListenConnections($port) {',
       '  $connections = @(Get-NetTCPConnection -LocalPort $port -State Listen -ErrorAction SilentlyContinue);',
       '  if ($connections.Count -gt 0) { return $connections }',
@@ -242,12 +254,18 @@ async function stopProcessesOnPorts(ports) {
       '    $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";',
+      '    $commandChain = if ($proc) { Get-ProcessCommandChain $proc } else { "" };',
+      '    $knownLiveDesk = ($processName -match "(?i)^node(?:\\.exe)?$") -and ($commandChain -match $liveDeskProcessPattern) -and ($commandChain -match $hubServerProcessPattern);',
       '    [pscustomobject]@{ Port = [int]$port; Pid = $owner; ProcessName = $processName; CommandLine = $commandLine; KnownLiveDesk = [bool]$knownLiveDesk; Action = "preserved"; PortAvailable = $false; ProcessGone = $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 });',
+      '$hubProcesses = @(Get-CimInstance Win32_Process -ErrorAction SilentlyContinue | Where-Object { $_.ProcessId -and $_.ProcessId -ne $currentNodePid -and ([string]$_.Name) -ieq "node.exe" } | ForEach-Object {',
+      '  $commandChain = Get-ProcessCommandChain $_;',
+      '  if (($commandChain -match $liveDeskProcessPattern) -and ($commandChain -match $hubServerProcessPattern)) {',
+      '    [pscustomobject]@{ ProcessId = [int]$_.ProcessId; ParentProcessId = [int]$_.ParentProcessId; Name = [string]$_.Name; CommandLine = [string]$_.CommandLine; CommandChain = $commandChain }',
+      '  }',
+      '});',
       '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 }',
@@ -291,7 +309,7 @@ async function stopProcessesOnPorts(ports) {
     }
     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(', ');
+      const summary = blocked.map(record => `${record.Pid}:${record.ProcessName || 'unknown'}@${record.Port}[port-free=${record.PortAvailable === true},process-gone=${record.ProcessGone === 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}. LiveDesk keeps the configured port fixed; stop that process 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.253",
   "description": "LiveDesk Hub and client launcher",
   "type": "module",
   "bin": {