@livedesk/client 0.1.12 → 0.1.14

package/README.md

@@ -7,10 +7,11 @@ npx @livedesk/client
 npx @livedesk/client 3
 ```
 
-The default flow opens Google sign-in, finds the active LiveDesk manager
-published by the same account, and connects locally. Omit the number for
-first-available placement, or pass `1` to `999` to pin this machine to a screen
-wall slot.
+The default flow opens Google sign-in, waits for the active LiveDesk manager
+published by the same account, and connects locally. If the manager is not
+ready yet, the client keeps checking every 5 seconds instead of exiting. Omit the
+number for first-available placement, or pass `1` to `999` to pin this machine
+to a screen wall slot.
 
 On the manager computer, open the LiveDesk dashboard and sign in first. The
 dashboard keeps its local hub address and private pair token refreshed in the

package/bin/livedesk-client.js

@@ -30,8 +30,9 @@ Usage:
   npx @livedesk/client 3
 
 Default flow:
-  Opens Google sign-in, finds the signed-in manager, and connects locally.
+  Opens Google sign-in, waits for the signed-in manager, and connects locally.
   Omit the number for first-available placement, or pass 1-999 to pin a slot.
+  If no manager is active yet, the client keeps checking every 5 seconds.
 
 Options:
   --slot <number>                 Screen wall slot number for this computer.
@@ -259,7 +260,7 @@ async function createSupabaseClient() {
     const { createClient } = await import('@supabase/supabase-js');
     return createClient(SUPABASE_URL, SUPABASE_PUBLISHABLE_KEY, {
         auth: {
-            autoRefreshToken: false,
+            autoRefreshToken: true,
             persistSession: true,
             detectSessionInUrl: false,
             flowType: 'pkce',
@@ -492,13 +493,17 @@ function canConnectToEndpoint(endpoint, timeoutMs = 1200) {
     });
 }
 
-async function chooseReachableEndpoint(candidates) {
+function sleep(ms) {
+    return new Promise(resolve => setTimeout(resolve, ms));
+}
+
+async function chooseReachableEndpoint(candidates, options = {}) {
     for (const endpoint of candidates) {
         if (await canConnectToEndpoint(endpoint)) {
             return endpoint;
         }
     }
-    return candidates[0] || DEFAULT_MANAGER;
+    return options.requireReachable ? '' : (candidates[0] || DEFAULT_MANAGER);
 }
 
 function normalizeEndpointCandidates(target) {
@@ -509,7 +514,7 @@ function normalizeEndpointCandidates(target) {
     return [...new Set(rawCandidates.map(value => String(value || '').trim()).filter(Boolean))];
 }
 
-async function resolveManagerFromSupabase(supabase) {
+async function resolveManagerFromSupabase(supabase, options = {}) {
     const { data, error } = await supabase
         .from('livedesk_remote_host_targets')
         .select('endpoint, endpoint_candidates, pair_token, active, expires_at, updated_at, manager_version')
@@ -531,7 +536,10 @@ async function resolveManagerFromSupabase(supabase) {
     if (endpointCandidates.length === 0) {
         throw new Error('The LiveDesk manager record does not contain a reachable local address.');
     }
-    const manager = await chooseReachableEndpoint(endpointCandidates);
+    const manager = await chooseReachableEndpoint(endpointCandidates, { requireReachable: options.requireReachable === true });
+    if (!manager) {
+        throw new Error(`No reachable LiveDesk manager endpoint yet. Checked ${endpointCandidates.join(', ')}.`);
+    }
     return {
         manager,
         pair: data.pair_token,
@@ -539,6 +547,28 @@ async function resolveManagerFromSupabase(supabase) {
     };
 }
 
+async function waitForManagerFromSupabase(supabase, options = {}) {
+    const intervalMs = Math.max(1000, Number(options.intervalMs || 5000));
+    const intervalSeconds = Math.max(1, Math.round(intervalMs / 1000));
+    let attempts = 0;
+    let lastMessage = '';
+    console.log(`Waiting for a LiveDesk manager. This client will keep trying every ${intervalSeconds}s.`);
+    while (true) {
+        attempts += 1;
+        try {
+            return await resolveManagerFromSupabase(supabase, { requireReachable: true });
+        } catch (err) {
+            const message = err instanceof Error ? err.message : String(err);
+            if (message !== lastMessage || attempts === 1 || attempts % 6 === 0) {
+                const suffix = attempts === 1 ? '' : ` attempt ${attempts}`;
+                console.log(`Still waiting for LiveDesk manager${suffix}: ${message}`);
+                lastMessage = message;
+            }
+            await sleep(intervalMs);
+        }
+    }
+}
+
 async function prepareLoginConnection(parsed) {
     if (parsed.logout) {
         rmSync(CLIENT_AUTH_PATH, { force: true });
@@ -556,7 +586,7 @@ async function prepareLoginConnection(parsed) {
         const session = await signInWithGoogle(supabase, { authPort: parsed.authPort });
         const email = session.user?.email ? ` as ${session.user.email}` : '';
         console.log(`Signed in to LiveDesk${email}.`);
-        const resolved = await resolveManagerFromSupabase(supabase);
+        const resolved = await waitForManagerFromSupabase(supabase);
         manager = resolved.manager;
         pair = resolved.pair;
         console.log(`Found LiveDesk manager at ${manager}.`);

package/package.json

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