livedesk 0.1.605 → 0.1.607

package/electron/main.mjs

@@ -6,7 +6,7 @@ import { spawn } from 'node:child_process';
 import { createRequire } from 'node:module';
 import { createProductUpdateManager } from './update-manager.mjs';
 import { createRecurringProductUpdateOwner } from './recurring-update-owner.mjs';
-import { createPkceAuthorizationUrl, exchangePkceCode, fetchSupabaseUser, parsePkceCallbackUrl, refreshSupabaseSession } from './oauth-pkce.mjs';
+import { AUTH_REQUEST_TIMEOUT_MS, createPkceAuthorizationUrl, exchangePkceCode, fetchSupabaseUser, parsePkceCallbackUrl, refreshSupabaseSession } from './oauth-pkce.mjs';
 import { getRuntimeAuthEnvironment, resolveDesktopAuthConfig, resolveDesktopBuildFlavor } from './auth-config.mjs';
 import { createBoundedDesktopLogger } from './bounded-desktop-log.mjs';
 import {
@@ -671,46 +671,59 @@ async function prepareRuntimeForUpdateInstall() {
     throw new Error('desktop-update-install-already-started');
   }
   updateInstallSequenceStarted = true;
-  isQuitting = true;
-  recurringProductUpdates?.stop();
-  try {
-    await stopRuntime();
-  } catch (error) {
-    updateInstallSequenceStarted = false;
-    isQuitting = false;
-    throw error;
-  }
+  isQuitting = true;
+  recurringProductUpdates?.stop();
+  try {
+    await quiesceDesktopAuthOwner('desktop-update-install');
+    await stopRuntime();
+  } catch (error) {
+    updateInstallSequenceStarted = false;
+    isQuitting = false;
+    scheduleDesktopAuthRefresh(readEncryptedSession());
+    throw error;
+  }
 }
 
 async function recoverRuntimeAfterUpdateInstallError(error) {
   log(`desktop update install launch failed after runtime drain: ${error?.message || error}`);
-  updateInstallSequenceStarted = false;
-  isQuitting = false;
-  if (!runtimeChild) {
+  updateInstallSequenceStarted = false;
+  isQuitting = false;
+  scheduleDesktopAuthRefresh(readEncryptedSession());
+  if (!runtimeChild) {
     startRuntime();
     const ready = await waitForRuntime();
     if (ready) mainWindow?.loadURL(LOCAL_RUNTIME_URL);
   }
 }
 
-async function syncSessionToRuntime(session) {
-  const normalized = normalizeSession(session);
-  if (!normalized) throw new Error('oauth-session-invalid');
-  const csrfToken = await getRuntimeCsrfToken();
-  const response = await fetch(`${LOCAL_RUNTIME_URL}api/auth/session`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      ...(csrfToken ? { 'X-LiveDesk-CSRF': csrfToken } : {})
-    },
-    body: JSON.stringify({
-      accessToken: normalized.access_token,
-      refreshToken: normalized.refresh_token,
-      expiresAt: normalized.expires_at,
-      userId: normalized.user?.id,
-      user: { id: normalized.user?.id, email: normalized.user?.email }
-    })
-  });
+async function syncSessionToRuntime(session) {
+  const normalized = normalizeSession(session);
+  if (!normalized) throw new Error('oauth-session-invalid');
+  const deadline = Date.now() + AUTH_REQUEST_TIMEOUT_MS + 2_500;
+  const csrfToken = await getRuntimeCsrfToken(Math.min(deadline, Date.now() + 2_500));
+  const response = await fetchBeforeRuntimeDeadline(
+    fetch,
+    `${LOCAL_RUNTIME_URL}api/auth/session`,
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        ...(csrfToken ? { 'X-LiveDesk-CSRF': csrfToken } : {})
+      },
+      body: JSON.stringify({
+        accessToken: normalized.access_token,
+        refreshToken: normalized.refresh_token,
+        expiresAt: normalized.expires_at,
+        userId: normalized.user?.id,
+        user: { id: normalized.user?.id, email: normalized.user?.email }
+      })
+    },
+    {
+      deadline,
+      maxDurationMs: Math.min(AUTH_REQUEST_TIMEOUT_MS, remainingRuntimeDeadlineMs(deadline)),
+      label: 'runtime-auth-sync-deadline'
+    }
+  );
   if (!response.ok) {
     const payload = await response.json().catch(() => ({}));
     throw new Error(String(payload?.error || `runtime-session-sync-failed:${response.status}`));
@@ -854,18 +867,29 @@ async function restoreEncryptedSessionOwned({ syncRuntime = true } = {}) {
   return session;
 }
 
-async function restoreEncryptedSession(options = {}) {
-  if (desktopSessionRestorePromise) return desktopSessionRestorePromise;
-  const operation = restoreEncryptedSessionOwned(options);
+async function restoreEncryptedSession(options = {}) {
+  if (desktopSessionRestorePromise) return desktopSessionRestorePromise;
+  if (isQuitting) return readEncryptedSession();
+  const operation = restoreEncryptedSessionOwned(options);
   desktopSessionRestorePromise = operation;
   try {
     return await operation;
   } finally {
     if (desktopSessionRestorePromise === operation) desktopSessionRestorePromise = null;
-  }
-}
-
-async function signOutDesktopSession() {
+  }
+}
+
+async function quiesceDesktopAuthOwner(reason = 'application-exit') {
+  clearDesktopAuthRefreshTimer();
+  while (desktopSessionRestorePromise) {
+    const pending = desktopSessionRestorePromise;
+    log(`waiting for secure auth owner before ${reason}`);
+    await pending;
+    if (desktopSessionRestorePromise === pending) break;
+  }
+}
+
+async function signOutDesktopSession() {
   desktopSessionEpoch += 1;
   desktopAuthInvalidationGuard.observeSuccess();
   clearEncryptedSession();
@@ -1071,19 +1095,21 @@ function registerIpc() {
     if (quitSequenceStarted || updateInstallSequenceStarted) {
       return { ok: false, error: 'application-exit-already-started' };
     }
-    quitSequenceStarted = true;
-    isQuitting = true;
-    try {
-      await stopRuntime();
+    quitSequenceStarted = true;
+    isQuitting = true;
+    try {
+      await quiesceDesktopAuthOwner('application-restart');
+      await stopRuntime();
       await desktopClipboardOwner?.close();
       await closeDesktopLog();
       app.relaunch();
       app.exit(0);
       return { ok: true };
-    } catch (error) {
-      isQuitting = false;
-      quitSequenceStarted = false;
-      updateTray('Runtime cleanup blocked');
+    } catch (error) {
+      isQuitting = false;
+      quitSequenceStarted = false;
+      scheduleDesktopAuthRefresh(readEncryptedSession());
+      updateTray('Runtime cleanup blocked');
       log(`runtime cleanup blocked application restart: ${error?.message || error}`);
       if (!runtimeChild) {
         startRuntime();
@@ -1277,19 +1303,22 @@ if (!app.requestSingleInstanceLock()) {
     if (quitSequenceStarted) return;
     event.preventDefault();
     recurringProductUpdates?.stop();
-    quitSequenceStarted = true;
-    isQuitting = true;
-    void stopRuntime().then(() => {
-      return desktopClipboardOwner?.close();
+    quitSequenceStarted = true;
+    isQuitting = true;
+    void quiesceDesktopAuthOwner('application-quit').then(() => {
+      return stopRuntime();
+    }).then(() => {
+      return desktopClipboardOwner?.close();
     }).then(() => {
       return closeDesktopLog();
     }).then(() => {
       app.quit();
     }).catch(error => {
-      isQuitting = false;
-      quitSequenceStarted = false;
-      updateInstallSequenceStarted = false;
-      updateTray('Runtime cleanup blocked');
+      isQuitting = false;
+      quitSequenceStarted = false;
+      updateInstallSequenceStarted = false;
+      scheduleDesktopAuthRefresh(readEncryptedSession());
+      updateTray('Runtime cleanup blocked');
       log(`runtime cleanup blocked application quit: ${error?.message || error}`);
     });
   });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "livedesk",
-  "version": "0.1.605",
-  "livedeskClientVersion": "0.1.260",
+  "version": "0.1.607",
+  "livedeskClientVersion": "0.1.262",
   "buildFlavor": "production",
   "description": "VuvoDesk Hub and client launcher",
   "type": "module",
@@ -51,10 +51,10 @@
     "ws": "^8.18.3"
   },
   "optionalDependencies": {
-    "@livedesk/fast-linux-x64": "0.1.457",
-    "@livedesk/fast-osx-arm64": "0.1.457",
-    "@livedesk/fast-osx-x64": "0.1.457",
-    "@livedesk/fast-win-x64": "0.1.457"
+    "@livedesk/fast-linux-x64": "0.1.458",
+    "@livedesk/fast-osx-arm64": "0.1.458",
+    "@livedesk/fast-osx-x64": "0.1.458",
+    "@livedesk/fast-win-x64": "0.1.458"
   },
   "publishConfig": {
     "access": "public"

package/web/dist/app.webmanifest

@@ -4,7 +4,7 @@
   "short_name": "VuvoDesk",
   "description": "Monitor and control your VuvoDesk computers from your phone.",
   "lang": "en",
-  "start_url": "/app?pwa=0.1.605",
+  "start_url": "/app?pwa=0.1.607",
   "scope": "/",
   "display": "standalone",
   "orientation": "any",