@livedesk/client 0.1.58 → 0.1.60

package/bin/livedesk-client.js

@@ -406,6 +406,29 @@ function createFileStorage(filePath) {
     };
 }
 
+function readSavedSessionFromFile() {
+    try {
+        const state = JSON.parse(readFileSync(CLIENT_AUTH_PATH, 'utf8'));
+        const raw = state?.[CLIENT_AUTH_STORAGE_KEY];
+        if (typeof raw !== 'string' || !raw.trim()) {
+            return null;
+        }
+        const session = JSON.parse(raw);
+        return session?.access_token ? session : null;
+    } catch {
+        return null;
+    }
+}
+
+function writeSavedSessionToFile(session) {
+    if (!session?.access_token || !session?.refresh_token) {
+        return false;
+    }
+    const storage = createFileStorage(CLIENT_AUTH_PATH);
+    storage.setItem(CLIENT_AUTH_STORAGE_KEY, JSON.stringify(session));
+    return true;
+}
+
 async function createSupabaseClient() {
     const { createClient } = await import('@supabase/supabase-js');
     return createClient(SUPABASE_URL, SUPABASE_PUBLISHABLE_KEY, {
@@ -461,19 +484,22 @@ function formatDiscoveryError(error) {
 
 async function refreshSessionIfNeeded(supabase) {
     const { data: existing } = await supabase.auth.getSession();
-    const session = existing?.session;
+    const session = existing?.session || readSavedSessionFromFile();
     if (!session?.access_token) {
         return null;
     }
     const expiresAt = Number(session.expires_at || 0);
     if (expiresAt <= 0 || expiresAt - Math.floor(Date.now() / 1000) > SESSION_REFRESH_SKEW_SECONDS) {
+        writeSavedSessionToFile(session);
         return session;
     }
     const { data, error } = await supabase.auth.refreshSession(session);
     if (error) {
         throw error;
     }
-    return data?.session || session;
+    const refreshed = data?.session || session;
+    writeSavedSessionToFile(refreshed);
+    return refreshed;
 }
 
 function openBrowser(url) {
@@ -553,12 +579,16 @@ function renderOAuthCallbackPage({ title, message, tone = 'neutral' }) {
 </html>`;
 }
 
-function renderConnectionChoicePage({ error = '', pin = '', slot = '', startup = false, startupSupported = false } = {}) {
+function renderConnectionChoicePage({ autoGoogle = false, error = '', pin = '', slot = '', startup = false, startupSupported = false } = {}) {
+    const shouldAutoGoogle = Boolean(autoGoogle && !error);
     const errorBlock = error
         ? `<div class="error">${escapeHtml(error)}</div>`
         : '';
     const normalizedSlot = normalizeSlotNumber(slot);
     const slotLabel = normalizedSlot ? `Slot ${String(normalizedSlot).padStart(3, '0')}` : 'First available';
+    const footerText = shouldAutoGoogle
+        ? 'Checking Google sign-in automatically. Enter a PIN to use the PIN path.'
+        : 'This tab can stay open until the connection is ready.';
     const startupBlock = startupSupported
         ? `<label class="startup-option">
             <input id="startup-toggle" type="checkbox" ${startup ? 'checked' : ''}>
@@ -900,7 +930,7 @@ function renderConnectionChoicePage({ error = '', pin = '', slot = '', startup =
             <input id="pin-startup" type="hidden" name="startup" value="${startup ? '1' : '0'}">
             <label class="field-label">
               Hub PIN
-              <input class="pin-input" name="pin" value="${escapeHtml(pin)}" inputmode="numeric" autocomplete="one-time-code" pattern="[0-9]{6}" maxlength="6" placeholder="000000" autofocus>
+              <input class="pin-input" name="pin" value="${escapeHtml(pin)}" inputmode="numeric" autocomplete="one-time-code" pattern="[0-9]{6}" maxlength="6" placeholder="000000" ${shouldAutoGoogle ? '' : 'autofocus'}>
             </label>
             <button type="submit">Connect with PIN</button>
           </form>
@@ -910,7 +940,7 @@ function renderConnectionChoicePage({ error = '', pin = '', slot = '', startup =
             <strong>${escapeHtml(slotLabel)}</strong>
           </div>
         </section>
-        <small>This tab can stay open until the connection is ready.</small>
+        <small>${escapeHtml(footerText)}</small>
       </div>
     </main>
     <aside aria-hidden="true">
@@ -943,6 +973,35 @@ function renderConnectionChoicePage({ error = '', pin = '', slot = '', startup =
       startupToggle.addEventListener('change', syncStartupFields);
       syncStartupFields();
     }
+    const autoGoogle = ${shouldAutoGoogle ? 'true' : 'false'};
+    let autoGoogleCanceled = false;
+    function cancelAutoGoogle() {
+      autoGoogleCanceled = true;
+    }
+    const pinInput = document.querySelector('.pin-input');
+    const pinForm = document.getElementById('pin-form');
+    if (pinInput) {
+      pinInput.addEventListener('focus', cancelAutoGoogle);
+      pinInput.addEventListener('input', cancelAutoGoogle);
+      pinInput.addEventListener('keydown', cancelAutoGoogle);
+    }
+    if (pinForm) {
+      pinForm.addEventListener('submit', cancelAutoGoogle);
+    }
+    if (startupToggle) {
+      startupToggle.addEventListener('change', cancelAutoGoogle);
+    }
+    if (autoGoogle) {
+      setTimeout(() => {
+        if (autoGoogleCanceled) return;
+        const googleForm = document.getElementById('google-form');
+        if (googleForm && typeof googleForm.requestSubmit === 'function') {
+          googleForm.requestSubmit();
+        } else if (googleForm) {
+          googleForm.submit();
+        }
+      }, 900);
+    }
     async function watchAutoConnection() {
       try {
         const response = await fetch('/api/state', { cache: 'no-store' });
@@ -1392,6 +1451,7 @@ async function startConnectionChoiceServer(supabase, options = {}) {
     const startupArgs = Array.isArray(options.startupArgs) ? options.startupArgs : [];
     const savedSession = options.savedSession?.access_token ? options.savedSession : null;
     const savedPin = normalizePairingPin(options.savedPin);
+    const autoGoogle = options.autoGoogle === true;
     let pendingStartup = isWindowsStartupRegistered();
     let listeningPort = port;
     let completed = false;
@@ -1432,6 +1492,7 @@ async function startConnectionChoiceServer(supabase, options = {}) {
         }
     };
     const renderChoice = (props = {}) => renderConnectionChoicePage({
+        autoGoogle,
         slot,
         startup: pendingStartup,
         startupSupported: isWindowsStartupSupported(),
@@ -1499,6 +1560,7 @@ async function startConnectionChoiceServer(supabase, options = {}) {
         res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
         res.end(renderChoice({
             error: error instanceof Error ? error.message : String(error),
+            autoGoogle: false,
             pin
         }));
     };
@@ -1539,6 +1601,7 @@ async function startConnectionChoiceServer(supabase, options = {}) {
                 }
                 res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
                 res.end(completed ? renderDashboard() : renderChoice({
+                    autoGoogle: false,
                     error: 'Saved Google sign-in was cleared.'
                 }));
                 return;
@@ -1560,6 +1623,7 @@ async function startConnectionChoiceServer(supabase, options = {}) {
                 pendingStartup = normalizeStartupChoice(requestUrl.searchParams.get('startup'), pendingStartup);
                 const { data: existing } = await supabase.auth.getSession();
                 if (existing?.session?.access_token) {
+                    writeSavedSessionToFile(existing.session);
                     applyStartupPreference(pendingStartup, startupArgs);
                     const choice = { type: 'google', session: existing.session };
                     complete(choice, 'LiveDesk client dashboard', 'Signed in. The client is starting automatically.');
@@ -1633,6 +1697,7 @@ async function startConnectionChoiceServer(supabase, options = {}) {
                 if (!code) {
                     res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
                     res.end(renderChoice({
+                        autoGoogle: false,
                         error: 'Google did not return an auth code. Try Google sign-in again.'
                     }));
                     return;
@@ -1653,6 +1718,7 @@ async function startConnectionChoiceServer(supabase, options = {}) {
                     server.close();
                     return;
                 }
+                writeSavedSessionToFile(sessionData.session);
                 applyStartupPreference(pendingStartup, startupArgs);
                 const choice = { type: 'google', session: sessionData.session };
                 complete(choice, 'LiveDesk client dashboard', 'Signed in. The client is starting automatically.');
@@ -1663,6 +1729,7 @@ async function startConnectionChoiceServer(supabase, options = {}) {
 
             res.writeHead(404, { 'Content-Type': 'text/html; charset=utf-8' });
             res.end(renderChoice({
+                autoGoogle: false,
                 error: 'Unknown LiveDesk connection route.'
             }));
         })().catch(err => {
@@ -1721,8 +1788,11 @@ async function startConnectionChoiceServer(supabase, options = {}) {
 async function chooseClientConnection(supabase, options = {}) {
     const connectionPage = await startConnectionChoiceServer(supabase, {
         authPort: options.authPort,
+        autoGoogle: options.autoGoogle,
         slot: options.slot,
-        startupArgs: options.startupArgs
+        startupArgs: options.startupArgs,
+        savedSession: options.savedSession,
+        savedPin: options.savedPin
     });
     console.log('Opening LiveDesk connection page...');
     openBrowser(connectionPage.url);
@@ -1873,6 +1943,7 @@ async function prepareLoginConnection(parsed) {
         if (!choice) {
             choice = await chooseClientConnection(supabase, {
                 authPort: parsed.authPort,
+                autoGoogle: !savedSession?.access_token && !savedPin,
                 slot: parsed.slot,
                 startupArgs,
                 savedSession,

package/package.json

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