@livedesk/client 0.1.207 → 0.1.208

package/bin/livedesk-client.js

@@ -47,8 +47,7 @@ const FRESH_REGISTRY_TIMEOUT_MAX_MS = 10000;
 // polling must stay interactive instead of backing off to multi-minute waits.
 const DISCOVERY_RETRY_SCHEDULE_MS = [750, 750, 750, 750, 750, 750, 750, 750, 5000];
 const DISCOVERY_RETRY_JITTER_RATIO = 0.2;
-const HUB_WAKE_QUERY_JITTER_MAX_MS = 2000;
-const EXIT_INVALID_PAIR_TOKEN = 23;
+const EXIT_INVALID_PAIR_TOKEN = 23;
 const EXIT_CLIENT_UPDATE = 42;
 const SESSION_REFRESH_SKEW_SECONDS = 60;
 const HUB_TARGET_CACHE_MAX_AGE_MS = 30 * 24 * 60 * 60 * 1000;
@@ -2706,9 +2705,10 @@ export async function resolveManagerFromPin(supabase, pin, options = {}) {
         allowRelayFallback: options.allowRelayFallback === true,
         relayEndpoint: options.relayEndpoint,
         probeEndpoint: options.probeEndpoint,
-        resolveFreshTarget: async () => {
+        resolveFreshTarget: async signal => {
             const { data, error } = await supabase.functions.invoke('livedesk-resolve-remote-host', {
-                body: { pin: normalizedPin }
+                body: { pin: normalizedPin },
+                signal
             });
             if (error) {
                 throw await normalizePinResolverInvocationError(error);
@@ -3667,28 +3667,73 @@ export function resolveManagerFromCachedRelayFallback(ownerKey, options = {}) {
     };
 }
 
+function normalizeFreshRegistryTimeoutMs(value) {
+    const configured = Number(value);
+    return Number.isFinite(configured)
+        ? Math.max(FRESH_REGISTRY_TIMEOUT_MIN_MS, Math.min(FRESH_REGISTRY_TIMEOUT_MAX_MS, configured))
+        : FRESH_REGISTRY_TIMEOUT_MS;
+}
+
+export async function runFreshHubRegistryLookup(resolveFreshTarget, options = {}) {
+    if (typeof resolveFreshTarget !== 'function') {
+        throw createHubDiscoveryError(
+            'fresh-registry-resolver-required',
+            'Fresh Hub registry resolver is required.'
+        );
+    }
+    const timeoutMs = normalizeFreshRegistryTimeoutMs(options.timeoutMs);
+    const controller = new AbortController();
+    let timeoutHandle = null;
+    const lookupOutcome = Promise.resolve()
+        .then(() => resolveFreshTarget(controller.signal))
+        .then(
+            target => ({ type: 'target', target }),
+            error => ({ type: 'error', error })
+        );
+    const timeoutOutcome = new Promise(resolveTimeout => {
+        timeoutHandle = setTimeout(
+            () => resolveTimeout({ type: 'timeout' }),
+            timeoutMs
+        );
+    });
+    const outcomes = [lookupOutcome, timeoutOutcome];
+    if (options.wakePromise && typeof options.wakePromise.then === 'function') {
+        outcomes.push(Promise.resolve(options.wakePromise).then(
+            event => ({ type: 'hub-online', event }),
+            () => new Promise(() => {})
+        ));
+    }
+    const outcome = await Promise.race(outcomes).finally(() => {
+        clearTimeout(timeoutHandle);
+    });
+    if (outcome.type === 'hub-online') {
+        controller.abort('hub-online');
+        return outcome;
+    }
+    if (outcome.type === 'timeout') {
+        controller.abort('hub-registry-timeout');
+        throw createHubDiscoveryError(
+            'hub-registry-timeout',
+            `Fresh LiveDesk Hub registry lookup exceeded ${timeoutMs}ms.`
+        );
+    }
+    if (outcome.type === 'error') {
+        controller.abort('hub-registry-error');
+        throw outcome.error;
+    }
+    return outcome;
+}
+
 export async function resolveManagerWithCachedRecovery(ownerKey, options = {}) {
     const cached = Object.prototype.hasOwnProperty.call(options, 'cachedTarget')
         ? normalizeCachedHubTarget(options.cachedTarget, ownerKey, options.now)
         : readCachedHubTarget(ownerKey);
     try {
-        if (typeof options.resolveFreshTarget !== 'function') {
-            throw createHubDiscoveryError('fresh-registry-resolver-required', 'Fresh Hub registry resolver is required.');
-        }
-        const configuredFreshTimeoutMs = Number(options.freshTimeoutMs);
-        const freshTimeoutMs = Number.isFinite(configuredFreshTimeoutMs)
-            ? Math.max(FRESH_REGISTRY_TIMEOUT_MIN_MS, Math.min(FRESH_REGISTRY_TIMEOUT_MAX_MS, configuredFreshTimeoutMs))
-            : FRESH_REGISTRY_TIMEOUT_MS;
-        let timeoutHandle = null;
-        const fresh = await Promise.race([
-            Promise.resolve().then(() => options.resolveFreshTarget()),
-            new Promise((_, reject) => {
-                timeoutHandle = setTimeout(() => reject(createHubDiscoveryError(
-                    'hub-registry-timeout',
-                    `Fresh LiveDesk Hub registry lookup exceeded ${freshTimeoutMs}ms.`
-                )), freshTimeoutMs);
-            })
-        ]).finally(() => clearTimeout(timeoutHandle));
+        const freshOutcome = await runFreshHubRegistryLookup(
+            options.resolveFreshTarget,
+            { timeoutMs: options.freshTimeoutMs }
+        );
+        const fresh = freshOutcome.target;
         if (!fresh?.manager || !fresh?.pair) {
             throw createHubDiscoveryError('fresh-registry-target-invalid', 'Fresh Hub registry target is incomplete.');
         }
@@ -3770,12 +3815,21 @@ function normalizeEndpointCandidates(target) {
 }
 
 export async function resolveManagerFromSupabase(supabase, options = {}) {
-    await refreshSessionIfNeeded(supabase);
-    const { data, error } = await supabase
-        .from('livedesk_remote_host_targets')
-        .select('node_id, endpoint, endpoint_candidates, pair_token, active, expires_at, updated_at, manager_version')
-        .eq('product_key', 'livedesk')
-        .maybeSingle();
+    if (options.signal?.aborted) {
+        throw createHubDiscoveryError('hub-registry-aborted', 'LiveDesk Hub registry lookup was cancelled.');
+    }
+    await refreshSessionIfNeeded(supabase);
+    if (options.signal?.aborted) {
+        throw createHubDiscoveryError('hub-registry-aborted', 'LiveDesk Hub registry lookup was cancelled.');
+    }
+    let query = supabase
+        .from('livedesk_remote_host_targets')
+        .select('node_id, endpoint, endpoint_candidates, pair_token, active, expires_at, updated_at, manager_version')
+        .eq('product_key', 'livedesk');
+    if (options.signal && typeof query.abortSignal === 'function') {
+        query = query.abortSignal(options.signal);
+    }
+    const { data, error } = await query.maybeSingle();
     if (error) {
         throw error;
     }
@@ -3849,9 +3903,12 @@ async function registerClientDeviceWithSupabase(supabase, options = {}) {
     }
 }
 
-async function waitForManagerFromSupabase(supabase, options = {}) {
+export async function waitForManagerFromSupabase(supabase, options = {}) {
     const configuredIntervalMs = Number(options.intervalMs || 0);
     const shouldStop = typeof options.shouldStop === 'function' ? options.shouldStop : () => false;
+    const createWakeListener = typeof options.createWakeListener === 'function'
+        ? options.createWakeListener
+        : createHubWakeListener;
     let attempts = 0;
     let lastMessage = '';
     let wakeListener = null;
@@ -3862,6 +3919,17 @@ async function waitForManagerFromSupabase(supabase, options = {}) {
             if (shouldStop()) {
                 return null;
             }
+            if (!wakeListener) {
+                try {
+                    wakeListener = await createWakeListener({
+                        getAccessToken: async () => (await refreshSessionIfNeeded(supabase))?.access_token || ''
+                    });
+                } catch (error) {
+                    if (attempts === 0) {
+                        console.warn(`[LiveDesk Client] Hub-online event channel unavailable; adaptive registry retries remain active: ${error?.message || error}`);
+                    }
+                }
+            }
             attempts += 1;
             try {
                 if (initialError) {
@@ -3869,9 +3937,24 @@ async function waitForManagerFromSupabase(supabase, options = {}) {
                     initialError = null;
                     throw error;
                 }
-                return await resolveManagerFromSupabase(supabase, {
-                    allowRelayFallback: options.allowRelayFallback === true
-                });
+                const outcome = await runFreshHubRegistryLookup(
+                    signal => resolveManagerFromSupabase(supabase, {
+                        allowRelayFallback: options.allowRelayFallback === true,
+                        probeEndpoint: options.probeEndpoint,
+                        signal
+                    }),
+                    {
+                        timeoutMs: options.freshTimeoutMs,
+                        wakePromise: wakeListener?.promise
+                    }
+                );
+                if (outcome.type === 'hub-online') {
+                    wakeListener?.close();
+                    wakeListener = null;
+                    console.log('[LiveDesk Client] Hub-online event received. Rechecking the registry now.');
+                    continue;
+                }
+                return outcome.target;
             } catch (err) {
                 const message = formatDiscoveryError(err);
                 if (message !== lastMessage || attempts === 1 || attempts % 6 === 0) {
@@ -3881,18 +3964,6 @@ async function waitForManagerFromSupabase(supabase, options = {}) {
                 }
             }
 
-            if (!wakeListener) {
-                try {
-                    wakeListener = await createHubWakeListener({
-                        getAccessToken: async () => (await refreshSessionIfNeeded(supabase))?.access_token || ''
-                    });
-                } catch (error) {
-                    if (attempts === 1) {
-                        console.warn(`[LiveDesk Client] Hub-online event channel unavailable; adaptive registry retries remain active: ${error?.message || error}`);
-                    }
-                }
-            }
-
             const trigger = await waitForDiscoveryTrigger(
                 getDiscoveryRetryDelay(attempts, configuredIntervalMs),
                 wakeListener?.promise,
@@ -3901,9 +3972,7 @@ async function waitForManagerFromSupabase(supabase, options = {}) {
             if (trigger.type === 'hub-online') {
                 wakeListener?.close();
                 wakeListener = null;
-                const jitterMs = Math.floor(Math.random() * (HUB_WAKE_QUERY_JITTER_MAX_MS + 1));
-                console.log(`[LiveDesk Client] Hub-online event received. Rechecking the registry in ${jitterMs}ms.`);
-                await waitForDiscoveryTrigger(jitterMs, null, shouldStop);
+                console.log('[LiveDesk Client] Hub-online event received. Rechecking the registry now.');
             }
         }
     } finally {
@@ -3993,7 +4062,7 @@ async function prepareLoginConnection(parsed, existingConnectionPage = null) {
                 resolved = await resolveManagerWithCachedRecovery(cacheOwnerKey, {
                     allowRelayFallback,
                     relayEndpoint: parsed.relay,
-                    resolveFreshTarget: async () => {
+                    resolveFreshTarget: async signal => {
                         // The signed registry is authoritative for Hub replacement
                         // and pair-token rotation. Cache direct/relay recovery is
                         // considered only after this one current lookup reports
@@ -4006,7 +4075,8 @@ async function prepareLoginConnection(parsed, existingConnectionPage = null) {
                             console.warn('[LiveDesk Client] Another auth owner rotated the refresh token. Keeping the runtime alive while the saved session catches up.');
                         }
                         return await resolveManagerFromSupabase(supabase, {
-                            allowRelayFallback
+                            allowRelayFallback,
+                            signal
                         });
                     }
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.207",
+  "version": "0.1.208",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {