@morehao/dsh-github-trending 0.3.1 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.3.2 - 2026-10-31
+
+### 改进
+
+- **更新入口更显眼**：概览页新增「插件更新」卡片——当前 / 最新版本、检查更新、更新到 vX、本地安装时的手动命令都在这里；侧栏包名在有新版时显示红点。关于弹层与概览共用同一个 controller（模块级单例），打开多个位置不会重复请求。
+- 关于弹层的更新区块改为复用同一组件（`client/update-panel.ts`），行为不变。
+
 ## 0.3.1 - 2026-10-31
 
 ### 新增

package/client.js

@@ -357,7 +357,8 @@ var DICT = {
     "about.update.manual": "当前是本地 {kind} 安装，不能一键更新（会把开发链接换成 npm 版）。手动更新：",
     "about.update.copy": "复制命令",
     "about.update.copied": "已复制",
-    "about.update.hint": "只检查 npm 上的 latest 稳定版；更新后需要重启 DSH。"
+    "about.update.hint": "只检查 npm 上的 latest 稳定版；更新后需要重启 DSH。",
+    "update.badge": "有新版本可用"
   },
   en: {
     "section.title": "GitHub Trending",
@@ -671,7 +672,8 @@ var DICT = {
     "about.update.manual": "Installed from a local {kind} spec; one-click update is disabled (it would replace the dev link). Update manually:",
     "about.update.copy": "Copy command",
     "about.update.copied": "Copied",
-    "about.update.hint": "Checks the npm latest stable tag only; applying requires a DSH restart."
+    "about.update.hint": "Checks the npm latest stable tag only; applying requires a DSH restart.",
+    "update.badge": "Update available"
   }
 };
 function activeLang(locale) {
@@ -952,6 +954,9 @@ var CSS = `
 .dshgt-update-manual{margin-top:9px;padding:9px 10px;border:1px solid color-mix(in srgb,var(--gt-warn) 35%,var(--gt-border));border-radius:8px;background:color-mix(in srgb,var(--gt-warn) 6%,var(--gt-card));}
 .dshgt-update-manual .dshgt-update-warn{margin:0 0 6px;}
 .dshgt-update-cmd{display:block;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:11.5px;line-height:1.5;color:var(--gt-fg);word-break:break-all;user-select:all;}
+.dshgt-update-dot{display:inline-block;width:6px;height:6px;margin-left:6px;border-radius:50%;background:var(--gt-err);vertical-align:middle;flex:none;}
+.dshgt-update-bare{margin-top:0;padding-top:0;border-top:0;}
+.dshgt-update-card .dshgt-card-h{margin-bottom:2px;}
 
 @media (max-width:1100px){
   .dshgt-app{grid-template-columns:190px minmax(0,1fr);}
@@ -1995,6 +2000,196 @@ function LiveRun(props) {
   );
 }
 
+// node_modules/@morehao/dsh-plugin-kit/dist/update-client.js
+var IDLE = { status: "idle", view: null, error: null };
+function errorOf(error) {
+  if (error !== null && typeof error === "object") {
+    const value = error;
+    const message = typeof value.message === "string" && value.message !== "" ? value.message : "操作失败";
+    return typeof value.code === "string" ? { code: value.code, message } : { message };
+  }
+  return { message: String(error ?? "操作失败") };
+}
+function createUpdateController(options) {
+  const now = options.now ?? Date.now;
+  let state = { ...IDLE };
+  const listeners = /* @__PURE__ */ new Set();
+  let inFlight = null;
+  function emit(next) {
+    state = next;
+    options.onChange?.(state);
+    for (const listener of listeners) listener(state);
+  }
+  async function check(checkOptions = {}) {
+    if (inFlight !== null) return;
+    inFlight = "check";
+    emit({ ...state, status: "checking", error: null });
+    try {
+      const view = await options.request.check(checkOptions);
+      const checkedAt = new Date(now()).toISOString();
+      if (view.checkFailed) {
+        emit({
+          status: "failed",
+          view,
+          error: { code: "CHECK_FAILED", message: "检查更新失败：拿不到 registry 上的最新版本" },
+          checkedAt
+        });
+      } else {
+        emit({ status: view.updateAvailable ? "available" : "current", view, error: null, checkedAt });
+      }
+    } catch (error) {
+      emit({ ...state, status: "failed", error: errorOf(error) });
+    } finally {
+      inFlight = null;
+    }
+  }
+  async function apply2() {
+    if (inFlight !== null) return;
+    const view = state.view;
+    if (view === null || !view.updateAvailable) {
+      emit({ ...state, status: "failed", error: { code: "NO_UPDATE", message: "没有可更新的版本，请先检查更新" } });
+      return;
+    }
+    if (!view.canApply) {
+      emit({
+        ...state,
+        status: "failed",
+        error: { code: "NO_APPLY", message: `当前环境不支持一键更新，请执行：${view.manualCommand}` }
+      });
+      return;
+    }
+    inFlight = "apply";
+    emit({ ...state, status: "applying", error: null });
+    try {
+      const result = await options.request.apply();
+      const restartRequired = result.restartRequired ?? result.application !== "applied";
+      emit({ ...state, status: restartRequired ? "restart-required" : "applied", error: null });
+    } catch (error) {
+      emit({ ...state, status: "failed", error: errorOf(error) });
+    } finally {
+      inFlight = null;
+    }
+  }
+  return {
+    getState: () => state,
+    subscribe: (listener) => {
+      listeners.add(listener);
+      return () => {
+        listeners.delete(listener);
+      };
+    },
+    check,
+    apply: apply2,
+    reset: () => emit({ ...IDLE })
+  };
+}
+
+// client/update-panel.ts
+var singleton = null;
+function getUpdateController() {
+  if (singleton === null) {
+    singleton = createUpdateController({
+      request: {
+        check: (options) => getPluginUpdate(options.fresh === true ? { fresh: true } : {}),
+        apply: () => applyPluginUpdate()
+      }
+    });
+  }
+  return singleton;
+}
+function usePluginUpdate() {
+  const controller = getUpdateController();
+  const [state, setState] = import_react.default.useState(() => controller.getState());
+  import_react.default.useEffect(() => {
+    const unsubscribe = controller.subscribe(setState);
+    if (controller.getState().status === "idle") void controller.check();
+    return unsubscribe;
+  }, [controller]);
+  return [state, controller];
+}
+function UpdateDot(props) {
+  const [state] = usePluginUpdate();
+  if (state.view?.updateAvailable !== true) return null;
+  return h("span", { className: "dshgt-update-dot", title: props.t("update.badge") });
+}
+function PluginUpdateSection(props) {
+  const { t } = props;
+  const [state, controller] = usePluginUpdate();
+  const [confirming, setConfirming] = import_react.default.useState(false);
+  const [copied, setCopied] = import_react.default.useState(false);
+  import_react.default.useEffect(() => {
+    if (state.status === "applying" || state.status === "restart-required" || state.status === "applied") setConfirming(false);
+  }, [state.status]);
+  const copyCommand = () => {
+    const command = state.view?.manualCommand;
+    if (command === void 0) return;
+    void copyText(command).then((ok) => {
+      if (!ok) return;
+      setCopied(true);
+      setTimeout(() => setCopied(false), 1600);
+    });
+  };
+  const view = state.view;
+  const status = state.status;
+  const target = view !== null && view.updateAvailable ? view.latestVersion ?? "" : "";
+  const busy = status === "checking" || status === "applying";
+  const settled = status === "restart-required" || status === "applied";
+  const actionable = view !== null && view.updateAvailable && view.canApply && !settled && !busy;
+  const manual = view !== null && (!view.canApply || view.checkFailed) ? view.manualCommand : null;
+  const statusLine = () => {
+    if (status === "checking" || view === null) return t("about.update.checking");
+    if (status === "applying") return t("about.update.applying", { version: target });
+    if (status === "restart-required") return t("about.update.done", { version: view.latestVersion ?? target });
+    if (status === "applied") return t("about.update.applied", { version: view.latestVersion ?? target });
+    if (status === "failed") {
+      if (state.error?.code === "CHECK_FAILED") return t("about.update.checkFailed");
+      return t("about.update.failed", { message: state.error?.message ?? "" });
+    }
+    if (view.checkFailed) return t("about.update.checkFailed");
+    if (view.updateAvailable) return t("about.update.available", { latest: view.latestVersion ?? "", current: view.currentVersion });
+    return t("about.update.current", { version: view.currentVersion });
+  };
+  const actions = [
+    h(Btn, { key: "check", small: true, disabled: busy, onClick: () => void controller.check({ fresh: true }) }, t("about.update.check")),
+    manual === null ? null : h(Btn, { key: "copy", small: true, onClick: copyCommand }, copied ? t("about.update.copied") : t("about.update.copy")),
+    actionable ? confirming ? [
+      h(
+        Btn,
+        {
+          key: "confirm",
+          small: true,
+          variant: "danger",
+          onClick: () => {
+            setConfirming(false);
+            void controller.apply();
+          }
+        },
+        t("about.update.confirmYes")
+      ),
+      h(Btn, { key: "cancel", small: true, onClick: () => setConfirming(false) }, t("about.update.cancel"))
+    ] : h(Btn, { key: "apply", small: true, variant: "primary", onClick: () => setConfirming(true) }, t("about.update.apply", { version: target })) : null
+  ].filter((item) => item !== null);
+  return h(
+    "div",
+    { className: `dshgt-update${props.bare === true ? " dshgt-update-bare" : ""}` },
+    props.bare === true ? null : h(
+      "div",
+      { className: "dshgt-update-head" },
+      h("h4", null, t("about.update.title")),
+      h("span", { className: "dshgt-hint" }, t("about.update.hint"))
+    ),
+    h("p", { className: `dshgt-update-line${status === "failed" ? " dshgt-update-err" : ""}` }, statusLine()),
+    confirming ? h("p", { className: "dshgt-update-warn" }, t("about.update.confirm", { version: target })) : null,
+    h("div", { className: "dshgt-update-actions" }, actions),
+    manual === null ? null : h(
+      "div",
+      { className: "dshgt-update-manual" },
+      h("p", { className: "dshgt-update-warn" }, t("about.update.manual", { kind: view?.installKind ?? "unknown" })),
+      h("code", { className: "dshgt-update-cmd" }, manual)
+    )
+  );
+}
+
 // client/digest-core.ts
 var DIGEST_WINDOW_DAYS = 30;
 var DATE_RE = /^(\d{4})-(\d{2})-(\d{2})$/;
@@ -2328,6 +2523,12 @@ function OverviewView(props) {
             )
           );
         })
+      ),
+      h(
+        "section",
+        { className: "dshgt-card dshgt-update-card" },
+        h("div", { className: "dshgt-card-h" }, h("h3", null, t("about.update.title"))),
+        h(PluginUpdateSection, { t, bare: true })
       )
     )
   );
@@ -3179,117 +3380,10 @@ function metaLine(rendered) {
   );
 }
 
-// node_modules/@morehao/dsh-plugin-kit/dist/update-client.js
-var IDLE = { status: "idle", view: null, error: null };
-function errorOf(error) {
-  if (error !== null && typeof error === "object") {
-    const value = error;
-    const message = typeof value.message === "string" && value.message !== "" ? value.message : "操作失败";
-    return typeof value.code === "string" ? { code: value.code, message } : { message };
-  }
-  return { message: String(error ?? "操作失败") };
-}
-function createUpdateController(options) {
-  const now = options.now ?? Date.now;
-  let state = { ...IDLE };
-  const listeners = /* @__PURE__ */ new Set();
-  let inFlight = null;
-  function emit(next) {
-    state = next;
-    options.onChange?.(state);
-    for (const listener of listeners) listener(state);
-  }
-  async function check(checkOptions = {}) {
-    if (inFlight !== null) return;
-    inFlight = "check";
-    emit({ ...state, status: "checking", error: null });
-    try {
-      const view = await options.request.check(checkOptions);
-      const checkedAt = new Date(now()).toISOString();
-      if (view.checkFailed) {
-        emit({
-          status: "failed",
-          view,
-          error: { code: "CHECK_FAILED", message: "检查更新失败：拿不到 registry 上的最新版本" },
-          checkedAt
-        });
-      } else {
-        emit({ status: view.updateAvailable ? "available" : "current", view, error: null, checkedAt });
-      }
-    } catch (error) {
-      emit({ ...state, status: "failed", error: errorOf(error) });
-    } finally {
-      inFlight = null;
-    }
-  }
-  async function apply2() {
-    if (inFlight !== null) return;
-    const view = state.view;
-    if (view === null || !view.updateAvailable) {
-      emit({ ...state, status: "failed", error: { code: "NO_UPDATE", message: "没有可更新的版本，请先检查更新" } });
-      return;
-    }
-    if (!view.canApply) {
-      emit({
-        ...state,
-        status: "failed",
-        error: { code: "NO_APPLY", message: `当前环境不支持一键更新，请执行：${view.manualCommand}` }
-      });
-      return;
-    }
-    inFlight = "apply";
-    emit({ ...state, status: "applying", error: null });
-    try {
-      const result = await options.request.apply();
-      const restartRequired = result.restartRequired ?? result.application !== "applied";
-      emit({ ...state, status: restartRequired ? "restart-required" : "applied", error: null });
-    } catch (error) {
-      emit({ ...state, status: "failed", error: errorOf(error) });
-    } finally {
-      inFlight = null;
-    }
-  }
-  return {
-    getState: () => state,
-    subscribe: (listener) => {
-      listeners.add(listener);
-      return () => {
-        listeners.delete(listener);
-      };
-    },
-    check,
-    apply: apply2,
-    reset: () => emit({ ...IDLE })
-  };
-}
-
 // client/about.ts
 function AboutDialog(props) {
   const { t, state } = props;
   const [copied, setCopied] = import_react.default.useState(false);
-  const [copiedCommand, setCopiedCommand] = import_react.default.useState(false);
-  const [confirming, setConfirming] = import_react.default.useState(false);
-  const controllerRef = import_react.default.useRef(null);
-  if (controllerRef.current === null) {
-    controllerRef.current = createUpdateController({
-      request: {
-        check: (options) => getPluginUpdate(options.fresh === true ? { fresh: true } : {}),
-        apply: () => applyPluginUpdate()
-      }
-    });
-  }
-  const controller = controllerRef.current;
-  const [updateState, setUpdateState] = import_react.default.useState(() => controller.getState());
-  import_react.default.useEffect(() => {
-    const unsubscribe = controller.subscribe(setUpdateState);
-    if (controller.getState().status === "idle") void controller.check();
-    return unsubscribe;
-  }, [controller]);
-  import_react.default.useEffect(() => {
-    if (updateState.status === "applying" || updateState.status === "restart-required" || updateState.status === "applied") {
-      setConfirming(false);
-    }
-  }, [updateState.status]);
   const plugin = state.plugin;
   const fullName = `${plugin.name}@v${plugin.version}`;
   const repository = plugin.repository;
@@ -3309,59 +3403,6 @@ function AboutDialog(props) {
       setTimeout(() => setCopied(false), 1600);
     });
   };
-  const copyCommand = () => {
-    const command = updateState.view?.manualCommand;
-    if (command === void 0) return;
-    void copyText(command).then((ok) => {
-      if (!ok) return;
-      setCopiedCommand(true);
-      setTimeout(() => setCopiedCommand(false), 1600);
-    });
-  };
-  const view = updateState.view;
-  const status = updateState.status;
-  const target = view !== null && view.updateAvailable ? view.latestVersion ?? "" : "";
-  const busy = status === "checking" || status === "applying";
-  const settled = status === "restart-required" || status === "applied";
-  const actionable = view !== null && view.updateAvailable && view.canApply && !settled && !busy;
-  const manual = view !== null && (!view.canApply || view.checkFailed) ? view.manualCommand : null;
-  const statusLine = () => {
-    if (status === "checking" || view === null) return t("about.update.checking");
-    if (status === "applying") return t("about.update.applying", { version: target });
-    if (status === "restart-required") return t("about.update.done", { version: view.latestVersion ?? target });
-    if (status === "applied") return t("about.update.applied", { version: view.latestVersion ?? target });
-    if (status === "failed") {
-      if (updateState.error?.code === "CHECK_FAILED") return t("about.update.checkFailed");
-      return t("about.update.failed", { message: updateState.error?.message ?? "" });
-    }
-    if (view.checkFailed) return t("about.update.checkFailed");
-    if (view.updateAvailable) return t("about.update.available", { latest: view.latestVersion ?? "", current: view.currentVersion });
-    return t("about.update.current", { version: view.currentVersion });
-  };
-  const updateActions = [
-    h(Btn, { key: "check", small: true, disabled: busy, onClick: () => void controller.check({ fresh: true }) }, t("about.update.check")),
-    manual === null ? null : h(
-      Btn,
-      { key: "copy-command", small: true, onClick: copyCommand },
-      copiedCommand ? t("about.update.copied") : t("about.update.copy")
-    ),
-    actionable ? confirming ? [
-      h(
-        Btn,
-        {
-          key: "confirm",
-          small: true,
-          variant: "danger",
-          onClick: () => {
-            setConfirming(false);
-            void controller.apply();
-          }
-        },
-        t("about.update.confirmYes")
-      ),
-      h(Btn, { key: "cancel", small: true, onClick: () => setConfirming(false) }, t("about.update.cancel"))
-    ] : h(Btn, { key: "apply", small: true, variant: "primary", onClick: () => setConfirming(true) }, t("about.update.apply", { version: target })) : null
-  ].filter((item) => item !== null);
   const dialog = h(
     "div",
     { className: "dshgt-modal-mask", onClick: (event) => {
@@ -3393,25 +3434,7 @@ function AboutDialog(props) {
           [t("about.env"), t("about.env.value")]
         ]
       }),
-      h(
-        "div",
-        { className: "dshgt-update" },
-        h(
-          "div",
-          { className: "dshgt-update-head" },
-          h("h4", null, t("about.update.title")),
-          h("span", { className: "dshgt-hint" }, t("about.update.hint"))
-        ),
-        h("p", { className: `dshgt-update-line${status === "failed" ? " dshgt-update-err" : ""}` }, statusLine()),
-        confirming ? h("p", { className: "dshgt-update-warn" }, t("about.update.confirm", { version: target })) : null,
-        h("div", { className: "dshgt-update-actions" }, updateActions),
-        manual === null ? null : h(
-          "div",
-          { className: "dshgt-update-manual" },
-          h("p", { className: "dshgt-update-warn" }, t("about.update.manual", { kind: view?.installKind ?? "unknown" })),
-          h("code", { className: "dshgt-update-cmd" }, manual)
-        )
-      )
+      h(PluginUpdateSection, { t })
     )
   );
   return h("div", { className: "dshgt-root" }, dialog);
@@ -3659,7 +3682,8 @@ function apply(ctx) {
                 onClick: () => setAboutOpen(true),
                 title: plugin === void 0 ? "" : fullName
               },
-              plugin?.name ?? t("section.title")
+              plugin?.name ?? t("section.title"),
+              h(UpdateDot, { t })
             ),
             h(
               "div",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morehao/dsh-github-trending",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "GitHub 趋势日报插件：每天定时 spawn 本地 trendradar 核心，抓取 Trending、生成中文简介与总结，提交到你的仓库并自动合并 PR。",
   "type": "module",
   "main": "lib/index.js",