dsh-clean-desktop-shell 0.1.0 → 0.1.2

package/electron/service.js

@@ -21,6 +21,29 @@ let currentStatus = 'stopped'
 let lastError = null
 let startResolver = null
 
+// Status-change listeners (tray menu auto-refresh, window auto-reload, ...).
+const listeners = new Set()
+
+/** Subscribe to backend status changes. Returns an unsubscribe function. */
+export function onStatusChange(cb) {
+  listeners.add(cb)
+  return () => listeners.delete(cb)
+}
+
+function setStatus(next, error = null) {
+  if (currentStatus !== next || lastError !== error) {
+    currentStatus = next
+    lastError = error
+    for (const cb of listeners) {
+      try {
+        cb(getStatus())
+      } catch {
+        // listener errors must not break the state machine
+      }
+    }
+  }
+}
+
 export function getStatus() {
   return {
     status: currentStatus,
@@ -53,10 +76,10 @@ export async function detect() {
   const url = `http://127.0.0.1:${DEFAULT_PORT}`
   const up = await probe(url)
   if (up) {
-    currentStatus = 'running'
+    setStatus('running')
     return url
   }
-  currentStatus = 'stopped'
+  setStatus('stopped')
   return null
 }
 
@@ -72,51 +95,74 @@ export async function start({ backendPath } = {}) {
   // Backend path: explicit config → common locations → PATH.
   const resolved = await resolveDshCommand(backendPath)
   if (!resolved) {
-    lastError = '未找到 dsh 后端。请在托盘「设置后端文件夹」中指定 dsh CLI 所在目录。'
-    currentStatus = 'error'
+    setStatus('error', '未找到 dsh 后端。请在托盘「设置后端文件夹」中指定 dsh CLI 所在目录。')
     throw new Error(lastError)
   }
 
-  currentStatus = 'starting'
-  lastError = null
-  child = spawn(resolved.command, [...resolved.args, 'web'], {
-    stdio: ['ignore', 'pipe', 'pipe'],
-    windowsHide: true,
-    env: { ...process.env, ...(resolved.env || {}) },
-  })
+  setStatus('starting')
+
+  // Windows: .cmd/.bat cannot be spawned directly — EINVAL. Route them
+  // through the shell so `dsh.cmd web` behaves like a normal terminal.
+  const isCmd = process.platform === 'win32' && /\.(cmd|bat)$/i.test(resolved.command)
+  const command = isCmd ? `"${resolved.command}"` : resolved.command
+
+  let spawned = null
+  try {
+    spawned = spawn(command, [...resolved.args, 'web'], {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      windowsHide: true,
+      shell: isCmd,
+      env: { ...process.env, ...(resolved.env || {}) },
+    })
+  } catch (err) {
+    // Synchronous spawn failures (e.g. EINVAL on Windows) must leave the
+    // state machine in 'error' — otherwise the tray is stuck on 'starting'.
+    setStatus('error', `后端启动失败：${err.message}`)
+    throw new Error(lastError)
+  }
+  child = spawned
 
   child.on('error', (err) => {
-    lastError = err.message
-    currentStatus = 'error'
+    setStatus('error', err.message)
     if (startResolver) {
-      startResolver.reject(new Error(lastError))
+      const r = startResolver
       startResolver = null
+      r.reject(new Error(lastError))
     }
   })
 
   child.on('exit', (code) => {
     child = null
     if (currentStatus === 'starting' && startResolver) {
-      lastError = `dsh 后端异常退出 (code ${code})`
-      currentStatus = 'error'
-      startResolver.reject(new Error(lastError))
+      const r = startResolver
       startResolver = null
+      setStatus('error', `dsh 后端异常退出 (code ${code})`)
+      r.reject(new Error(lastError))
     } else if (currentStatus !== 'stopped') {
-      currentStatus = 'stopped'
+      setStatus('stopped')
     }
   })
 
-  // Wait for the ready line with a timeout.
+  // Wait for readiness: ready line on stdout/stderr, or the port answering.
   return await new Promise((resolve, reject) => {
     startResolver = { resolve, reject }
     let stdout = ''
     let stderr = ''
-    const timer = setTimeout(() => {
-      child?.kill()
+    const timer = setTimeout(async () => {
+      if (!startResolver) return
+      const r = startResolver
       startResolver = null
-      lastError = 'dsh 后端启动超时（45s）'
-      currentStatus = 'error'
-      reject(new Error(lastError))
+      // Timeout does not mean failure — the port may already be up while
+      // the CLI never printed a parseable URL. Probe before giving up.
+      const url = `http://127.0.0.1:${DEFAULT_PORT}`
+      if (await probe(url, 1500)) {
+        setStatus('running')
+        r.resolve(url)
+        return
+      }
+      child?.kill()
+      setStatus('error', 'dsh 后端启动超时（45s）')
+      r.reject(new Error(lastError))
     }, 45000)
 
     const onData = () => {
@@ -124,9 +170,11 @@ export async function start({ backendPath } = {}) {
       const m = text.match(/http:\/\/127\.0\.0\.1:(\d+)/)
       if (m && startResolver) {
         clearTimeout(timer)
-        currentStatus = 'running'
-        startResolver.resolve(`http://127.0.0.1:${m[1]}`)
+        const r = startResolver
         startResolver = null
+        const url = `http://127.0.0.1:${m[1]}`
+        setStatus('running')
+        r.resolve(url)
       }
     }
     child.stdout.on('data', (d) => {
@@ -140,19 +188,110 @@ export async function start({ backendPath } = {}) {
   })
 }
 
-/** Stop the local backend (spawned by us). External instances are left alone. */
+/**
+ * Stop the backend.
+ *
+ * - If the backend was spawned by us, kill our child (and force-free the
+ *   port — a shell-spawned .cmd can leave orphan node processes behind).
+ * - Otherwise (an external instance, e.g. the user ran `dsh web` themselves)
+ *   find the process listening on the port and terminate it, but only when
+ *   it looks like a node-based backend, never an unrelated program.
+ */
 export async function stop() {
-  if (!child) {
-    currentStatus = 'stopped'
+  if (child) {
+    const proc = child
+    child = null
+    setStatus('stopped')
+    await new Promise((resolve) => {
+      proc.once('exit', resolve)
+      proc.kill()
+      setTimeout(resolve, 3000)
+    })
+    await ensurePortFree(DEFAULT_PORT)
     return
   }
-  const proc = child
-  child = null
-  currentStatus = 'stopped'
-  await new Promise((resolve) => {
-    proc.once('exit', resolve)
-    proc.kill()
-    setTimeout(resolve, 3000)
+
+  // External instance: locate it by port and kill (node-only guard).
+  const pid = await findProcessOnPort(DEFAULT_PORT)
+  if (pid) {
+    const name = await processName(pid)
+    if (name && /node/i.test(name)) {
+      await killProcess(pid)
+      await ensurePortFree(DEFAULT_PORT)
+    }
+  }
+  setStatus('stopped')
+}
+
+const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms))
+
+/** Wait until nothing answers on the port (or give up after ~6s). */
+async function ensurePortFree(port, tries = 12) {
+  const url = `http://127.0.0.1:${port}`
+  for (let i = 0; i < tries; i++) {
+    if (!(await probe(url, 500))) return true
+    await sleep(500)
+  }
+  return !(await probe(url, 500))
+}
+
+/** Find the PID listening on a TCP port (netstat on Windows, lsof elsewhere). */
+function findProcessOnPort(port) {
+  return new Promise((resolve) => {
+    const isWin = process.platform === 'win32'
+    const cmd = isWin ? 'netstat' : 'lsof'
+    const args = isWin ? ['-ano'] : ['-ti', `:${port}`]
+    const p = spawn(cmd, args, { windowsHide: true })
+    let out = ''
+    p.stdout.on('data', (d) => {
+      out += d.toString()
+    })
+    p.on('error', () => resolve(null))
+    p.on('exit', () => {
+      if (isWin) {
+        const re = new RegExp(`\\bTCP\\s+[^\\s]*:${port}\\s+[^\\s]*\\s+LISTENING\\s+(\\d+)`)
+        const m = out.match(re)
+        resolve(m ? m[1] : null)
+      } else {
+        const pid = out.split(/\r?\n/).map((s) => s.trim()).find(Boolean)
+        resolve(pid || null)
+      }
+    })
+  })
+}
+
+/** Process image name for a PID (Windows tasklist; null elsewhere). */
+function processName(pid) {
+  return new Promise((resolve) => {
+    if (process.platform !== 'win32') {
+      resolve(null)
+      return
+    }
+    const p = spawn('tasklist', ['/FI', `PID eq ${pid}`, '/FO', 'CSV', '/NH'], {
+      windowsHide: true,
+    })
+    let out = ''
+    p.stdout.on('data', (d) => {
+      out += d.toString()
+    })
+    p.on('error', () => resolve(null))
+    p.on('exit', () => {
+      // CSV row: "image name","pid","session name",...
+      const m = out.match(/"([^"]+)","(\d+)"/)
+      resolve(m ? m[1] : null)
+    })
+  })
+}
+
+/** Force-kill a process (taskkill on Windows, kill -9 elsewhere). */
+function killProcess(pid) {
+  return new Promise((resolve) => {
+    const isWin = process.platform === 'win32'
+    const cmd = isWin ? 'taskkill' : 'kill'
+    const args = isWin ? ['/PID', String(pid), '/F', '/T'] : ['-9', String(pid)]
+    const p = spawn(cmd, args, { windowsHide: true, stdio: 'ignore' })
+    p.on('error', () => resolve(false))
+    p.on('exit', () => resolve(true))
   })
 }
 
@@ -218,8 +357,12 @@ async function resolveDshCommand(backendPath) {
     if (found) return { command: found, args: [] }
   }
 
-  // 2) `dsh` on PATH
-  if (await commandExists('dsh')) return { command: 'dsh', args: [] }
+  // 2) `dsh` on PATH — resolve to the real file so .cmd/.bat gets the
+  //    shell treatment (a bare `spawn('dsh')` would ENOENT on Windows).
+  const onPath = await commandPath('dsh')
+  if (onPath) {
+    return { command: /\.(cmd|bat)$/i.test(onPath) ? onPath : 'dsh', args: [] }
+  }
 
   // 3) Common locations (dev convenience).
   if (process.platform === 'win32') {
@@ -267,15 +410,6 @@ function commandPath(cmd) {
   })
 }
 
-function commandExists(cmd) {
-  return new Promise((resolve) => {
-    const finder = process.platform === 'win32' ? 'where' : 'which'
-    const c = spawn(finder, [cmd], { stdio: 'ignore', windowsHide: true })
-    c.on('error', () => resolve(false))
-    c.on('exit', (code) => resolve(code === 0))
-  })
-}
-
 function exists(p) {
   return new Promise((resolve) => access(p, (err) => resolve(!err)))
 }

package/electron/tray.js

@@ -8,8 +8,18 @@ import { Tray, Menu, dialog, nativeImage } from 'electron'
 import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { loadConfig, saveConfig } from './config.js'
-import { getStatus, start, stop, restart, detect, findDshInFolder, detectInstallFolder } from './service.js'
-import { checkForUpdate, openRepo, openUrl } from './update.js'
+import {
+  getStatus,
+  start,
+  stop,
+  restart,
+  detect,
+  findDshInFolder,
+  detectInstallFolder,
+  onStatusChange,
+} from './service.js'
+import { showProgress, setProgress, closeProgress } from './progress.js'
+import { checkForUpdate, checkForUpdatesAuto, isAutoUpdateSupported, openRepo, openUrl } from './update.js'
 
 const trayIconPath = join(
   fileURLToPath(new URL('.', import.meta.url)),
@@ -20,15 +30,19 @@ const trayIconPath = join(
 let trayInstance = null
 let handlers = null
 
-export function createTray({ onShow, onToggleAutoStart, onQuit }) {
+export function createTray({ onShow, onToggleAutoStart, onReload, onQuit }) {
   const icon = nativeImage.createFromPath(trayIconPath)
 
-  handlers = { onShow, onToggleAutoStart, onQuit }
+  handlers = { onShow, onToggleAutoStart, onReload, onQuit }
 
   trayInstance = new Tray(icon)
   trayInstance.setToolTip('DSH Clean Desktop Shell')
   trayInstance.on('click', onShow)
 
+  // Keep the menu in sync whenever the backend state machine changes
+  // (starting → running / error / stopped happens asynchronously).
+  onStatusChange(() => refreshTrayMenu())
+
   refreshTrayMenu()
   return trayInstance
 }
@@ -36,34 +50,34 @@ export function createTray({ onShow, onToggleAutoStart, onQuit }) {
 /** Rebuild the context menu (call after backend state changes). */
 export function refreshTrayMenu() {
   if (!trayInstance || !handlers) return
-  const { onShow, onToggleAutoStart, onQuit } = handlers
-  const config = loadConfig()
+  const { onShow, onToggleAutoStart, onReload, onQuit } = handlers
   const st = getStatus()
   const label = statusLabel(st)
 
   const menu = Menu.buildFromTemplate([
     { label: '显示 / 打开窗口', click: onShow },
+    {
+      label: '刷新窗口',
+      click: onReload,
+    },
     { type: 'separator' },
     { label: `后端：${label}`, enabled: false },
     {
       label: '启动后端',
       enabled: st.status !== 'running' && st.status !== 'starting',
-      click: async () => {
-        try {
-          await start({ backendPath: loadConfig().backendPath })
-        } catch (err) {
-          dialog.showErrorBox('后端启动失败', err.message)
-        }
-        refreshTrayMenu()
-      },
+      click: () => startBackendWithProgress(),
     },
     {
       label: '重启后端',
       enabled: st.status === 'running' || st.status === 'starting',
       click: async () => {
+        showProgress({ title: '重启后端', message: '正在重启 dsh 后端…' })
         try {
           await restart({ backendPath: loadConfig().backendPath })
+          setProgress({ title: '重启后端', message: '后端已重启', state: 'ok' })
+          setTimeout(closeProgress, 1200)
         } catch (err) {
+          closeProgress()
           dialog.showErrorBox('后端重启失败', err.message)
         }
         refreshTrayMenu()
@@ -73,7 +87,15 @@ export function refreshTrayMenu() {
       label: '关闭后端',
       enabled: st.status === 'running' || st.status === 'starting',
       click: async () => {
-        await stop()
+        showProgress({ title: '关闭后端', message: '正在关闭 dsh 后端…' })
+        try {
+          await stop()
+          setProgress({ title: '关闭后端', message: '后端已关闭', state: 'ok' })
+          setTimeout(closeProgress, 1200)
+        } catch (err) {
+          closeProgress()
+          dialog.showErrorBox('后端关闭失败', err.message)
+        }
         refreshTrayMenu()
       },
     },
@@ -87,44 +109,18 @@ export function refreshTrayMenu() {
     },
     {
       label: '设置后端安装文件夹…',
-      click: async () => {
-        // Default location: auto-detect the dsh install folder first.
-        const detected = await detectInstallFolder()
-        const defaultFolder = detected || config.backendPath || undefined
-        const result = await dialog.showOpenDialog({
-          title: '选择dsh后端安装文件夹，默认安装用自动探测',
-          buttonLabel: '选择此文件夹',
-          message: '默认安装用自动探测。可手动指定 dsh 后端安装文件夹（包含 dsh 可执行文件）。',
-          properties: ['openDirectory'],
-          defaultPath: defaultFolder,
-        })
-        if (!result.canceled && result.filePaths[0]) {
-          const folder = result.filePaths[0]
-          saveConfig({ ...loadConfig(), backendPath: folder })
-          const found = await findDshInFolder(folder)
-          if (found) {
-            dialog.showMessageBox({
-              type: 'info',
-              title: '后端安装文件夹已设置',
-              message: `已找到 dsh：\n${found}`,
-            })
-          } else {
-            dialog.showMessageBox({
-              type: 'warning',
-              title: '未在此文件夹找到 dsh',
-              message:
-                '此文件夹内未找到 dsh 可执行文件。已保存该路径，但启动后端时可能失败——\n' +
-                '请确认选择的是包含 dsh（dsh.cmd / bin/dsh.cmd / node_modules/.bin/dsh.cmd）的文件夹。',
-            })
-          }
-        }
-        refreshTrayMenu()
-      },
+      click: () => chooseBackendFolder(),
     },
     { type: 'separator' },
     {
       label: '检查更新…',
       click: async () => {
+        // Windows (packaged): auto-download + install on restart.
+        // macOS / dev mode: manual page link (macOS needs a signature).
+        if (isAutoUpdateSupported()) {
+          await checkForUpdatesAuto()
+          return
+        }
         const r = await checkForUpdate()
         if (r.hasUpdate) {
           const choice = dialog.showMessageBoxSync({
@@ -181,3 +177,62 @@ function statusLabel(st) {
       return '未运行'
   }
 }
+
+/**
+ * Start the backend with a progress window. Shared by the tray menu and
+ * the offline screen buttons. Returns true on success.
+ */
+export async function startBackendWithProgress() {
+  showProgress({ title: '启动后端', message: '正在启动 dsh 后端…' })
+  try {
+    await start({ backendPath: loadConfig().backendPath })
+    setProgress({ title: '启动后端', message: '后端已启动', state: 'ok' })
+    setTimeout(closeProgress, 1200)
+    return true
+  } catch (err) {
+    closeProgress()
+    dialog.showErrorBox('后端启动失败', err.message)
+    return false
+  } finally {
+    refreshTrayMenu()
+  }
+}
+
+/**
+ * Pick the dsh install folder via a native dialog (auto-detect default).
+ * Shared by the tray menu and the offline screen. Saves the choice to
+ * config and validates that a dsh executable exists inside.
+ */
+export async function chooseBackendFolder() {
+  const config = loadConfig()
+  const detected = await detectInstallFolder()
+  const defaultFolder = detected || config.backendPath || undefined
+  const result = await dialog.showOpenDialog({
+    title: '选择dsh后端安装文件夹，默认安装用自动探测',
+    buttonLabel: '选择此文件夹',
+    message: '默认安装用自动探测。可手动指定 dsh 后端安装文件夹（包含 dsh 可执行文件）。',
+    properties: ['openDirectory'],
+    defaultPath: defaultFolder,
+  })
+  if (!result.canceled && result.filePaths[0]) {
+    const folder = result.filePaths[0]
+    saveConfig({ ...loadConfig(), backendPath: folder })
+    const found = await findDshInFolder(folder)
+    if (found) {
+      dialog.showMessageBox({
+        type: 'info',
+        title: '后端安装文件夹已设置',
+        message: `已找到 dsh：\n${found}`,
+      })
+    } else {
+      dialog.showMessageBox({
+        type: 'warning',
+        title: '未在此文件夹找到 dsh',
+        message:
+          '此文件夹内未找到 dsh 可执行文件。已保存该路径，但启动后端时可能失败——\n' +
+          '请确认选择的是包含 dsh（dsh.cmd / bin/dsh.cmd / node_modules/.bin/dsh.cmd）的文件夹。',
+      })
+    }
+  }
+  refreshTrayMenu()
+}