livedesk 0.1.573 → 0.1.575

package/electron/durable-auth-session-file.mjs

@@ -0,0 +1,104 @@
+import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs';
+import { dirname } from 'node:path';
+
+let temporaryFileSequence = 0;
+
+function writeAtomicPrivateFile(path, contents) {
+  mkdirSync(dirname(path), { recursive: true });
+  temporaryFileSequence += 1;
+  const temporaryPath = `${path}.${process.pid}.${Date.now()}.${temporaryFileSequence}.tmp`;
+  try {
+    writeFileSync(temporaryPath, contents, {
+      encoding: 'utf8',
+      mode: 0o600,
+      flush: true
+    });
+    renameSync(temporaryPath, path);
+  } finally {
+    try { rmSync(temporaryPath, { force: true }); } catch { /* best effort */ }
+  }
+}
+
+export function writeDurableAuthSessionRecord({
+  primaryPath,
+  backupPath = `${primaryPath}.backup`,
+  record
+}) {
+  if (!primaryPath || !record || typeof record !== 'object') {
+    throw new Error('durable-auth-session-write-parameters-required');
+  }
+  const contents = JSON.stringify(record, null, 2);
+  let backupError = null;
+  try {
+    writeAtomicPrivateFile(backupPath, contents);
+  } catch (error) {
+    // A mirror failure is reported to the caller, but it must not prevent the
+    // primary from preserving the successfully refreshed encrypted login.
+    backupError = error;
+  }
+  writeAtomicPrivateFile(primaryPath, contents);
+  return { backupWritten: !backupError, backupError };
+}
+
+export function readDurableAuthSessionRecord({
+  primaryPath,
+  backupPath = `${primaryPath}.backup`,
+  decode
+}) {
+  if (!primaryPath || typeof decode !== 'function') {
+    throw new Error('durable-auth-session-read-parameters-required');
+  }
+  const failures = [];
+  const candidates = [];
+  for (const candidatePath of [primaryPath, backupPath]) {
+    if (!existsSync(candidatePath)) continue;
+    try {
+      const record = JSON.parse(readFileSync(candidatePath, 'utf8'));
+      const value = decode(record);
+      if (!value) throw new Error('durable-auth-session-record-invalid');
+      const savedAt = Date.parse(String(record?.savedAt || ''));
+      candidates.push({
+        path: candidatePath,
+        record,
+        value,
+        savedAt: Number.isFinite(savedAt) ? savedAt : 0
+      });
+    } catch (error) {
+      failures.push({ path: candidatePath, error: String(error?.message || error) });
+    }
+  }
+  if (candidates.length === 0) {
+    return { value: null, recoveredFromBackup: false, primaryRepaired: false, failures };
+  }
+
+  // A refresh may finish writing the backup immediately before an interrupted
+  // primary replacement. Prefer the newest valid encrypted record so the app
+  // does not fall back to an older, already-rotated refresh token.
+  candidates.sort((left, right) => {
+    if (right.savedAt !== left.savedAt) return right.savedAt - left.savedAt;
+    if (left.path === primaryPath) return -1;
+    if (right.path === primaryPath) return 1;
+    return 0;
+  });
+  const selected = candidates[0];
+  const recoveredFromBackup = selected.path === backupPath;
+  let primaryRepaired = false;
+  if (recoveredFromBackup) {
+    try {
+      writeAtomicPrivateFile(primaryPath, JSON.stringify(selected.record, null, 2));
+      primaryRepaired = true;
+    } catch (error) {
+      failures.push({ path: primaryPath, error: String(error?.message || error) });
+    }
+  }
+  return { value: selected.value, recoveredFromBackup, primaryRepaired, failures };
+}
+
+export function clearDurableAuthSessionRecord({
+  primaryPath,
+  backupPath = `${primaryPath}.backup`
+}) {
+  for (const path of [primaryPath, backupPath]) {
+    try { rmSync(path, { force: true }); } catch { /* best effort */ }
+  }
+}

package/electron/main.mjs

@@ -1,5 +1,5 @@
 import { app, BrowserWindow, clipboard, dialog, ipcMain, Menu, nativeImage, powerMonitor, safeStorage, shell, Tray } from 'electron';
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join, resolve } from 'node:path';
 import { spawn } from 'node:child_process';
