dsh-vpn 0.1.1 → 0.1.2

package/README.md

@@ -18,16 +18,13 @@ npx @deepseek-ai/dsh plugin --profile web add dsh-vpn
 dsh plugin --profile web add dsh-vpn
 ```
 
-装好后重启 dsh，然后打开设置页：
+装好后重启 dsh，点左下角「设置」，左侧菜单里的「**VPN 设置**」就是本插件的设置页（dsh 0.1.5 和 0.1.7 相同）。
 
-- dsh 0.1.5：「设置」→「插件」→「插件配置」→「VPN 节点」
-- dsh 0.1.7 及以后：侧边栏「插件」→ dsh-vpn
-
-在设置页里：
+在 VPN 设置里：
 
 1. 填写服务器 IP、SSH 端口、用户名、密码，点「保存」和「测试连接」。
 2. 勾选要安装的协议，选择证书类型（推荐「IP 证书」），保存后点「安装 / 更新」。
-3. 在「节点二维码」里点「刷新」，用手机或电脑上的客户端扫码导入。
+3. 在「节点二维码」里点「刷新二维码」，用手机或电脑上的客户端扫码导入。
 4. 在云服务商控制台的安全组里放行页面提示的端口。用 IP 证书时，TCP 80 端口要一直开放，用于续期。
 
 ## 证书
@@ -64,7 +61,7 @@ IP 证书由 sing-box 1.14 内置的 ACME 向 Let's Encrypt 申请（[2026 年
 | `src/settings.ts` / `src/credential-store.ts` | 服务器设置的校验和存储 |
 | `src/api.ts` | 设置页调用的 `/api/dsh-vpn/*` 接口 |
 | `src/index.ts` | agent 工具 `vpn_install` / `vpn_status` / `vpn_links` / `vpn_uninstall`，以及执行前的审批 |
-| `src/client/` | 浏览器端：设置页、二维码 |
+| `src/client/` | 浏览器端：设置弹窗里的「VPN 设置」一栏、二维码 |
 | `src/skill.ts` + `assets/vpn-ops.md` | `vpn-ops` 技能：操作流程和排障 |
 
 ## 远端落盘位置
@@ -89,7 +86,7 @@ npm 上的 `@deepseek-ai/*` 包版本过旧，所以 `build` 不做类型检查
 
 ## 发布
 
-推送与 `package.json` 版本号一致的标签，GitHub Actions 会先跑测试，再发布到 npm，并附带来源证明（provenance）。需要在仓库 Secrets 里配置 `NPM_TOKEN`：
+推送与 `package.json` 版本号一致的标签，GitHub Actions 会先跑测试，再发布到 npm。需要在仓库 Secrets 里配置 `NPM_TOKEN`。仓库是私有的，npm 不支持为私有仓库生成来源证明（provenance），所以发布时不带来源证明：
 
 ```bash
 git tag v0.1.0 && git push origin v0.1.0

package/assets/vpn-ops.md

@@ -1,14 +1,14 @@
 # vpn-ops
 
-Deploy and operate a personal sing-box server on the user's VPS. The plugin logs in over SSH with the password saved on its settings page (dsh → Plugins → dsh-vpn). No local ssh client is needed.
+Deploy and operate a personal sing-box server on the user's VPS. The plugin logs in over SSH with the password saved in dsh Settings (bottom-left gear) → VPN 设置. No local ssh client is needed.
 
 ## Workflow
 
 1. **Check first.** Call `vpn_status`.
-   - `error: not_configured` → tell the user to open dsh → 插件 (Plugins) → dsh-vpn, fill in server IP, SSH port, username and password, then click 保存 and 测试连接. Never ask for the password in chat.
+   - `error: not_configured` → tell the user to open dsh 设置 (Settings, bottom left) → VPN 设置, fill in server IP, SSH port, username and password, then click 保存 and 测试连接. Never ask for the password in chat.
    - Installed and active → offer `vpn_links` instead of reinstalling.
 2. **Install.** Call `vpn_install`. Omit `protocols` to use the selection saved in settings. Only pass `regenerate: true` when the user explicitly wants new keys, because every old link stops working.
-3. **Deliver.** Say the links are ready and that the settings page shows scannable QR codes (刷新 button). Client apps: v2rayN, NekoBox, Shadowrocket, sing-box, Clash Meta / mihomo.
+3. **Deliver.** Say the links are ready and that 设置 → VPN 设置 shows scannable QR codes (刷新二维码 button). Client apps: v2rayN, NekoBox, Shadowrocket, sing-box, Clash Meta / mihomo.
 4. **Remind** the user to open the reported ports in the cloud provider's security group, using the right transport for each protocol.
 
 ## Certificates

package/lib/client.js

@@ -62,6 +62,7 @@ var vpnApi = {
 var NS = "dsh-vpn";
 var zh = {
   title: "VPN \u8282\u70B9",
+  nav: "VPN \u8BBE\u7F6E",
   description: "\u5728\u4F60\u7684 VPS \u4E0A\u4E00\u952E\u90E8\u7F72 sing-box\uFF0C\u5E76\u7528\u4E8C\u7EF4\u7801\u5BFC\u5165\u624B\u673A\u6216\u7535\u8111\u4E0A\u7684\u4EE3\u7406\u5BA2\u6237\u7AEF\u3002",
   serverSection: "\u670D\u52A1\u5668",
   host: "\u670D\u52A1\u5668 IP \u6216\u57DF\u540D",
@@ -114,8 +115,12 @@ var zh = {
   working: "\u6267\u884C\u4E2D\u2026",
   qrSection: "\u8282\u70B9\u4E8C\u7EF4\u7801",
   qrHint: "\u7528 v2rayN\u3001NekoBox\u3001Shadowrocket\u3001sing-box\u3001Clash Meta \u7B49\u5BA2\u6237\u7AEF\u626B\u63CF\u5BFC\u5165\u3002\u4E8C\u7EF4\u7801\u7B49\u540C\u4E8E\u5BC6\u7801\uFF0C\u8BF7\u52FF\u5916\u4F20\u3002",
-  refresh: "\u5237\u65B0",
-  qrEmpty: "\u70B9\u300C\u5237\u65B0\u300D\u4ECE\u670D\u52A1\u5668\u8BFB\u53D6\u8282\u70B9\u5E76\u751F\u6210\u4E8C\u7EF4\u7801\u3002",
+  refresh: "\u5237\u65B0\u4E8C\u7EF4\u7801",
+  refreshing: "\u6B63\u5728\u5237\u65B0\u2026",
+  refreshedAt: "\u4E0A\u6B21\u5237\u65B0 {time}",
+  generate: "\u751F\u6210\u8282\u70B9\u4E8C\u7EF4\u7801",
+  qrEmpty: "\u8FD8\u6CA1\u6709\u4E8C\u7EF4\u7801\u3002\u5B89\u88C5\u5B8C\u6210\u540E\uFF0C\u70B9\u4E0B\u9762\u7684\u6309\u94AE\u4ECE\u670D\u52A1\u5668\u8BFB\u53D6\u8282\u70B9\u5E76\u751F\u6210\u4E8C\u7EF4\u7801\u3002",
+  qrNeedsSave: "\u8BF7\u5148\u586B\u5199\u5E76\u4FDD\u5B58\u670D\u52A1\u5668\u4FE1\u606F\u3002",
   copy: "\u590D\u5236\u94FE\u63A5",
   copied: "\u5DF2\u590D\u5236",
   portLabel: "\u7AEF\u53E3 {port}",
@@ -145,6 +150,7 @@ var zh = {
 };
 var en = {
   title: "VPN node",
+  nav: "VPN",
   description: "Deploy sing-box to your VPS in one click and import it into proxy apps by scanning QR codes.",
   serverSection: "Server",
   host: "Server IP or domain",
@@ -197,8 +203,12 @@ var en = {
   working: "Working\u2026",
   qrSection: "Node QR codes",
   qrHint: "Scan with v2rayN, NekoBox, Shadowrocket, sing-box, Clash Meta and similar apps. A QR code is as secret as a password.",
-  refresh: "Refresh",
-  qrEmpty: 'Click "Refresh" to read the nodes from the server and show QR codes.',
+  refresh: "Refresh QR codes",
+  refreshing: "Refreshing\u2026",
+  refreshedAt: "Last refreshed {time}",
+  generate: "Generate node QR codes",
+  qrEmpty: "No QR codes yet. After installing, click below to read the nodes from the server and generate QR codes.",
+  qrNeedsSave: "Fill in and save the server details first.",
   copy: "Copy link",
   copied: "Copied",
   portLabel: "Port {port}",
@@ -263,16 +273,21 @@ var STYLES = `
 .dshvpn-qr { background: #fff; padding: 6px; border-radius: 6px; line-height: 0; align-self: center; }
 .dshvpn-qr svg { width: 180px; height: 180px; }
 .dshvpn-link { display: block; max-width: 100%; max-height: 3.2em; overflow: hidden; color: var(--dsw-alias-label-secondary, #666); }
-.dshvpn-card { list-style: none; border-radius: 10px; border: 1px solid var(--dsw-alias-border-l2, rgba(127,127,127,.3)); }
-.dshvpn-card-head { all: unset; box-sizing: border-box; width: 100%; display: flex; align-items: center; justify-content: space-between; gap: 12px; padding: 12px 14px; cursor: pointer; }
-.dshvpn-card-title { display: flex; flex-direction: column; gap: 2px; font-size: 13px; }
-.dshvpn-card-chevron { color: var(--dsw-alias-label-tertiary, #888); }
-.dshvpn-card-body { padding: 4px 14px 16px; }
+.dshvpn-section { display: flex; flex-direction: column; gap: 16px; }
+.dshvpn-section-head h2 { margin: 0 0 4px; font-size: 18px; font-weight: 600; }
+.dshvpn-section-head p { margin: 0; }
+.dshvpn-qr-section { padding: 14px; border-radius: 12px; border: 1px solid var(--dsw-alias-border-l2, rgba(127,127,127,.3)); }
+.dshvpn-qr-section h3 { font-size: 15px; }
+.dshvpn-refresh { gap: 6px; font-weight: 600; }
+.dshvpn-refresh-lg { padding: 10px 22px !important; font-size: 14px !important; }
+.dshvpn-spin { display: inline-block; animation: dshvpn-spin 1s linear infinite; }
+@keyframes dshvpn-spin { to { transform: rotate(360deg); } }
+.dshvpn-qr-empty { display: flex; flex-direction: column; align-items: center; gap: 10px; padding: 28px 16px; text-align: center;
+  border: 2px dashed var(--dsw-alias-border-l3, rgba(127,127,127,.35)); border-radius: 12px; }
+.dshvpn-qr-empty p { margin: 0; font-size: 13px; color: var(--dsw-alias-label-secondary, #666); max-width: 420px; }
+.dshvpn-qr-empty-icon { font-size: 36px; line-height: 1; color: var(--dsw-alias-label-tertiary, #888); }
 `;
 
-// src/client/VpnSettingsCard.tsx
-var import_react2 = require("react");
-
 // src/client/VpnSettingsPage.tsx
 var import_react = require("react");
 var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
@@ -1044,6 +1059,7 @@ function VpnSettingsPage({ view, t, api }) {
   const [busy, setBusy] = (0, import_react.useState)(null);
   const [notice, setNotice] = (0, import_react.useState)(null);
   const [links, setLinks] = (0, import_react.useState)(null);
+  const [refreshedAt, setRefreshedAt] = (0, import_react.useState)(null);
   const [regenerate, setRegenerate] = (0, import_react.useState)(false);
   const [confirming, setConfirming] = (0, import_react.useState)(null);
   (0, import_react.useEffect)(() => {
@@ -1099,13 +1115,21 @@ function VpnSettingsPage({ view, t, api }) {
   });
   const install = async () => {
     const r = await op("install", () => api.install(regenerate), (v) => {
-      if (v.links) setLinks(v.links);
+      if (v.links) {
+        setLinks(v.links);
+        setRefreshedAt(/* @__PURE__ */ new Date());
+      }
       return { tone: "success", text: `${t("installed")} ${v.links ? portsReminder(v.links) : ""}` };
     });
     if (!r.ok && r.links) setLinks(r.links);
     setRegenerate(false);
     void refreshSettings();
   };
