@livedesk/client 0.1.245 → 0.1.247

package/bin/livedesk-client.js

@@ -143,16 +143,16 @@ function publishWindowsOwnedAgentRecords(records, {
     }
 }
 
-export function requestClientRuntimeShutdown(signal = 'SIGTERM') {
-    disposeAgentTerminationHandlers.requestTermination(signal);
-}
-
-const HUB_SELF_AGENT_SHUTDOWN_MESSAGE = 'livedesk.self-agent.shutdown';
-const HUB_SELF_AGENT_READY_MESSAGE = 'livedesk.self-agent.ready';
-
-function isHubSelfAgentRuntime() {
-    return isTruthy(process.env.LIVEDESK_HUB_SELF_AGENT);
-}
+export function requestClientRuntimeShutdown(signal = 'SIGTERM') {
+    disposeAgentTerminationHandlers.requestTermination(signal);
+}
+
+const HUB_SELF_AGENT_SHUTDOWN_MESSAGE = 'livedesk.self-agent.shutdown';
+const HUB_SELF_AGENT_READY_MESSAGE = 'livedesk.self-agent.ready';
+
+function isHubSelfAgentRuntime() {
+    return isTruthy(process.env.LIVEDESK_HUB_SELF_AGENT);
+}
 
 function requestActiveAgentStop(signal = 'SIGTERM') {
     const child = activeAgentProcess;
@@ -4118,7 +4118,7 @@ export async function waitForManagerFromSupabase(supabase, options = {}) {
     }
 }
 
-async function prepareLoginConnection(parsed, existingConnectionPage = null, getSupabaseClient = createSupabaseClient) {
+async function prepareLoginConnection(parsed, existingConnectionPage = null, getSupabaseClient = createSupabaseClient) {
     if (parsed.logout) {
         clearSavedSession();
     }
@@ -4382,46 +4382,46 @@ async function prepareLoginConnection(parsed, existingConnectionPage = null, get
         rediscoverOnDisconnect: shouldLogin,
         rediscoverOnInvalidPair: shouldLogin
     };
-}
-
-export function prepareHubSelfAgentConnection(parsed) {
-    const manager = String(parsed?.manager || '').trim();
-    const pair = String(parsed?.pair || '').trim();
-    const deviceId = String(parsed?.deviceId || '').trim();
-    const endpoint = parseManagerEndpoint(manager);
-    const loopbackHosts = new Set(['127.0.0.1', 'localhost', '::1']);
-    if (!endpoint || !loopbackHosts.has(endpoint.host.toLowerCase())) {
-        throw new Error('Hub Self Agent must connect to this Hub through a loopback endpoint.');
-    }
-    if (!pair) throw new Error('Hub Self Agent requires the current Hub pair token.');
-    if (!deviceId) throw new Error('Hub Self Agent requires the Hub device identity.');
-
-    let forwarded = Array.isArray(parsed.forwarded) ? [...parsed.forwarded] : [];
-    forwarded = upsertForwardedOption(forwarded, '--manager', manager);
-    forwarded = upsertForwardedOption(forwarded, '--device-id', deviceId);
-    const slot = normalizeSlotNumber(parsed.slot);
-    if (slot) forwarded = upsertForwardedOption(forwarded, '--slot', slot);
-    return {
-        ...parsed,
-        engine: 'fast',
-        manager,
-        pair,
-        deviceId,
-        slot,
-        transport: 'tcp',
-        relay: '',
-        relayExplicit: false,
-        requireFast: true,
-        connectionPage: null,
-        forwarded,
-        connectionTransport: 'direct-tcp',
-        directReachable: true,
-        directProbeSkipReason: '',
-        discoverySource: 'hub-self-agent',
-        rediscoverOnDisconnect: false,
-        rediscoverOnInvalidPair: false
-    };
-}
+}
+
+export function prepareHubSelfAgentConnection(parsed) {
+    const manager = String(parsed?.manager || '').trim();
+    const pair = String(parsed?.pair || '').trim();
+    const deviceId = String(parsed?.deviceId || '').trim();
+    const endpoint = parseManagerEndpoint(manager);
+    const loopbackHosts = new Set(['127.0.0.1', 'localhost', '::1']);
+    if (!endpoint || !loopbackHosts.has(endpoint.host.toLowerCase())) {
+        throw new Error('Hub Self Agent must connect to this Hub through a loopback endpoint.');
+    }
+    if (!pair) throw new Error('Hub Self Agent requires the current Hub pair token.');
+    if (!deviceId) throw new Error('Hub Self Agent requires the Hub device identity.');
+
+    let forwarded = Array.isArray(parsed.forwarded) ? [...parsed.forwarded] : [];
+    forwarded = upsertForwardedOption(forwarded, '--manager', manager);
+    forwarded = upsertForwardedOption(forwarded, '--device-id', deviceId);
+    const slot = normalizeSlotNumber(parsed.slot);
+    if (slot) forwarded = upsertForwardedOption(forwarded, '--slot', slot);
+    return {
+        ...parsed,
+        engine: 'fast',
+        manager,
+        pair,
+        deviceId,
+        slot,
+        transport: 'tcp',
+        relay: '',
+        relayExplicit: false,
+        requireFast: true,
+        connectionPage: null,
+        forwarded,
+        connectionTransport: 'direct-tcp',
+        directReachable: true,
+        directProbeSkipReason: '',
+        discoverySource: 'hub-self-agent',
+        rediscoverOnDisconnect: false,
+        rediscoverOnInvalidPair: false
+    };
+}
 
 function getFastRuntime() {
     const platform = os.platform();
@@ -4904,10 +4904,10 @@ function spawnAgent(command, args, env = process.env, onStart = null) {
         windowsHide: true
     });
     child.livedeskOwnsProcessGroup = ownsProcessGroup;
