dsh-vpn 0.1.6 → 0.1.7

package/README.md

@@ -38,6 +38,8 @@ dsh plugin --profile web add dsh-vpn
 3. 在「节点二维码」里点「刷新二维码」，用手机或电脑上的客户端扫码导入。
 4. 服务器防火墙的端口由插件自动放行，不用手动操作；安装完成后提示框会列出放行了哪些端口。
 
+**找回已有节点**：如果重装过 dsh 或 dsh-vpn，本地保存的设置会丢失，但 VPS 上的节点还在。重新填写服务器 IP、端口、用户名和密码后点「保存」，插件会自动检查这台服务器上是否已有安装（也可以随时点「检查已有安装」）。找到后直接显示原来的节点二维码，并按服务器上的实际情况勾选协议和证书类型，已经导入手机或电脑客户端的配置可以继续使用，不用重新扫码。
+
 页面第一行显示插件版本，有新版本时旁边会提示，点「更新」即可升级插件，重启 dsh 后生效（需要 dsh 0.2 及以上；更早的版本请在「设置 → 插件」中更新）。为了供应链安全，发布不足 24 小时的新版本会等满 24 小时再提供更新。
 
 ## 语言

package/lib/client.js

@@ -54,6 +54,8 @@ var vpnApi = {
   test: () => post("/test"),
   status: () => post("/status"),
   links: () => post("/links"),
+  /** Find an earlier installation on the server and adopt its protocols and certificate mode. */
+  detect: () => post("/detect"),
   install: (regenerate) => post("/install", { regenerate }),
   uninstall: () => post("/uninstall"),
   /** Installed version; with `check`, also the newest release on npm. */
@@ -132,6 +134,10 @@ 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",
+  detect: "\u68C0\u67E5\u5DF2\u6709\u5B89\u88C5",
+  detectFound: "\u5DF2\u627E\u5230\u4E4B\u524D\u7684\u5B89\u88C5\uFF1Asing-box {version}\uFF0C\u534F\u8BAE\uFF1A{protocols}\uFF08{cert}\uFF09\u3002\u8282\u70B9\u4E8C\u7EF4\u7801\u5DF2\u663E\u793A\u5728\u4E0B\u65B9\uFF0C\u539F\u6709\u7684\u5BA2\u6237\u7AEF\u914D\u7F6E\u53EF\u4EE5\u7EE7\u7EED\u4F7F\u7528\u3002",
+  detectSynced: "\u5DF2\u6309\u670D\u52A1\u5668\u4E0A\u7684\u5B9E\u9645\u60C5\u51B5\u66F4\u65B0\u4E86\u534F\u8BAE\u52FE\u9009\u548C\u8BC1\u4E66\u7C7B\u578B\u3002",
+  detectNone: "\u8FD9\u53F0\u670D\u52A1\u5668\u4E0A\u6CA1\u6709\u627E\u5230\u4E4B\u524D\u7684\u5B89\u88C5\uFF0C\u53EF\u4EE5\u76F4\u63A5\u70B9\u300C\u5B89\u88C5 / \u66F4\u65B0\u300D\u3002",
   refresh: "\u5237\u65B0\u4E8C\u7EF4\u7801",
   refreshing: "\u6B63\u5728\u5237\u65B0\u2026",
   refreshedAt: "\u4E0A\u6B21\u5237\u65B0 {time}",
@@ -234,6 +240,10 @@ 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.",
+  detect: "Find existing install",
+  detectFound: "Found an earlier installation: sing-box {version}, protocols: {protocols} ({cert}). Its QR codes are shown below; clients you already set up keep working.",
+  detectSynced: "The protocol selection and certificate type now match the server.",
+  detectNone: "No earlier installation was found on this server. Click Install / Update to set one up.",
   refresh: "Refresh QR codes",
   refreshing: "Refreshing\u2026",
   refreshedAt: "Last refreshed {time}",
@@ -1133,11 +1143,35 @@ function VpnSettingsPage({ view, t, api }) {
       setBusy(null);
     }
   }