+  const refreshLinks = () => op("links", api.links, (r) => {
+    if (r.links) setLinks(r.links);
+    setRefreshedAt(/* @__PURE__ */ new Date());
+    return null;
+  });
   const disabled = busy !== null;
   const needsSave = dirty || !saved.configured;
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dshvpn", children: [
@@ -1312,53 +1336,51 @@ ${t("certExpires", { date: new Date(cert.expires ?? "").toLocaleString(), hours
       ] })
     ] }),
     (busy !== null || notice) && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: `dshvpn-notice dshvpn-${busy !== null ? "info" : notice?.tone}`, role: "status", children: busy !== null ? t("working") : notice?.text }),
-    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("section", { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("section", { className: "dshvpn-qr-section", children: [
       /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dshvpn-row", children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("h3", { children: t("qrSection") }),
-        /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-          import_dsh_client_ui_primitives.Button,
-          {
-            variant: "outline",
-            size: "sm",
-            disabled: disabled || needsSave,
-            onClick: () => {
-              void op("links", api.links, (r) => {
-                if (r.links) setLinks(r.links);
-                return null;
-              });
-            },
-            children: t("refresh")
-          }
-        )
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("span", { className: "dshvpn-actions", children: [
+          refreshedAt && busy !== "links" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("small", { className: "dshvpn-muted", children: t("refreshedAt", { time: refreshedAt.toLocaleTimeString() }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_dsh_client_ui_primitives.Button, { variant: "primary", className: "dshvpn-refresh", disabled: disabled || needsSave, onClick: () => {
+            void refreshLinks();
+          }, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: busy === "links" ? "dshvpn-spin" : void 0, "aria-hidden": "true", children: "\u21BB" }),
+            busy === "links" ? t("refreshing") : t("refresh")
+          ] })
+        ] })
       ] }),
       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("small", { className: "dshvpn-muted", children: t("qrHint") }),
