dsh-vpn 0.1.5 → 0.1.6

package/README.md

@@ -38,6 +38,8 @@ dsh plugin --profile web add dsh-vpn
 3. 在「节点二维码」里点「刷新二维码」，用手机或电脑上的客户端扫码导入。
 4. 服务器防火墙的端口由插件自动放行，不用手动操作；安装完成后提示框会列出放行了哪些端口。
 
+页面第一行显示插件版本，有新版本时旁边会提示，点「更新」即可升级插件，重启 dsh 后生效（需要 dsh 0.2 及以上；更早的版本请在「设置 → 插件」中更新）。为了供应链安全，发布不足 24 小时的新版本会等满 24 小时再提供更新。
+
 ## 语言
 
 整个插件的语言跟随 dsh 的界面语言（「设置 → 通用设置 → 语言」），目前支持 dsh 提供的中文和 English：

package/lib/client.js

@@ -56,6 +56,10 @@ var vpnApi = {
   links: () => post("/links"),
   install: (regenerate) => post("/install", { regenerate }),
   uninstall: () => post("/uninstall"),
+  /** Installed version; with `check`, also the newest release on npm. */
+  version: (check = false) => post("/version", { check }),
+  /** Install the newest release through dsh's plugin manager. */
+  update: () => post("/update"),
   /** Tell the host which language dsh's UI shows (approval prompts follow it). */
   reportUiLocale: (locale) => post("/ui-locale", { locale })
 };
