npm - dsh-clean-desktop-shell - Versions diffs - 0.1.0 → 0.1.2 - Mend

dsh-clean-desktop-shell 0.1.0 → 0.1.2

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 (23) hide show

package/LICENSE +21 -21
package/README.en.md +168 -91
package/README.md +161 -90
package/cordis.patch.yml +4 -4
package/electron/config.js +46 -48
package/electron/error.html +113 -0
package/electron/main.js +20 -15
package/electron/preload.js +14 -1
package/electron/progress-preload.js +11 -0
package/electron/progress.html +79 -0
package/electron/progress.js +56 -0
package/electron/service.js +181 -47
package/electron/tray.js +103 -48
package/electron/update.js +201 -74
package/electron/window.js +179 -5
package/lib/client.js +10 -10
package/lib/index.js +13 -13
package/package.json +11 -3
package/scripts/build.mjs +12 -12
package/scripts/gen-icons.mjs +70 -70
package/src/client/client.js +10 -10
package/src/host/index.js +13 -13
package/version.txt +1 -1

package/electron/config.js CHANGED Viewed

@@ -1,48 +1,46 @@
-/**
- * Shell config persistence (userData/config.json).
- *
- * Fields:
- *  - targetUrl:       default 'http://127.0.0.1:3080' — set to any remote
- *                     DSH address to run the shell as a pure window.
- *  - autoStartService: default true — only applies to the local default URL.
- *  - closeToTray:      default true.
- *  - windowMode:       'advanced' (mica/vibrancy) | 'compatibility'.
- *  - autoLaunch:       open at login.
- */
-import { app } from 'electron'
-import { readFileSync, writeFileSync, mkdirSync } from 'node:fs'
-import { dirname, join } from 'node:path'
-const DEFAULTS = {
-  targetUrl: 'http://127.0.0.1:3080',
-  autoStartService: true,
-  closeToTray: true,
-  windowMode: 'advanced',
-  autoLaunch: false,
-  backendPath: null,
-}
-let cached = null
-function configPath() {
-  return join(app.getPath('userData'), 'config.json')
-}
-export function loadConfig() {
-  if (cached) return cached
-  try {
-    const raw = readFileSync(configPath(), 'utf8')
-    cached = { ...DEFAULTS, ...JSON.parse(raw) }
-  } catch {
-    cached = { ...DEFAULTS }
-  }
-  return cached
-}
-export function saveConfig(next) {
-  cached = { ...DEFAULTS, ...next }
-  const file = configPath()
-  mkdirSync(dirname(file), { recursive: true })
-  writeFileSync(file, JSON.stringify(cached, null, 2), 'utf8')
-  return cached
-}
+/**
+ * Shell config persistence (userData/config.json).
+ *
+ * Fields:
+ *  - targetUrl:       default 'http://127.0.0.1:3080' — set to any remote
+ *                     DSH address to run the shell as a pure window.
+ *  - closeToTray:      default true.
+ *  - windowMode:       'advanced' (mica/vibrancy) | 'compatibility'.
+ *  - autoLaunch:       open at login.
+ */
+import { app } from 'electron'
+import { readFileSync, writeFileSync, mkdirSync } from 'node:fs'
+import { dirname, join } from 'node:path'
+const DEFAULTS = {
+  targetUrl: 'http://127.0.0.1:3080',
+  closeToTray: true,
+  windowMode: 'advanced',
+  autoLaunch: false,
+  backendPath: null,
+}
+let cached = null
+function configPath() {
+  return join(app.getPath('userData'), 'config.json')
+}
+export function loadConfig() {
+  if (cached) return cached
+  try {
+    const raw = readFileSync(configPath(), 'utf8')
+    cached = { ...DEFAULTS, ...JSON.parse(raw) }
+  } catch {
+    cached = { ...DEFAULTS }
+  }
+  return cached
+}
+export function saveConfig(next) {
+  cached = { ...DEFAULTS, ...next }
+  const file = configPath()
+  mkdirSync(dirname(file), { recursive: true })
+  writeFileSync(file, JSON.stringify(cached, null, 2), 'utf8')
+  return cached
+}