-      links ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dshvpn-qr-grid", children: links.items.map((item) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(QrCard, { item, t }, item.id)) }) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { className: "dshvpn-muted", children: t("qrEmpty") })
+      links ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "dshvpn-qr-grid", children: links.items.map((item) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(QrCard, { item, t }, item.id)) }) : /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dshvpn-qr-empty", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: "dshvpn-qr-empty-icon", "aria-hidden": "true", children: "\u25A6" }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsx)("p", { children: needsSave ? t("qrNeedsSave") : t("qrEmpty") }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_dsh_client_ui_primitives.Button, { variant: "primary", className: "dshvpn-refresh dshvpn-refresh-lg", disabled: disabled || needsSave, onClick: () => {
+          void refreshLinks();
+        }, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { className: busy === "links" ? "dshvpn-spin" : void 0, "aria-hidden": "true", children: "\u21BB" }),
+          busy === "links" ? t("refreshing") : t("generate")
+        ] })
+      ] })
     ] })
   ] });
 }
 
-// src/client/VpnSettingsCard.tsx
+// src/client/VpnSettingsSection.tsx
 var import_jsx_runtime2 = require("react/jsx-runtime");
-function VpnSettingsCard(props) {
+function VpnSettingsSection(props) {
   const { t } = props;
-  const [open, setOpen] = (0, import_react2.useState)(false);
-  return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("li", { className: "dshvpn-card", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("button", { type: "button", className: "dshvpn-card-head", "aria-expanded": open, onClick: () => {
-      setOpen(!open);
-    }, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("span", { className: "dshvpn-card-title", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("strong", { children: t("title") }),
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("small", { className: "dshvpn-muted", children: t("description") })
-      ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { "aria-hidden": "true", className: "dshvpn-card-chevron", children: open ? "\u25BE" : "\u25B8" })
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("div", { className: "dshvpn-section", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("header", { className: "dshvpn-section-head", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("h2", { children: t("nav") }),
+      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "dshvpn-muted", children: t("description") })
     ] }),
-    open && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "dshvpn-card-body", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(VpnSettingsPage, { ...props, view: "page" }) })
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(VpnSettingsPage, { t, api: props.api, view: "page" })
   ] });
 }
 
 // src/client/index.ts
 var PACKAGE_NAME = "dsh-vpn";
 var inject = ["slots", "locale"];
