@xrxs-ai/dsh-xrxs-plugins-store 0.2.2 → 0.2.3

package/lib/client.js

@@ -30,7 +30,7 @@ __export(index_exports, {
   inject: () => inject
 });
 module.exports = __toCommonJS(index_exports);
-var import_react11 = require("react");
+var import_react12 = require("react");
 
 // src/client/MarketplaceApp.tsx
 var import_react9 = require("react");
@@ -140,6 +140,12 @@ function installPlugin(name, version, sourceType) {
 function uninstallPlugin(name) {
   return hostPost("/api/uninstall", { name });
 }
+function checkSelfUpdate() {
+  return hostGet("/api/self-update");
+}
+function applySelfUpdate(version) {
+  return hostPost("/api/self-update/apply", { version });
+}
 
 // src/client/data/developer-api.ts
 var BASE = "/api/developer/plugins";
@@ -3576,6 +3582,126 @@ function GeneralTokenRow() {
   ] });
 }
 
+// src/client/settings/GeneralUpdateRow.tsx
+var import_react11 = require("react");
+var import_jsx_runtime22 = require("react/jsx-runtime");
+var rowStyle2 = {
+  display: "flex",
+  justifyContent: "space-between",
+  alignItems: "center",
+  gap: 24,
+  padding: "16px 0",
+  borderBottom: "0.5px solid var(--dsw-alias-border-l2, #dee0e3)"
+};
+var leftStyle2 = { minWidth: 0 };
+var titleStyle2 = {
+  fontSize: 14,
+  lineHeight: "20px",
+  color: "var(--dsw-alias-label-primary, #1f2329)"
+};
+var descStyle2 = {
+  marginTop: 4,
+  fontSize: 12,
+  lineHeight: "18px",
+  color: "var(--dsw-alias-label-secondary, #646a73)"
+};
+var valueStyle2 = {
+  fontSize: 13,
+  lineHeight: "20px",
+  color: "var(--dsw-alias-label-primary, #1f2329)"
+};
+var hintStyle2 = {
+  fontSize: 12,
+  lineHeight: "18px",
+  color: "var(--dsw-alias-label-tertiary, #8f959e)"
+};
+var errorStyle2 = {
+  ...hintStyle2,
+  color: "var(--dsw-alias-state-error-primary, #d83931)",
+  whiteSpace: "pre-line"
+};
+var rightStyle2 = {
+  flexShrink: 0,
+  display: "flex",
+  flexDirection: "column",
+  alignItems: "flex-end",
+  gap: 4
+};
+function messageOf3(error, fallback) {
+  return error instanceof Error && error.message !== "" ? error.message : fallback;
+}
+function GeneralUpdateRow() {
+  const [phase, setPhase] = (0, import_react11.useState)({ kind: "checking" });
+  const [error, setError] = (0, import_react11.useState)("");
+  const check = () => {
+    setPhase({ kind: "checking" });
+    setError("");
+    void checkSelfUpdate().then((result) => setPhase({ kind: "checked", check: result })).catch((err) => {
+      setPhase({ kind: "checked", check: { current: null, latest: null, updateAvailable: false } });
+      setError(messageOf3(err, "\u68C0\u67E5\u66F4\u65B0\u5931\u8D25"));
+    });
+  };
+  (0, import_react11.useEffect)(check, []);
+  const handleUpdate = (target, check0) => {
+    setPhase({ kind: "updating", check: check0 });
+    setError("");
+    void applySelfUpdate(target).then((result) => {
+      if (result.command !== void 0 && result.command !== "") {
+        setPhase({ kind: "degraded", command: result.command, version: target });
+        return;
+      }
+      setPhase({ kind: "updated", version: target });
+    }).catch((err) => {
+      setPhase({ kind: "checked", check: check0 });
+      setError(messageOf3(err, "\u66F4\u65B0\u5931\u8D25"));
+    });
+  };
+  const checking = phase.kind === "checking";
+  const updating = phase.kind === "updating";
+  return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { style: rowStyle2, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { style: leftStyle2, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { style: titleStyle2, children: "\u85AA\u4EBA\u85AA\u4E8B\u5E02\u573A \xB7 \u63D2\u4EF6\u66F4\u65B0" }),
+      /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { style: descStyle2, children: phase.kind === "checked" && phase.check.current !== null ? `\u5F53\u524D\u7248\u672C v${phase.check.current}` : "\u81EA\u52A8\u68C0\u6D4B npm \u4E0A\u7684\u65B0\u7248\u672C,\u4E00\u952E\u66F4\u65B0(\u66F4\u65B0\u540E\u9700\u91CD\u542F\u5E94\u7528\u751F\u6548)" })
+    ] }),
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { style: rightStyle2, children: [
+      phase.kind === "checking" && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { style: hintStyle2, children: "\u6B63\u5728\u68C0\u67E5\u66F4\u65B0\u2026" }),
+      phase.kind === "checked" && (phase.check.updateAvailable && phase.check.latest !== null ? /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { style: { display: "flex", alignItems: "center", gap: 8 }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { style: valueStyle2, children: [
+          "\u53D1\u73B0\u65B0\u7248\u672C v",
+          phase.check.latest
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(
+          Button,
+          {
+            variant: "primary",
+            size: "small",
+            onClick: () => handleUpdate(phase.check.latest ?? "", phase.check),
+            title: `\u66F4\u65B0\u5230 v${phase.check.latest}`,
+            children: "\u4E00\u952E\u66F4\u65B0"
+          }
+        )
+      ] }) : /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { style: { display: "flex", alignItems: "center", gap: 8 }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { style: hintStyle2, children: phase.check.latest === null ? "\u65E0\u6CD5\u83B7\u53D6\u6700\u65B0\u7248\u672C\u4FE1\u606F" : "\u5DF2\u662F\u6700\u65B0\u7248\u672C" }),
+        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Button, { size: "small", variant: "ghost", onClick: check, title: "\u91CD\u65B0\u68C0\u67E5 npm \u4E0A\u7684\u6700\u65B0\u7248\u672C", children: "\u91CD\u65B0\u68C0\u67E5" })
+      ] })),
+      updating && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { style: hintStyle2, children: "\u6B63\u5728\u66F4\u65B0,\u8BF7\u7A0D\u5019\u2026" }),
+      phase.kind === "updated" && /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { style: valueStyle2, children: [
+        "\u5DF2\u66F4\u65B0\u5230 v",
+        phase.version,
+        ",\u5B8C\u5168\u9000\u51FA\u5E76\u91CD\u542F\u5E94\u7528\u540E\u751F\u6548"
+      ] }),
+      phase.kind === "degraded" && /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { style: { maxWidth: 420, textAlign: "right" }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { style: errorStyle2, children: "\u5BBF\u4E3B\u547D\u4EE4\u884C\u4E0D\u53EF\u7528,\u8BF7\u624B\u52A8\u6267\u884C\u4EE5\u4E0B\u547D\u4EE4\u540E\u91CD\u542F\u5E94\u7528:" }),
+        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { style: { ...hintStyle2, whiteSpace: "pre-wrap", wordBreak: "break-all" }, children: phase.command })
+      ] }),
+      error !== "" && /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)("div", { style: { display: "flex", alignItems: "center", gap: 8 }, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)("div", { style: errorStyle2, children: error }),
+        /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Button, { size: "small", variant: "ghost", onClick: check, disabled: checking, children: "\u91CD\u8BD5" })
+      ] })
+    ] })
+  ] });
+}
+
 // src/client/index.ts
 var inject = ["slots"];
 function injectTheme() {
@@ -3588,7 +3714,7 @@ function injectTheme() {
 function StoreIcon(props) {
   const active = props.active === true;
   const size = typeof props.size === "number" ? props.size : 20;
-  return (0, import_react11.createElement)(
+  return (0, import_react12.createElement)(
     "svg",
     {
       width: size,
@@ -3599,13 +3725,13 @@ function StoreIcon(props) {
         color: active ? "var(--dsw-alias-brand-primary, #3861fb)" : "var(--dsw-alias-label-secondary, #646a73)"
       }
     },
-    (0, import_react11.createElement)("path", {
+    (0, import_react12.createElement)("path", {
       d: "M4 7h16l-1.2-3.2A1 1 0 0 0 17.85 3H6.15a1 1 0 0 0-.95.8L4 7Zm0 0v12a1 1 0 0 0 1 1h14a1 1 0 0 0 1-1V7",
       stroke: "currentColor",
       strokeWidth: 1.6,
       strokeLinejoin: "round"
     }),
-    (0, import_react11.createElement)("path", {
+    (0, import_react12.createElement)("path", {
       d: "M9 11a3 3 0 0 0 6 0",
       stroke: "currentColor",
       strokeWidth: 1.6,
@@ -3615,13 +3741,13 @@ function StoreIcon(props) {
 }
 function BundleConfigSeat(props) {
   if (props.view === "page") {
-    return (0, import_react11.createElement)(
+    return (0, import_react12.createElement)(
       "div",
       { className: "xps-page-placeholder" },
       "\u85AA\u4EBA\u85AA\u4E8B\u5E02\u573A\u914D\u7F6E(\u5360\u4F4D):serviceBaseUrl / cacheDir / requestTimeout / cachePolicy"
     );
   }
-  return (0, import_react11.createElement)("div", null, "\u85AA\u4EBA\u85AA\u4E8B\u5E02\u573A:\u79C1\u6709\u63D2\u4EF6\u6D4F\u89C8\u3001\u5B89\u88C5\u4E0E\u5F00\u53D1\u8005\u4E0A\u4F20");
+  return (0, import_react12.createElement)("div", null, "\u85AA\u4EBA\u85AA\u4E8B\u5E02\u573A:\u79C1\u6709\u63D2\u4EF6\u6D4F\u89C8\u3001\u5B89\u88C5\u4E0E\u5F00\u53D1\u8005\u4E0A\u4F20");
 }
 function apply(ctx) {
   const slots = ctx.get("slots");
@@ -3654,7 +3780,7 @@ function apply(ctx) {
       "main",
       () => safe(
         "main",
-        () => slots.register({ name: "main", key: "xrxs-plugins-store" }, () => (0, import_react11.createElement)(MarketplaceApp))
+        () => slots.register({ name: "main", key: "xrxs-plugins-store" }, () => (0, import_react12.createElement)(MarketplaceApp))
       )
     ),
     "xrxs-plugins-store.main"
@@ -3666,12 +3792,25 @@ function apply(ctx) {
         "settings.general.item",
         () => slots.register(
           { name: "settings.general.item", id: "xrxs-plugins-store-token", order: 50 },
-          () => (0, import_react11.createElement)(GeneralTokenRow)
+          () => (0, import_react12.createElement)(GeneralTokenRow)
         )
       )
     ),
     "xrxs-plugins-store.settings.general-item"
   );
+  ctx.effect(
+    () => slots.inject(
+      "settings.general.item",
+      () => safe(
+        "settings.general.item",
+        () => slots.register(
+          { name: "settings.general.item", id: "xrxs-plugins-store-update", order: 51 },
+          () => (0, import_react12.createElement)(GeneralUpdateRow)
+        )
+      )
+    ),
+    "xrxs-plugins-store.settings.general-update"
+  );
   ctx.effect(
     () => slots.inject(
       "plugins.bundle.config",
@@ -3679,7 +3818,7 @@ function apply(ctx) {
         "plugins.bundle.config",
         () => slots.register(
           { name: "plugins.bundle.config", key: "@xrxs-ai/dsh-xrxs-plugins-store" },
-          (props) => (0, import_react11.createElement)(BundleConfigSeat, props)
+          (props) => (0, import_react12.createElement)(BundleConfigSeat, props)
         )
       )
     ),

package/lib/host/routes.js

@@ -1,5 +1,6 @@
 import { ApiError } from "./api-client.js";
 import { approveProfileBuilds } from "./build-approval.js";
+import { applySelfUpdate, checkSelfUpdate } from "./self-update.js";
 import { submitPackage } from "./package-submit.js";
 import { installPlugin, listInstalledFromProfile, rawOutputOf, reportInstall, scrubCredentials, uninstallPlugin, InstallFailure, } from "./installer.js";
 /**
@@ -393,6 +394,18 @@ async function handleUninstall(rc) {
         throw new HttpError(400, '缺少参数 name');
     writeInstallOutcome(rc, await uninstallPlugin(name, rc.deps.installer));
 }
+/** GET /api/self-update:当前版本 vs npm latest(公开端点,无鉴权;失败 latest=null,UI 显示检查失败)。 */
+async function handleSelfUpdateCheck(rc) {
+    writeOk(rc, await checkSelfUpdate());
+}
+/** POST /api/self-update/apply:一键自我更新(复用安装链路装 npm 确切版本),成功后提示重启。 */
+async function handleSelfUpdateApply(rc) {
+    const body = await readJsonBody(rc.req);
+    const version = requiredString(body.version);
+    if (version === null)
+        throw new HttpError(400, '缺少参数 version(要更新到的确切版本)');
+    writeInstallOutcome(rc, await applySelfUpdate(version, rc.deps.installer));
+}
 /** POST /api/approve-builds:批准 pnpm 拦下的依赖构建脚本(allowBuilds 占位 → true),批准后 client 重试安装。 */
 async function handleApproveBuilds(rc) {
     const body = await readJsonBody(rc.req);
@@ -510,6 +523,8 @@ const ROUTES = [
     { method: 'POST', pattern: '/api/uninstall', handler: handleUninstall },
     { method: 'POST', pattern: '/api/install-report', handler: handleInstallReport },
     { method: 'POST', pattern: '/api/approve-builds', handler: handleApproveBuilds },
+    { method: 'GET', pattern: '/api/self-update', handler: handleSelfUpdateCheck },
+    { method: 'POST', pattern: '/api/self-update/apply', handler: handleSelfUpdateApply },
     {
         method: 'POST',
         pattern: '/api/developer/plugins',

package/lib/host/self-update.d.ts

@@ -0,0 +1,30 @@
+import { type InstallOutcome, type InstallerDeps } from './installer.ts';
+/**
+ * 市场插件自我更新(设计文档外新增,入口:设置 → 通用 → 薪人薪事市场 下方):
+ * - 当前版本:读插件包根的 package.json(运行实例的 version,重启后即新版本);
+ * - 最新版本:查 npm registry 的 dist-tag latest(公开端点,无鉴权、零凭据);
+ * - 一键更新:复用安装链路 `dsh plugin --profile <n> add @xrxs-ai/dsh-xrxs-plugins-store@<版本>`
+ *   (installPlugin 白名单 + --profile + 老 CLI 回退全继承)。
+ *   覆盖安装运行中的自身目录是安全的:文件句柄仍指向旧 inode,重启后加载新版本 ——
+ *   与市场里更新其他插件走的是同一条路。
+ */
+/** npm 包名(自我更新的目标就是本插件)。 */
+export declare const SELF_PACKAGE_NAME = "@xrxs-ai/dsh-xrxs-plugins-store";
+/** 当前运行实例的版本(包根 package.json);读不到为 null(极端情况:裸文件运行)。
+ *  依次尝试:模块相对层级(tsc 产物 lib/host/ 与源码 src/host/ 都是上一级的上一级)、
+ *  按包名 resolve(profile 安装布局变化时的兜底);读到的包名必须匹配,防止层级猜错读成别的包。 */
+export declare function currentSelfVersion(): string | null;
+export interface SelfUpdateCheck {
+    /** 当前运行实例版本;读不到为 null(无法比较,不可更新) */
+    current: string | null;
+    /** npm 上 latest 的版本;查询失败为 null */
+    latest: string | null;
+    updateAvailable: boolean;
+}
+/** 查 npm latest 并与当前版本比较;registry 查询失败时 latest 为 null(不抛,便于 UI 展示「检查失败」)。 */
+export declare function checkSelfUpdate(): Promise<SelfUpdateCheck>;
+/** 应用更新:复用安装链路装确切版本(不装 latest tag,避免「检查到装的」漂移)。 */
+export declare function applySelfUpdate(version: string, deps: InstallerDeps): Promise<InstallOutcome>;
+/** 简易 semver 比较(本插件只用 x.y.z;逐段数值比较,长度不齐补 0):
+ *  a>b → 1,a<b → -1,相等 → 0;不可解析的段当 0。 */
+export declare function compareVersions(a: string, b: string): number;

package/lib/host/self-update.js

@@ -0,0 +1,97 @@
+import { readFileSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
+import { installPlugin } from "./installer.js";
+/**
+ * 市场插件自我更新(设计文档外新增,入口:设置 → 通用 → 薪人薪事市场 下方):
+ * - 当前版本:读插件包根的 package.json(运行实例的 version,重启后即新版本);
+ * - 最新版本:查 npm registry 的 dist-tag latest(公开端点,无鉴权、零凭据);
+ * - 一键更新:复用安装链路 `dsh plugin --profile <n> add @xrxs-ai/dsh-xrxs-plugins-store@<版本>`
+ *   (installPlugin 白名单 + --profile + 老 CLI 回退全继承)。
+ *   覆盖安装运行中的自身目录是安全的:文件句柄仍指向旧 inode,重启后加载新版本 ——
+ *   与市场里更新其他插件走的是同一条路。
+ */
+/** npm 包名(自我更新的目标就是本插件)。 */
+export const SELF_PACKAGE_NAME = '@xrxs-ai/dsh-xrxs-plugins-store';
+/** 查 latest 的 registry(源头以 npmjs 为准;镜像站有分钟级同步延迟,可能查到旧 latest)。 */
+const NPM_REGISTRY_LATEST = 'https://registry.npmjs.org/@xrxs-ai%2Fdsh-xrxs-plugins-store/latest';
+/** registry 查询超时:公开端点,给短超时,失败让用户重试而不是干等。 */
+const LATEST_TIMEOUT_MS = 10_000;
+let cachedVersion = null;
+/** 当前运行实例的版本(包根 package.json);读不到为 null(极端情况:裸文件运行)。
+ *  依次尝试:模块相对层级(tsc 产物 lib/host/ 与源码 src/host/ 都是上一级的上一级)、
+ *  按包名 resolve(profile 安装布局变化时的兜底);读到的包名必须匹配,防止层级猜错读成别的包。 */
+export function currentSelfVersion() {
+    if (cachedVersion !== null)
+        return cachedVersion;
+    const tryRead = (path) => {
+        try {
+            const pkg = JSON.parse(readFileSync(path, 'utf8'));
+            return typeof pkg.version === 'string' && pkg.name === SELF_PACKAGE_NAME ? pkg.version : null;
+        }
+        catch {
+            return null;
+        }
+    };
+    try {
+        const pkgPath = fileURLToPath(new URL('../../package.json', import.meta.url));
+        cachedVersion = tryRead(pkgPath);
+    }
+    catch {
+        cachedVersion = null;
+    }
+    if (cachedVersion === null) {
+        try {
+            cachedVersion = tryRead(createRequire(import.meta.url).resolve(`${SELF_PACKAGE_NAME}/package.json`));
+        }
+        catch {
+            cachedVersion = null;
+        }
+    }
+    return cachedVersion;
+}
+/** 查 npm latest 并与当前版本比较;registry 查询失败时 latest 为 null(不抛,便于 UI 展示「检查失败」)。 */
+export async function checkSelfUpdate() {
+    const current = currentSelfVersion();
+    let latest = null;
+    try {
+        const response = await fetch(NPM_REGISTRY_LATEST, {
+            signal: AbortSignal.timeout(LATEST_TIMEOUT_MS),
+            headers: { accept: 'application/json' },
+        });
+        if (response.ok) {
+            const data = (await response.json());
+            if (typeof data.version === 'string' && data.version !== '')
+                latest = data.version;
+        }
+    }
+    catch {
+        // 网络失败/超时:latest 保持 null
+    }
+    return { current, latest, updateAvailable: current !== null && latest !== null && compareVersions(latest, current) > 0 };
+}
+/** 应用更新:复用安装链路装确切版本(不装 latest tag,避免「检查到装的」漂移)。 */
+export async function applySelfUpdate(version, deps) {
+    return installPlugin({ name: SELF_PACKAGE_NAME, version, sourceType: 'npm' }, deps);
+}
+/** 简易 semver 比较(本插件只用 x.y.z;逐段数值比较,长度不齐补 0):
+ *  a>b → 1,a<b → -1,相等 → 0;不可解析的段当 0。 */
+export function compareVersions(a, b) {
+    const parse = (text) => text
+        .trim()
+        .replace(/^v/, '')
+        .split('.')
+        .map((part) => {
+        const numeric = /^\d+/.exec(part);
+        return numeric === null ? 0 : Number(numeric[0]);
+    });
+    const left = parse(a);
+    const right = parse(b);
+    const length = Math.max(left.length, right.length);
+    for (let index = 0; index < length; index += 1) {
+        const diff = (left[index] ?? 0) - (right[index] ?? 0);
+        if (diff !== 0)
+            return diff > 0 ? 1 : -1;
+    }
+    return 0;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xrxs-ai/dsh-xrxs-plugins-store",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "DSH 私有插件市场插件(静态持久 bundle,双 face)",
   "type": "module",
   "license": "MIT",