package/electron/error.html ADDED Viewed

@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta charset="utf-8" />
+  <meta http-equiv="Content-Security-Policy" content="default-src 'self'; style-src 'unsafe-inline'; script-src 'unsafe-inline'" />
+  <title>后端未连接</title>
+  <style>
+    html, body {
+      height: 100%;
+      margin: 0;
+      background: #10131A;
+      color: #9aa3b2;
+      font-family: system-ui, "Segoe UI", "Microsoft YaHei", sans-serif;
+      -webkit-user-select: none;
+      user-select: none;
+    }
+    .wrap {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      gap: 10px;
+    }
+    .whale {
+      width: 72px;
+      height: 72px;
+      border-radius: 18px;
+      background: #1b2330;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 22px;
+      font-weight: 700;
+      letter-spacing: 0.5px;
+      color: #cdd3de;
+      filter: drop-shadow(0 8px 24px rgba(0, 0, 0, 0.45));
+    }
+    h2 {
+      margin: 0;
+      font-size: 17px;
+      font-weight: 600;
+      color: #e8eaf0;
+    }
+    p {
+      margin: 0;
+      font-size: 13px;
+    }
+    button {
+      padding: 9px 22px;
+      font-size: 13px;
+      color: #e8eaf0;
+      background: #232d3d;
+      border: 1px solid #33405a;
+      border-radius: 8px;
+      cursor: pointer;
+    }
+    button:hover { background: #2b3750; }
+    button:active { background: #202a3c; }
+    .actions {
+      display: flex;
+      gap: 10px;
+      margin-top: 4px;
+    }
+    .folder-btn {
+      margin-top: 2px;
+      padding: 4px 8px;
+      font-size: 12px;
+      color: #6b7686;
+      background: none;
+      border: none;
+      border-radius: 6px;
+      text-decoration: underline;
+    }
+    .folder-btn:hover { color: #9aa3b2; background: none; }
+    .hint {
+      font-size: 12px;
+      opacity: 0.55;
+    }
+  </style>
+</head>
+<body>
+  <div class="wrap">
+    <div class="whale">DSH</div>
+    <h2>后端未连接</h2>
+    <p>请启动 dsh 后端，或使用下方按钮</p>
+    <button id="retry">重新加载</button>
+    <div class="actions">
+      <button id="start">启动后端</button>
+      <button id="detect">自动探测后端</button>
+    </div>
+    <button id="folder" class="folder-btn">设置后端安装文件夹</button>
+    <p class="hint">后端启动后本窗口会自动刷新</p>
+  </div>
+  <script>
+    // Injected by preload (sandbox-safe). Falls back to a plain reload.
+    var api = window.shellAPI || {};
+    document.getElementById('retry').addEventListener('click', function () {
+      if (api.reload) api.reload();
+      else location.reload();
+    });
+    var startBtn = document.getElementById('start');
+    if (api.startBackend) startBtn.addEventListener('click', api.startBackend);
+    else startBtn.style.display = 'none';
+    var detectBtn = document.getElementById('detect');
+    if (api.detectBackend) detectBtn.addEventListener('click', api.detectBackend);
+    else detectBtn.style.display = 'none';
+    var folderBtn = document.getElementById('folder');
+    if (api.chooseBackendFolder) folderBtn.addEventListener('click', api.chooseBackendFolder);
+    else folderBtn.style.display = 'none';
+  </script>
+</body>
+</html>

package/electron/main.js CHANGED Viewed

@@ -9,10 +9,11 @@
  * The main window is a pure shell — all backend controls live in the tray.
  */
 import { app, BrowserWindow } from 'electron'
-import { createMainWindow } from './window.js'
+import { createMainWindow, reloadWindow } from './window.js'
 import { createTray, refreshTrayMenu } from './tray.js'
 import { loadConfig, saveConfig } from './config.js'
-import { detect, start } from './service.js'
+import { detect } from './service.js'
+import { setupAutoUpdater } from './update.js'
 const isMac = process.platform === 'darwin'
@@ -56,22 +57,18 @@ if (!gotLock) {
     return mainWindow
   }
-  /** Launch-time backend bootstrap: detect, and auto-start when local. */
+  /**
+   * 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 || 'http://127.0.0.1:3080'
-    const isLocalDefault = target === 'http://127.0.0.1:3080'
-    if (!isLocalDefault || config.autoStartService === false) return
-    const url = await detect()
-    if (!url) {
-      // Not running — try to start it, but never block window opening.
-      try {
-        await start({ backendPath: config.backendPath })
-      } catch {
-        // Backend unavailable; window still opens, tray shows the error.
-      }
-    }
+    // Remote targets are the user's own business — never probe local.
+    if (target !== 'http://127.0.0.1:3080') return
+    await detect()
     // Reflect the post-detect state in the tray menu.
     refreshTrayMenu()
   }
@@ -89,6 +86,11 @@ if (!gotLock) {
         saveConfig({ ...config, autoLaunch: enabled })
         app.setLoginItemSettings({ openAtLogin: enabled })
       },
+      onReload: () => {
+        if (mainWindow && !mainWindow.isDestroyed()) {
+          reloadWindow(mainWindow, loadConfig().targetUrl || 'http://127.0.0.1:3080')
+        }
+      },
       onQuit: () => {
         app.isQuitting = true
         app.quit()
@@ -98,6 +100,9 @@ if (!gotLock) {
     // Backend bootstrap in background (never delays the window).
     bootstrapBackend().catch(() => {})
+    // Windows: wire the auto-updater (downloads new installers silently).
+    setupAutoUpdater()
     app.on('activate', () => {
       if (BrowserWindow.getAllWindows().length === 0) createWindow()
       else mainWindow?.show()

package/electron/preload.js CHANGED Viewed

@@ -1,5 +1,6 @@
 /**
- * Preload: makes the frameless window draggable.
+ * Preload: makes the frameless window draggable + exposes the minimal
+ * shell API to the loaded page (sandbox-safe contextBridge).
  *
  * A frameless window has no title bar, so dragging is provided by a
  * `-webkit-app-region: drag` strip along the top of the loaded page.
@@ -12,6 +13,18 @@
  * DSH top bar area. Overlap is acceptable: the strip is click-through for
  * everything except dragging (app-region drag areas swallow mouse events).
  */
+const { contextBridge, ipcRenderer } = require('electron')
+contextBridge.exposeInMainWorld('shellAPI', {
+  // Ask the main process to (re)load the real target URL. Used by the
+  // offline screen's retry button.
+  reload: () => ipcRenderer.send('shell:reload'),
+  // Offline-screen quick actions (mirror the tray backend controls).
+  startBackend: () => ipcRenderer.send('shell:start-backend'),
+  detectBackend: () => ipcRenderer.send('shell:detect-backend'),
+  chooseBackendFolder: () => ipcRenderer.send('shell:choose-backend-folder'),
+})
 window.addEventListener('DOMContentLoaded', () => {
   const platform = process.platform
   const isWin = platform === 'win32'

package/electron/progress-preload.js ADDED Viewed

@@ -0,0 +1,11 @@
+/**
+ * Preload for the progress window — exposes a sandbox-safe listener for
+ * status updates pushed from the main process.
+ */
+const { contextBridge, ipcRenderer } = require('electron')
+contextBridge.exposeInMainWorld('progressAPI', {
+  onSet: (cb) => {
+    ipcRenderer.on('progress:set', (_event, data) => cb(data))
+  },
+})

package/electron/progress.html ADDED Viewed

@@ -0,0 +1,79 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+  <meta charset="utf-8" />
+  <meta http-equiv="Content-Security-Policy" content="default-src 'self'; style-src 'unsafe-inline'; script-src 'unsafe-inline'" />
+  <title>后端操作</title>
+  <style>
+    html, body {
+      margin: 0;
+      height: 100%;
+      background: #10131A;
+      color: #9aa3b2;
+      font-family: system-ui, "Segoe UI", "Microsoft YaHei", sans-serif;
+      -webkit-user-select: none;
+      user-select: none;
+      overflow: hidden;
+    }
+    .wrap {
+      height: 100%;
+      box-sizing: border-box;
+      padding: 18px 22px;
+      display: flex;
+      flex-direction: column;
+      gap: 12px;
+    }
+    .title {
+      font-size: 14px;
+      font-weight: 600;
+      color: #e8eaf0;
+    }
+    .status {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+      font-size: 13px;
+      min-height: 18px;
+    }
+    .dot {
+      width: 14px;
+      height: 14px;
+      flex: none;
+      border-radius: 50%;
+      border: 2px solid #2c3644;
+      border-top-color: #7f858f;
+      animation: spin 0.8s linear infinite;
+    }
+    .dot.ok {
+      border-color: #3d8b6a;
+      animation: none;
+    }
+    .dot.error {
+      border-color: #c0564d;
+      animation: none;
+    }
+    .msg { line-height: 1.4; }
+    .msg.error { color: #e09090; }
+    .msg.ok { color: #8fbfa4; }
+    @keyframes spin { to { transform: rotate(360deg); } }
+  </style>
+</head>
+<body>
+  <div class="wrap">
+    <div class="title" id="title">后端操作</div>
+    <div class="status">
+      <div class="dot" id="dot"></div>
+      <div class="msg" id="msg">请稍候…</div>
+    </div>
+  </div>
+  <script>
+    window.progressAPI.onSet((data) => {
+      if (data.title) document.getElementById('title').textContent = data.title
+      const msg = document.getElementById('msg')
+      msg.textContent = data.message || ''
+      msg.className = 'msg' + (data.state === 'error' ? ' error' : data.state === 'ok' ? ' ok' : '')
+      document.getElementById('dot').className = 'dot' + (data.state === 'error' ? ' error' : data.state === 'ok' ? ' ok' : '')
+    })
+  </script>
+</body>
+</html>

package/electron/progress.js ADDED Viewed

@@ -0,0 +1,56 @@
+/**
+ * Small always-on-top progress window for backend operations
+ * (start / restart / stop). Single instance; reused across calls.
+ *
+ * States: 'busy' (spinner) | 'ok' | 'error' — the caller decides when to
+ * close it (auto-close timers live in the caller).
+ */
+import { BrowserWindow } from 'electron'
+import { fileURLToPath } from 'node:url'
+const PRELOAD = fileURLToPath(new URL('./progress-preload.js', import.meta.url))
+const PAGE = fileURLToPath(new URL('./progress.html', import.meta.url))
+let win = null
+/** Show (or update) the progress window. */
+export function showProgress({ title, message, state = 'busy' }) {
+  if (!win || win.isDestroyed()) {
+    win = new BrowserWindow({
+      width: 420,
+      height: 128,
+      frame: false,
+      resizable: false,
+      movable: true,
+      alwaysOnTop: true,
+      skipTaskbar: true,
+      show: false,
+      backgroundColor: '#10131A',
+      webPreferences: {
+        preload: PRELOAD,
+        contextIsolation: true,
+        nodeIntegration: false,
+        sandbox: true,
+      },
+    })
+    win.loadFile(PAGE)
+    win.once('ready-to-show', () => win.show())
+    win.on('closed', () => {
+      win = null
+    })
+  }
+  setProgress({ title, message, state })
+  return win
+}
+/** Update the currently visible progress window (no-op if hidden). */
+export function setProgress({ title, message, state }) {
+  if (win && !win.isDestroyed()) {
+    win.webContents.send('progress:set', { title, message, state })
+  }
+}
+/** Close the progress window if open. */
+export function closeProgress() {
+  if (win && !win.isDestroyed()) win.close()
+}