@@ -66,6 +70,17 @@ var zh = {
   title: "VPN \u8282\u70B9",
   nav: "VPN \u8BBE\u7F6E",
   description: "\u5728\u4F60\u81EA\u5DF1\u7684 VPS \u4E0A\u4E00\u952E\u90E8\u7F72\u52A0\u5BC6 VPN\uFF0C\u4FDD\u62A4\u4F60\u5728\u516C\u5171 Wi-Fi \u7B49\u7F51\u7EDC\u4E2D\u7684\u8FDE\u63A5\u5B89\u5168\u548C\u9690\u79C1\uFF1B\u626B\u7801\u5373\u53EF\u5BFC\u5165\u624B\u673A\u6216\u7535\u8111\u4E0A\u7684\u5BA2\u6237\u7AEF\u3002",
+  version: "\u7248\u672C v{version}",
+  update: "\u66F4\u65B0",
+  updating: "\u6B63\u5728\u66F4\u65B0\u2026",
+  "update.latest": "\u5DF2\u662F\u6700\u65B0\u7248\u672C",
+  "update.available": "\u6709\u65B0\u7248\u672C v{version}",
+  "update.tooNew": "\u65B0\u7248\u672C v{version} \u521A\u53D1\u5E03\uFF0C\u4E3A\u5B89\u5168\u8D77\u89C1 {time} \u540E\u53EF\u66F4\u65B0",
+  "update.done": "\u5DF2\u66F4\u65B0\u5230 v{version}\uFF0C\u91CD\u542F dsh \u540E\u751F\u6548",
+  "update.unsupported": "\u5F53\u524D dsh \u7248\u672C\u4E0D\u652F\u6301\u5728\u6B64\u66F4\u65B0\uFF0C\u8BF7\u5728\u300C\u8BBE\u7F6E \u2192 \u63D2\u4EF6\u300D\u4E2D\u66F4\u65B0 dsh-vpn\u3002",
+  "update.busy": "\u6B63\u5728\u66F4\u65B0\uFF0C\u8BF7\u7A0D\u5019\u3002",
+  "update.check_failed": "\u65E0\u6CD5\u68C0\u67E5\u65B0\u7248\u672C\uFF1A{message}",
+  "update.install_failed": "\u66F4\u65B0\u5931\u8D25\uFF1A{message}",
   serverSection: "\u670D\u52A1\u5668",
   host: "\u670D\u52A1\u5668 IP \u6216\u57DF\u540D",
   hostHint: "\u4F60\u8D2D\u4E70\u7684 VPS \u7684\u516C\u7F51\u5730\u5740\u3002",
@@ -157,6 +172,17 @@ var en = {
   title: "VPN node",
   nav: "VPN",
   description: "Deploy an encrypted VPN to your own VPS in one click to keep your connections private and secure on networks like public Wi-Fi; import it into client apps by scanning QR codes.",
+  version: "Version v{version}",
+  update: "Update",
+  updating: "Updating\u2026",
+  "update.latest": "You have the latest version",
+  "update.available": "v{version} is available",
+  "update.tooNew": "v{version} was just released; for safety it can be installed after {time}",
+  "update.done": "Updated to v{version}. Restart dsh to use it.",
+  "update.unsupported": "This dsh version cannot update plugins from here. Update dsh-vpn in Settings \u2192 Plugins.",
+  "update.busy": "An update is already running.",
+  "update.check_failed": "Could not check for updates: {message}",
+  "update.install_failed": "Update failed: {message}",
   serverSection: "Server",
   host: "Server IP or domain",
   hostHint: "Public address of your VPS.",
@@ -282,7 +308,11 @@ var STYLES = `
 .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-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 h2 { margin: 0; font-size: 18px; font-weight: 600; }
+.dshvpn-title-row { display: flex; align-items: center; flex-wrap: wrap; gap: 10px; margin-bottom: 4px; }
+.dshvpn-version { font-size: 12px; font-variant-numeric: tabular-nums; color: var(--dsw-alias-label-secondary, #666); }
+.dshvpn-update-note { font-size: 12px; color: var(--dsw-alias-label-secondary, #666); }
+.dshvpn-update-note.dshvpn-new { color: var(--dsw-alias-state-success-primary, #2f855a); 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; }
@@ -296,6 +326,10 @@ var STYLES = `
 .dshvpn-qr-empty-icon { font-size: 36px; line-height: 1; color: var(--dsw-alias-label-tertiary, #888); }
 `;
 
+// src/client/VpnSettingsSection.tsx
+var import_react2 = require("react");
+var import_dsh_client_ui_primitives2 = require("@deepseek-ai/dsh-client-ui-primitives");
+
 // src/client/VpnSettingsPage.tsx
 var import_react = require("react");
 var import_dsh_client_ui_primitives = require("@deepseek-ai/dsh-client-ui-primitives");
@@ -1377,13 +1411,57 @@ ${fw.backend === "none" ? t("fwNone") : t("fwStatus", { backend: fw.backend, cou
 // src/client/VpnSettingsSection.tsx
 var import_jsx_runtime2 = require("react/jsx-runtime");
 function VpnSettingsSection(props) {
-  const { t } = props;
+  const { t, api } = props;
+  const [info, setInfo] = (0, import_react2.useState)(null);
+  const [note, setNote] = (0, import_react2.useState)(null);
+  const [updating, setUpdating] = (0, import_react2.useState)(false);
+  const when = (iso) => new Date(iso).toLocaleString();
+  const describe = (v) => {
+    if (v.target) return { text: t("update.available", { version: v.target }), fresh: true };
+    if (v.availableAt && v.latest) return { text: t("update.tooNew", { version: v.latest, time: when(v.availableAt) }) };
+    return null;
+  };
+  (0, import_react2.useEffect)(() => {
+    let live = true;
+    void api.version().then((r) => {
+      if (live && r.ok) setInfo(r);
+    });
+    void api.version(true).then((r) => {
+      if (!live || !r.ok) return;
+      setInfo(r);
+      setNote(describe(r));
+    });
+    return () => {
+      live = false;
+    };
+  }, [api]);
+  const update = async () => {
+    setUpdating(true);
+    setNote(null);
+    const r = await api.update();
+    setUpdating(false);
+    if (!r.ok) {
+      const known = ["unsupported", "busy", "check_failed"].includes(r.error) ? r.error : "install_failed";
+      setNote({ text: t(`update.${known}`, { message: r.message ?? r.error }) });
+      return;
+    }
+    setInfo((prev) => ({ ...prev, ...r.info, canUpdate: prev?.canUpdate ?? true }));
+    if (r.status === "updated") setNote({ text: t("update.done", { version: r.version }), fresh: true });
+    else setNote(describe(r.info) ?? { text: t("update.latest") });
+  };
   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.jsxs)("div", { className: "dshvpn-title-row", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("h2", { children: t("nav") }),
+        info?.current && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: "dshvpn-version", children: t("version", { version: info.current }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_dsh_client_ui_primitives2.Button, { size: "sm", variant: "outline", disabled: updating, onClick: () => {
+          void update();
+        }, children: updating ? t("updating") : t("update") }),
+        note && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("span", { className: `dshvpn-update-note${note.fresh ? " dshvpn-new" : ""}`, children: note.text })
+      ] }),
       /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("p", { className: "dshvpn-muted", children: t("description") })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(VpnSettingsPage, { t, api: props.api, view: "page" })
+    /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(VpnSettingsPage, { t, api, view: "page" })
   ] });
 }
 

package/lib/index.js

@@ -20264,8 +20264,19 @@ function json(status, value) {
     headers: { "content-type": "application/json; charset=utf-8", "cache-control": "no-store" }
   });
 }
-function apiHandlers(service, uiLang, onUiLang) {
+function apiHandlers(service, uiLang, onUiLang, updater) {
   return {
+    "/version": async (body, signal) => {
+      const current = updater?.current;
+      const canUpdate = updater?.manager !== void 0;
+      if (!updater || body.check !== true) return { ok: true, current, canUpdate };
+      try {
+        return { ok: true, canUpdate, ...await updater.check(signal) };
+      } catch (err) {
+        return { ok: false, error: "check_failed", current, canUpdate, message: err instanceof Error ? err.message : String(err) };
+      }
+    },
+    "/update": async (_body, signal) => updater ? updater.update(signal) : { ok: false, error: "unsupported" },
     "/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?.();
@@ -20310,8 +20321,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, uiLang, onUiLang) {
-  for (const [path, handler] of Object.entries(apiHandlers(service, uiLang, onUiLang))) {
+function registerApi(ctx, service, uiLang, onUiLang, updater) {
+  for (const [path, handler] of Object.entries(apiHandlers(service, uiLang, onUiLang, updater))) {
     ctx.effect(() => ctx.connection.fetch.register({
       path: `${API_BASE}${path}`,
       methods: ["POST"],
@@ -20743,6 +20754,126 @@ function notConfiguredMessage(lang) {
   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/update.ts
+import { readFileSync } from "node:fs";
+var PACKAGE_NAME = "dsh-vpn";
+var MIN_RELEASE_AGE_MS = 24 * 60 * 60 * 1e3;
+var NPM_REGISTRY = "https://registry.npmjs.org/";
+function currentVersion() {
+  try {
+    const pkg = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
+    return typeof pkg.version === "string" ? pkg.version : "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+}
+var RELEASE = /^(\d+)\.(\d+)\.(\d+)$/;
+function compareVersions(a, b) {
+  const pa = RELEASE.exec(a);
+  const pb = RELEASE.exec(b);
+  if (!pa || !pb) return 0;
+  for (let i = 1; i <= 3; i++) {
+    const d = Number(pa[i]) - Number(pb[i]);
+    if (d !== 0) return d;
+  }
+  return 0;
+}
+function planUpdate(current, doc, now = Date.now()) {
+  const latest = doc["dist-tags"]?.latest;
+  const info = { current };
+  if (typeof latest !== "string" || !RELEASE.test(latest)) return info;
+  info.latest = latest;
+  if (compareVersions(latest, current) <= 0) return info;
+  const published = (v) => Date.parse(doc.time?.[v] ?? "");
+  const mature = (v) => {
+    const t = published(v);
+    return Number.isFinite(t) && now - t >= MIN_RELEASE_AGE_MS;
+  };
+  const candidates = Object.keys(doc.versions ?? { [latest]: {} }).filter((v) => RELEASE.test(v) && compareVersions(v, current) > 0 && compareVersions(v, latest) <= 0 && mature(v)).sort(compareVersions);
+  const target = candidates.at(-1);
+  if (target) info.target = target;
+  if (target !== latest) {
+    const t = published(latest);
+    if (Number.isFinite(t)) info.availableAt = new Date(t + MIN_RELEASE_AGE_MS).toISOString();
+  }
+  return info;
+}
+async function registriesOf(manager) {
+  const list = [];
+  if (manager) {
+    try {
+      const r = await manager.registries();
+      for (const url of [r.resolved, r.registry, ...r.fallbackRegistries]) if (url) list.push(url);
+    } catch {
+    }
+  }
+  list.push(NPM_REGISTRY);
+  return [...new Set(list.map((u) => u.endsWith("/") ? u : `${u}/`))];
+}
+async function fetchPackument(registries, signal, fetchImpl = fetch) {
+  let lastError;
+  for (const registry of registries) {
+    try {
+      const res = await fetchImpl(`${registry}${PACKAGE_NAME}`, {
+        headers: { accept: "application/json" },
+        signal: AbortSignal.any([AbortSignal.timeout(15e3), ...signal ? [signal] : []])
+      });
+      if (!res.ok) throw new Error(`${registry}: HTTP ${res.status}`);
+      return await res.json();
+    } catch (err) {
+      lastError = err;
+    }
+  }
+  throw lastError instanceof Error ? lastError : new Error(String(lastError));
+}
+var Updater = class {
+  constructor(current = currentVersion(), fetchImpl = fetch, now = Date.now) {
+    this.current = current;
+    this.fetchImpl = fetchImpl;
+    this.now = now;
+  }
+  current;
+  fetchImpl;
+  now;
+  manager;
+  running = false;
+  async check(signal) {
+    const doc = await fetchPackument(await registriesOf(this.manager), signal, this.fetchImpl);
+    return planUpdate(this.current, doc, this.now());
+  }
+  async update(signal) {
+    const manager = this.manager;
+    if (!manager) return { ok: false, error: "unsupported" };
+    if (this.running) return { ok: false, error: "busy" };
+    this.running = true;
+    try {
+      let info;
+      try {
+        info = await this.check(signal);
+      } catch (err) {
+        return { ok: false, error: "check_failed", message: messageOf(err) };
+      }
+      if (!info.target) return { ok: true, status: info.availableAt ? "too-new" : "up-to-date", info };
+      const result = await manager.installBundle(`${PACKAGE_NAME}@${info.target}`);
+      if (result.application === "applied" || result.application === "restart-required") {
+        return { ok: true, status: "updated", info, version: info.target, restartRequired: result.application === "restart-required" };
+      }
+      const output = result.packageResult?.output?.trim();
+      return { ok: false, error: "install_failed", info, message: tail(output || messageOf(result.error) || result.application) };
+    } finally {
+      this.running = false;
+    }
+  }
+};
+function messageOf(err) {
+  if (err instanceof Error) return err.message;
+  if (err && typeof err === "object" && "message" in err && typeof err.message === "string") return err.message;
+  return err === void 0 ? "" : String(err);
+}
+function tail(text, max = 600) {
+  return text.length > max ? `\u2026${text.slice(-max)}` : text;
+}
+
 // src/index.ts
 var name = "dsh-vpn";
 var inject = ["tools", "credentials"];
@@ -20852,8 +20983,15 @@ function apply(ctx, config) {
       };
     });
   }
+  const updater = new Updater();
+  ctx.inject(["pluginManager"], (pmCtx) => {
+    updater.manager = pmCtx.pluginManager;
+    pmCtx.effect(() => () => {
+      updater.manager = void 0;
+    }, "dsh-vpn: plugin manager");
+  });
   ctx.inject(["connection"], (webCtx) => {
-    registerApi(webCtx, service, uiLang, persistUiLang);
+    registerApi(webCtx, service, uiLang, persistUiLang, updater);
   });
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-vpn",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "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",