dsh-reload-buttons 0.1.4 → 0.1.5

package/index.js

@@ -25,6 +25,8 @@ export const name = 'dsh-reload-buttons'
 export const inject = []
 
 const ROUTE = '/dsh-reload-buttons/api/restart'
+/** 探测路由：客户端点重启前先确认宿主半边在，失败时才能给出可读原因。 */
+const PING_ROUTE = '/dsh-reload-buttons/api/ping'
 const WORKER = fileURLToPath(new URL('./assets/restart-app.mjs', import.meta.url))
 
 /** 桌面端＝宿主跑在 Electron 的 Node 模式里。 */
@@ -94,34 +96,50 @@ function sendJson(res, code, value) {
   res.end(JSON.stringify(value))
 }
 
-/** 注册重启路由。 */
+/** 注册探测路由与重启路由。 */
 export function apply(ctx) {
   const mount = (hostCtx) => {
     const webServer = hostCtx
       && (hostCtx.webServer || (typeof hostCtx.get === 'function' ? hostCtx.get('webServer') : undefined))
     if (!webServer || typeof webServer.register !== 'function') return
-    ctx.effect(() => webServer.register({
-      kind: 'exact',
-      path: ROUTE,
-      handler: (req, res) => {
-        if (!isLocal(req)) return sendJson(res, 403, { ok: false, error: '只接受本机请求' })
-        if (req.method !== 'POST') return sendJson(res, 405, { ok: false, error: '只支持 POST' })
-        if (isDesktop()) {
-          let handedOff = false
-          try {
-            handedOff = handOffRestart(webServer.port)
-          } catch {
-            handedOff = false
+    ctx.effect(() => {
+      // 探测优先：客户端点重启前先问一句宿主在不在，失败时才能给出可读原因。
+      const offPing = webServer.register({
+        kind: 'exact',
+        path: PING_ROUTE,
+        handler: (req, res) => {
+          if (!isLocal(req)) return sendJson(res, 403, { ok: false, error: '只接受本机请求' })
+          if (req.method !== 'GET') return sendJson(res, 405, { ok: false, error: '只支持 GET' })
+          sendJson(res, 200, { ok: true })
+        },
+      })
+      const offRestart = webServer.register({
+        kind: 'exact',
+        path: ROUTE,
+        handler: (req, res) => {
+          if (!isLocal(req)) return sendJson(res, 403, { ok: false, error: '只接受本机请求' })
+          if (req.method !== 'POST') return sendJson(res, 405, { ok: false, error: '只支持 POST' })
+          if (isDesktop()) {
+            let handedOff = false
+            try {
+              handedOff = handOffRestart(webServer.port)
+            } catch {
+              handedOff = false
+            }
+            sendJson(res, 200, { ok: true, mode: handedOff ? 'relaunch' : 'exit' })
+            // 脚本没起来就别干等：退回内核自己退出（会弹恢复框，但至少不会卡死）
+            if (!handedOff) setTimeout(shutdownAndExit, 400)
+            return
           }
-          sendJson(res, 200, { ok: true, mode: handedOff ? 'relaunch' : 'exit' })
-          // 脚本没起来就别干等：退回内核自己退出（会弹恢复框，但至少不会卡死）
-          if (!handedOff) setTimeout(shutdownAndExit, 400)
-          return
-        }
-        sendJson(res, 200, { ok: true, mode: 'exit' })
-        setTimeout(shutdownAndExit, 400)
-      },
-    }), 'dsh-reload-buttons: restart route')
+          sendJson(res, 200, { ok: true, mode: 'exit' })
+          setTimeout(shutdownAndExit, 400)
+        },
+      })
+      return () => {
+        offPing()
+        offRestart()
+      }
+    }, 'dsh-reload-buttons: restart routes')
   }
   // apply 期直接取 ctx.get('webServer') 往往还没就绪，优先放进 inject 回调等它到位；
   // 桩 ctx（冒烟、测试）没有 inject，退回直接取（拿不到就什么也不做，不影响加载）。

package/lib/client.js

@@ -32,6 +32,7 @@ module.exports = __toCommonJS(entry_exports);
 var import_react = require("react");
 var import_jsx_runtime = require("react/jsx-runtime");
 var ROUTE = "/dsh-reload-buttons/api/restart";
+var PING_ROUTE = "/dsh-reload-buttons/api/ping";
 function api(path) {
   const relative = String(path).replace(/^\/+/, "");
   if (typeof document === "undefined") return "/" + relative;
@@ -108,9 +109,26 @@ async function probeBootBundles() {
   return { ok: results.every((r) => r.ok), total: results.length, bad: results.filter((r) => !r.ok) };
 }
 async function requestRestart() {
+  let alive = false;
   try {
-    await fetch(api(ROUTE), { method: "POST", headers: { "content-type": "application/json" }, body: "{}" });
-  } catch (e) {
+    const res = await fetch(api(PING_ROUTE), { method: "GET", cache: "no-store" });
+    alive = res.ok;
+  } catch {
+    alive = false;
+  }
+  if (!alive) return { ok: false, reason: "宿主半边没响应（插件可能没装全，或宿主已停止）" };
+  try {
+    const res = await fetch(api(ROUTE), { method: "POST", headers: { "content-type": "application/json" }, body: "{}" });
+    if (res.ok) return { ok: true };
+    let reason = "HTTP " + res.status;
+    try {
+      const data = await res.json();
+      if (data && data.error) reason = data.error;
+    } catch {
+    }
+    return { ok: false, reason };
+  } catch {
+    return { ok: true };
   }
 }
 function overlay(text, ms) {
@@ -148,7 +166,7 @@ function announceRefreshed() {
     return;
   }
   if (!stamp || Date.now() - stamp > 2e4) return;
-  overlay("\u754C\u9762\u5DF2\u5237\u65B0", 1800);
+  overlay("界面已刷新", 1800);
 }
 var modulesRef;
 function moduleSystem() {
@@ -185,11 +203,14 @@ function freshGraph() {
 async function resyncPlugins() {
   const modules = moduleSystem();
   const entries = modules && modules.entries;
-  if (!entries || typeof entries.sync !== "function") return false;
+  if (!entries || typeof entries.sync !== "function") return { ok: false, reason: "当前界面不支持就地刷新" };
   const graph = await freshGraph();
-  if (!graph) return false;
+  if (!graph) return { ok: false, reason: "没拿到宿主的插件清单" };
   await entries.sync(graph);
-  return true;
+  const state = entries.state && typeof entries.state.getSnapshot === "function" ? entries.state.getSnapshot() : null;
+  const failure = state && Array.isArray(state.failures) ? state.failures[0] : void 0;
+  if (failure) return { ok: false, reason: "插件加载失败：" + (failure.message || failure.id) };
+  return { ok: true };
 }
 function HeaderButtons() {
   const [restarting, setRestarting] = (0, import_react.useState)(false);
@@ -208,29 +229,31 @@ function HeaderButtons() {
         sessionStorage.setItem(REFRESH_FLAG, String(Date.now()));
       } catch {
       }
-      overlay("\u6B63\u5728\u5237\u65B0\u2026");
+      overlay("正在刷新…");
       await new Promise((resolve) => {
         setTimeout(resolve, 180);
       });
       window.location.reload();
       return;
     }
-    const hide = overlay("\u6B63\u5728\u5237\u65B0\u2026");
-    let resynced = false;
+    const hide = overlay("正在刷新…");
+    let resynced = { ok: false, reason: "未知原因" };
     try {
       resynced = await resyncPlugins();
-    } catch {
-      resynced = false;
+    } catch (error) {
+      resynced = { ok: false, reason: String(error && error.message || error) };
     }
     hide();
-    overlay(resynced ? "\u754C\u9762\u5DF2\u5237\u65B0" : "\u5237\u65B0\u5931\u8D25\uFF1A\u6E05\u5355\u5DF2\u8FC7\u671F\uFF0C\u8BF7\u7528\u300C\u91CD\u542F\u300D", 2200);
+    overlay(resynced.ok ? "界面已刷新" : "刷新失败：" + resynced.reason + "；请用「重启」", 2600);
     setChecking(false);
   }
   async function restart() {
     if (restarting) return;
-    if (!window.confirm("\u91CD\u542F\u5E94\u7528\uFF1F\u754C\u9762\u4F1A\u5173\u6389\uFF0C\u51E0\u79D2\u540E\u81EA\u52A8\u91CD\u5F00\uFF1B\u82E5\u5F39\u51FA\u300C\u5E94\u7528\u65E0\u6CD5\u4F7F\u7528\u300D\u7A97\u53E3\uFF0C\u70B9\u5176\u4E2D\u7684\u300C\u91CD\u542F\u300D\u5373\u53EF\u3002")) return;
+    if (!window.confirm("重启应用？界面会关掉：桌面版会在几秒后自动重开；命令行启动（dsh web）的进程会直接退出，需要你手动再启动。若弹出「应用无法使用」窗口，点其中的「重启」即可。")) return;
     setRestarting(true);
-    await requestRestart();
+    const result = await requestRestart();
+    setRestarting(false);
+    if (result && result.ok === false) overlay("重启失败：" + result.reason, 3200);
   }
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { style: wrap, children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
@@ -238,8 +261,8 @@ function HeaderButtons() {
       {
         type: "button",
         style: Object.assign({}, btn, checking ? { opacity: 0.35, cursor: "default" } : null),
-        title: "\u5237\u65B0\u754C\u9762",
-        "aria-label": "\u5237\u65B0\u754C\u9762",
+        title: "刷新界面",
+        "aria-label": "刷新界面",
         onClick: () => void reload(),
         children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(IconRefresh, {})
       }
@@ -249,8 +272,8 @@ function HeaderButtons() {
       {
         type: "button",
         style: Object.assign({}, btn, restarting ? { opacity: 0.35, cursor: "default" } : null),
-        title: "\u91CD\u542F\u5E94\u7528\uFF08\u5173\u6389\u754C\u9762\uFF0C\u51E0\u79D2\u540E\u81EA\u52A8\u91CD\u5F00\uFF09",
-        "aria-label": "\u91CD\u542F\u5E94\u7528",
+        title: "重启应用（桌面版自动重开；命令行版需手动再启动）",
+        "aria-label": "重启应用",
         onClick: () => void restart(),
         children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(IconPower, {})
       }

package/package.json

@@ -1,18 +1,16 @@
 {
   "name": "dsh-reload-buttons",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "在 DSH 界面左上角放两个按钮：刷新界面、重启应用。",
   "type": "module",
   "main": "index.js",
   "exports": {
     ".": "./index.js",
-    "./invariant": "./invariant.js",
     "./client": "./lib/client.js",
     "./package.json": "./package.json"
   },
   "files": [
     "index.js",
-    "invariant.js",
     "cordis.patch.yml",
     "src",
     "lib/client.js",
@@ -48,7 +46,7 @@
     "build:client": "node scripts/build-client.mjs",
     "check:client": "node scripts/build-client.mjs --check",
     "smoke": "node scripts/smoke.mjs",
-    "check": "node --check index.js && node --check invariant.js && node --check assets/restart-app.mjs"
+    "check": "node --check index.js && node --check assets/restart-app.mjs"
   },
   "devDependencies": {
     "esbuild": "^0.28.1"

package/scripts/build-client.mjs

@@ -34,6 +34,8 @@ const bundled = await build({
   platform: 'browser',
   jsx: 'automatic',
   target: ['chrome120'],
+  // 保留中文字面量：产物要能按原文核对文案，别让构建把中文转成 \uXXXX
+  charset: 'utf8',
   // react 由 DSH 客户端模块表提供，不能打进产物
   external: ['react', 'react/jsx-runtime'],
   write: false,

package/scripts/smoke.mjs

@@ -28,7 +28,6 @@ const fail = (label, why) => {
 /** 1. 包结构 */
 const REQUIRED = [
   'index.js',
-  'invariant.js',
   'cordis.patch.yml',
   'assets/restart-app.mjs',
   'src/entry.jsx',
@@ -74,11 +73,14 @@ try {
 }
 
 const ROUTE = '/' + pkg.name + '/api/restart'
-if (routes.length !== 1) fail('宿主半边', '应注册 1 条路由，实际 ' + routes.length)
-else if (routes[0].path !== ROUTE) fail('宿主半边', '路由路径是 ' + routes[0].path + '，应为 ' + ROUTE)
-else if (routes[0].kind !== 'exact') fail('宿主半边', '路由 kind 是 ' + routes[0].kind + '，应为 exact')
+const PING = '/' + pkg.name + '/api/ping'
+const routeOf = (path) => routes.find((route) => route.path === path)
+if (routes.length !== 2) fail('宿主半边', '应注册 2 条路由，实际 ' + routes.length)
+else if (!routeOf(PING)) fail('宿主半边', '缺探测路由 ' + PING)
+else if (!routeOf(ROUTE)) fail('宿主半边', '缺重启路由 ' + ROUTE)
+else if (routeOf(PING).kind !== 'exact' || routeOf(ROUTE).kind !== 'exact') fail('宿主半边', '路由 kind 应为 exact')
 else if (effects.length !== 1) fail('宿主半边', '应登记 1 个 effect，实际 ' + effects.length)
-else ok('宿主半边', 'POST ' + ROUTE + ' 已注册（kind=exact）')
+else ok('宿主半边', 'GET ' + PING + '、POST ' + ROUTE + ' 已注册（kind=exact）')
 
 /** 3. 路由鉴权 */
 function call(handler, req) {
@@ -98,19 +100,23 @@ function call(handler, req) {
   return res
 }
 
-if (routes.length === 1) {
-  const handler = routes[0].handler
+if (routes.length === 2) {
+  const restart = routeOf(ROUTE).handler
+  const ping = routeOf(PING).handler
   const cases = [
-    { label: '非回环地址被拒', req: { socket: { remoteAddress: '10.1.2.3' }, method: 'POST' }, want: 403 },
-    { label: 'GET 被拒', req: { socket: { remoteAddress: '127.0.0.1' }, method: 'GET' }, want: 405 },
-    { label: '::1 本机照常走 POST 分支', req: { socket: { remoteAddress: '::1' }, method: 'GET' }, want: 405 },
-    { label: 'IPv4 映射地址被认作本机', req: { socket: { remoteAddress: '::ffff:127.0.0.1' }, method: 'GET' }, want: 405 },
+    { label: '非回环地址被拒', handler: restart, req: { socket: { remoteAddress: '10.1.2.3' }, method: 'POST' }, want: 403 },
+    { label: 'GET 打重启被拒', handler: restart, req: { socket: { remoteAddress: '127.0.0.1' }, method: 'GET' }, want: 405 },
+    { label: '::1 本机照常走 POST 分支', handler: restart, req: { socket: { remoteAddress: '::1' }, method: 'GET' }, want: 405 },
+    { label: 'IPv4 映射地址被认作本机', handler: restart, req: { socket: { remoteAddress: '::ffff:127.0.0.1' }, method: 'GET' }, want: 405 },
+    { label: '探测路由非回环被拒', handler: ping, req: { socket: { remoteAddress: '10.1.2.3' }, method: 'GET' }, want: 403 },
+    { label: '探测路由 POST 被拒', handler: ping, req: { socket: { remoteAddress: '127.0.0.1' }, method: 'POST' }, want: 405 },
+    { label: '探测路由本机 GET 放行', handler: ping, req: { socket: { remoteAddress: '127.0.0.1' }, method: 'GET' }, want: 200 },
   ]
   let passed = 0
   for (const item of cases) {
     let res
     try {
-      res = call(handler, item.req)
+      res = call(item.handler, item.req)
     } catch (error) {
       fail('路由鉴权', item.label + '：handler 抛错 ' + error.message)
       continue
@@ -127,7 +133,11 @@ const idMatch = /^\s*id:\s*"([^"]+)"/m.exec(client)
 if (!idMatch) fail('客户端产物', '外壳里找不到 id')
 else if (idMatch[1] !== pkg.name) fail('客户端产物', '外壳 id 是 ' + idMatch[1] + '，应等于包名 ' + pkg.name)
 else if (!client.includes(ROUTE)) fail('客户端产物', '产物里没有路由 ' + ROUTE + '（源码改了但没重新构建）')
+else if (!client.includes(PING)) fail('客户端产物', '产物里没有探测路由 ' + PING + '（源码改了但没重新构建）')
 else if (!client.includes(pkg.name + ':refreshed')) fail('客户端产物', '产物里没有刷新标记（源码改了但没重新构建）')
+else if (!client.includes('getSnapshot')) fail('客户端产物', '产物里没有读取替换结果（源码改了但没重新构建）')
+else if (!client.includes('命令行启动')) fail('客户端产物', '产物里没有区分命令行版的文案（源码改了但没重新构建）')
+else if (client.includes('关掉界面，几秒后自动重开')) fail('客户端产物', '产物里还带着旧的确认框文案')
 else ok('客户端产物', 'id=' + pkg.name + '，' + Buffer.byteLength(client, 'utf8') + ' 字节')
 
 console.log('')

package/src/entry.jsx

@@ -15,6 +15,7 @@
 import { useState } from 'react'
 
 const ROUTE = '/dsh-reload-buttons/api/restart'
+const PING_ROUTE = '/dsh-reload-buttons/api/ping'
 
 /** 把路由拼成当前页面挂载点下的路径（锚 document.baseURI，兼容子路径部署）。 */
 function api(path) {
@@ -75,11 +76,32 @@ async function probeBootBundles() {
   return { ok: results.every((r) => r.ok), total: results.length, bad: results.filter((r) => !r.ok) }
 }
 
-/** 请求宿主重启。界面随壳一起关掉，所以连接断掉是预期，不当错误。 */
+/**
+ * 请求宿主重启：先探一次宿主在不在，再发重启请求。
+ * 返回 { ok, reason }。界面随壳一起关掉时连接会断，那是预期，按成功算。
+ */
 async function requestRestart() {
+  let alive = false
+  try {
+    const res = await fetch(api(PING_ROUTE), { method: 'GET', cache: 'no-store' })
+    alive = res.ok
+  } catch {
+    alive = false
+  }
+  if (!alive) return { ok: false, reason: '宿主半边没响应（插件可能没装全，或宿主已停止）' }
   try {
-    await fetch(api(ROUTE), { method: 'POST', headers: { 'content-type': 'application/json' }, body: '{}' })
-  } catch (e) { /* 界面壳被关掉时连接会断，属预期 */ }
+    const res = await fetch(api(ROUTE), { method: 'POST', headers: { 'content-type': 'application/json' }, body: '{}' })
+    if (res.ok) return { ok: true }
+    let reason = 'HTTP ' + res.status
+    try {
+      const data = await res.json()
+      if (data && data.error) reason = data.error
+    } catch { /* 回包不是 JSON 就用状态码 */ }
+    return { ok: false, reason }
+  } catch {
+    // 桌面端重启时壳先关，连接断在这里属预期：请求已经送到宿主。
+    return { ok: true }
+  }
 }
 
 /** 顶部浮层：先提示「正在刷新…」，重载回来后再给一句「界面已刷新」，让人知道这一下确实生效了。 */
@@ -156,15 +178,22 @@ function freshGraph() {
   })
 }
 
-/** 清单过期时：按宿主当前图就地对齐插件条目——不重载整页、不关应用。 */
+/**
+ * 清单过期时：按宿主当前图就地对齐插件条目——不重载整页、不关应用。
+ * 返回 { ok, reason }：sync 只管执行，某个条目加载失败时它把失败记在内部状态里，
+ * 不读这个状态就会把「替换失败」报成「已刷新」。
+ */
 async function resyncPlugins() {
   const modules = moduleSystem()
   const entries = modules && modules.entries
-  if (!entries || typeof entries.sync !== 'function') return false
+  if (!entries || typeof entries.sync !== 'function') return { ok: false, reason: '当前界面不支持就地刷新' }
   const graph = await freshGraph()
-  if (!graph) return false
+  if (!graph) return { ok: false, reason: '没拿到宿主的插件清单' }
   await entries.sync(graph)
-  return true
+  const state = entries.state && typeof entries.state.getSnapshot === 'function' ? entries.state.getSnapshot() : null
+  const failure = state && Array.isArray(state.failures) ? state.failures[0] : undefined
+  if (failure) return { ok: false, reason: '插件加载失败：' + (failure.message || failure.id) }
+  return { ok: true }
 }
 
 /** 左上一行两个按钮。 */
@@ -191,22 +220,24 @@ function HeaderButtons() {
     }
     // 清单过期：整页重载会白屏（旧 rev 已 404）。改为就地重载插件，同行样给可见反馈。
     const hide = overlay('正在刷新…')
-    let resynced = false
+    let resynced = { ok: false, reason: '未知原因' }
     try {
       resynced = await resyncPlugins()
-    } catch {
-      resynced = false
+    } catch (error) {
+      resynced = { ok: false, reason: String((error && error.message) || error) }
     }
     hide()
-    overlay(resynced ? '界面已刷新' : '刷新失败：清单已过期，请用「重启」', 2200)
+    overlay(resynced.ok ? '界面已刷新' : '刷新失败：' + resynced.reason + '；请用「重启」', 2600)
     setChecking(false)
   }
 
   async function restart() {
     if (restarting) return
-    if (!window.confirm('重启应用？界面会关掉，几秒后自动重开；若弹出「应用无法使用」窗口，点其中的「重启」即可。')) return
+    if (!window.confirm('重启应用？界面会关掉：桌面版会在几秒后自动重开；命令行启动（dsh web）的进程会直接退出，需要你手动再启动。若弹出「应用无法使用」窗口，点其中的「重启」即可。')) return
     setRestarting(true)
-    await requestRestart()
+    const result = await requestRestart()
+    setRestarting(false)
+    if (result && result.ok === false) overlay('重启失败：' + result.reason, 3200)
   }
 
   return (
@@ -223,7 +254,7 @@ function HeaderButtons() {
       <button
         type="button"
         style={Object.assign({}, btn, restarting ? { opacity: 0.35, cursor: 'default' } : null)}
-        title="重启应用（关掉界面，几秒后自动重开）"
+        title="重启应用（桌面版自动重开；命令行版需手动再启动）"
         aria-label="重启应用"
         onClick={() => void restart()}
       >

package/invariant.js

@@ -1,10 +0,0 @@
-const PACKAGE_NAME = 'dsh-reload-buttons'
-
-/** Cordis companion plugin name. */
-export const name = 'dsh-reload-buttons-invariant'
-/** Service required before the companion can reserve package ownership. */
-export const inject = ['invariants']
-
-const install = () => {}
-
-export const apply = (ctx) => Promise.resolve(ctx.invariants.register(PACKAGE_NAME, install))