@livedesk/client 0.1.64 → 0.1.65

package/bin/livedesk-client.js

@@ -429,6 +429,10 @@ function writeSavedSessionToFile(session) {
     return true;
 }
 
+function clearSavedSession() {
+    rmSync(CLIENT_AUTH_PATH, { force: true });
+}
+
 async function createSupabaseClient() {
     const { createClient } = await import('@supabase/supabase-js');
     return createClient(SUPABASE_URL, SUPABASE_PUBLISHABLE_KEY, {
@@ -466,6 +470,14 @@ function getNestedErrorMessage(error) {
     return messages.join(' ');
 }
 
+function isInvalidRefreshTokenError(error) {
+    const code = getNestedErrorCode(error).toLowerCase();
+    const message = getNestedErrorMessage(error);
+    return code === 'refresh_token_not_found'
+        || code === 'invalid_grant'
+        || /invalid refresh token|refresh token not found/i.test(message);
+}
+
 function isTransientNetworkError(error) {
     const code = getNestedErrorCode(error).toUpperCase();
     if (['ENOTFOUND', 'EAI_AGAIN', 'ECONNRESET', 'ECONNREFUSED', 'ETIMEDOUT', 'ENETUNREACH', 'EHOSTUNREACH'].includes(code)) {
@@ -483,8 +495,18 @@ function formatDiscoveryError(error) {
 }
 
 async function refreshSessionIfNeeded(supabase) {
-    const { data: existing } = await supabase.auth.getSession();
-    const session = existing?.session || readSavedSessionFromFile();
+    let existingSession = null;
+    try {
+        const { data: existing } = await supabase.auth.getSession();
+        existingSession = existing?.session || null;
+    } catch (error) {
+        if (isInvalidRefreshTokenError(error)) {
+            clearSavedSession();
+            return null;
+        }
+        throw error;
+    }
+    const session = existingSession || readSavedSessionFromFile();
     if (!session?.access_token) {
         return null;
     }
@@ -495,6 +517,10 @@ async function refreshSessionIfNeeded(supabase) {
     }
     const { data, error } = await supabase.auth.refreshSession(session);
     if (error) {
+        if (isInvalidRefreshTokenError(error)) {
+            clearSavedSession();
+            return null;
+        }
         throw error;
     }
     const refreshed = data?.session || session;
@@ -1947,7 +1973,7 @@ async function startConnectionChoiceServer(supabase, options = {}) {
                     await supabase.auth.signOut();
                 } catch {
                 }
-                rmSync(CLIENT_AUTH_PATH, { force: true });
+                clearSavedSession();
                 clearSavedPin();
                 dashboardState.choice = null;
                 dashboardState.loggedOut = true;
@@ -1980,11 +2006,22 @@ async function startConnectionChoiceServer(supabase, options = {}) {
 
             if (requestUrl.pathname === '/google') {
                 pendingStartup = normalizeStartupChoice(requestUrl.searchParams.get('startup'), pendingStartup);
-                const { data: existing } = await supabase.auth.getSession();
-                if (existing?.session?.access_token) {
-                    writeSavedSessionToFile(existing.session);
+                let existingSession = null;
+                try {
+                    const { data: existing } = await supabase.auth.getSession();
+                    existingSession = existing?.session || null;
+                } catch (err) {
+                    if (isInvalidRefreshTokenError(err)) {
+                        clearSavedSession();
+                    } else {
+                        handleError(res, err);
+                        return;
+                    }
+                }
+                if (existingSession?.access_token) {
+                    writeSavedSessionToFile(existingSession);
                     applyStartupPreference(pendingStartup, startupArgs);
-                    const choice = { type: 'google', session: existing.session };
+                    const choice = { type: 'google', session: existingSession };
                     complete(choice, 'LiveDesk client dashboard', 'Signed in. The client is starting automatically.');
                     res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
                     res.end(renderDashboard());

package/package.json

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