@shellraining/dsh-plugin-updates 0.1.1 → 0.1.2

package/README.md

@@ -21,7 +21,11 @@ dsh plugin --profile web add @shellraining/dsh-plugin-updates
 
 插件不改 profile 文件，所有改动都调用宿主插件管理器的接口：先卸载旧版本，再安装 `包名@版本`，用精确版本号保存，并保留原来的启用状态。版本兼容检查、构建脚本审批和锁文件回滚都由宿主处理。
 
-卸载后安装失败时，插件会保持未安装状态，提示里会显示 pnpm 的输出，并提供「恢复」按钮，按原来的版本重新安装。发布不足 24 小时的版本会标为「新发布」，pnpm 开启 `minimumReleaseAge` 时，这类版本可能装不上。
+操作前会重新读取安装状态，已经是目标版本时跳过；精确版本声明与实际安装版本不一致时，会停止更新，提示先修复安装。卸载失败后不会继续安装，也不会断言安装状态完全没变。
+
+卸载后安装失败时，已安装列表下方会保留完整错误、日志路径和「恢复」按钮，按原来的版本重新安装；恢复失败后可以再次重试。只有确认卸载成功后才提供恢复，不会覆盖随后通过其他入口安装的版本。错误摘要优先显示错误行，不会把 pnpm 开头的成功检查信息当成失败原因。
+
+发布不足 24 小时的版本会标为「新发布」，pnpm 开启 `minimumReleaseAge` 时，这类版本可能装不上。如果出现 `ERR_PNPM_RESOLUTION_POLICY_VIOLATIONS_UNHANDLED`，说明 pnpm 的策略处理发生内部错误，不代表供应链校验通过就能继续安装；插件会停止操作并保留日志，不会关闭安全策略。
 
 本插件不能在页面里更新自己，因为卸载自己时界面也会一起卸载。有新版本时，它的详情页会给出对应的 `dsh plugin` 命令，退出 DSH 后在终端运行即可。
 

package/lib/client.js

