livedesk 0.1.394 → 0.1.396

package/bin/livedesk.js

@@ -15,6 +15,7 @@ import { createRoleBootstrapServer } from '../bootstrap/role-bootstrap-server.js
 import { parseLsofPids } from '../bootstrap/port-inspection.js';
 import { isKnownLiveDeskClientAgentProcess } from '../bootstrap/client-process-identity.js';
 import { runLegacyClientUpdateSupervisorCli } from '../bootstrap/legacy-client-update.js';
+import { transferSavedClientSessionToHub } from '../bootstrap/hub-auth-handoff.js';
 
 const require = createRequire(import.meta.url);
 const __dirname = dirname(fileURLToPath(import.meta.url));
@@ -1514,14 +1515,31 @@ async function runManager(args, resolvedRole = null) {
     });
   };
 
-  startHubProcess();
-  updatePollId = setInterval(pollUpdateRequest, HUB_UPDATE_POLL_MS);
-
-  if (options.openBrowserOnStart) {
-    void waitForManager(openUrl).then(ok => {
-      if (ok) {
-        openBrowser(openUrl);
-      } else {
+  startHubProcess();
+  updatePollId = setInterval(pollUpdateRequest, HUB_UPDATE_POLL_MS);
+
+  const hubReady = waitForManager(hubProbeBaseUrl);
+  const hubStartup = hubReady.then(async ok => {
+    if (!ok) {
+      return false;
+    }
+    const handoff = await transferSavedClientSessionToHub(hubProbeBaseUrl, MANAGER_STATE_DIR);
+    if (handoff.ok) {
+      reportLauncherUpdate('[LiveDesk Hub] Saved Client sign-in adopted by the Hub.');
+      if (!handoff.hostTargetOk) {
+        reportLauncherUpdate('[LiveDesk Hub] Sign-in was adopted; host publication will continue through lease renewal.', true);
+      }
+    } else if (!handoff.skipped) {
+      reportLauncherUpdate(`[LiveDesk Hub] Saved Client sign-in could not be adopted: ${handoff.reason}. Continue sign-in in the Hub page.`, true);
+    }
+    return true;
+  });
+
+  if (options.openBrowserOnStart) {
+    void hubStartup.then(ok => {
+      if (ok) {
+        openBrowser(openUrl);
+      } else {
         console.warn(`LiveDesk Hub did not answer at ${openUrl} yet. Open it manually when it is ready.`);
       }
     });

package/bootstrap/hub-auth-handoff.js

@@ -0,0 +1,97 @@
+import { readFile } from 'node:fs/promises';
+import { join } from 'node:path';
+import { normalizeRuntimeAuthSession } from '../runtime-core/src/auth-session.js';
+
+const CLIENT_AUTH_STORAGE_KEY = 'livedesk.client.supabase.auth';
+const MINIMUM_SESSION_LIFETIME_SECONDS = 30;
+
+function parseStoredSession(value) {
+  if (value && typeof value === 'object') {
+    return value;
+  }
+  if (typeof value !== 'string' || !value.trim()) {
+    return null;
+  }
+  try {
+    return JSON.parse(value);
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Contract:
+ * - Reads only the unified local Client auth store.
+ * - Returns only a refreshable access session that will remain valid long
+ *   enough for the new local Hub to verify it.
+ * - Never logs or serializes token values outside the loopback handoff.
+ */
+export async function readSavedClientSessionForHub(
+  stateDir,
+  nowSeconds = Math.floor(Date.now() / 1000)
+) {
+  try {
+    const authState = JSON.parse(await readFile(join(stateDir, 'auth.json'), 'utf8'));
+    const candidate = parseStoredSession(authState?.[CLIENT_AUTH_STORAGE_KEY]);
+    const normalized = normalizeRuntimeAuthSession(candidate, { requireRefreshToken: true });
+    if (!normalized.ok) {
+      return null;
+    }
+    const expiresAt = Number(normalized.session.expires_at || 0);
+    if (!Number.isFinite(expiresAt)
+      || expiresAt - Number(nowSeconds || 0) <= MINIMUM_SESSION_LIFETIME_SECONDS) {
+      return null;
+    }
+    return normalized.session;
+  } catch {
+    return null;
+  }
+}
+
+export async function transferSavedClientSessionToHub(
+  baseUrl,
+  stateDir,
+  fetchImpl = fetch,
+  nowSeconds = Math.floor(Date.now() / 1000)
+) {
+  const session = await readSavedClientSessionForHub(stateDir, nowSeconds);
+  if (!session) {
+    return { ok: false, skipped: true, reason: 'no-valid-saved-client-session' };
+  }
+
+  try {
+    const response = await fetchImpl(new URL('/api/auth/session', baseUrl), {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        Accept: 'application/json'
+      },
+      body: JSON.stringify({
+        accessToken: session.access_token,
+        refreshToken: session.refresh_token,
+        expiresAt: session.expires_at
+      }),
+      signal: AbortSignal.timeout(5_000)
+    });
+    const data = await response.json().catch(() => null);
+    if (!response.ok || data?.authenticated !== true) {
+      return {
+        ok: false,
+        skipped: false,
+        reason: String(data?.error || `hub-auth-session-http-${response.status}`)
+      };
+    }
+    return {
+      ok: true,
+      skipped: false,
+      authenticated: true,
+      hostTargetOk: data?.hostTarget?.ok !== false
+    };
+  } catch (error) {
+    return {
+      ok: false,
+      skipped: false,
+      reason: error instanceof Error ? error.message : String(error)
+    };
+  }
+}

package/client/bin/livedesk-client.js

@@ -21,6 +21,7 @@ const packageRoot = resolve(__dirname, '..');
 const nodeAgentPath = join(__dirname, 'livedesk-client-node.js');
 const FAST_PREFLIGHT_TIMEOUT_MS = 5000;
 const DEFAULT_MANAGER = '127.0.0.1:5197';
+const DEFAULT_HUB_CLIENT_PORT = 5197;
 const DEFAULT_AUTH_CALLBACK_HOST = '127.0.0.1';
 const DEFAULT_AUTH_CALLBACK_PORT = 5179;
 const ENDPOINT_PROBE_TIMEOUT_MS = 900;
@@ -112,30 +113,50 @@ function writeLocalRoleCache(role, deviceId, roleVersion = 0, assignedHubId = ''
     return true;
 }
 
-function spawnUnifiedRoleRestart(role) {
-    if (isTruthy(process.env.LIVEDESK_DESKTOP_HOST)) {
-        console.log(`[LiveDesk] Desktop supervisor will restart the runtime as ${role}.`);
-        return false;
-    }
-    const unifiedEntry = String(process.env.LIVEDESK_UNIFIED_LAUNCHER_ENTRY || '').trim();
-    const child = unifiedEntry && existsSync(unifiedEntry)
-        ? spawn(process.execPath, [unifiedEntry, '--force-role', role, '--no-open'], {
-            env: {
-                ...process.env,
-                LIVEDESK_ROLE_TRANSITION: '1',
-                LIVEDESK_RESTART_WAIT_PID: String(process.ppid),
-                LIVEDESK_SKIP_BROWSER_OPEN: '1'
-            },
-            detached: true,
-            stdio: 'ignore',
-            windowsHide: true
-        })
-        : process.platform === 'win32'
-            ? spawn('npx.cmd', ['-y', '--prefer-online', 'livedesk@latest', '--force-role', role, '--no-open'], { detached: true, stdio: 'ignore', windowsHide: true })
-            : spawn('npx', ['-y', '--prefer-online', 'livedesk@latest', '--force-role', role, '--no-open'], { detached: true, stdio: 'ignore' });
-    child.unref();
-    return true;
-}
+export function buildUnifiedRoleRestartEnvironment(role, baseEnv = process.env, runtimePid = process.pid) {
+    const normalizedRole = String(role || '').trim().toLowerCase();
+    const waitPid = Number(runtimePid);
+    if (normalizedRole !== 'hub' && normalizedRole !== 'client') {
+        throw new Error(`Unsupported LiveDesk role restart: ${role}`);
+    }
+    if (!Number.isInteger(waitPid) || waitPid <= 1) {
+        throw new Error(`Invalid LiveDesk runtime PID for role restart: ${runtimePid}`);
+    }
+    return {
+        ...baseEnv,
+        LIVEDESK_ROLE_TRANSITION: '1',
+        // The replacement must wait only for this Client runtime. Waiting for
+        // npm, npx, PowerShell, or another terminal parent can deadlock the
+        // takeover even after Supabase has selected this device as Hub.
+        LIVEDESK_RESTART_WAIT_PID: String(waitPid),
+        LIVEDESK_ROLE_TAKEOVER: normalizedRole === 'hub' ? '1' : '',
+        LIVEDESK_SKIP_BROWSER_OPEN: '1'
+    };
+}
+
+function spawnUnifiedRoleRestart(role) {
+    if (isTruthy(process.env.LIVEDESK_DESKTOP_HOST)) {
+        console.log(`[LiveDesk] Desktop supervisor will restart the runtime as ${role}.`);
+        return false;
+    }
+    const unifiedEntry = String(process.env.LIVEDESK_UNIFIED_LAUNCHER_ENTRY || '').trim();
+    const restartEnvironment = buildUnifiedRoleRestartEnvironment(role);
+    const spawnOptions = {
+        env: restartEnvironment,
+        detached: true,
+        stdio: 'ignore',
+        windowsHide: true
+    };
+    const child = unifiedEntry && existsSync(unifiedEntry)
+        ? spawn(process.execPath, [unifiedEntry, '--force-role', role, '--no-open'], {
+            ...spawnOptions
+        })
+        : process.platform === 'win32'
+            ? spawn('npx.cmd', ['-y', '--prefer-online', 'livedesk@latest', '--force-role', role, '--no-open'], spawnOptions)
+            : spawn('npx', ['-y', '--prefer-online', 'livedesk@latest', '--force-role', role, '--no-open'], spawnOptions);
+    child.unref();
+    return true;
+}
 
 function printHelp() {
     process.stdout.write(`
@@ -349,15 +370,64 @@ function parseLauncherArgs(argv) {
     };
 }
 
-function normalizePort(value) {
+function normalizePort(value) {
     const port = Number(String(value || '').trim());
     if (!Number.isInteger(port) || port < 1 || port > 65535) {
         return 0;
     }
     return port;
-}
-
-function normalizeSlotNumber(value) {
+}
+
+export function resolveHubClientPort(env = process.env) {
+    return normalizePort(env.REMOTE_HUB_PORT || env.LIVEDESK_HUB_REMOTE_PORT) || DEFAULT_HUB_CLIENT_PORT;
+}
+
+export function preflightHubClientPort(port = resolveHubClientPort()) {
+    const normalizedPort = normalizePort(port);
+    if (!normalizedPort) {
+        return Promise.resolve({ ok: false, port: Number(port) || 0, code: 'invalid-hub-client-port' });
+    }
+    return new Promise(resolvePreflight => {
+        const probe = net.createServer();
+        let completed = false;
+        const finish = result => {
+            if (completed) return;
+            completed = true;
+            resolvePreflight({ port: normalizedPort, ...result });
+        };
+        probe.unref?.();
+        probe.once('error', error => {
+            finish({
+                ok: false,
+                code: error?.code === 'EADDRINUSE' ? 'hub-client-port-in-use' : 'hub-client-port-unavailable',
+                systemCode: String(error?.code || '')
+            });
+        });
+        probe.listen({ host: '0.0.0.0', port: normalizedPort, exclusive: true }, () => {
+            probe.close(error => {
+                if (error) {
+                    finish({ ok: false, code: 'hub-client-port-unavailable', systemCode: String(error?.code || '') });
+                    return;
+                }
+                finish({ ok: true, code: 'ok' });
+            });
+        });
+    });
+}
+
+function hubClientPortPreflightError(preflight) {
+    const port = Number(preflight?.port || resolveHubClientPort());
+    return {
+        ok: false,
+        code: String(preflight?.code || 'hub-client-port-unavailable'),
+        port,
+        error: preflight?.code === 'hub-client-port-in-use'
+            ? `LiveDesk cannot switch this computer to Hub because TCP ${port} is already in use. Change or stop the owning service, then try Switch to Hub again. The current Hub was not changed.`
+            : `LiveDesk cannot switch this computer to Hub because TCP ${port} is unavailable. Check the local port configuration, then try again. The current Hub was not changed.`
+    };
+}
+
+function normalizeSlotNumber(value) {
     const number = Number(String(value || '').trim());
     if (!Number.isInteger(number) || number < 1 || number > 999) {
         return '';
@@ -2628,12 +2698,18 @@ async function startConnectionChoiceServer(supabase, options = {}) {
                         payload = Object.fromEntries(params.entries());
                     }
                     const nextRole = String(payload.role || '').trim().toLowerCase();
-                    if (nextRole !== 'hub') {
+                    if (nextRole !== 'hub') {
                         res.writeHead(400, { 'Content-Type': 'application/json; charset=utf-8', 'Access-Control-Allow-Origin': '*' });
                         res.end(JSON.stringify({ ok: false, error: 'client-can-only-transition-to-hub' }));
-                        return;
-                    }
-                    const session = await refreshSessionIfNeeded(supabase);
+                        return;
+                    }
+                    const portPreflight = await preflightHubClientPort();
+                    if (!portPreflight.ok) {
+                        res.writeHead(409, { 'Content-Type': 'application/json; charset=utf-8', 'Access-Control-Allow-Origin': '*' });
+                        res.end(JSON.stringify(hubClientPortPreflightError(portPreflight)));
+                        return;
+                    }
+                    const session = await refreshSessionIfNeeded(supabase);
                     const expectedRoleVersion = Number(dashboardState.roleVersion || 0);
                     const { data, error } = await supabase.rpc('set_livedesk_device_role', {
                         p_device_id: deviceId,
@@ -2928,6 +3004,10 @@ async function chooseClientConnection(supabase, options = {}) {
                 if (!supabase) {
                     return { ok: false, error: 'supabase-session-required' };
                 }
+                const portPreflight = await preflightHubClientPort();
+                if (!portPreflight.ok) {
+                    return hubClientPortPreflightError(portPreflight);
+                }
                 const session = await refreshSessionIfNeeded(supabase);
                 if (!session?.access_token) {
                     return { ok: false, error: 'supabase-session-required' };

package/client/src/runtime/client-runtime-server.js

@@ -739,6 +739,7 @@ export function createClientRuntimeServer(options = {}) {
         osVersion: os.release(),
         pid: process.pid,
         cpuUsagePercent: Math.round(cpuUsagePercent * 10) / 10,
+        cpuLogicalCores: Math.max(1, os.cpus().length),
         memoryTotalBytes: totalMemoryBytes,
         memoryUsedBytes: Math.max(0, totalMemoryBytes - freeMemoryBytes),
         uptimeSeconds: Math.max(0, Math.floor(os.uptime())),

package/hub/src/server.js

@@ -136,6 +136,7 @@ const hubWakeBaseUrl = String(process.env.LIVEDESK_WAKE_URL || 'https://livedesk
 const HUB_WAKE_NOTIFY_RETRY_MS = 60_000;
 let hubHostTargetRenewTimer = null;
 let hubHostTargetRenewInFlight = false;
+let roleTransitionTakeoverPending = process.env.LIVEDESK_ROLE_TAKEOVER === '1';
 let hubHostTargetLeaseState = {
   state: 'idle',
   lastAttemptAt: '',
@@ -2913,7 +2914,7 @@ app.post('/api/auth/session', async (req, res) => {
     runtimeAccessTokenExpiresAt = normalizeSessionExpiryMs(expiresAt);
     runtimeManager.setAuthenticated(true, user.id);
     const hostTarget = runtimeRole === 'hub'
-      ? await publishHubHostTarget({ reason: 'session-received' })
+      ? await publishHubHostTargetWithPendingRoleTakeover('session-received')
       : { ok: true, active: false };
     if (runtimeRole === 'hub') {
       startHubHostTargetLeaseRenewal();
@@ -3147,6 +3148,21 @@ async function publishHubHostTarget({ takeover = false, reason = 'renewal' } = {
   }
 }
 
+async function publishHubHostTargetWithPendingRoleTakeover(reason = 'renewal') {
+  const takeover = roleTransitionTakeoverPending;
+  const result = await publishHubHostTarget({
+    takeover,
+    reason: takeover ? `${reason}-role-takeover` : reason
+  });
+  if (takeover && result.ok) {
+    // One explicit Client -> Hub selection authorizes one ownership handoff.
+    // Normal renewals must never keep takeover authority after publication.
+    roleTransitionTakeoverPending = false;
+    delete process.env.LIVEDESK_ROLE_TAKEOVER;
+  }
+  return result;
+}
+
 async function clearHubHostTarget(reason = 'shutdown') {
   if (hubHostTargetRenewTimer) {
     clearInterval(hubHostTargetRenewTimer);
@@ -3194,7 +3210,7 @@ function startHubHostTargetLeaseRenewal() {
     return;
   }
   hubHostTargetRenewTimer = setInterval(() => {
-    void publishHubHostTarget({ reason: 'renewal' });
+    void publishHubHostTargetWithPendingRoleTakeover('renewal');
   }, HUB_HOST_TARGET_RENEW_MS);
   hubHostTargetRenewTimer.unref?.();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.394",
+  "version": "0.1.396",
   "livedeskClientVersion": "0.1.173",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",