dsh-clean-desktop-shell 0.1.11 → 0.1.13

package/electron/main.js

@@ -1,187 +1,203 @@
-/**
- * dsh-clean-desktop-shell — Electron main process entry.
- *
- * Shell/core decoupling:
- *  - default target: http://127.0.0.1:3080 (existing web profile, zero migration)
- *  - configurable remote target (settings file)
- *  - local backend auto-start on launch; full manual control from the tray
- *
- * The main window is a pure shell — all backend controls live in the tray.
- */
-import { app, BrowserWindow, dialog, nativeImage } from 'electron'
-import { fileURLToPath } from 'node:url'
-import { createMainWindow, reloadWindow } from './window.js'
-import { createTray, refreshTrayMenu } from './tray.js'
-import { loadConfig, saveConfig, DEFAULT_TARGET_URL } from './config.js'
-import { detect } from './service.js'
-import { setupAutoUpdater } from './update.js'
-import { shortcutSupported, hasDesktopShortcut, createDesktopShortcut, ensureStartMenuShortcut } from './shortcut.js'
-import { APP_USER_MODEL_ID } from './aumid.js'
-import { setupCrashGuard } from './crashGuard.js'
-
-const isMac = process.platform === 'darwin'
-
-// Last-resort error capture (userData/shell-crash.log) — install before
-// anything else so even early startup failures leave a trace.
-setupCrashGuard()
-
-// Windows: pin the AppUserModelId so the taskbar shows our whale icon
-// instead of the generic Electron icon. Plugin mode uses a distinct ID
-// (see aumid.js) so Windows re-reads the icon instead of serving a
-// stale per-AUMID cached one.
-if (process.platform === 'win32') {
-  app.setAppUserModelId(APP_USER_MODEL_ID)
-}
-
-// macOS: a bare runtime has no .app bundle (no icon resource), so set the
-// Dock icon at runtime. Unlike Windows there is no per-AUMID taskbar cache
-// here — app.dock.setIcon applies directly. Packaged builds already carry
-// the icon in their bundle, so skip those.
-if (isMac && !app.isPackaged) {
-  try {
-    const dockIcon = nativeImage.createFromPath(
-      fileURLToPath(new URL('../build/icon.png', import.meta.url)),
-    )
-    if (!dockIcon.isEmpty()) app.dock.setIcon(dockIcon)
-  } catch {
-    // non-fatal: keep the default icon
-  }
-}
-
-// Uniform userData across both distribution branches (installer vs
-// plugin-market), so config (target URL, backend path, ...) is shared
-// no matter how the shell was launched.
-app.setName('DSH Clean Desktop Shell')
-
-/** Single instance: a second launch just focuses the existing window. */
-const gotLock = app.requestSingleInstanceLock()
-if (!gotLock) {
-  app.quit()
-} else {
-  let mainWindow = null
-  let tray = null
-
-  app.on('second-instance', () => {
-    if (mainWindow) {
-      if (mainWindow.isMinimized()) mainWindow.restore()
-      mainWindow.focus()
-    }
-  })
-
-  async function createWindow() {
-    const config = loadConfig()
-    const target = config.targetUrl || DEFAULT_TARGET_URL
-
-    mainWindow = createMainWindow({ target })
-    mainWindow.on('closed', () => {
-      mainWindow = null
-    })
-    mainWindow.on('close', (event) => {
-      // Close hides to tray unless we are actually quitting. Read the
-      // config fresh so a runtime change to closeToTray takes effect.
-      if (!app.isQuitting && loadConfig().closeToTray !== false) {
-        event.preventDefault()
-        mainWindow?.hide()
-      }
-    })
-
-    return mainWindow
-  }
-
-  /**
-   * Launch-time backend detection. Detects whether a local dsh web is
-   * already running so the tray and window reflect the real state, but
-   * never auto-starts it — starting is a manual action (tray menu or the
-   * offline screen button) so it cannot fight an explicit "stop".
-   */
-  async function bootstrapBackend() {
-    const config = loadConfig()
-    const target = config.targetUrl || DEFAULT_TARGET_URL
-    // Remote targets are the user's own business — never probe local.
-    // Origin comparison (not string equality) tolerates trailing slashes
-    // and an explicitly written default.
-    if (new URL(target).origin !== new URL(DEFAULT_TARGET_URL).origin) return
-    await detect()
-    // Reflect the post-detect state in the tray menu.
-    refreshTrayMenu()
-  }
-
-  /**
-   * First-run desktop shortcut prompt (Windows packaged apps only).
-   * Asks once; the tray "create desktop shortcut" item stays available
-   * forever, so saying no is never a dead end.
-   */
-  async function ensureShortcut() {
-    if (!shortcutSupported() || loadConfig().shortcutAsked) return
-    saveConfig({ ...loadConfig(), shortcutAsked: true })
-    if (await hasDesktopShortcut()) return
-    const choice = dialog.showMessageBoxSync({
-      type: 'question',
-      title: '创建桌面快捷方式？',
-      message: '是否在桌面创建「DSH Clean Desktop Shell」快捷方式？',
-      detail: '选择「跳过」也不影响使用——之后可随时在托盘右键菜单中一键添加。',
-      buttons: ['创建', '跳过'],
-      defaultId: 0,
-      cancelId: 1,
-    })
-    if (choice === 0) {
-      const ok = await createDesktopShortcut()
-      if (!ok) {
-        dialog.showErrorBox('创建快捷方式失败', '无法在桌面创建快捷方式。可稍后在托盘右键菜单中重试。')
-      }
-    }
-  }
-
-  app.whenReady().then(async () => {
-    await createWindow()
-    tray = createTray({
-      onShow: () => {
-        if (!mainWindow) return createWindow()
-        mainWindow.show()
-        mainWindow.focus()
-      },
-      onReload: () => {
-        if (mainWindow && !mainWindow.isDestroyed()) {
-          reloadWindow(mainWindow, loadConfig().targetUrl || DEFAULT_TARGET_URL)
-        }
-      },
-      onQuit: () => {
-        app.isQuitting = true
-        app.quit()
-      },
-    })
-
-    // Backend bootstrap in background (never delays the window).
-    bootstrapBackend().catch(() => {})
-
-    // Windows: wire the auto-updater (downloads new installers silently).
-    setupAutoUpdater()
-
-    // Windows: ensure the AUMID-carrying Start-menu shortcut exists so the
-    // taskbar button shows our icon (see shortcut.js). Best-effort.
-    try {
-      ensureStartMenuShortcut()
-    } catch {
-      // non-fatal
-    }
-
-    // First run: offer a desktop shortcut (never nags twice).
-    ensureShortcut().catch(() => {})
-
-    app.on('activate', () => {
-      if (BrowserWindow.getAllWindows().length === 0) createWindow()
-      else mainWindow?.show()
-    })
-  })
-
-  app.on('window-all-closed', () => {
-    // Keep the app alive in the tray (like a normal desktop utility).
-    if (!isMac && !app.isQuitting) {
-      // do not quit — tray keeps running
-    }
-  })
-
-  app.on('before-quit', () => {
-    app.isQuitting = true
-  })
-}
+/**
+ * dsh-clean-desktop-shell — Electron main process entry.
+ *
+ * Shell/core decoupling:
+ *  - default target: http://127.0.0.1:3080 (existing web profile, zero migration)
+ *  - configurable remote target (settings file)
+ *  - local backend auto-start on launch; full manual control from the tray
+ *
+ * The main window is a pure shell — all backend controls live in the tray.
+ */
+import { app, BrowserWindow, dialog, nativeImage } from 'electron'
+import { fileURLToPath } from 'node:url'
+import { createMainWindow, reloadWindow } from './window.js'
+import { createTray, refreshTrayMenu } from './tray.js'
+import { loadConfig, saveConfig, DEFAULT_TARGET_URL } from './config.js'
+import { detect, getAuthenticatedUrl, getStatus } from './service.js'
+import { setupAutoUpdater } from './update.js'
+import { shortcutSupported, hasDesktopShortcut, createDesktopShortcut, ensureStartMenuShortcut } from './shortcut.js'
+import { APP_USER_MODEL_ID } from './aumid.js'
+import { setupCrashGuard } from './crashGuard.js'
+
+const isMac = process.platform === 'darwin'
+
+// Last-resort error capture (userData/shell-crash.log) — install before
+// anything else so even early startup failures leave a trace.
+setupCrashGuard()
+
+// Windows: pin the AppUserModelId so the taskbar shows our whale icon
+// instead of the generic Electron icon. Plugin mode uses a distinct ID
+// (see aumid.js) so Windows re-reads the icon instead of serving a
+// stale per-AUMID cached one.
+if (process.platform === 'win32') {
+  app.setAppUserModelId(APP_USER_MODEL_ID)
+}
+
+// macOS: a bare runtime has no .app bundle (no icon resource), so set the
+// Dock icon at runtime. Unlike Windows there is no per-AUMID taskbar cache
+// here — app.dock.setIcon applies directly. Packaged builds already carry
+// the icon in their bundle, so skip those.
+if (isMac && !app.isPackaged) {
+  try {
+    const dockIcon = nativeImage.createFromPath(
+      fileURLToPath(new URL('../build/icon.png', import.meta.url)),
+    )
+    if (!dockIcon.isEmpty()) app.dock.setIcon(dockIcon)
+  } catch {
+    // non-fatal: keep the default icon
+  }
+}
+
+// Uniform userData across both distribution branches (installer vs
+// plugin-market), so config (target URL, backend path, ...) is shared
+// no matter how the shell was launched.
+app.setName('DSH Clean Desktop Shell')
+
+/** Single instance: a second launch just focuses the existing window. */
+const gotLock = app.requestSingleInstanceLock()
+if (!gotLock) {
+  app.quit()
+} else {
+  let mainWindow = null
+  let tray = null
+
+  app.on('second-instance', () => {
+    if (mainWindow) {
+      if (mainWindow.isMinimized()) mainWindow.restore()
+      mainWindow.focus()
+    }
+  })
+
+  async function createWindow() {
+    const config = loadConfig()
+    const target = config.targetUrl || DEFAULT_TARGET_URL
+    // In plugin mode the host half (same dsh web process) supplies the real
+    // per-process launch URL through DSH_WEB_LAUNCH_URL. In tray-start mode
+    // service.start() will surface a fresh one through status changes.
+    // Only apply BrowserAuth bootstrap to the local default; remote targets
+    // remain the user's own externally-managed surface.
+    let isLocalDefault = false
+    try {
+      isLocalDefault = new URL(target).origin === new URL(DEFAULT_TARGET_URL).origin
+    } catch {
+      // A malformed configured target must not break window creation, and it
+      // must never receive the local launch credential — stay non-local.
+    }
+    const launchUrl = isLocalDefault ? (getStatus().launchUrl || null) : null
+
+    mainWindow = createMainWindow({ target, launchUrl })
+    mainWindow.on('closed', () => {
+      mainWindow = null
+    })
+    mainWindow.on('close', (event) => {
+      // Close hides to tray unless we are actually quitting. Read the
+      // config fresh so a runtime change to closeToTray takes effect.
+      if (!app.isQuitting && loadConfig().closeToTray !== false) {
+        event.preventDefault()
+        mainWindow?.hide()
+      }
+    })
+
+    return mainWindow
+  }
+
+  /**
+   * Launch-time backend detection. Detects whether a local dsh web is
+   * already running so the tray and window reflect the real state, but
+   * never auto-starts it — starting is a manual action (tray menu or the
+   * offline screen button) so it cannot fight an explicit "stop".
+   */
+  async function bootstrapBackend() {
+    const config = loadConfig()
+    const target = config.targetUrl || DEFAULT_TARGET_URL
+    // Remote targets are the user's own business — never probe local.
+    // Origin comparison (not string equality) tolerates trailing slashes
+    // and an explicitly written default.
+    if (new URL(target).origin !== new URL(DEFAULT_TARGET_URL).origin) return
+    await detect()
+    // Reflect the post-detect state in the tray menu.
+    refreshTrayMenu()
+  }
+
+  /**
+   * First-run desktop shortcut prompt (Windows packaged apps only).
+   * Asks once; the tray "create desktop shortcut" item stays available
+   * forever, so saying no is never a dead end.
+   */
+  async function ensureShortcut() {
+    if (!shortcutSupported() || loadConfig().shortcutAsked) return
+    saveConfig({ ...loadConfig(), shortcutAsked: true })
+    if (await hasDesktopShortcut()) return
+    const choice = dialog.showMessageBoxSync({
+      type: 'question',
+      title: '创建桌面快捷方式？',
+      message: '是否在桌面创建「DSH Clean Desktop Shell」快捷方式？',
+      detail: '选择「跳过」也不影响使用——之后可随时在托盘右键菜单中一键添加。',
+      buttons: ['创建', '跳过'],
+      defaultId: 0,
+      cancelId: 1,
+    })
+    if (choice === 0) {
+      const ok = await createDesktopShortcut()
+      if (!ok) {
+        dialog.showErrorBox('创建快捷方式失败', '无法在桌面创建快捷方式。可稍后在托盘右键菜单中重试。')
+      }
+    }
+  }
+
+  app.whenReady().then(async () => {
+    await createWindow()
+    tray = createTray({
+      onShow: () => {
+        if (!mainWindow) return createWindow()
+        mainWindow.show()
+        mainWindow.focus()
+      },
+      onReload: () => {
+        if (mainWindow && !mainWindow.isDestroyed()) {
+          // Prefer the live launch-token URL from the last shell-started
+          // backend; a manual refresh is exactly when a stale config target
+          // (or a bare pre-0.1.2 loopback URL) would 401.
+          reloadWindow(mainWindow, getAuthenticatedUrl() || loadConfig().targetUrl || DEFAULT_TARGET_URL)
+        }
+      },
+      onQuit: () => {
+        app.isQuitting = true
+        app.quit()
+      },
+    })
+
+    // Backend bootstrap in background (never delays the window).
+    bootstrapBackend().catch(() => {})
+
+    // Windows: wire the auto-updater (downloads new installers silently).
+    setupAutoUpdater()
+
+    // Windows: ensure the AUMID-carrying Start-menu shortcut exists so the
+    // taskbar button shows our icon (see shortcut.js). Best-effort.
+    try {
+      ensureStartMenuShortcut()
+    } catch {
+      // non-fatal
+    }
+
+    // First run: offer a desktop shortcut (never nags twice).
+    ensureShortcut().catch(() => {})
+
+    app.on('activate', () => {
+      if (BrowserWindow.getAllWindows().length === 0) createWindow()
+      else mainWindow?.show()
+    })
+  })
+
+  app.on('window-all-closed', () => {
+    // Keep the app alive in the tray (like a normal desktop utility).
+    if (!isMac && !app.isQuitting) {
+      // do not quit — tray keeps running
+    }
+  })
+
+  app.on('before-quit', () => {
+    app.isQuitting = true
+  })
+}

