npm - livedesk - Versions diffs - 0.1.608 → 0.1.609 - Mend

livedesk 0.1.608 → 0.1.609

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/electron/main.mjs +134 -60
package/electron/runtime-window-load-owner.mjs +153 -0
package/package.json +1 -1

package/electron/main.mjs CHANGED Viewed

@@ -41,11 +41,12 @@ import {
   waitForOwnedRuntimeTreeExit,
   waitForPromiseBeforeDeadline
 } from './runtime-process-owner.mjs';
-import {
-  desktopHubTakeoverPublicationConfirmed,
-  resolveDesktopHubTakeoverPending
-} from './runtime-role-transition.mjs';
-import { createDesktopClipboardOwner } from './desktop-clipboard-owner.mjs';
+import {
+  desktopHubTakeoverPublicationConfirmed,
+  resolveDesktopHubTakeoverPending
+} from './runtime-role-transition.mjs';
+import { createDesktopClipboardOwner } from './desktop-clipboard-owner.mjs';
+import { createRuntimeWindowLoadOwner } from './runtime-window-load-owner.mjs';
 // Chromium otherwise leaves an out-of-process Audio Service (~80-90 MiB on
 // Windows) alive after the exact Remote Audio owner, AudioContext, worklet,
@@ -168,14 +169,34 @@ let desktopAuthRefreshTimer = null;
 let desktopSessionRestorePromise = null;
 let lastDesktopResumeRecoveryAt = 0;
 let desktopSessionEpoch = 0;
-let lastKnownDesktopSession = null;
-let desktopClipboardOwner = null;
+let lastKnownDesktopSession = null;
+let desktopClipboardOwner = null;
+let runtimeWindowLoadOwner = null;
 const desktopAuthInvalidationGuard = createDesktopAuthInvalidationGuard();
 const installerQuitGate = createInstallerQuitGate({
   requestQuit: () => app.quit()
 });
