livedesk 0.1.393 → 0.1.395

package/client/bin/livedesk-client.js

@@ -112,30 +112,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(`

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.393",
+  "version": "0.1.395",
   "livedeskClientVersion": "0.1.173",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",