@livedesk/client 0.1.241 → 0.1.242

package/bin/livedesk-client-fast.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';

package/bin/livedesk-client-node.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import net from 'net';
 import os from 'os';

package/bin/livedesk-client.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import { randomBytes } from 'node:crypto';
 import { chmodSync, existsSync, mkdirSync, readFileSync, renameSync, rmSync, statfsSync, statSync, writeFileSync } from 'node:fs';
@@ -143,9 +143,16 @@ function publishWindowsOwnedAgentRecords(records, {
     }
 }
 
-export function requestClientRuntimeShutdown(signal = 'SIGTERM') {
-    disposeAgentTerminationHandlers.requestTermination(signal);
-}
+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;
@@ -4111,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();
     }
@@ -4375,7 +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
+    };
+}
 
 function getFastRuntime() {
     const platform = os.platform();
@@ -4858,9 +4904,10 @@ function spawnAgent(command, args, env = process.env, onStart = null) {
         windowsHide: true
     });
     child.livedeskOwnsProcessGroup = ownsProcessGroup;
-    child.livedeskWindowsTreeTracker = createWindowsProcessTreeTracker(child, {
-        spawnedAtMs: agentSpawnedAtMs,
-        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
     });
@@ -4959,8 +5006,9 @@ export function requiresFastTransport(prepared = {}) {
         || prepared.relayExplicit === true;
 }
 
-export async function runClientRuntime(argv = process.argv.slice(2), runtimeOptions = {}) {
-    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();
     }
@@ -4977,9 +5025,11 @@ export async function runClientRuntime(argv = process.argv.slice(2), runtimeOpti
     if (parsed.updateWaitPid) {
         await waitForProcessExit(parsed.updateWaitPid);
     }
-    writeClientUpdateRuntimeStage('launcher-started', {
-        restartVerified: false
-    });
+    if (!hubSelfAgent) {
+        writeClientUpdateRuntimeStage('launcher-started', {
+            restartVerified: false
+        });
+    }
     if (parsed.help) {
         printHelp();
         return;
@@ -5015,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)) {
+    if (isTruthy(process.env.LIVEDESK_UNIFIED_RUNTIME) && !hubSelfAgent) {
         let resolveStarted;
         let rejectStarted;
         const started = new Promise((resolve, reject) => {
@@ -5052,7 +5102,9 @@ export async function runClientRuntime(argv = process.argv.slice(2), runtimeOpti
         if (savedSlot) {
             parsed.slot = savedSlot;
         }
-        const prepared = 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,
@@ -5106,8 +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 => {
-                    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),
@@ -5254,8 +5312,14 @@ export async function runClientRuntime(argv = process.argv.slice(2), runtimeOpti
     }
 }
 
-if (process.argv[1] && resolve(process.argv[1]) === resolve(fileURLToPath(import.meta.url))) {
-    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.241",
+  "version": "0.1.242",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {
@@ -42,10 +42,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.440",
-    "@livedesk/fast-osx-arm64": "0.1.440",
-    "@livedesk/fast-osx-x64": "0.1.440",
-    "@livedesk/fast-win-x64": "0.1.440"
+    "@livedesk/fast-linux-x64": "0.1.440",
+    "@livedesk/fast-osx-arm64": "0.1.440",
+    "@livedesk/fast-osx-x64": "0.1.440",
+    "@livedesk/fast-win-x64": "0.1.440"
   },
   "publishConfig": {
     "access": "public"