dsh-plugin 1.3.2 → 1.3.4

package/src/client/data/catalog.ts

@@ -16,21 +16,22 @@ const PROXY_BASE = '/dsh-plugin-hub/catalog'
 const PLUGINS_URL = (lang: LocaleId) => `${PROXY_BASE}?lang=${lang}`
 const STATS_URL = `${PROXY_BASE}?stats=1`
 
-async function fetchJson(url: string): Promise<unknown> {
-  const res = await fetch(url, { cache: 'no-store' })
+async function fetchJson(url: string, signal?: AbortSignal): Promise<unknown> {
+  const res = await fetch(url, { cache: 'no-store', signal })
   if (!res.ok) throw new Error(String(res.status))
   return res.json()
 }
 
-/** 目录插件列表（在线 API 已只返回 verified；过滤与排序由上层负责）。 */
-export async function fetchCatalog(lang: LocaleId): Promise<HubPlugin[]> {
-  const data = await fetchJson(PLUGINS_URL(lang))
+/** 目录插件列表（在线 API 已只返回 verified；过滤与排序由上层负责）。
+ *  signal 可选：宿主重启/代理抖动导致请求挂起时，上层可中止旧请求释放连接。 */
+export async function fetchCatalog(lang: LocaleId, signal?: AbortSignal): Promise<HubPlugin[]> {
+  const data = await fetchJson(PLUGINS_URL(lang), signal)
   return (Array.isArray(data) ? data : []).map((item) => normalize(item as Record<string, unknown>))
 }
 
 /** 收录/精选统计（/api/stats.json）；字段不完整返回 null。 */
-export async function fetchStats(): Promise<{ total: number; verified: number } | null> {
-  const s = await fetchJson(STATS_URL) as { total?: number; verified?: number }
+export async function fetchStats(signal?: AbortSignal): Promise<{ total: number; verified: number } | null> {
+  const s = await fetchJson(STATS_URL, signal) as { total?: number; verified?: number }
   if (s && typeof s.total === 'number' && typeof s.verified === 'number') {
     return { total: s.total, verified: s.verified }
   }

package/src/client/hooks/useCatalog.ts

@@ -9,7 +9,7 @@
  * installed-plugin table, and the filter/search/sort/install-status view
  * state, exposing the derived visible list and per-category counts.
  */
-import { useEffect, useMemo, useState } from 'react'
+import { useEffect, useMemo, useRef, useState } from 'react'
 import type { HubPlugin, LocaleId } from '../types.ts'
 import { HUB_REPO, PLUGIN_VERSION } from '../logic/constants.ts'
 import type { HubAboutInfo, HubUpdateInfo } from '../types.ts'
@@ -45,6 +45,14 @@ export function useCatalog(lang: LocaleId) {
   const [sort, setSort] = useState<SortKey>('sortStars')
   /** 当前排序方向：点同一个排序按钮切换 正序/倒序；点新排序用该排序的默认方向（与已安装视图一致） */
   const [sortDir, setSortDir] = useState<'asc' | 'desc'>('desc')
+  /** 目录加载「超时自动强制刷新」重试计数：宿主重启/代理未就绪时请求可能长时间挂起，
+   *  界面停在「正在加载插件数据…」假死 —— 超时自动重拉，最多自动重试 2 次后转失败态；
+   *  用户手动刷新（reload）时清零重新计数。 */
+  const loadRetriesRef = useRef(0)
+  /** 目录加载超时阈值：超过即判定挂起，强制刷新一次（服务端代理 curl 上限 20s，客户端 12s 先兜底） */
+  const LOAD_TIMEOUT_MS = 12000
+  /** 挂起后最多自动重试次数：避免代理持续不通时无限循环刷新（每次重试仍 12s，2 次后转失败界面可手动重试） */
+  const MAX_LOAD_RETRIES = 2
 
   /** 点击排序按钮：同一按钮切换正/倒序，新按钮用默认方向 */
   function toggleSort(key: SortKey) {
@@ -83,15 +91,21 @@ export function useCatalog(lang: LocaleId) {
   // 拉取目录 + 统计。在线 API 已只返回 verified；再过滤一次，保证只展示人工验证通过的插件。
   useEffect(() => {
     let cancelled = false
+    // 本次加载是否已收尾（成功或失败）：超时定时器只对「还在加载中」生效
+    let settled = false
+    // 中止控制器：请求挂起时（宿主重启/代理抖动）超时自动重试会换新请求，
+    // 旧请求在此中止释放连接，避免挂起堆积
+    const controller = new AbortController()
     setPlugins(null)
     setHubPlugin(null)
     setStats(null)
     setFailed(false)
     // 目录数据直拉：hub 自身版本由独立 Worker 版本控制中心管理，不再依赖主站版本号接口。
-    const load = () => Promise.all([fetchCatalog(lang), fetchStats()])
+    const load = () => Promise.all([fetchCatalog(lang, controller.signal), fetchStats(controller.signal)])
     load()
       .then(([list, stats]) => {
         if (cancelled) return
+        settled = true
         // 插件市场不显示自己：DSH Plugin Hub 从目录里排除自身条目，
         // 防止「自己出现在自己的插件列表里、还能自己安装自己」；统计计数同步减 1 保持与列表一致。
         // 目录数据已排除自身，此处再兜底过滤一次，防旧快照仍含自身条目。
@@ -106,9 +120,27 @@ export function useCatalog(lang: LocaleId) {
         }
       })
       .catch(() => {
-        if (!cancelled) setFailed(true)
+        if (cancelled) return
+        settled = true
+        setFailed(true)
       })
-    return () => { cancelled = true }
+    // 加载超时兜底：宿主刚重启/代理未就绪时目录请求可能长时间挂起，界面停在「正在加载插件数据…」
+    // 像假死。超过阈值未收尾 → 强制刷新列表（重拉一次，最多 MAX_LOAD_RETRIES 次自动重试），
+    // 重试仍失败 → 转失败界面（显示「重试」按钮，手动刷新时计数清零重新开始）。
+    const timer = window.setTimeout(() => {
+      if (cancelled || settled) return
+      if (loadRetriesRef.current < MAX_LOAD_RETRIES) {
+        loadRetriesRef.current += 1
+        setReloadKey((k) => k + 1)
+      } else {
+        setFailed(true)
+      }
+    }, LOAD_TIMEOUT_MS)
+    return () => {
+      cancelled = true
+      window.clearTimeout(timer)
+      controller.abort()
+    }
     // lang 必须进依赖：切换界面语言要重新拉对应语言的数据文件，
     // 否则英文模式仍停留在 plugins.zh.json，描述/名称全是中文
   }, [reloadKey, lang])
@@ -218,7 +250,7 @@ export function useCatalog(lang: LocaleId) {
     hubPlugin,
     stats,
     failed,
-    reload: () => setReloadKey((k) => k + 1),
+    reload: () => { loadRetriesRef.current = 0; setReloadKey((k) => k + 1) },
     installed,
     installedItems,
     installedName,

package/src/client/locales.ts

@@ -141,6 +141,12 @@ export const zh = {
   logOpenFile: '打开文件',
   logOpenFileTip: '在系统文件管理器中定位日志文件',
   logOpenFileFail: '打开失败，请在文件管理器中手动定位',
+  logClearAll: '清空所有日志',
+  logClearConfirmTitle: '清空所有日志？',
+  logClearConfirmDesc: '将删除全部日志记录，且不可恢复。',
+  logClearing: '正在清空…',
+  logClearAllTip: '清空全部日志记录',
+  logClearFailed: '清空失败，请重试',
   logPathSettingTitle: '日志存放位置',
   logPathSettingDesc: '默认存于宿主配置目录，可填目录或 .log 文件路径改存别处',
   logPathPlaceholder: '留空恢复默认',
@@ -241,7 +247,7 @@ export const zh = {
   restartNow: '立即重启',
   restartLater: '稍后重启',
   restarting: '正在重启…',
-  restartHint: '部分插件（如插件市场、顶层 bundle）需重启后才会生效。',
+  restartHint: '重启会中断正在进行的安装/卸载任务，其进度将丢失。部分插件（如插件市场、顶层 bundle）需重启后才会生效。',
   done: '完成',
   // 待重启：装完没重启的插件常驻提醒，直到宿主真正重启
   restartPendingHint: '安装成功，重启后生效',
@@ -254,7 +260,11 @@ export const zh = {
   notificationsDesc: '安装、卸载任务与更新提醒都会记录在这里，即使错过提示也能随时回来查看。',
   notificationsEmpty: '暂无通知记录',
   notificationsClear: '清空通知',
+  notificationsClearConfirmTitle: '清空所有通知？',
+  notificationsClearConfirmDesc: '将删除全部通知记录，且不可恢复。',
   removeNotification: '删除这条通知',
+  removeNotificationConfirmTitle: '删除这条通知？',
+  removeNotificationConfirmDesc: '该通知将被移除，且不可恢复。',
   // 串行队列：安装/卸载弹窗内可后台关闭，排队任务自动串行执行
   queuedTitle: '已加入安装排队',
   queuedUninstallTitle: '已加入卸载排队',
@@ -458,6 +468,12 @@ export const en = {
   logOpenFile: 'Reveal',
   logOpenFileTip: 'Reveal the log file in your system file manager',
   logOpenFileFail: 'Could not open; locate the file manually',
+  logClearAll: 'Clear all logs',
+  logClearConfirmTitle: 'Clear all logs?',
+  logClearConfirmDesc: 'All log entries will be deleted. This cannot be undone.',
+  logClearing: 'Clearing…',
+  logClearAllTip: 'Delete all log entries',
+  logClearFailed: 'Failed to clear; try again',
   logPathSettingTitle: 'Log Location',
   logPathSettingDesc: 'Stored in the host config directory by default — set a directory or a .log file path to store elsewhere',
   logPathPlaceholder: 'Leave empty for default',
@@ -558,7 +574,7 @@ export const en = {
   restartNow: 'Restart now',
   restartLater: 'Later',
   restarting: 'Restarting…',
-  restartHint: 'Some plugins (such as plugin markets / top-level bundles) only take effect after a restart.',
+  restartHint: 'Restarting interrupts any in-progress install / uninstall task — its progress will be lost. Some plugins (such as plugin markets / top-level bundles) only take effect after a restart.',
   done: 'Done',
   restartPendingHint: 'Installed — takes effect after restart',
   restartPendingHintUninstall: 'Removed — cleaned up after restart',
@@ -570,7 +586,11 @@ export const en = {
   notificationsDesc: 'Every install, remove and update notice is logged here — even if you missed the prompt, you can always check back.',
   notificationsEmpty: 'No notifications yet',
   notificationsClear: 'Clear notifications',
+  notificationsClearConfirmTitle: 'Clear all notifications?',
+  notificationsClearConfirmDesc: 'All notification records will be deleted. This cannot be undone.',
   removeNotification: 'Remove this notification',
+  removeNotificationConfirmTitle: 'Remove this notification?',
+  removeNotificationConfirmDesc: 'This notification will be removed. This cannot be undone.',
   queuedTitle: 'Queued…',
   queuedUninstallTitle: 'Queued for removal…',
   queuedHint: 'Queued — starts automatically after earlier tasks finish. You may close this window.',

package/src/client/logic/ensure-plugin-css.ts

@@ -0,0 +1,42 @@
+/**
+ * Self-heal missing plugin CSS tags.
+ *
+ * CSS injection is a one-shot side effect of the bundle factory (guarded by
+ * "tag already present"). When the host restarts the page survives, but the
+ * host HMR chain may remove the <style data-plugin> tags while the in-memory
+ * module cache still holds the old factory — so the factory never re-runs and
+ * the styles never come back until some interaction triggers a reload.
+ *
+ * The tsdown `dsh-css-modules-inline` build plugin registers every module's
+ * { tagId, css } into the global list `__DSH_PLUGIN_CSS__` at factory time.
+ * This helper compares that list against the live DOM and re-injects any
+ * missing tags, turning the "click around to fix it" self-heal into an
+ * automatic one on mount / view switch.
+ */
+
+interface PluginCssEntry {
+  tagId: string
+  css: string
+}
+
+declare global {
+  interface Window {
+    __DSH_PLUGIN_CSS__?: PluginCssEntry[]
+  }
+}
+
+/** Re-inject any registered stylesheet that is missing from the DOM. Idempotent. */
+export function ensurePluginCss(): void {
+  if (typeof document === 'undefined') return
+  const registry = window.__DSH_PLUGIN_CSS__
+  if (!registry || registry.length === 0) return
+  for (const { tagId, css } of registry) {
+    const selector = 'style[data-plugin-css=' + JSON.stringify(tagId) + ']'
+    if (document.querySelector(selector) !== null) continue
+    const tag = document.createElement('style')
+    tag.dataset.plugin = 'dsh-plugin'
+    tag.dataset.pluginCss = tagId
+    tag.textContent = css
+    document.head.appendChild(tag)
+  }
+}

package/src/client/styles/LogsView.module.css

@@ -62,16 +62,37 @@
   cursor: default;
 }
 
-/* 主操作：导出日志，品牌色实底 */
-.btnPrimary {
-  color: #ffffff;
-  background: var(--hub-brand);
-  border-color: var(--hub-brand);
+/* 弹窗头部动作：清空所有日志（危险操作，二次确认时转红） */
+.headActions {
+  flex: 1;
+  display: flex;
+  justify-content: flex-end;
+  margin-right: 4px;
+}
+
+.clearBtn {
+  flex: none;
+  height: 22px;
+  padding: 0 10px;
+  font-size: 11px;
+  font-weight: 500;
+  color: var(--hub-text-secondary);
+  background: transparent;
+  border: 1px solid var(--hub-border-2);
+  border-radius: 6px;
+  cursor: pointer;
+  user-select: none;
+  transition: color 0.12s ease, background-color 0.12s ease, border-color 0.12s ease;
 }
 
-.btnPrimary:hover:not(:disabled) {
-  background: var(--hub-brand-hover);
-  border-color: var(--hub-brand-hover);
+.clearBtn:hover:not(:disabled) {
+  color: var(--hub-text-primary);
+  background: var(--hub-bg-2);
+}
+
+.clearBtn:disabled {
+  opacity: 0.55;
+  cursor: default;
 }
 
 /* 日志列表：一行一条，悬浮高亮；超出限高内部滚动 */

package/src/client/styles/Modal.module.css

@@ -122,6 +122,83 @@
   flex-shrink: 0;
 }
 
+/* 确认弹窗图标区：图标居中占位，位于标题下方、描述上方 —— 所有询问框都要有对应图标 */
+.confirmIconWrap {
+  display: flex;
+  justify-content: center;
+  padding: 2px 0 6px;
+}
+
+/* 确认弹窗图标：圆形徽标（48px），普通确认 = 品牌蓝底白图形 */
+.confirmIcon {
+  width: 48px;
+  height: 48px;
+  flex: none;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  background: var(--hub-brand);
+  box-shadow: 0 4px 12px rgba(79, 110, 247, 0.28);
+}
+
+/* 危险操作确认图标：红色底白图形 —— 清空/删除/卸载/重置，醒目区分于普通确认 */
+.confirmIconDanger {
+  background: var(--hub-danger);
+  box-shadow: 0 4px 12px rgba(209, 36, 47, 0.3);
+}
+
+/* 危险操作确认按钮：红色实底白字 —— 清空/删除/卸载/重置的最终确认，显著醒目 */
+.dangerConfirm {
+  flex: none;
+  height: 28px;
+  padding: 0 14px;
+  font-size: 12px;
+  font-weight: 600;
+  color: #ffffff;
+  background: var(--hub-danger);
+  border: 1px solid var(--hub-danger);
+  border-radius: 6px;
+  cursor: pointer;
+  user-select: none;
+  transition: background-color 0.12s ease, border-color 0.12s ease;
+}
+
+.dangerConfirm:hover:not(:disabled) {
+  background: var(--hub-danger-hover);
+  border-color: var(--hub-danger-hover);
+}
+
+.dangerConfirm:disabled {
+  opacity: 0.55;
+  cursor: default;
+}
+
+/* 普通确认按钮：品牌蓝实底白字 —— 安装/更新/重启/忽略等常规确认 */
+.confirmPrimary {
+  flex: none;
+  height: 28px;
+  padding: 0 14px;
+  font-size: 12px;
+  font-weight: 600;
+  color: #ffffff;
+  background: var(--hub-brand);
+  border: 1px solid var(--hub-brand);
+  border-radius: 6px;
+  cursor: pointer;
+  user-select: none;
+  transition: filter 0.12s ease;
+}
+
+.confirmPrimary:hover:not(:disabled) {
+  filter: brightness(1.08);
+}
+
+.confirmPrimary:disabled {
+  opacity: 0.55;
+  cursor: default;
+}
+
 .modalDesc {
   font-size: 12px;
   line-height: 18px;

package/src/server/http/routes.ts

@@ -20,7 +20,63 @@ import { resolveNpmPackage } from '../services/install/npm-resolve.ts'
 import { preflightTarget } from '../services/install/preflight.ts'
 import { isDshPlugin, isEntryLoaded } from '../services/loader.ts'
 import { loadSettings, saveSettings, resetSettings, type HubSettings } from '../services/settings.ts'
-import { appendLog, readLog, logFilePath, defaultLogFilePath, customLogFile } from '../services/log.ts'
+import { appendLog, clearLog, readLog, logFilePath, defaultLogFilePath, customLogFile } from '../services/log.ts'
+
+/**
+ * 跨平台宿主重启脚本（以 `node -e` 运行，独立于宿主进程）。
+ * 取代原先的 `/bin/sh -c`：Windows 无 /bin/sh，且 lsof/nohup 仅 POSIX 存在。
+ * 由 `spawn(process.execPath, ['-e', SCRIPT, port], { detached, stdio:'ignore' })` 孵化，
+ * 宿主进程被 kill 后仍能完成「停旧 → 等端口释放 → 拉起新 dsh web」。
+ */
+const HOST_RESTART_SCRIPT = String.raw`const C = require('node:child_process')
+const F = require('node:fs')
+const P = require('node:path')
+const O = require('node:os')
+const win = process.platform === 'win32'
+const port = Number(process.argv[1])
+
+function findPids() {
+  if (win) {
+    const out = C.spawnSync('netstat', ['-ano', '-p', 'tcp'], { encoding: 'utf8' })
+    const found = []
+    for (const line of String(out.stdout || '').split(/\r?\n/)) {
+      if (!/LISTENING/i.test(line)) continue
+      const parts = line.trim().split(/\s+/)
+      const addr = parts[1] || ''
+      if (!addr.endsWith(':' + port)) continue
+      const pid = parts[parts.length - 1]
+      if (pid && /\d+/.test(pid)) found.push(pid)
+    }
+    return found
+  }
+  const out = C.spawnSync('lsof', ['-ti', 'tcp:' + port, '-sTCP:LISTEN'], { encoding: 'utf8' })
+  return String(out.stdout || '').split(/\s+/).filter(Boolean)
+}
+
+for (const pid of findPids()) {
+  try {
+    if (win) C.spawnSync('taskkill', ['/pid', pid, '/t', '/f'])
+    else process.kill(Number(pid), 'SIGTERM')
+  } catch {}
+}
+
+let tries = 0
+;(function waitForStop() {
+  if (findPids().length === 0 || ++tries > 20) return startHost()
+  setTimeout(waitForStop, 250)
+})()
+
+function startHost() {
+  const dir = P.join(O.homedir(), '.dsh', 'logs')
+  F.mkdirSync(dir, { recursive: true })
+  const fd = F.openSync(P.join(dir, 'dsh-web-' + port + '.log'), 'a')
+  const child = C.spawn('dsh', ['web', '--port', String(port)], {
+    detached: true,
+    shell: win,
+    stdio: ['ignore', fd, fd],
+  })
+  child.unref()
+}`
 
 export interface WebRoute {
   kind: 'exact'
@@ -325,6 +381,25 @@ export function mountPluginHubRoutes(webServer: WebServerService, profile: strin
         }
       },
     }),
+    webServer.register({
+      kind: 'exact',
+      path: '/dsh-plugin-hub/clear-log',
+      handler: (request, response) => {
+        if (!requireTrustedPost(request, response)) return
+        // 清空所有日志：截断当前日志文件为空
+        try {
+          const ok = clearLog(profile)
+          if (!ok) {
+            sendJson(response, 500, { error: 'failed to clear log' })
+            return
+          }
+          appendLog(profile, { at: Date.now(), level: 'info', category: 'system', event: 'system.clear', message: '日志已由用户清空' })
+          sendJson(response, 200, { ok: true })
+        } catch {
+          sendJson(response, 500, { error: 'failed to clear log' })
+        }
+      },
+    }),
     webServer.register({
       kind: 'exact',
       path: '/dsh-plugin-hub/open-log',
@@ -773,16 +848,12 @@ export function mountPluginHubRoutes(webServer: WebServerService, profile: strin
         const host = request.headers.host ?? ''
         const portMatch = host.match(/:(\d+)$/)
         const port = portMatch ? Number(portMatch[1]) : 7923
-        // detached 子 shell 完成「停旧进程 → 等端口释放 → 后台拉起 dsh web」，
-        // 即使当前宿主（即本插件所在进程）被 kill，重启仍会继续执行
-        const script = [
-          `pids=$(lsof -ti tcp:${port} -sTCP:LISTEN 2>/dev/null)`,
-          '[ -n "$pids" ] && kill -TERM $pids 2>/dev/null || true',
-          `i=0; while [ -n "$(lsof -ti tcp:${port} -sTCP:LISTEN 2>/dev/null)" ] && [ $i -lt 20 ]; do sleep 0.25; i=$((i + 1)); done`,
-          'mkdir -p "$HOME/.dsh/logs"',
-          `nohup dsh web --port ${port} >>"$HOME/.dsh/logs/dsh-web-${port}.log" 2>&1 &`,
-        ].join('\n')
-        spawn('/bin/sh', ['-c', script], { detached: true, stdio: 'ignore' }).unref()
+        // detached 子进程完成「停旧进程 → 等端口释放 → 后台拉起 dsh web」，
+        // 即使当前宿主（即本插件所在进程）被 kill，重启仍会继续执行。
+        // 不用 /bin/sh：Windows 无此路径，且 lsof/nohup 等仅 POSIX 存在，
+        // 故孵化 node(process.execPath) 跑跨平台脚本 —— Windows 用
+        // netstat + taskkill + shell:true 解析 dsh.cmd，POSIX 用 lsof + SIGTERM。
+        spawn(process.execPath, ['-e', HOST_RESTART_SCRIPT, String(port)], { detached: true, stdio: 'ignore' }).unref()
         sendJson(response, 200, { ok: true, port })
       },
     }),

package/src/server/services/install/npm-check.ts

@@ -23,7 +23,8 @@ export const NPM_MIN_VERSION = [11, 6, 0]
 /** 读本机 npm 版本（major.minor.patch）；npm 不在 PATH 或执行失败/超时时返回 null（不妄下结论）。 */
 export function npmVersionOf(env: NodeJS.ProcessEnv | undefined): [number, number, number] | null {
   try {
-    const res = spawnSync('npm', ['-v'], { env, encoding: 'utf8', timeout: 10_000, stdio: ['ignore', 'pipe', 'pipe'] })
+    // Windows 下 npm 是 npm.cmd：spawn 直接 exec 会拒绝，须 shell:true 解析（与 task-queue 的 useShell 一致）
+    const res = spawnSync('npm', ['-v'], { env, encoding: 'utf8', timeout: 10_000, stdio: ['ignore', 'pipe', 'pipe'], shell: process.platform === 'win32' })
     if (res.error !== undefined || res.status !== 0) return null
     const m = /(\d+)\.(\d+)\.(\d+)/.exec(res.stdout ?? '')
     return m ? [Number(m[1]), Number(m[2]), Number(m[3])] : null

package/src/server/services/log.ts

@@ -105,6 +105,18 @@ export function appendLog(profile: string, entry: LogEntry): void {
   }
 }
 
+/** 清空系统日志：把当前日志文件截断为空。失败返回 false（不阻断调用方）。 */
+export function clearLog(profile: string): boolean {
+  try {
+    const file = logFilePath(profile)
+    mkdirSync(dirname(file), { recursive: true })
+    writeFileSync(file, '')
+    return true
+  } catch {
+    return false
+  }
+}
+
 /** 兼容旧格式：早期无 category（level 用 info/ok/fail/warn），归一化到新版。 */
 function normalize(raw: unknown): LogEntry | null {
   if (typeof raw !== 'object' || raw === null) return null