-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 });
+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 DESKTOP_RUNTIME_RECOVERY_PAGE_URL = `data:text/html;charset=utf-8,${encodeURIComponent(`<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'unsafe-inline'">
+  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <title>VuvoDesk Desktop</title>
+  <style>
+    :root { color-scheme: dark; font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif; }
+    body { margin: 0; min-height: 100vh; display: grid; place-items: center; background: #0f172a; color: #f8fafc; }
+    main { display: grid; justify-items: center; gap: 18px; padding: 32px; text-align: center; }
+    .mark { width: 42px; height: 42px; border: 3px solid #334155; border-top-color: #38bdf8; border-radius: 999px; animation: spin .9s linear infinite; }
+    h1 { margin: 0; font-size: 22px; font-weight: 650; }
+    p { margin: 0; max-width: 480px; color: #cbd5e1; font-size: 15px; line-height: 1.65; }
+    @keyframes spin { to { transform: rotate(360deg); } }
+  </style>
+</head>
+<body><main><div class="mark" aria-hidden="true"></div><h1>VuvoDesk is reconnecting</h1><p>The service on this computer is starting. This window will reconnect automatically.</p></main></body>
+</html>`)}`;
+const desktopLogger = createBoundedDesktopLogger({ logPath });
 function mask(value) {
   return String(value ?? '')
@@ -600,9 +621,11 @@ async function waitForRuntime(options = {}) {
       await new Promise(resolveDelay => setTimeout(resolveDelay, Math.min(200, remainingMs)));
     }
   }
-  log(`runtime identity check timed out; expectedRole=${expectedRole || 'any'}`);
-  return null;
-}
+  if (config.logTimeout !== false) {
+    log(`runtime identity check timed out; expectedRole=${expectedRole || 'any'}`);
+  }
+  return null;
+}
 async function stopRuntime() {
   if (runtimeRestartTimer) {
@@ -1056,25 +1079,28 @@ function updateTray(status = 'Starting') {
   tray.setToolTip(`${APP_NAME} — ${status}`);
 }
-function showWindow() {
-  if (!mainWindow) return;
-  if (mainWindow.isMinimized()) mainWindow.restore();
-  mainWindow.show();
+function showWindow() {
+  if (!mainWindow) return;
+  runtimeWindowLoadOwner?.start('window-show');
+  if (mainWindow.isMinimized()) mainWindow.restore();
+  mainWindow.show();
   mainWindow.focus();
   if (!mainWindow.webContents.isDestroyed()) mainWindow.webContents.invalidate();
   requestDesktopResumeAuthRecovery('window-show');
 }
-function createMainWindow() {
-  const iconPath = appResource('electron', 'icon.png');
-  Menu.setApplicationMenu(null);
-  mainWindow = new BrowserWindow({
-    width: 1440,
-    height: 960,
-    minWidth: 1080,
-    minHeight: 720,
-    show: false,
-    autoHideMenuBar: true,
+function createMainWindow() {
+  const iconPath = appResource('electron', 'icon.png');
+  Menu.setApplicationMenu(null);
+  runtimeWindowLoadOwner?.stop();
+  const window = new BrowserWindow({
+    width: 1440,
+    height: 960,
+    minWidth: 1080,
+    minHeight: 720,
+    show: false,
+    backgroundColor: '#0f172a',
+    autoHideMenuBar: true,
     title: appWindowTitle(),
     icon: existsSync(iconPath) ? iconPath : nativeImage.createFromDataURL(FALLBACK_ICON_DATA_URL),
     webPreferences: {
@@ -1082,41 +1108,89 @@ function createMainWindow() {
       contextIsolation: true,
       nodeIntegration: false,
       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();
-    void shell.openExternal(url);
-  });
-  mainWindow.webContents.setWindowOpenHandler(({ url }) => {
-    if (isAllowedRuntimeUrl(url)) return { action: 'allow' };
-    void shell.openExternal(url);
-    return { action: 'deny' };
-  });
-  mainWindow.loadURL(LOCAL_RUNTIME_URL);
-  mainWindow.webContents.on('did-finish-load', () => {
-    void restoreEncryptedSession({ syncRuntime: true }).then(session => {
-      if (desktopSessionIsUsable(session)) sendAuthEvent({ ok: true, session, restored: true });
+      spellcheck: false
+    }
+  });
+  mainWindow = window;
+  let loadFailureCount = 0;
+  const reportWindowLoadFailure = (message, context = {}) => {
+    loadFailureCount += 1;
+    if (loadFailureCount === 1 || loadFailureCount % 10 === 0) {
+      log(`desktop renderer recovery ${message}; failures=${loadFailureCount}; generation=${context.generation || 'event'}; attempt=${context.attempt || 'event'}`);
+    }
+  };
+  const windowLoadOwner = createRuntimeWindowLoadOwner({
+    probeRuntime: () => waitForRuntime({ timeoutMs: 1_000, logTimeout: false }),
+    showRecovery: async () => {
+      if (window.isDestroyed() || window.webContents.isDestroyed()) return;
+      if (window.webContents.getURL() !== DESKTOP_RUNTIME_RECOVERY_PAGE_URL) {
+        await window.loadURL(DESKTOP_RUNTIME_RECOVERY_PAGE_URL);
+      }
+      if (process.env.LIVEDESK_E2E_HEADLESS !== '1') showWindow();
+    },
+    loadRuntime: async () => {
+      if (window.isDestroyed() || window.webContents.isDestroyed()) {
+        throw new Error('desktop-runtime-window-destroyed');
+      }
+      await window.loadURL(LOCAL_RUNTIME_URL);
+    },
+    onLoaded: context => {
+      loadFailureCount = 0;
+      updateTray('Running');
+      log(`desktop renderer loaded current runtime; generation=${context.generation}; attempt=${context.attempt}`);
+      if (process.env.LIVEDESK_E2E_HEADLESS !== '1') showWindow();
+    },
+    onAttemptError: (error, context) => {
+      reportWindowLoadFailure(`${context.phase}: ${error?.message || error}`, context);
+    },
+    retryDelayMs: 1_000
+  });
+  runtimeWindowLoadOwner = windowLoadOwner;
+  window.on('page-title-updated', event => {
+    event.preventDefault();
+    if (!window.isDestroyed()) window.setTitle(appWindowTitle());
+  });
+  window.on('focus', () => requestDesktopResumeAuthRecovery('window-focus'));
+  window.webContents.on('will-navigate', (event, url) => {
+    if (isAllowedRuntimeUrl(url) || url === DESKTOP_RUNTIME_RECOVERY_PAGE_URL) return;
+    event.preventDefault();
+    void shell.openExternal(url);
+  });
+  window.webContents.setWindowOpenHandler(({ url }) => {
+    if (isAllowedRuntimeUrl(url)) return { action: 'allow' };
+    void shell.openExternal(url);
+    return { action: 'deny' };
+  });
+  window.webContents.on('did-fail-load', (_event, errorCode, errorDescription, validatedUrl, isMainFrame) => {
+    if (!isMainFrame || errorCode === -3) return;
+    reportWindowLoadFailure(`main-frame-failed code=${errorCode} url=${validatedUrl || 'unknown'} error=${errorDescription || 'unknown'}`);
+    windowLoadOwner.noteMainFrameFailure(`main-frame-${errorCode}`);
+  });
+  window.webContents.on('render-process-gone', (_event, details) => {
+    reportWindowLoadFailure(`renderer-gone reason=${details?.reason || 'unknown'} exitCode=${details?.exitCode ?? 'unknown'}`);
+    windowLoadOwner.noteRendererGone(`renderer-${details?.reason || 'gone'}`);
+  });
+  window.webContents.on('did-finish-load', () => {
+    if (!isAllowedRuntimeUrl(window.webContents.getURL())) return;
+    void restoreEncryptedSession({ syncRuntime: true }).then(session => {
+      if (desktopSessionIsUsable(session)) sendAuthEvent({ ok: true, session, restored: true });
     }).catch(error => {
-      log(`secure auth session window restore failed: ${error?.message || error}`);
-    });
-  });
-  mainWindow.once('ready-to-show', () => { updateTray('Running'); if (process.env.LIVEDESK_E2E_HEADLESS !== '1') showWindow(); });
-  mainWindow.on('close', event => {
-    if (!isQuitting) {
-      event.preventDefault();
-      mainWindow.hide();
-    }
-  });
-  mainWindow.on('closed', () => { mainWindow = null; });
-}
+      log(`secure auth session window restore failed: ${error?.message || error}`);
+    });
+  });
+  windowLoadOwner.start('window-created');
+  window.on('close', event => {
+    if (!isQuitting) {
+      event.preventDefault();
+      window.hide();
+    }
+  });
+  window.on('closed', () => {
+    windowLoadOwner.stop();
+    if (runtimeWindowLoadOwner === windowLoadOwner) runtimeWindowLoadOwner = null;
+    if (mainWindow === window) mainWindow = null;
+  });
+}
 function registerIpc() {
   const handle = (channel, handler) => ipcMain.handle(channel, async (event, ...args) => {

package/electron/runtime-window-load-owner.mjs ADDED Viewed

@@ -0,0 +1,153 @@
+const DEFAULT_RETRY_DELAY_MS = 1_000;
+function normalizeDelay(value, fallback = 0) {
+  const milliseconds = Number(value);
+  return Number.isFinite(milliseconds) && milliseconds >= 0
+    ? Math.round(milliseconds)
+    : fallback;
+}
+/**
+ * Owns the one retry timer and one in-flight load attempt for a BrowserWindow.
+ * A successfully mounted runtime document is never reloaded by start(). Only a
+ * real main-frame failure or renderer termination opens a new generation.
+ */
+export function createRuntimeWindowLoadOwner({
+  probeRuntime,
+  showRecovery = async () => undefined,
+  loadRuntime,
+  onLoaded = () => undefined,
+  onAttemptError = () => undefined,
+  retryDelayMs = DEFAULT_RETRY_DELAY_MS,
+  setTimer = setTimeout,
+  clearTimer = clearTimeout
+} = {}) {
+  if (typeof probeRuntime !== 'function') throw new Error('runtime-window-probe-required');
+  if (typeof loadRuntime !== 'function') throw new Error('runtime-window-loader-required');
+  const retryDelay = normalizeDelay(retryDelayMs, DEFAULT_RETRY_DELAY_MS);
+  let generation = 1;
+  let stopped = false;
+  let loaded = false;
+  let recoveryVisible = false;
+  let timer = null;
+  let operation = null;
+  let attemptCount = 0;
+  let pendingReason = 'created';
+  let pendingRetryDelay = retryDelay;
+  const snapshot = () => ({
+    generation,
+    stopped,
+    loaded,
+    recoveryVisible,
+    retryScheduled: timer !== null,
+    attemptPending: operation !== null,
+    attemptCount,
+    pendingReason
+  });
+  const reportAttemptError = (error, context) => {
+    try {
+      onAttemptError(error, context);
+    } catch {
+      // Diagnostics cannot take ownership from the load recovery path.
+    }
+  };
+  const ensureRecoveryVisible = async context => {
+    if (stopped || loaded || recoveryVisible || context.generation !== generation) return;
+    try {
+      await showRecovery(context);
+      if (!stopped && !loaded && context.generation === generation) recoveryVisible = true;
+    } catch (error) {
+      reportAttemptError(error, { ...context, phase: 'recovery-page' });
+    }
+  };
+  const schedule = (reason = 'retry', delayMs = 0) => {
+    if (stopped || loaded || timer !== null || operation !== null) return false;
+    pendingReason = String(reason || 'retry');
+    const ownerGeneration = generation;
+    timer = setTimer(() => {
+      timer = null;
+      if (stopped || loaded || ownerGeneration !== generation) return;
+      const context = {
+        generation: ownerGeneration,
+        attempt: ++attemptCount,
+        reason: pendingReason
+      };
+      const currentOperation = (async () => {
+        const ready = await probeRuntime(context);
+        if (stopped || loaded || ownerGeneration !== generation) return;
+        if (!ready) {
+          await ensureRecoveryVisible({ ...context, phase: 'runtime-wait' });
+          return;
+        }
+        await loadRuntime(context);
+        if (stopped || loaded || ownerGeneration !== generation) return;
+        loaded = true;
+        recoveryVisible = false;
+        try {
+          onLoaded(context);
+        } catch (error) {
+          reportAttemptError(error, { ...context, phase: 'loaded-callback' });
+        }
+      })()
+        .catch(async error => {
+          if (stopped || loaded || ownerGeneration !== generation) return;
+          reportAttemptError(error, { ...context, phase: 'runtime-load' });
+          await ensureRecoveryVisible({ ...context, phase: 'runtime-load' });
+        })
+        .finally(() => {
+          if (operation !== currentOperation) return;
+          operation = null;
+          if (!stopped && !loaded) {
+            const delay = pendingRetryDelay;
+            pendingRetryDelay = retryDelay;
+            schedule(pendingReason || 'retry', delay);
+          }
+        });
+      operation = currentOperation;
+    }, normalizeDelay(delayMs));
+    timer?.unref?.();
+    return true;
+  };
+  const beginNewGeneration = reason => {
+    if (stopped) return false;
+    generation += 1;
+    loaded = false;
+    recoveryVisible = false;
+    pendingReason = String(reason || 'reload');
+    pendingRetryDelay = 0;
+    if (timer !== null) {
+      clearTimer(timer);
+      timer = null;
+    }
+    schedule(pendingReason, 0);
+    return true;
+  };
+  return {
+    getStatus: snapshot,
+    start(reason = 'start') {
+      return schedule(reason, 0);
+    },
+    noteMainFrameFailure(reason = 'main-frame-failed') {
+      return beginNewGeneration(reason);
+    },
+    noteRendererGone(reason = 'renderer-gone') {
+      return beginNewGeneration(reason);
+    },
+    stop() {
+      if (stopped) return;
+      stopped = true;
+      generation += 1;
+      if (timer !== null) {
+        clearTimer(timer);
+        timer = null;
+      }
+    }
+  };
+}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "livedesk",
-  "version": "0.1.608",
+  "version": "0.1.609",
   "livedeskClientVersion": "0.1.262",
   "buildFlavor": "production",
   "description": "VuvoDesk Hub and client launcher",