dsh-plugin-rack 0.1.4 → 0.1.5

package/README.md

@@ -205,10 +205,33 @@ POST /api/dsh-plugin-rack/uninstall   { name }
 
 写入 `cordis.patch.yml` 是原子操作（写临时文件 + rename），只删这个插件自己创建过的覆盖项，用户手写的内容原样保留。
 
+## 网络要求
+
+插件本身不带代理，也不改你的代理设置：它只是**按顺序试**「环境变量代理 → 系统的代理设置 → 直连」，把一个能通的路径交给自己的下载器；真正的安装动作交给宿主自己的 pnpm，所以走哪个 registry 完全听宿主的（`pluginManager.registries()` 解析出来的那个，没有就退回 `registry.npmjs.org`）。
+
+| 你在做的事 | 需要访问 | 没有代理能行吗 |
+| --- | --- | --- |
+| 检查 npm 包的更新、安装/更新 npm 包 | 宿主的 registry（国内常见是 `registry.npmmirror.com`） | **行**，镜像本来就直连可用 |
+| 检查 github 安装的插件有没有新提交 | `api.github.com` | 视网络而定；被墙时会报错，其它行不受影响 |
+| 更新 github 安装的插件 | `github.com`、`codeload.github.com` | 视网络而定，同上 |
+
+几个具体结论：
+
+- 系统代理**关掉但注册表里还留着旧的 `ProxyServer`** 不会再把下载带偏：现在会读 `ProxyEnable`，值为 `0` 时直接跳过（这就是「tried 127.0.0.1:7900 … direct: The operation was aborted」那个报错的成因）。
+- 每一条回退路线各拿一份独立的超时预算，前一条失败不会把后一条的时间耗光。
+- `GITHUB_TOKEN` 可以不设。不设时按匿名额度查 public 仓库（每小时 60 次，按 IP 算）；包多或频繁检查时才需要它，面板的「接口」页会显示当前是否已设置。
+- 不需要联网的操作：开/关插件、自动/手动清单、看日志、卸载、热替换。断网时面板照常可用，只有「检查更新」和一键更新会失败并给出原因。
+
 ## 兼容性
 
-- DSH `>=0.2.1-rc.2 <0.2.3-0`。已实测 `0.2.1-rc.2`、`0.2.1-rc.5`、`0.2.2-rc.1`、`0.2.2-rc.2`、`0.2.2-rc.3`；
+- DSH `>=0.2.1-rc.2 <0.3.0-0`。已实测 `0.2.1-rc.2`、`0.2.1-rc.5`、`0.2.2-rc.1`、`0.2.2-rc.2`、`0.2.2-rc.3`；
   名单之外的版本会明说不确定，不会假装兼容。
+
+  这个区间怎么理解：`engines.dsh` 是**宿主安装/启用插件时检查**的硬门槛，落在区间外会直接拒绝启用。
+  所以上界特意放到 `0.3.0` 之前而不是紧贴当前版本——DSH `0.2.x` 的小版本和 rc 都不会把插件锁死，
+  只有跨到 `0.3` 这种可能改表面的版本才需要重新确认一次。真到了那一天，插件本身也会先报错
+  （缺 `pluginManager`、缺 HMR、找不到 pnpm），不会静默半坏。
+
 - DSH 的 Web 界面（`dsh.client.platform = web`）。
 - 需要宿主提供 `pluginManager` 服务；没有它会明确报错，而不是假装成功。
 - 热替换依赖宿主的 HMR 服务；拿不到时退回提示「重启一次生效」，**不会骗你说已经生效了**。

package/client.js

