livedesk 0.1.2 → 0.1.4

package/bin/livedesk.js

@@ -3,14 +3,16 @@
 import { createRequire } from 'node:module';
 import { dirname, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { spawn } from 'node:child_process';
+import { execFile, spawn } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import os from 'node:os';
 
 const require = createRequire(import.meta.url);
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const packageRoot = resolve(__dirname, '..');
-const DEFAULT_MANAGER_URL = 'http://127.0.0.1:5179';
+const DEFAULT_MANAGER_HTTP_PORT = 5179;
+const DEFAULT_REMOTE_HUB_PORT = 5197;
+const DEFAULT_MANAGER_URL = `http://127.0.0.1:${DEFAULT_MANAGER_HTTP_PORT}`;
 
 function printHelp() {
   process.stdout.write(`
@@ -31,6 +33,9 @@ Manager options:
   --url <url>    Browser URL to open. Default: ${DEFAULT_MANAGER_URL}
   --host <host>  Manager HTTP host. Default: 0.0.0.0
   --port <port>  Manager HTTP port. Default: 5179
+  --remote-port <port>
+                 Client connection port. Default: 5197
+  --no-clean     Do not stop existing processes on the manager ports.
 
 Common:
   --help         Show this help.
@@ -72,19 +77,27 @@ function readVersion() {
 
 function parseManagerArgs(args) {
   const forwarded = [];
+  let cleanPortsOnStart = true;
   let openBrowserOnStart = true;
   let openUrl = DEFAULT_MANAGER_URL;
+  let openUrlExplicit = false;
   let host = '';
   let port = '';
+  let remotePort = '';
 
   for (let index = 0; index < args.length; index += 1) {
     const arg = args[index];
+    if (arg === '--no-clean') {
+      cleanPortsOnStart = false;
+      continue;
+    }
     if (arg === '--no-open') {
       openBrowserOnStart = false;
       continue;
     }
     if (arg === '--url') {
       openUrl = args[index + 1] || openUrl;
+      openUrlExplicit = true;
       index += 1;
       continue;
     }
@@ -98,18 +111,34 @@ function parseManagerArgs(args) {
       index += 1;
       continue;
     }
+    if (arg === '--remote-port' || arg === '--client-port') {
+      remotePort = args[index + 1] || remotePort;
+      index += 1;
+      continue;
+    }
     forwarded.push(arg);
   }
 
   return {
+    cleanPortsOnStart,
     forwarded,
     host,
     openBrowserOnStart,
+    openUrlExplicit,
     openUrl,
-    port
+    port,
+    remotePort
   };
 }
 
+function normalizePort(value, fallback) {
+  const number = Number(String(value || '').trim());
+  if (!Number.isInteger(number) || number < 1 || number > 65535) {
+    return fallback;
+  }
+  return number;
+}
+
 function openBrowser(url) {
   if (!url) {
     return;
@@ -135,6 +164,63 @@ async function isManagerAlreadyRunning(url = DEFAULT_MANAGER_URL) {
   }
 }
 
+function runQuiet(command, args) {
+  return new Promise(resolve => {
+    execFile(command, args, { windowsHide: true }, (error, stdout, stderr) => {
+      resolve({
+        ok: !error,
+        stdout: String(stdout || '').trim(),
+        stderr: String(stderr || '').trim(),
+        error
+      });
+    });
+  });
+}
+
+async function stopProcessesOnPorts(ports) {
+  const uniquePorts = [...new Set(ports.map(port => normalizePort(port, 0)).filter(Boolean))];
+  if (uniquePorts.length === 0) {
+    return;
+  }
+
+  if (os.platform() === 'win32') {
+    const script = [
+      '$ErrorActionPreference = "SilentlyContinue";',
+      `$ports = @(${uniquePorts.join(',')});`,
+      '$owners = foreach ($port in $ports) {',
+      '  Get-NetTCPConnection -LocalPort $port -ErrorAction SilentlyContinue | Select-Object -ExpandProperty OwningProcess -Unique',
+      '}',
+      '$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;',
+      '  }',
+      '}'
+    ].join(' ');
+    const result = await runQuiet('powershell.exe', ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command', script]);
+    if (result.stdout) {
+      console.log(`Restarting LiveDesk manager. Cleared port owner(s): ${result.stdout.replace(/\r?\n/g, ', ')}`);
+    }
+    return;
+  }
+
+  const script = uniquePorts.map(port => [
+    `pids="$(lsof -ti tcp:${port} -sTCP:LISTEN 2>/dev/null || true)"`,
+    'for pid in $pids; do',
+    '  if [ "$pid" != "$$" ]; then',
+    '    kill "$pid" 2>/dev/null || true',
+    '    echo "$pid"',
+    '  fi',
+    'done'
+  ].join('; ')).join('; ');
+  const result = await runQuiet('sh', ['-c', script]);
+  if (result.stdout) {
+    console.log(`Restarting LiveDesk manager. Cleared port owner(s): ${result.stdout.replace(/\r?\n/g, ', ')}`);
+  }
+}
+
 async function waitForManager(url = DEFAULT_MANAGER_URL, timeoutMs = 10000) {
   const startedAt = Date.now();
   while (Date.now() - startedAt < timeoutMs) {
@@ -156,16 +242,20 @@ function resolvePackageEntry(packageName, fallback) {
 
 async function runManager(args) {
   const options = parseManagerArgs(args);
-  const openUrl = options.port && options.openUrl === DEFAULT_MANAGER_URL
-    ? `http://127.0.0.1:${options.port}`
-    : (options.openUrl || DEFAULT_MANAGER_URL);
-
-  if (await isManagerAlreadyRunning(openUrl)) {
-    console.log(`LiveDesk manager is already running at ${openUrl}`);
-    if (options.openBrowserOnStart) {
-      openBrowser(openUrl);
-    }
-    return;
+  const httpPort = normalizePort(
+    options.port || process.env.LIVEDESK_HUB_HTTP_PORT || process.env.PORT,
+    DEFAULT_MANAGER_HTTP_PORT
+  );
+  const remotePort = normalizePort(
+    options.remotePort || process.env.REMOTE_HUB_PORT,
+    DEFAULT_REMOTE_HUB_PORT
+  );
+  const openUrl = options.openUrlExplicit
+    ? (options.openUrl || `http://127.0.0.1:${httpPort}`)
+    : `http://127.0.0.1:${httpPort}`;
+
+  if (options.cleanPortsOnStart) {
+    await stopProcessesOnPorts([httpPort, remotePort]);
   }
 
   const internalHubEntry = resolve(packageRoot, 'hub', 'src', 'server.js');
@@ -176,11 +266,10 @@ async function runManager(args) {
   const env = {
     ...process.env,
     LIVEDESK_HUB_HTTP_HOST: options.host || process.env.LIVEDESK_HUB_HTTP_HOST || '0.0.0.0',
+    LIVEDESK_HUB_HTTP_PORT: String(httpPort),
+    REMOTE_HUB_PORT: String(remotePort),
     LIVEDESK_WEB_DIST: existsSync(resolve(packagedWebDist, 'index.html')) ? packagedWebDist : (process.env.LIVEDESK_WEB_DIST || '')
   };
-  if (options.port) {
-    env.LIVEDESK_HUB_HTTP_PORT = options.port;
-  }
 
   const child = spawn(process.execPath, [hubEntry, ...options.forwarded], {
     env,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "LiveDesk manager and client launcher",
   "type": "module",
   "bin": {
@@ -30,7 +30,7 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@livedesk/client": "0.1.16",
+    "@livedesk/client": "0.1.17",
     "cors": "^2.8.5",
     "express": "^4.21.2",
     "ws": "^8.18.3"