@@ -1289,13 +1289,19 @@ var ZH = {
   "self.body": "\u5728\u9875\u9762\u91CC\u5378\u8F7D\u81EA\u5DF1\u4F1A\u8BA9\u8FD9\u4E2A\u754C\u9762\u4E00\u8D77\u6D88\u5931\u3002\u8BF7\u5148\u5B8C\u5168\u9000\u51FA DSH\uFF0C\u5728\u7EC8\u7AEF\u8FD0\u884C\u4E0B\u9762\u7684\u547D\u4EE4\uFF0C\u518D\u91CD\u65B0\u6253\u5F00\uFF1A",
   "self.copy": "\u590D\u5236\u547D\u4EE4",
   "self.copied": "\u5DF2\u590D\u5236",
+  "error.policy": "pnpm \u5904\u7406 minimumReleaseAge \u65F6\u53D1\u751F\u5185\u90E8\u9519\u8BEF\u3002\u8BF7\u5347\u7EA7\u5BBF\u4E3B\u9644\u5E26\u7684 pnpm\uFF0C\u6216\u7B49\u53D1\u5E03\u7B49\u5F85\u671F\u7ED3\u675F\u540E\u91CD\u8BD5\uFF1B\u5B8C\u6574\u9519\u8BEF\u89C1\u4E0B\u65B9\u65E5\u5FD7",
+  "error.inconsistent": "\u5B89\u88C5\u58F0\u660E\u4E0E\u5B9E\u9645\u7248\u672C\u4E0D\u4E00\u81F4\uFF0C\u8BF7\u5148\u7528\u5BBF\u4E3B\u63D2\u4EF6\u7BA1\u7406\u5668\u6216 CLI \u4FEE\u590D\u5B89\u88C5\uFF0C\u518D\u91CD\u8BD5\u66F4\u65B0",
+  "error.stateChanged": "\u63D2\u4EF6\u5B89\u88C5\u72B6\u6001\u5DF2\u53D8\u5316\uFF0C\u8BF7\u5237\u65B0\u63D2\u4EF6\u5217\u8868\u540E\u91CD\u8BD5",
+  "op.checking": "\u6B63\u5728\u6838\u5BF9 {name} \u7684\u5B89\u88C5\u72B6\u6001\u2026",
+  "op.checkFailed": "\u65E0\u6CD5\u786E\u8BA4 {name} \u7684\u5B89\u88C5\u72B6\u6001\uFF0C\u5DF2\u505C\u6B62\u64CD\u4F5C\uFF1A{reason}",
+  "op.current": "{name} \u5DF2\u662F {to}\uFF0C\u65E0\u9700\u91CD\u590D\u5B89\u88C5",
   "op.removing": "\u6B63\u5728\u5378\u8F7D {name} {from}\u2026",
   "op.installing": "\u6B63\u5728\u5B89\u88C5 {name} {to}\u2026",
   "op.restoring": "\u6B63\u5728\u6062\u590D {name} {to}\u2026",
   "op.done": "{name} \u5DF2\u5207\u6362\u5230 {to}",
   "op.restart": "{name} \u5DF2\u5207\u6362\u5230 {to}\uFF0C\u91CD\u542F DSH \u540E\u751F\u6548",
   "op.failed": "{name} \u5B89\u88C5 {to} \u5931\u8D25\uFF1A{reason}",
-  "op.removeFailed": "{name} \u5378\u8F7D\u5931\u8D25\uFF0C\u6CA1\u6709\u505A\u4EFB\u4F55\u6539\u52A8\uFF1A{reason}",
+  "op.removeFailed": "{name} \u5378\u8F7D\u672A\u5B8C\u6210\uFF0C\u5DF2\u505C\u6B62\u540E\u7EED\u5B89\u88C5\uFF1A{reason}",
   "op.restore": "\u6062\u590D {from}",
   "op.dismiss": "\u5173\u95ED",
   "op.log": "\u65E5\u5FD7\uFF1A{path}"
@@ -1325,13 +1331,19 @@ var EN = {
   "self.body": "Uninstalling it from the page would unload this page too. Quit DSH completely, run this command in a terminal, then start DSH again:",
   "self.copy": "Copy command",
   "self.copied": "Copied",
+  "error.policy": "pnpm hit an internal error while handling minimumReleaseAge. Upgrade the pnpm bundled with the host, or retry after the release-age waiting period; see the full error below",
+  "error.inconsistent": "The declared and installed versions differ. Repair the installation with the host plugin manager or CLI before retrying",
+  "error.stateChanged": "The installed state has changed. Refresh the plugin list and retry",
+  "op.checking": "Checking the installed version of {name}\u2026",
+  "op.checkFailed": "Could not confirm the installed state of {name}; stopped: {reason}",
+  "op.current": "{name} is already at {to}; no reinstall needed",
   "op.removing": "Uninstalling {name} {from}\u2026",
   "op.installing": "Installing {name} {to}\u2026",
   "op.restoring": "Restoring {name} {to}\u2026",
   "op.done": "{name} is now at {to}",
   "op.restart": "{name} is now at {to}; restart DSH to apply it",
   "op.failed": "Could not install {name} {to}: {reason}",
-  "op.removeFailed": "Could not uninstall {name}; nothing changed: {reason}",
+  "op.removeFailed": "Uninstalling {name} did not finish; installation was not started: {reason}",
   "op.restore": "Restore {from}",
   "op.dismiss": "Dismiss",
   "op.log": "Log: {path}"
@@ -1354,7 +1366,7 @@ function updateTarget(candidate, lookup) {
   return best !== void 0 && (0, import_gt.default)(best.version, candidate.version) ? best.version : void 0;
 }
 function isBusy(operation) {
-  return operation?.phase === "removing" || operation?.phase === "installing";
+  return operation?.phase === "checking" || operation?.phase === "removing" || operation?.phase === "installing";
 }
 function record(value) {
   return typeof value === "object" && value !== null ? value : {};
@@ -1362,6 +1374,14 @@ function record(value) {
 function errorText(error) {
   return error instanceof Error ? error.message : String(error);
 }
+function failureReason(result) {
+  if (!result.ok) return result.error.message;
+  const { error, packageResult, application } = result.value;
+  const diagnostic = error?.diagnostic?.trim();
+  const lines = (diagnostic || packageResult?.output || "").split("\n").map((line) => line.trim()).filter(Boolean);
+  const failure = lines.find((line) => /\bERR[_!\s]|\berror\b|\bfatal\b/i.test(line));
+  return failure ?? error?.code ?? diagnostic ?? application;
+}
 function npmInstalled(bundle) {
   const prefix = `${bundle.name}@`;
   return bundle.installed && !bundle.official && bundle.availability === "profile" && bundle.removable && bundle.readOnlyReason === void 0 && (0, import_valid.default)(bundle.version ?? "") !== null && bundle.source?.startsWith(prefix) === true && (0, import_valid2.default)(bundle.source.slice(prefix.length)) !== null;
@@ -1422,6 +1442,13 @@ var UpdatesStore = class {
     if (this.state.status !== "idle") void this.load();
   };
   async load() {
+    try {
+      await this.loadBundles();
+    } catch {
+      if (!this.disposed) this.patch({ status: "error" });
+    }
+  }
+  async loadBundles() {
     const generation = ++this.generation;
     this.patch({ status: this.state.status === "ready" ? "ready" : "loading" });
     const pm = this.ctx.remote.pluginManager;
@@ -1495,14 +1522,14 @@ var UpdatesStore = class {
   /** Switch one plugin to `version`: uninstall it, then install that exact version with its enabled state. */
   install = async (name2, version) => {
     const candidate = this.state.candidates.find((item) => item.name === name2);
-    if (candidate === void 0 || name2 === SELF || isBusy(this.state.operation)) return false;
+    if (this.disposed || candidate === void 0 || name2 === SELF || isBusy(this.state.operation) || (0, import_valid.default)(version) === null) return false;
     return this.run({ name: name2, from: candidate.version, to: version, enabled: candidate.enabled, restoring: false }, true);
   };
   /** Put back the version a failed switch removed; the plugin is no longer installed, so only install. */
   restore = async () => {
     const failed = this.state.operation;
-    if (failed?.phase !== "failed" || failed.restoring) return;
-    await this.run({ name: failed.name, from: failed.to, to: failed.from, enabled: failed.enabled, restoring: true }, false);
+    if (this.disposed || failed?.phase !== "failed" || !failed.recoverable) return;
+    await this.run({ name: failed.name, from: failed.from, to: failed.from, enabled: failed.enabled, restoring: true }, false);
   };
   /** The outcome toast finished; the banner in the tab keeps the result. */
   toastDone = () => {
@@ -1525,34 +1552,75 @@ var UpdatesStore = class {
   };
   async run(base, remove) {
     const pm = this.ctx.remote.pluginManager;
-    const fail = (phase, result) => {
+    let failurePhase = "check-failed";
+    let recoverable = false;
+    const fail = (result) => {
       const value = result.ok ? result.value : void 0;
-      const output = value?.packageResult?.output.trim();
+      const output = value?.packageResult?.output.trim() || value?.error?.diagnostic;
       const logPath = value?.packageResult?.logPath;
-      const reason = result.ok ? value?.error?.diagnostic?.split("\n")[0] ?? value?.error?.code ?? value?.application ?? "" : result.error.message;
-      this.patch({ operation: { ...base, phase, reason, toast: Date.now(), ...output ? { output } : {}, ...logPath ? { logPath } : {} } });
+      this.patch({ operation: {
+        ...base,
+        phase: failurePhase,
+        recoverable,
+        reason: failureReason(result),
+        toast: Date.now(),
+        ...output ? { output } : {},
+        ...logPath ? { logPath } : {}
+      } });
       return false;
     };
-    if (remove) {
-      this.patch({ operation: { ...base, phase: "removing" } });
-      const removed = await pm.removeBundle(base.name);
-      const stopProfile = removed.ok && removed.value.error?.code === "stop-profile";
-      if (!stopProfile && (!removed.ok || removed.value.application === "failed" || removed.value.application === "cancelled")) {
-        return fail("remove-failed", removed);
+    this.patch({ operation: { ...base, phase: "checking" } });
+    try {
+      const listed = await pm.listBundles();
+      if (this.disposed) return false;
+      if (!listed.ok) return fail(listed);
+      const current = listed.value.find((bundle) => bundle.name === base.name && bundle.installed);
+      if (current !== void 0 && (0, import_valid.default)(current.version ?? "") === (0, import_valid.default)(base.to)) {
+        this.patch({ operation: { ...base, phase: "current", toast: Date.now() } });
+        return true;
       }
+      if (remove) {
+        if (current === void 0 || !npmInstalled(current)) {
+          return fail({ ok: true, value: { application: "failed", error: { code: "plugin-state-changed" } } });
+        }
+        const declared = (0, import_valid.default)(current.source?.slice(`${base.name}@`.length) ?? "");
+        if (declared !== null && declared !== (0, import_valid.default)(current.version ?? "")) {
+          return fail({ ok: true, value: { application: "failed", error: { code: "installation-inconsistent" } } });
+        }
+        base = { ...base, from: current.version ?? base.from, enabled: current.enabled };
+        failurePhase = "remove-failed";
+        this.patch({ operation: { ...base, phase: "removing" } });
+        const removed = await pm.removeBundle(base.name);
+        const stopProfile = removed.ok && removed.value.error?.code === "stop-profile";
+        if (!stopProfile && (!removed.ok || removed.value.application === "failed" || removed.value.application === "cancelled")) {
+          return fail(removed);
+        }
+        recoverable = !stopProfile;
+      } else {
+        if (current !== void 0) {
+          return fail({ ok: true, value: { application: "failed", error: { code: "plugin-state-changed" } } });
+        }
+        recoverable = true;
+      }
+      if (this.disposed) return false;
+      failurePhase = "failed";
+      this.patch({ operation: { ...base, phase: "installing" } });
+      const installed = await pm.installBundle(`${base.name}@${base.to}`, {
+        enabled: base.enabled,
+        saveExact: true,
+        requestId: `${SELF}:${Date.now()}`
+      });
+      if (!installed.ok || installed.value.application === "failed" || installed.value.application === "cancelled") {
+        return fail(installed);
+      }
+      const to = installed.value.version ?? base.to;
+      this.patch({ operation: { ...base, to, toast: Date.now(), phase: installed.value.application === "restart-required" ? "restart" : "done" } });
+      return true;
+    } catch (error) {
+      return fail({ ok: false, error: { message: errorText(error) } });
+    } finally {
+      if (!this.disposed) await this.load();
     }
-    this.patch({ operation: { ...base, phase: "installing" } });
-    const installed = await pm.installBundle(`${base.name}@${base.to}`, {
-      enabled: base.enabled,
-      saveExact: true,
-      requestId: `${SELF}:${Date.now()}`
-    });
-    if (!installed.ok || installed.value.application === "failed" || installed.value.application === "cancelled") {
-      return fail("failed", installed);
-    }
-    const to = installed.value.version ?? base.to;
-    this.patch({ operation: { ...base, to, toast: Date.now(), phase: installed.value.application === "restart-required" ? "restart" : "done" } });
-    return true;
   }
 };
 
@@ -1618,10 +1686,11 @@ function scan(document2) {
     const end = card.querySelector('[role="switch"]')?.parentElement;
     if (name2 && end) cards.set(name2, mountIn(end, "card", true));
   }
-  return { ...head === void 0 ? {} : { head }, cards };
+  const status = mountIn(group, "status", false);
+  return { ...head === void 0 ? {} : { head }, status, cards };
 }
 function same(a, b) {
-  if (a.head !== b.head || a.cards.size !== b.cards.size) return false;
+  if (a.head !== b.head || a.status !== b.status || a.cards.size !== b.cards.size) return false;
   for (const [name2, node] of a.cards) if (b.cards.get(name2) !== node) return false;
   return true;
 }
@@ -1675,8 +1744,16 @@ function SelfNotice({ t, version }) {
   ] });
 }
 function operationText(t, operation) {
-  const params = { name: operation.name, from: operation.from, to: operation.to, reason: operation.reason ?? "" };
+  const raw = operation.reason ?? "";
+  const reason = raw.includes("ERR_PNPM_RESOLUTION_POLICY_VIOLATIONS_UNHANDLED") ? t("error.policy") : raw === "installation-inconsistent" ? t("error.inconsistent") : raw === "plugin-state-changed" ? t("error.stateChanged") : raw;
+  const params = { name: operation.name, from: operation.from, to: operation.to, reason };
   switch (operation.phase) {
+    case "checking":
+      return t("op.checking", params);
+    case "check-failed":
+      return t("op.checkFailed", params);
+    case "current":
+      return t("op.current", params);
     case "removing":
       return t("op.removing", params);
     case "installing":
@@ -1694,8 +1771,8 @@ function operationText(t, operation) {
 function OperationToast({ t, useUpdates, actions }) {
   const operation = useUpdates((state) => state.operation);
   if (operation?.toast === void 0) return null;
-  const failed = operation.phase === "failed" || operation.phase === "remove-failed";
-  const restorable = operation.phase === "failed" && !operation.restoring;
+  const failed = operation.phase === "failed" || operation.phase === "remove-failed" || operation.phase === "check-failed";
+  const restorable = operation.phase === "failed" && operation.recoverable;
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     import_dsh_client_ui_primitives.Toast,
     {
@@ -1713,12 +1790,12 @@ function OperationToast({ t, useUpdates, actions }) {
 function OperationBanner({ t, operation, actions }) {
   const params = { from: operation.from };
   const busy = isBusy(operation);
-  const failed = operation.phase === "failed" || operation.phase === "remove-failed";
+  const failed = operation.phase === "failed" || operation.phase === "remove-failed" || operation.phase === "check-failed";
   const text = operationText(t, operation);
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dpu-banner", role: failed ? "alert" : "status", ...failed ? { "data-tone": "error" } : {}, children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dpu-banner-row", children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: text }),
-      operation.phase === "failed" && !operation.restoring ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { size: "sm", variant: "outline", onClick: () => {
+      operation.phase === "failed" && operation.recoverable ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { size: "sm", variant: "outline", onClick: () => {
         void actions.restore();
       }, children: t("op.restore", params) }) : null,
       busy ? null : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { size: "sm", variant: "ghost", onClick: actions.dismiss, children: t("op.dismiss") })
@@ -1826,6 +1903,13 @@ function ListControls({ t, useUpdates, actions }) {
     if (target !== void 0 && candidate.name !== SELF) targets.set(candidate.name, target);
   }
   const portals = [];
+  if (anchors.status !== void 0 && operation !== void 0) {
+    portals.push((0, import_react_dom.createPortal)(
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(OperationBanner, { t, operation, actions }),
+      anchors.status,
+      "operation"
+    ));
+  }
   if (anchors.head !== void 0 && targets.size > 0) {
     portals.push((0, import_react_dom.createPortal)(
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { size: "sm", variant: "outline", icon: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives2.IconDownloadOutlineRegular, { size: 13 }), disabled: busy, onClick: () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shellraining/dsh-plugin-updates",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "module",
   "description": "在插件页检查 npm 来源插件的新版本，一键更新或安装指定版本",
   "main": "./lib/index.js",