package/electron/outage.js

@@ -0,0 +1,60 @@
+/**
+ * Per-window backend-outage run (liveness-watch state).
+ *
+ * Pure module — no Electron imports — so the recovery self-test
+ * (scripts/selftest-recovery.mjs) can exercise the real transitions under
+ * plain node: consecutive-failure escalation, reset-on-recovery, and the
+ * navigation token that discards probe results which finished after the
+ * window navigated away or was disposed.
+ */
+
+// An outage escalates from transient to persistent/unavailable copy after
+// this many consecutive failed probes (~3 × 4s watch interval).
+export const PERSISTENT_AFTER_FAILURES = 3
+
+export class OutageRun {
+  constructor() {
+    this.failures = 0
+    // Navigation epoch. reset() bumps it; every async probe captures a
+    // checkpoint() before awaiting and apply() discards the result if the
+    // epoch moved meanwhile — a stale probe can never act on a newer
+    // navigation (or on a disposed window's fresh lookalike state).
+    this.epoch = 0
+  }
+
+  /** Capture the current epoch before starting an async probe. */
+  checkpoint() {
+    return this.epoch
+  }
+
+  /** True while the run is still on the navigation `token` was taken under. */
+  isCurrent(token) {
+    return token === this.epoch
+  }
+
+  /** Navigation/flip (or fresh page load): invalidate in-flight probes and start a fresh run. */
+  reset() {
+    this.epoch += 1
+    this.failures = 0
+  }
+
+  /**
+   * Apply a probe result taken under `token`. Returns null when the run was
+   * reset (the window navigated away or was disposed) while the probe was in
+   * flight — the result is stale and must not act. Otherwise advances the
+   * consecutive-failure counter and returns the exact renderer payload for
+   * the in-page connection notice (window.js sends it verbatim).
+   */
+  apply(token, up) {
+    if (!this.isCurrent(token)) return null
+    if (up) {
+      this.failures = 0
+      return { state: 'ok' }
+    }
+    this.failures += 1
+    return {
+      state: 'degraded',
+      persistent: this.failures >= PERSISTENT_AFTER_FAILURES,
+    }
+  }
+}