-  const save = () => op("save", () => api.saveSettings(form), (r) => {
-    setSaved(r.settings);
-    setForm(formOf(r.settings));
-    return { tone: "success", text: t("saved") };
-  });
+  const detect = async () => {
+    await op("detect", api.detect, (r) => {
+      const res = r.result ?? {};
+      if (res.installed !== true) return { tone: "info", text: t("detectNone") };
+      if (r.links) {
+        setLinks(r.links);
+        setRefreshedAt(/* @__PURE__ */ new Date());
+      }
+      const protocols = (res.protocols ?? []).map((id) => PROTOCOLS.find((p) => p.id === id)?.name ?? id).join("\u3001");
+      const cert = res.certMode === "ip" ? t("certIp") : t("certSelf");
+      const text = t("detectFound", { version: String(res.version ?? ""), protocols, cert });
+      return { tone: "success", text: res.synced === true ? `${text}
+${t("detectSynced")}` : text };
+    });
+    const s = await api.getSettings();
+    if (s.ok) {
+      setSaved(s.settings);
+      setForm(formOf(s.settings));
+    }
+  };
+  const save = async () => {
+    const first = !saved.configured;
+    const r = await op("save", () => api.saveSettings(form), (r2) => {
+      setSaved(r2.settings);
+      setForm(formOf(r2.settings));
+      return { tone: "success", text: t("saved") };
+    });
+    if (r.ok && first) await detect();
+  };
   const refreshSettings = async () => {
     const r = await api.getSettings();
     if (r.ok) {
@@ -1300,6 +1334,9 @@ ${t("cloudHint")}`;
           children: t("test")
         }
       ),
+      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { variant: "outline", disabled: disabled || needsSave, onClick: () => {
+        void detect();
+      }, children: busy === "detect" ? t("working") : t("detect") }),
       dirty && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("small", { className: "dshvpn-warn", children: t("unsaved") })
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("section", { children: [

package/lib/index.js

@@ -20298,6 +20298,7 @@ function apiHandlers(service, uiLang, onUiLang, updater) {
     "/test": (_body, signal) => service.test(signal),
     "/status": (_body, signal) => service.status(signal),
     "/links": (_body, signal) => service.links(signal),
+    "/detect": (_body, signal) => service.detect(signal),
     "/install": (body, signal) => service.install({ regenerate: body.regenerate === true }, signal),
     "/uninstall": (_body, signal) => service.uninstall(signal)
   };
@@ -20615,6 +20616,34 @@ var VpnService = class {
   links(signal) {
     return this.run("links", (s) => ["--server", s.linkAddress ?? s.host], signal);
   }
+  /**
+   * Find an existing installation (e.g. after dsh-vpn was removed and its local
+   * settings lost): read the server's protocols, certificate mode and links,
+   * and adopt the protocols and certificate mode into local settings so a
+   * later 安装 / 更新 keeps the node as it is.
+   */
+  async detect(signal) {
+    const status = await this.status(signal);
+    if (!status.ok || status.result?.installed !== true) return status.ok ? { ok: true, result: { installed: false } } : status;
+    const r = status.result;
+    const protocols = String(r.protocols ?? "").split(",").filter(isProtocolId);
+    const mode = r.cert?.mode;
+    const certMode = mode === "ip" || mode === "self" ? mode : void 0;
+    let synced = false;
+    await this.store.update((cur) => {
+      if (!cur) return void 0;
+      const next = { ...cur, ...protocols.length > 0 ? { protocols } : {}, ...certMode ? { certMode } : {} };
+      synced = next.certMode !== cur.certMode || next.protocols.join() !== cur.protocols.join();
+      return synced ? next : void 0;
+    });
+    const links = await this.links(signal);
+    return {
+      ok: links.ok,
+      ...links.error ? { error: links.error, message: links.message } : {},
+      result: { installed: true, active: r.active, version: r.version, protocols, certMode, synced },
+      ...links.links ? { links: links.links } : {}
+    };
+  }
   uninstall(signal) {
     return this.run("uninstall", () => [], signal);
   }

package/package.json

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