livedesk 0.1.257 → 0.1.259

package/bin/livedesk.js

@@ -220,28 +220,45 @@ function waitMilliseconds(milliseconds) {
   return new Promise(resolve => setTimeout(resolve, milliseconds));
 }
 
-function probePortBind(port, host = '0.0.0.0') {
-  return new Promise(resolve => {
-    const server = net.createServer();
-    let settled = false;
-    const finish = value => {
-      if (settled) return;
+function probePortBind(port, host = '0.0.0.0') {
+  return new Promise(resolve => {
+    const server = net.createServer();
+    let settled = false;
+    const finish = value => {
+      if (settled) return;
       settled = true;
       resolve(value);
     };
-    server.once('error', error => finish({
-      ok: false,
-      error: error?.code || error?.message || 'bind-failed'
-    }));
-    server.listen(port, host, () => {
-      server.close(() => finish({ ok: true, error: '' }));
-    });
-  });
-}
-
-async function canBindPort(port, host = '0.0.0.0') {
-  return (await probePortBind(port, host)).ok;
-}
+    server.once('error', error => finish({
+      ok: false,
+      error: error?.code || error?.message || 'bind-failed'
+    }));
+    server.listen(port, host, () => {
+      server.close(() => finish({ ok: true, error: '' }));
+    });
+  });
+}
+
+async function canBindPort(port, host = '0.0.0.0') {
+  return (await probePortBind(port, host)).ok;
+}
+
+async function waitForPortBindable(port, host = '0.0.0.0', timeoutMs = PORT_CLEANUP_TIMEOUT_MS) {
+  const deadline = Date.now() + timeoutMs;
+  let lastProbe = { ok: false, error: 'bind-not-tested' };
+  do {
+    lastProbe = await probePortBind(port, host);
+    if (lastProbe.ok) {
+      return lastProbe;
+    }
+    const remainingMs = deadline - Date.now();
+    if (remainingMs <= 0) {
+      break;
+    }
+    await waitMilliseconds(Math.min(PORT_CLEANUP_POLL_MS, remainingMs));
+  } while (true);
+  return lastProbe;
+}
 
 function isKnownLiveDeskProcess(processName, commandLine) {
   const normalizedName = String(processName || '').trim();
@@ -270,7 +287,7 @@ function assertPortCleanupReady(finalRecords, portStates) {
     const owners = finalRecords
       .filter(record => Number(record?.Port) === Number(port?.Port))
       .map(formatPortOwner);
-    return `TCP ${port.Port}[available=${port.PortAvailable === true},bindable=${port.PortBindable === true},bind-error=${port.BindError || 'none'},owners=${owners.length ? owners.join('; ') : 'owner not visible'}`;
+    return `TCP ${port.Port}[available=${port.PortAvailable === true},bindable=${port.PortBindable === true},bind-error=${port.BindError || 'none'},owners=${owners.length ? owners.join('; ') : 'owner not visible'}`;
   }).join('], ');
   throw new Error(`LiveDesk Hub startup cleanup could not release the configured port(s): ${summary}]. Unrelated processes are preserved; stop the owning process manually or choose an explicit --port/--remote-port value.`);
 }
@@ -388,7 +405,7 @@ async function stopProcessesOnPorts(ports) {
       '    [pscustomobject]@{ Port = [int]$port; Pid = $owner; ProcessName = $processName; CommandLine = $commandLine; KnownLiveDesk = $knownLiveDesk; Action = "preserved"; KillAttempted = $false }',
       '  }',
       '}',
-      '$records = @($ports | ForEach-Object { Get-PortRecords $_ } | Sort-Object Port,Pid -Unique);',
+      '$records = @($ports | ForEach-Object { Get-PortRecords $_ } | Sort-Object Port,Pid -Unique);',
       '$killableOwners = @($records | Where-Object { $_.KnownLiveDesk } | Group-Object Pid | ForEach-Object { @($_.Group)[0] });',
       'foreach ($owner in $killableOwners) {',
       '  Stop-Process -Id $owner.Pid -Force -ErrorAction SilentlyContinue;',
@@ -406,8 +423,8 @@ async function stopProcessesOnPorts(ports) {
       '  $portStates = @($ports | ForEach-Object {',
       '    $port = [int]$_;',
       '    $busy = $busyPorts -contains $port;',
-      '    $bindable = [bool](-not $busy);',
-      '    [pscustomobject]@{ Port = $port; PortAvailable = [bool](-not $busy); PortBindable = $bindable; Ready = [bool](-not $busy) }',
+      '    $bindable = [bool](-not $busy);',
+      '    [pscustomobject]@{ Port = $port; PortAvailable = [bool](-not $busy); PortBindable = $bindable; Ready = [bool](-not $busy) }',
       '  });',
       '  if ((@($portStates | Where-Object { -not $_.Ready }).Count -eq 0) -or (Get-Date).ToUniversalTime() -ge $deadline) { break }',
       `  Start-Sleep -Milliseconds ${PORT_CLEANUP_POLL_MS};`,
@@ -431,22 +448,22 @@ async function stopProcessesOnPorts(ports) {
     }
     const records = Array.isArray(payload?.Records) ? payload.Records : [];
     const finalRecords = Array.isArray(payload?.FinalRecords) ? payload.FinalRecords : [];
-    const rawPortStates = Array.isArray(payload?.Ports) ? payload.Ports : [];
-    const rawStatesByPort = new Map(rawPortStates.map(state => [Number(state?.Port), state]));
-    const portStates = [];
-    for (const port of uniquePorts) {
-      const rawState = rawStatesByPort.get(Number(port)) || {};
-      const probe = rawState.PortAvailable === true
-        ? await probePortBind(port)
-        : { ok: false, error: 'port-in-use' };
-      portStates.push({
-        ...rawState,
-        Port: Number(port),
-        PortBindable: probe.ok,
-        BindError: probe.error || '',
-        Ready: rawState.PortAvailable === true && probe.ok
-      });
-    }
+    const rawPortStates = Array.isArray(payload?.Ports) ? payload.Ports : [];
+    const rawStatesByPort = new Map(rawPortStates.map(state => [Number(state?.Port), state]));
+    const portStates = [];
+    for (const port of uniquePorts) {
+      const rawState = rawStatesByPort.get(Number(port)) || {};
+      const probe = rawState.PortAvailable === true
+        ? await waitForPortBindable(port)
+        : { ok: false, error: 'port-in-use' };
+      portStates.push({
+        ...rawState,
+        Port: Number(port),
+        PortBindable: probe.ok,
+        BindError: probe.error || '',
+        Ready: rawState.PortAvailable === true && probe.ok
+      });
+    }
     const stopped = records.filter(record => record?.Action === 'stopped');
     if (stopped.length > 0) {
       const stoppedOwners = new Map();

package/package.json

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