+var SECTION_ORDER = 25;
 function apply(ctx) {
   ctx.effect(() => ctx.locale.register(NS, { zh, en }), "dsh-vpn: dictionaries");
   ctx.effect(() => {
@@ -1370,18 +1392,15 @@ function apply(ctx) {
       style.remove();
     };
   }, "dsh-vpn: styles");
-  ctx.slots.inject("plugins.bundle.config", () => ctx.slots.register({
-    name: "plugins.bundle.config",
-    key: PACKAGE_NAME,
-    locale: NS,
-    inject: () => ({ api: vpnApi })
-  }, VpnSettingsPage));
-  ctx.slots.inject("settings.plugin.item", () => ctx.slots.register({
-    name: "settings.plugin.item",
-    key: PACKAGE_NAME,
+  const t = ctx.locale.bind(NS);
+  ctx.slots.inject("settings.section", () => ctx.slots.register({
+    name: "settings.section",
+    id: PACKAGE_NAME,
+    order: SECTION_ORDER,
+    label: () => t("nav"),
     locale: NS,
     inject: () => ({ api: vpnApi })
-  }, VpnSettingsCard));
+  }, VpnSettingsSection));
 }
 
 		return module.exports;

package/lib/index.js

@@ -20706,7 +20706,7 @@ function uninstallPrompt(lang, target) {
   return lang === "zh" ? `\u5C06\u505C\u6B62\u5E76\u5220\u9664 ${target} \u4E0A\u7684 sing-box \u670D\u52A1\u3001\u914D\u7F6E\u548C\u5BC6\u94A5\u3002\u73B0\u6709\u8282\u70B9\u94FE\u63A5\u5C06\u5168\u90E8\u5931\u6548\u3002` : `Stop and remove the sing-box service, its config and keys from ${target}. All existing node links stop working.`;
 }
 function notConfiguredMessage(lang) {
-  return lang === "zh" ? "\u5C1A\u672A\u914D\u7F6E\u670D\u52A1\u5668\u3002\u8BF7\u5148\u5728 dsh\u300C\u63D2\u4EF6\u300D\u9875\u9762\u6253\u5F00 dsh-vpn\uFF0C\u586B\u5199\u670D\u52A1\u5668 IP\u3001\u7AEF\u53E3\u3001\u7528\u6237\u540D\u548C\u5BC6\u7801\u3002" : "No server configured. Open dsh-vpn on the dsh Plugins page and fill in the server IP, port, username and password first.";
+  return lang === "zh" ? "\u5C1A\u672A\u914D\u7F6E\u670D\u52A1\u5668\u3002\u8BF7\u70B9 dsh \u5DE6\u4E0B\u89D2\u300C\u8BBE\u7F6E\u300D\u2192\u300CVPN \u8BBE\u7F6E\u300D\uFF0C\u586B\u5199\u670D\u52A1\u5668 IP\u3001\u7AEF\u53E3\u3001\u7528\u6237\u540D\u548C\u5BC6\u7801\u3002" : "No server configured. Open dsh Settings (bottom left) \u2192 VPN and fill in the server IP, port, username and password first.";
 }
 
 // src/index.ts