@@ -144,6 +144,10 @@ window.__ModuleLoader__.load({
         updateNow: 'Update just this plugin',
         jobRunning: 'Host is updating in the background · {n} plugins',
         jobRollingBack: 'Rolling back — this cannot be cancelled',
+        jobPhaseWait: 'waiting for sessions to go idle',
+        jobPhaseDownload: 'downloading',
+        jobPhaseInstall: 'installing',
+        rowUpdating: 'updating',
         jobDone: 'Background update finished',
         jobFailed: 'Background update failed',
         jobInterrupted: 'The last update never finished (host restarted or interrupted)',
@@ -304,6 +308,10 @@ window.__ModuleLoader__.load({
         updateNow: '只更新这一个插件',
         jobRunning: '宿主正在后台更新 · {n} 个插件',
         jobRollingBack: '正在回滚，这一步不能取消',
+        jobPhaseWait: '等待会话空闲',
+        jobPhaseDownload: '正在下载',
+        jobPhaseInstall: '正在安装',
+        rowUpdating: '更新中',
         jobDone: '后台更新已完成',
         jobFailed: '后台更新失败',
         jobInterrupted: '上次更新没跑完（宿主重启或中断）',
@@ -690,6 +698,39 @@ function updatePageState(updates, checking) {
   return { kind: 'list', updatable: updatable, outOfRange: outOfRange };
 }
 
+/**
+ * How many entries across both channels can be updated right now.
+ *
+ * The 更新 tab badge used to read the npm answer alone (`updates.updates`) while
+ * the 「全部更新」button counted the github / tarball rows too, so a panel with
+ * one github update showed "更新 7" next to "全部更新 (8)".
+ *
+ * @param {{rows?: Array<object>}|null} updates
+ * @param {{rows?: Array<object>}|null} extras
+ * @returns {number}
+ */
+function updatableTotal(updates, extras) {
+  const countOf = (answer) => {
+    if (answer === null || typeof answer !== 'object' || !Array.isArray(answer.rows)) return 0;
+    return answer.rows.filter((row) => row !== null && typeof row === 'object' && row.hasUpdate === true).length;
+  };
+  return countOf(updates) + countOf(extras);
+}
+
+/**
+ * Which dictionary key describes the phase the host job is in.
+ *
+ * @param {string|null|undefined} phase
+ * @returns {string|null}
+ */
+function jobPhaseKey(phase) {
+  if (phase === 'start') return 'jobPhaseWait';
+  if (phase === 'download') return 'jobPhaseDownload';
+  if (phase === 'install') return 'jobPhaseInstall';
+  if (phase === 'rollback') return 'jobRollingBack';
+  return null;
+}
+
     const CSS = [
       '.pd-root{display:flex;flex-direction:column;height:100%;min-height:0;box-sizing:border-box;',
       'background:var(--dsw-alias-bg-base);color:var(--dsw-alias-label-primary)}',
@@ -924,6 +965,8 @@ function updatePageState(updates, checking) {
       '.pd-update-row{display:flex;align-items:center;gap:10px;padding:7px 10px;border-radius:9px;cursor:pointer}',
       // 已经是最新的行：压暗一档，让"需要动手的"和"不用管的"一眼分开。
       '.pd-update-row-done{opacity:.55;cursor:default}',
+      '.pd-update-row-busy{background:var(--dsw-alias-interactive-bg-hover);cursor:default}',
+      '.pd-update-busy{margin-left:auto;flex:none;border-color:var(--dsw-alias-brand-primary) transparent var(--dsw-alias-brand-primary) var(--dsw-alias-brand-primary)}',
       '.pd-update-row-done:hover{opacity:.8}',
       '.pd-update-row:hover{background:var(--dsw-alias-interactive-bg-hover)}',
       '.pd-update-name{flex:1;min-width:0;font-size:13px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}',
@@ -1821,7 +1864,7 @@ function updatePageState(updates, checking) {
           { key: 'plugins', title: t('tabPlugins') },
           { key: 'core', title: t('tabCore') },
           { key: 'failed', title: t('tabFailed') },
-          { key: 'updates', title: t('tabUpdates'), badge: updates === null ? null : updates.updates },
+          { key: 'updates', title: t('tabUpdates'), badge: updates === null && extras === null ? null : updatableTotal(updates, extras) },
         ].map((page) => ({ ...page, rows: pageRows(page.key) }));
 
         const current = pages.find((page) => page.key === tab) || pages[0];
@@ -2473,15 +2516,23 @@ function updatePageState(updates, checking) {
         };
 
         const pickedNames = Object.keys(picked).filter((name) => picked[name] === true);
-        const updateRowNode = (row) =>
-          h(
+        const updateRowNode = (row) => {
+          // The host job runs pnpm once for the whole batch, so no row ever flips
+          // its own phase to "running". Mark the names the job carries instead,
+          // otherwise the banner spins while the list looks dead.
+          const busyNow =
+            job !== null &&
+            job.running === true &&
+            Array.isArray(job.names) &&
+            job.names.indexOf(row.name) >= 0;
+          return h(
             'label',
-            { key: row.name, className: 'pd-update-row' },
+            { key: row.name, className: busyNow ? 'pd-update-row pd-update-row-busy' : 'pd-update-row' },
             h('input', {
               type: 'checkbox',
               className: 'pd-check',
               checked: picked[row.name] === true,
-              disabled: updatesBusy !== '',
+              disabled: updatesBusy !== '' || busyNow,
               onChange: () =>
                 setPicked((prev) => ({ ...prev, [row.name]: prev[row.name] !== true })),
             }),
@@ -2490,7 +2541,9 @@ function updatePageState(updates, checking) {
             typeof row.spec === 'string' && row.kind !== 'exact'
               ? h('code', { className: 'pd-update-spec', title: row.spec }, row.spec)
               : null,
+            busyNow ? h('span', { className: 'pd-spin pd-update-busy', title: t('rowUpdating') }) : null,
           );
+        };
 
         const installPanel = h(
           'div',
@@ -2828,9 +2881,11 @@ function updatePageState(updates, checking) {
                   h(
                     'span',
                     null,
-                    job.stage === 'rollback'
-                      ? t('jobRollingBack')
-                      : t('jobRunning', { n: String(Array.isArray(job.names) ? job.names.length : 0) }),
+                    t('jobRunning', { n: String(Array.isArray(job.names) ? job.names.length : 0) }) +
+                      (jobPhaseKey(job.phase) === null ? '' : ' · ' + t(jobPhaseKey(job.phase))) +
+                      (typeof job.startedAt === 'string' && Number.isFinite(Date.parse(job.startedAt))
+                        ? ' · ' + Math.max(0, Math.round((Date.now() - Date.parse(job.startedAt)) / 1000)) + 's'
+                        : ''),
                   ),
                   // 服务端判断这个任务此刻能不能取消。回滚阶段是唯一必须跑完的
                   // 一段，client 不能靠 job.running 自己猜——那样回滚时按钮还在，

package/index.js

@@ -385,7 +385,15 @@ function jobStatus() {
   const running = activeJob !== null && activeJob.id === job.id
   // 回滚期间不接受取消：那是唯一一段「后台必须跑完」的工作。
   const cancelable = running && job.stage !== 'rollback'
-  return Object.assign({}, job, { running, cancelable, interrupted: !running && job.finishedAt === null })
+  return Object.assign({}, job, {
+    running,
+    cancelable,
+    // Which step the host is on right now. Without it the panel can only say
+    // "updating", which looks frozen during the (up to three minute) wait for
+    // every session to go idle.
+    phase: running ? activeJobStage : null,
+    interrupted: !running && job.finishedAt === null,
+  })
 }
 
 function emptyRoster() {
@@ -2625,17 +2633,36 @@ function noProxyMatch(host, raw) {
   return false
 }
 
-/** The proxy Windows itself is configured with, when there is one. */
+/**
+ * Whether Windows is actually routing through that proxy right now.
+ *
+ * The ProxyServer value stays in the registry after the user turns the proxy
+ * off — only ProxyEnable flips. Reading ProxyServer alone therefore sends every
+ * download into a dead port and burns the whole timeout budget before the direct
+ * fallback even starts; that is the "tried 127.0.0.1:7900 … direct: The
+ * operation was aborted" report. A missing ProxyEnable counts as enabled,
+ * because older layouts only wrote ProxyServer.
+ */
+function proxyEnableAllows(stdout) {
+  if (typeof stdout !== 'string') return true
+  const match = /ProxyEnable\s+REG_DWORD\s+0x([0-9a-fA-F]+)/.exec(stdout)
+  if (match === null) return true
+  return Number.parseInt(match[1], 16) !== 0
+}
+
+/** The proxy Windows itself is configured with, when it is switched on. */
 function systemProxyRoute() {
   if (process.platform !== 'win32') return null
   try {
     const key = 'HKCU\\Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings'
-    const query = spawnSync('reg', ['query', key, '/v', 'ProxyServer'], {
+    // One query for the whole key: ProxyEnable only exists as a sibling value.
+    const query = spawnSync('reg', ['query', key], {
       encoding: 'utf8',
       timeout: 3000,
       windowsHide: true,
     })
     if (query.status !== 0 || typeof query.stdout !== 'string') return null
+    if (!proxyEnableAllows(query.stdout)) return null
     const match = /ProxyServer\s+REG_SZ\s+(.+)/.exec(query.stdout)
     if (match === null) return null
     const parts = match[1]
@@ -3052,12 +3079,16 @@ export async function fetchAny(url, init) {
     return await fetch(url, init)
   } catch (error) {
     const target = new URL(url)
-    const signal = init !== undefined && init !== null ? init.signal : undefined
     const routes = downloadRoutes(target)
     const failures = []
     for (const route of routes) {
       try {
-        return await readResponseLike(target, route.route, signal)
+        // A fresh budget per route: the caller's signal is usually a
+        // AbortSignal.timeout(...) that the failed fetch has already spent, so
+        // passing it on would abort every fallback instantly and report "The
+        // operation was aborted" for a route that was never actually tried.
+        const fallback = AbortSignal.timeout(REGISTRY_TIMEOUT)
+        return await readResponseLike(target, route.route, fallback)
       } catch (next) {
         failures.push(route.label + ': ' + (next instanceof Error ? next.message : String(next)))
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-rack",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "type": "module",
   "description": "DSH 插件管理：所有插件一屏看完，一个开关直接开关，更新完自动热替换不用重启。/ Plugin rack for DSH: every plugin in one list with a power switch, an auto/manual flag that scopes the one-click bulk actions, and hot-swapped updates that need no restart.",
   "author": "Jaside (LZM-P)",
@@ -65,7 +65,7 @@
       ]
     },
     "engines": {
-      "dsh": ">=0.2.1-rc.2 <0.2.3-0"
+      "dsh": ">=0.2.1-rc.2 <0.3.0-0"
     },
     "compatibility": {
       "dshReleases": {