dsh-vpn 0.1.4 → 0.1.5

package/README.md

@@ -38,6 +38,14 @@ dsh plugin --profile web add dsh-vpn
 3. 在「节点二维码」里点「刷新二维码」，用手机或电脑上的客户端扫码导入。
 4. 服务器防火墙的端口由插件自动放行，不用手动操作；安装完成后提示框会列出放行了哪些端口。
 
+## 语言
+
+整个插件的语言跟随 dsh 的界面语言（「设置 → 通用设置 → 语言」），目前支持 dsh 提供的中文和 English：
+
+- 设置页切换语言后立即生效。
+- agent 安装、卸载前的审批提示，以及 agent 收到的提示，也使用同一种语言。浏览器端会把 dsh 当前的界面语言告诉插件，插件把它保存下来，dsh 重启后仍然沿用。
+- 只有从来没有打开过 dsh 网页界面时（例如纯命令行运行），才临时使用电脑的系统语言。
+
 ## 防火墙
 
 安装时插件会检测 VPS 上启用的防火墙，自动放行所选协议的端口（使用 IP 证书时还有 TCP 80）：
@@ -76,7 +84,7 @@ IP 证书由 sing-box 1.14 内置的 ACME 向 Let's Encrypt 申请（[2026 年
 | 接口鉴权 | 设置页的接口挂在 dsh 自己的 `/api` 下，复用 dsh 的登录 cookie 和防跨站、防 DNS rebinding 检查 |
 | 主机指纹 | 首次连接时记录 SSH 主机指纹，之后指纹变化就拒绝连接，防止中间人截获密码 |
 | sudo | 非 root 用户用 `sudo -S`：密码只经 stdin 传入，不会出现在命令行，也不会传给脚本 |
-| agent 操作 | agent 安装或卸载前会弹出审批，提示语言跟随电脑系统语言，并写明目标服务器、协议，以及是否重新生成密钥 |
+| agent 操作 | agent 安装或卸载前会弹出审批，写明目标服务器、协议，以及是否重新生成密钥 |
 | 证书 | 推荐用 IP 证书，所有协议都正常校验；自签模式下 Hysteria2 锁定指纹，TUIC 和 AnyTLS 会标注“需跳过证书校验” |
 
 ## 组成

package/lib/client.js

@@ -55,7 +55,9 @@ var vpnApi = {
   status: () => post("/status"),
   links: () => post("/links"),
   install: (regenerate) => post("/install", { regenerate }),
-  uninstall: () => post("/uninstall")
+  uninstall: () => post("/uninstall"),
+  /** Tell the host which language dsh's UI shows (approval prompts follow it). */
+  reportUiLocale: (locale) => post("/ui-locale", { locale })
 };
 
 // src/client/locales.ts
@@ -1400,6 +1402,17 @@ function apply(ctx) {
       style.remove();
     };
   }, "dsh-vpn: styles");