@@ -20751,7 +20751,7 @@ function apply(ctx, config) {
   const service = new VpnService(new CredentialSettingsStore(ctx), { timeoutMs: config.timeoutMs, acmeProvider: config.acmeProvider });
   ctx.tools.register(defineTool({
     name: "vpn_install",
-    description: `Install or reconfigure sing-box on the VPS configured in the dsh-vpn settings page, then return share links. Idempotent: rerunning keeps existing keys and ports unless \`regenerate\` is set. Protocols: ${PROTOCOL_IDS.join(", ")}; omit to use the ones selected in settings.`,
+    description: `Install or reconfigure sing-box on the VPS configured in dsh Settings \u2192 VPN, then return share links. Idempotent: rerunning keeps existing keys and ports unless \`regenerate\` is set. Protocols: ${PROTOCOL_IDS.join(", ")}; omit to use the ones selected in settings.`,
     parameters: {
       protocols: {
         type: "array",
@@ -20774,7 +20774,7 @@ function apply(ctx, config) {
   }));
   ctx.tools.register(defineTool({
     name: "vpn_links",
-    description: "Return the share links (vless://, hysteria2://, \u2026) of the installed server. Tell the user they can scan QR codes on the dsh-vpn settings page.",
+    description: "Return the share links (vless://, hysteria2://, \u2026) of the installed server. Tell the user they can scan QR codes in dsh Settings \u2192 VPN (\u5237\u65B0\u4E8C\u7EF4\u7801).",
     parameters: {},
     output: OUTPUT,
     execute: async (_args, exec) => toToolValue(await service.links(exec.signal))
@@ -20811,13 +20811,6 @@ function apply(ctx, config) {
   ctx.inject(["connection"], (webCtx) => {
     registerApi(webCtx, service);
   });
-  ctx.inject(["settings"], (settingsCtx) => {
-    const settings = settingsCtx.settings;
-    try {
-      settings?.register?.("dsh-vpn", Schema.object({}), {});
-    } catch {
-    }
-  });
 }
 export {
   Config,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vpn",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "DeepSeek Harness plugin: one-click sing-box deployment to a VPS over SSH, with a settings page and QR codes",
   "keywords": [
     "dsh-plugin",
@@ -53,8 +53,7 @@
   },
   "packageManager": "pnpm@11.9.0",
   "publishConfig": {
-    "access": "public",
-    "provenance": true
+    "access": "public"
   },
   "scripts": {
     "build": "node scripts/build.mjs",