@@ -7,7 +7,12 @@ import { createProductUpdateManager } from './update-manager.mjs';
 import { createRecurringProductUpdateOwner } from './recurring-update-owner.mjs';
 import { 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 { createBoundedDesktopLogger } from './bounded-desktop-log.mjs';
+import {
+  clearDurableAuthSessionRecord,
+  readDurableAuthSessionRecord,
+  writeDurableAuthSessionRecord
+} from './durable-auth-session-file.mjs';
 import {
   DESKTOP_AUTH_RETRY_MS,
   createDesktopAuthInvalidationGuard,
@@ -42,7 +47,8 @@ import {
 // warm-idle process baseline instead of retaining a hidden utility process.
 app.commandLine.appendSwitch('disable-features', 'AudioServiceOutOfProcess');
 
-const APP_NAME = 'LiveDesk Desktop';
+const APP_NAME = 'LiveDesk Desktop';
+const appWindowTitle = () => `${APP_NAME} · ${app.getVersion()}`;
 const LOCAL_RUNTIME_PORT = Number(process.env.LIVEDESK_LOCAL_RUNTIME_PORT || 5179);
 const LOCAL_RUNTIME_URL = `http://127.0.0.1:${Number.isInteger(LOCAL_RUNTIME_PORT) && LOCAL_RUNTIME_PORT > 0 ? LOCAL_RUNTIME_PORT : 5179}/`;
 function readDesktopPackageMetadata() {
@@ -72,7 +78,8 @@ const stateRoot = configuredStateRoot
   : join(process.env.LOCALAPPDATA || join(homedir(), 'AppData', 'Local'), 'LiveDesk');
 const logDir = join(stateRoot, 'logs');
 const logPath = join(logDir, 'desktop.log');
-const authSessionPath = join(stateRoot, 'auth-session.json');
+const authSessionPath = join(stateRoot, 'auth-session.json');
+const authSessionBackupPath = join(stateRoot, 'auth-session.backup.json');
 const runtimeStateDir = process.env.LIVEDESK_STATE_DIR || join(homedir(), '.livedesk');
 try { app.setPath('userData', stateRoot); } catch { /* Electron may reject late path changes in embedded test hosts. */ }
 const appPath = app.getAppPath();
@@ -113,7 +120,8 @@ let runtimeLogoutPromise = null;
 let desktopAuthRefreshTimer = null;
 let desktopSessionRestorePromise = null;
 let lastDesktopResumeRecoveryAt = 0;
-let desktopSessionEpoch = 0;
+let desktopSessionEpoch = 0;
+let lastKnownDesktopSession = null;
 const desktopAuthInvalidationGuard = createDesktopAuthInvalidationGuard();
 const FALLBACK_ICON_DATA_URL = `data:image/svg+xml;charset=utf-8,${encodeURIComponent('<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none"><rect x="1" y="1" width="30" height="30" rx="7" fill="#111827"/><g transform="translate(5 5) scale(.785714)"><rect x="2.5" y="4" width="14" height="9" rx="1.5" stroke="#F8FAFC" stroke-width="1.7" opacity=".42"/><path d="M7 16v1.5h5" stroke="#F8FAFC" stroke-width="1.7" stroke-linecap="round" opacity=".42"/><rect x="10.5" y="2.5" width="14" height="9" rx="1.5" stroke="#F8FAFC" stroke-width="1.7" opacity=".62"/><path d="M15 14.5V16h5" stroke="#F8FAFC" stroke-width="1.7" stroke-linecap="round" opacity=".62"/><rect x="6.5" y="8.5" width="15" height="10" rx="1.7" fill="#F8FAFC" fill-opacity=".12" stroke="#F8FAFC" stroke-width="1.9"/><path d="M12 21v1.5H9.5M16 21v1.5h2.5M9.5 22.5h9" stroke="#F8FAFC" stroke-width="1.9" stroke-linecap="round"/></g></svg>')}`;
 const desktopLogger = createBoundedDesktopLogger({ logPath });
@@ -177,32 +185,55 @@ function normalizeSession(session) {
   };
 }
 
-function saveEncryptedSession(session) {
-  const normalized = normalizeSession(session);
-  if (!normalized) throw new Error('oauth-session-invalid');
-  if (!safeStorage.isEncryptionAvailable()) throw new Error('secure-storage-unavailable');
-  mkdirSync(stateRoot, { recursive: true });
-  const encryptedSession = safeStorage.encryptString(JSON.stringify(normalized)).toString('base64');
-  writeFileSync(authSessionPath, JSON.stringify({ version: 1, encryptedSession }, null, 2), { encoding: 'utf8', mode: 0o600 });
-  return normalized;
-}
-
-function readEncryptedSession() {
-  if (!safeStorage.isEncryptionAvailable()) return null;
-  try {
-    const saved = JSON.parse(readFileSync(authSessionPath, 'utf8'));
-    if (!saved?.encryptedSession) return null;
-    const session = JSON.parse(safeStorage.decryptString(Buffer.from(saved.encryptedSession, 'base64')));
-    return normalizeSession(session);
-  } catch (error) {
-    log(`secure auth session read failed: ${error?.message || error}`);
-    return null;
-  }
-}
-
-function clearEncryptedSession() {
-  clearDesktopAuthRefreshTimer();
-  try { rmSync(authSessionPath, { force: true }); } catch { /* best effort */ }
+function saveEncryptedSession(session) {
+  const normalized = normalizeSession(session);
+  if (!normalized) throw new Error('oauth-session-invalid');
+  if (!safeStorage.isEncryptionAvailable()) throw new Error('secure-storage-unavailable');
+  const encryptedSession = safeStorage.encryptString(JSON.stringify(normalized)).toString('base64');
+  const persisted = writeDurableAuthSessionRecord({
+    primaryPath: authSessionPath,
+    backupPath: authSessionBackupPath,
+    record: { version: 2, savedAt: new Date().toISOString(), encryptedSession }
+  });
+  if (!persisted.backupWritten) {
+    log(`secure auth session backup write failed: ${persisted.backupError?.message || persisted.backupError}`);
+  }
+  lastKnownDesktopSession = normalized;
+  return normalized;
+}
+
+function readEncryptedSession() {
+  if (!safeStorage.isEncryptionAvailable()) return lastKnownDesktopSession;
+  const restored = readDurableAuthSessionRecord({
+    primaryPath: authSessionPath,
+    backupPath: authSessionBackupPath,
+    decode: saved => {
+      if (!saved?.encryptedSession) return null;
+      const session = JSON.parse(safeStorage.decryptString(Buffer.from(saved.encryptedSession, 'base64')));
+      return normalizeSession(session);
+    }
+  });
+  if (restored.failures.length > 0) {
+    log(`secure auth session read recovered=${restored.recoveredFromBackup} failures=${restored.failures.length}`);
+  }
+  if (restored.recoveredFromBackup) log('secure auth session primary restored from encrypted backup');
+  if (!restored.value && restored.failures.length > 0) return lastKnownDesktopSession;
+  if (restored.value && !existsSync(authSessionBackupPath)) {
+    try {
+      saveEncryptedSession(restored.value);
+      log('secure auth session upgraded to atomic mirrored storage');
+    } catch (error) {
+      log(`secure auth session mirror upgrade deferred: ${error?.message || error}`);
+    }
+  }
+  lastKnownDesktopSession = restored.value;
+  return restored.value;
+}
+
+function clearEncryptedSession() {
+  clearDesktopAuthRefreshTimer();
+  lastKnownDesktopSession = null;
+  clearDurableAuthSessionRecord({ primaryPath: authSessionPath, backupPath: authSessionBackupPath });
 }
 
 function migrateLegacyPlaintextSession() {
@@ -873,11 +904,12 @@ function updateTray(status = 'Starting') {
   tray.setToolTip(`${APP_NAME} — ${status}`);
 }
 
-function showWindow() {
-  if (!mainWindow) return;
-  mainWindow.show();
-  mainWindow.focus();
-}
+function showWindow() {
+  if (!mainWindow) return;
+  mainWindow.show();
+  mainWindow.focus();
+  requestDesktopResumeAuthRecovery('window-show');
+}
 
 function createMainWindow() {
   const iconPath = appResource('electron', 'icon.png');
@@ -889,7 +921,7 @@ function createMainWindow() {
     minHeight: 720,
     show: false,
     autoHideMenuBar: true,
-    title: APP_NAME,
+    title: appWindowTitle(),
     icon: existsSync(iconPath) ? iconPath : nativeImage.createFromDataURL(FALLBACK_ICON_DATA_URL),
     webPreferences: {
       preload: appResource('electron', 'preload.cjs'),
@@ -898,7 +930,12 @@ function createMainWindow() {
       sandbox: true,
       spellcheck: false
     }
-  });
+  });
+  mainWindow.on('page-title-updated', event => {
+    event.preventDefault();
+    mainWindow?.setTitle(appWindowTitle());
+  });
+  mainWindow.on('focus', () => requestDesktopResumeAuthRecovery('window-focus'));
   mainWindow.webContents.on('will-navigate', (event, url) => {
     if (isAllowedRuntimeUrl(url)) return;
     event.preventDefault();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.573",
+  "version": "0.1.575",
   "livedeskClientVersion": "0.1.249",
   "buildFlavor": "production",
   "description": "LiveDesk Hub and client launcher",