-    child.livedeskWindowsTreeTracker = createWindowsProcessTreeTracker(child, {
-        spawnedAtMs: agentSpawnedAtMs,
-        ownerPid: WINDOWS_PROCESS_MANIFEST_OWNER?.pid || process.pid,
-        publishTrackedRecords: WINDOWS_PROCESS_MANIFEST_OWNER
+    child.livedeskWindowsTreeTracker = createWindowsProcessTreeTracker(child, {
+        spawnedAtMs: agentSpawnedAtMs,
+        ownerPid: WINDOWS_PROCESS_MANIFEST_OWNER?.pid || process.pid,
+        publishTrackedRecords: WINDOWS_PROCESS_MANIFEST_OWNER
             ? publishWindowsOwnedAgentRecords
             : null
     });
@@ -5006,9 +5006,9 @@ export function requiresFastTransport(prepared = {}) {
         || prepared.relayExplicit === true;
 }
 
-export async function runClientRuntime(argv = process.argv.slice(2), runtimeOptions = {}) {
-    const hubSelfAgent = isHubSelfAgentRuntime();
-    if (!hubSelfAgent) startNetworkChangeMonitor();
+export async function runClientRuntime(argv = process.argv.slice(2), runtimeOptions = {}) {
+    const hubSelfAgent = isHubSelfAgentRuntime();
+    if (!hubSelfAgent) startNetworkChangeMonitor();
     if (isTruthy(process.env.LIVEDESK_DESKTOP_HOST)) {
         unregisterWindowsStartup();
     }
@@ -5025,11 +5025,11 @@ export async function runClientRuntime(argv = process.argv.slice(2), runtimeOpti
     if (parsed.updateWaitPid) {
         await waitForProcessExit(parsed.updateWaitPid);
     }
-    if (!hubSelfAgent) {
-        writeClientUpdateRuntimeStage('launcher-started', {
-            restartVerified: false
-        });
-    }
+    if (!hubSelfAgent) {
+        writeClientUpdateRuntimeStage('launcher-started', {
+            restartVerified: false
+        });
+    }
     if (parsed.help) {
         printHelp();
         return;
@@ -5065,7 +5065,7 @@ export async function runClientRuntime(argv = process.argv.slice(2), runtimeOpti
         return supabaseClientPromise;
     };
     let connectionPage = null;
-    if (isTruthy(process.env.LIVEDESK_UNIFIED_RUNTIME) && !hubSelfAgent) {
+    if (isTruthy(process.env.LIVEDESK_UNIFIED_RUNTIME) && !hubSelfAgent) {
         let resolveStarted;
         let rejectStarted;
         const started = new Promise((resolve, reject) => {
@@ -5102,9 +5102,9 @@ export async function runClientRuntime(argv = process.argv.slice(2), runtimeOpti
         if (savedSlot) {
             parsed.slot = savedSlot;
         }
-        const prepared = hubSelfAgent
-            ? prepareHubSelfAgentConnection(parsed)
-            : await prepareLoginConnection(parsed, connectionPage, getSupabaseClient);
+        const prepared = hubSelfAgent
+            ? prepareHubSelfAgentConnection(parsed)
+            : await prepareLoginConnection(parsed, connectionPage, getSupabaseClient);
         connectionPage = prepared.connectionPage || connectionPage;
         prepared.connectionPage?.update({
             manager: prepared.manager,
@@ -5158,14 +5158,14 @@ export async function runClientRuntime(argv = process.argv.slice(2), runtimeOpti
                     runtimeId: fastRuntime?.rid || '',
                     state: 'launching'
                 });
-                result = await spawnAgent(fastLaunch.command, launchArgs, buildFastEnvironment(prepared), child => {
-                    if (hubSelfAgent && typeof process.send === 'function') {
-                        process.send({
-                            type: HUB_SELF_AGENT_READY_MESSAGE,
-                            agentPid: Number(child.pid || 0)
-                        });
-                    }
-                    updateAgentDashboard({
+                result = await spawnAgent(fastLaunch.command, launchArgs, buildFastEnvironment(prepared), child => {
+                    if (hubSelfAgent && typeof process.send === 'function') {
+                        process.send({
+                            type: HUB_SELF_AGENT_READY_MESSAGE,
+                            agentPid: Number(child.pid || 0)
+                        });
+                    }
+                    updateAgentDashboard({
                         engine: 'fast',
                         command: fastLaunch.command,
                         args: redactAgentArgs(launchArgs),
@@ -5277,7 +5277,8 @@ export async function runClientRuntime(argv = process.argv.slice(2), runtimeOpti
             console.log(`[LiveDesk Client] Restarting Agent after ${restart.reason}.`);
             continue;
         }
-        if (result?.signal) {
+        const terminalShutdownRequested = disposeAgentTerminationHandlers.isTerminating?.() === true;
+        if (result?.signal && terminalShutdownRequested) {
             connectionPage?.close?.();
             process.kill(process.pid, result.signal);
             return;
@@ -5295,7 +5296,9 @@ export async function runClientRuntime(argv = process.argv.slice(2), runtimeOpti
             }
             console.error(pairChanged
                 ? 'LiveDesk Hub pair token changed. Refreshing Hub discovery now.'
-                : 'LiveDesk Hub connection ended. Looking for the current Hub now.');
+                : result?.signal
+                    ? `LiveDesk Agent ended unexpectedly with signal ${result.signal}. Keeping the Client alive and reconnecting to the Hub now.`
+                    : 'LiveDesk Hub connection ended. Looking for the current Hub now.');
             connectionPage?.update({
                 agent: {
                     requestedEngine: prepared.engine,
@@ -5307,19 +5310,24 @@ export async function runClientRuntime(argv = process.argv.slice(2), runtimeOpti
             });
             continue;
         }
+        if (result?.signal) {
+            connectionPage?.close?.();
+            process.kill(process.pid, result.signal);
+            return;
+        }
         connectionPage?.close?.();
         process.exit(result?.code ?? 0);
     }
 }
 
-if (process.argv[1] && resolve(process.argv[1]) === resolve(fileURLToPath(import.meta.url))) {
-    if (isHubSelfAgentRuntime()) {
-        process.on('message', message => {
-            if (message?.type !== HUB_SELF_AGENT_SHUTDOWN_MESSAGE) return;
-            requestClientRuntimeShutdown(message?.signal === 'SIGINT' ? 'SIGINT' : 'SIGTERM');
-        });
-    }
-    runClientRuntime().catch(error => {
+if (process.argv[1] && resolve(process.argv[1]) === resolve(fileURLToPath(import.meta.url))) {
+    if (isHubSelfAgentRuntime()) {
+        process.on('message', message => {
+            if (message?.type !== HUB_SELF_AGENT_SHUTDOWN_MESSAGE) return;
+            requestClientRuntimeShutdown(message?.signal === 'SIGINT' ? 'SIGINT' : 'SIGTERM');
+        });
+    }
+    runClientRuntime().catch(error => {
         console.error(error?.message || error);
         process.exit(1);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.245",
+  "version": "0.1.247",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -42,10 +42,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.443",
-    "@livedesk/fast-osx-arm64": "0.1.443",
-    "@livedesk/fast-osx-x64": "0.1.443",
-    "@livedesk/fast-win-x64": "0.1.443"
+    "@livedesk/fast-linux-x64": "0.1.444",
+    "@livedesk/fast-osx-arm64": "0.1.444",
+    "@livedesk/fast-osx-x64": "0.1.444",
+    "@livedesk/fast-win-x64": "0.1.444"
   },
   "publishConfig": {
     "access": "public"

package/src/runtime/agent-process-lifecycle.js

@@ -856,5 +856,6 @@ export function installAgentTerminationHandlers({
         const normalizedSignal = signal === 'SIGINT' ? 'SIGINT' : 'SIGTERM';
         handlers.get(normalizedSignal)?.();
     };
+    dispose.isTerminating = () => terminating;
     return dispose;
 }