+  const reportLocale = (locale, attempt = 0) => {
+    void vpnApi.reportUiLocale(locale).then((r) => {
+      if (!r.ok && attempt < 3) setTimeout(() => {
+        reportLocale(locale, attempt + 1);
+      }, 2e3 * (attempt + 1));
+    });
+  };
+  reportLocale(ctx.locale.getSnapshot().active);
+  ctx.on("locale/change", (snapshot) => {
+    reportLocale(snapshot.active);
+  });
   const t = ctx.locale.bind(NS);
   ctx.slots.inject("settings.section", () => ctx.slots.register({
     name: "settings.section",

package/lib/index.js

@@ -20264,8 +20264,13 @@ function json(status, value) {
     headers: { "content-type": "application/json; charset=utf-8", "cache-control": "no-store" }
   });
 }
-function apiHandlers(service) {
+function apiHandlers(service, uiLang, onUiLang) {
   return {
+    "/ui-locale": async (body) => {
+      if (typeof body.locale !== "string" || body.locale.length > 35) return { ok: false, error: "bad_request", message: "locale must be a string" };
+      if (uiLang?.set(body.locale)) onUiLang?.();
+      return { ok: true, lang: uiLang?.get() };
+    },
     "/settings/get": async () => ({ ok: true, settings: publicView(await service.store.get()) }),
     "/settings/save": async (body) => {
       let saved;
@@ -20305,8 +20310,8 @@ async function handle(handler, request) {
     return json(500, { ok: false, error: "internal", message: err instanceof Error ? err.message : String(err) });
   }
 }
-function registerApi(ctx, service) {
-  for (const [path, handler] of Object.entries(apiHandlers(service))) {
+function registerApi(ctx, service, uiLang, onUiLang) {
+  for (const [path, handler] of Object.entries(apiHandlers(service, uiLang, onUiLang))) {
     ctx.effect(() => ctx.connection.fetch.register({
       path: `${API_BASE}${path}`,
       methods: ["POST"],
@@ -20672,6 +20677,15 @@ var CredentialSettingsStore = class {
     });
   }
 };
+var UI_LANG_KEY = credentialKey("dsh-vpn", "ui-locale");
+async function readUiLang(ctx) {
+  const record = await ctx.credentials.readRecord(UI_LANG_KEY);
+  const lang = record?.kind === "grant" ? record.payload?.lang : void 0;
+  return lang === "zh" || lang === "en" ? lang : void 0;
+}
+async function writeUiLang(ctx, lang) {
+  await ctx.credentials.modifyRecord(UI_LANG_KEY, async () => ({ kind: "grant", payload: { lang } }));
+}
 
 // src/i18n.ts
 import { execFileSync } from "node:child_process";
@@ -20696,6 +20710,26 @@ var cached;
 function osLang() {
   return cached ??= detectOsLang();
 }
+var UiLang = class {
+  current;
+  constructor(initial) {
+    this.current = initial;
+  }
+  /** @returns true when the value changed (worth persisting). */
+  set(tag) {
+    const next = fromTag(tag) ?? "en";
+    if (next === this.current) return false;
+    this.current = next;
+    return true;
+  }
+  get() {
+    return this.current ?? osLang();
+  }
+  /** Explicitly reported (not the OS fallback). */
+  get reported() {
+    return this.current;
+  }
+};
 var protocolNames = (ids, sep) => ids.map((id) => PROTOCOLS.find((p) => p.id === id)?.name ?? id).join(sep);
 var TLS_PROTOCOLS = ["hy2", "tuic", "anytls"];
 function installPrompt(lang, p) {
@@ -20738,8 +20772,8 @@ var OUTPUT = {
     ].join("\n")
   }]
 };
-function toToolValue(r) {
-  const message = r.error === "not_configured" ? notConfiguredMessage(osLang()) : r.message;
+function toToolValue(r, uiLang) {
+  const message = r.error === "not_configured" ? notConfiguredMessage(uiLang.get()) : r.message;
   return {
     ok: r.ok,
     ...r.error ? { error: r.error } : {},
@@ -20749,6 +20783,16 @@ function toToolValue(r) {
 }
 function apply(ctx, config) {
   const service = new VpnService(new CredentialSettingsStore(ctx), { timeoutMs: config.timeoutMs, acmeProvider: config.acmeProvider });
+  const uiLang = new UiLang();
+  readUiLang(ctx).then((lang) => {
+    if (lang && !uiLang.reported) uiLang.set(lang);
+  }, () => {
+  });
+  const persistUiLang = () => {
+    const lang = uiLang.reported;
+    if (lang) writeUiLang(ctx, lang).catch(() => {
+    });
+  };
   ctx.tools.register(defineTool({
     name: "vpn_install",
     description: `Install or reconfigure sing-box on the VPS configured in dsh Settings \u2192 VPN, then return share links. Opens the ports in the VPS firewall automatically (result.firewall). Idempotent: rerunning keeps existing keys and ports unless \`regenerate\` is set. Protocols: ${PROTOCOL_IDS.join(", ")}; omit to use the ones selected in settings.`,
@@ -20762,7 +20806,7 @@ function apply(ctx, config) {
     },
     output: OUTPUT,
     async execute(args, exec) {
-      return toToolValue(await service.install({ protocols: args.protocols, regenerate: args.regenerate }, exec.signal));
+      return toToolValue(await service.install({ protocols: args.protocols, regenerate: args.regenerate }, exec.signal), uiLang);
     }
   }));
   ctx.tools.register(defineTool({
@@ -20770,21 +20814,21 @@ function apply(ctx, config) {
     description: "Report whether sing-box is installed, running and listening on the configured VPS.",
     parameters: {},
     output: OUTPUT,
-    execute: async (_args, exec) => toToolValue(await service.status(exec.signal))
+    execute: async (_args, exec) => toToolValue(await service.status(exec.signal), uiLang)
   }));
   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 in dsh Settings \u2192 VPN (\u5237\u65B0\u4E8C\u7EF4\u7801).",
     parameters: {},
     output: OUTPUT,
-    execute: async (_args, exec) => toToolValue(await service.links(exec.signal))
+    execute: async (_args, exec) => toToolValue(await service.links(exec.signal), uiLang)
   }));
   ctx.tools.register(defineTool({
     name: "vpn_uninstall",
     description: "Stop and remove sing-box, its config and credentials from the configured VPS.",
     parameters: {},
     output: OUTPUT,
-    execute: async (_args, exec) => toToolValue(await service.uninstall(exec.signal))
+    execute: async (_args, exec) => toToolValue(await service.uninstall(exec.signal), uiLang)
   }));
   if (config.confirm) {
     ctx.on("tools/pre-execute", async (exec, next) => {
@@ -20792,7 +20836,7 @@ function apply(ctx, config) {
       if (decision.kind !== "allow" || exec.name !== "vpn_install" && exec.name !== "vpn_uninstall") return decision;
       const s = await service.store.get();
       if (!s) return decision;
-      const lang = osLang();
+      const lang = uiLang.get();
       const target = `${s.host}:${s.port}`;
       if (exec.name === "vpn_uninstall") return { kind: "ask", reason: uninstallPrompt(lang, target) };
       const args = exec.arguments;
@@ -20809,7 +20853,7 @@ function apply(ctx, config) {
     });
   }
   ctx.inject(["connection"], (webCtx) => {
-    registerApi(webCtx, service);
+    registerApi(webCtx, service, uiLang, persistUiLang);
   });
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vpn",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "DeepSeek Harness plugin: deploy an encrypted VPN (sing-box) to your own VPS in one click, to protect your connections and privacy on untrusted networks",
   "keywords": [
     "anytls",