dsh-vpn 0.1.8 → 0.1.9

package/README.md

@@ -45,7 +45,7 @@ dsh plugin --profile web add dsh-vpn
 
 放好后点「保存」和「测试连接」。已经有自己的私钥、服务器上也放好了对应公钥的，展开「改用我自己已有的私钥」粘贴进去即可（支持带密码短语的私钥）。用非 root 用户时，「sudo 密码」一栏填该用户的 sudo 密码；root 或免密 sudo 不用填。
 
-**找回已有节点**：如果重装过 dsh 或 dsh-vpn，本地保存的设置会丢失，但 VPS 上的节点还在。重新填写服务器 IP、端口、用户名和密码后点「保存」，插件会自动检查这台服务器上是否已有安装（也可以随时点「检查已有安装」）。找到后直接显示原来的节点二维码，并按服务器上的实际情况勾选协议和证书类型，已经导入手机或电脑客户端的配置可以继续使用，不用重新扫码。
+**找回已有节点**：重装过 dsh 或 dsh-vpn 后，本地保存的设置会丢失，但 VPS 上的节点还在运行。在 VPN 设置里填好服务器 IP、端口、用户名和密码（或选密钥登录），**不用先保存**，直接点登录方式下面的「检查已有安装」：插件登录服务器读取仍在运行的节点，显示原来的二维码（链接和以前完全一样，已经导入手机或电脑客户端的配置继续可用），按服务器上的实际情况勾选协议和证书类型，并自动保存设置。登录失败时什么都不保存，填的内容也不会被清掉。
 
 页面第一行显示插件版本，有新版本时旁边会提示，点「更新」即可升级插件，重启 dsh 后生效（需要 dsh 0.2 及以上；更早的版本请在「设置 → 插件」中更新）。为了供应链安全，发布不足 24 小时的新版本会等满 24 小时再提供更新。
 

package/lib/client.js

@@ -57,7 +57,7 @@ var vpnApi = {
   status: () => post("/status"),
   links: () => post("/links"),
   /** Find an earlier installation on the server and adopt its protocols and certificate mode. */
-  detect: () => post("/detect"),
+  detect: (form) => post("/detect", form ?? {}),
   install: (regenerate) => post("/install", { regenerate }),
   uninstall: () => post("/uninstall"),
   /** Installed version; with `check`, also the newest release on npm. */
@@ -157,6 +157,8 @@ var zh = {
   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",
+  detecting: "\u6B63\u5728\u8BFB\u53D6\u670D\u52A1\u5668\u2026",
+  detectHint: "\u91CD\u88C5\u8FC7 dsh \u6216\u672C\u63D2\u4EF6\uFF1F\u586B\u597D\u4E0A\u9762\u7684\u767B\u5F55\u4FE1\u606F\u76F4\u63A5\u70B9\u8FD9\u91CC\uFF08\u4E0D\u7528\u5148\u4FDD\u5B58\uFF09\uFF0C\u4F1A\u767B\u5F55\u670D\u52A1\u5668\u8BFB\u53D6\u4ECD\u5728\u8FD0\u884C\u7684\u8282\u70B9\uFF0C\u663E\u793A\u539F\u6765\u7684\u4E8C\u7EF4\u7801\uFF0C\u5E76\u81EA\u52A8\u4FDD\u5B58\u8BBE\u7F6E\u3002",
   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",
@@ -286,6 +288,8 @@ var en = {
   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",
+  detecting: "Reading the server\u2026",
+  detectHint: "Reinstalled dsh or this plugin? Fill in the login details above and click here (no need to save first): it logs in, reads the node that is still running, shows its QR codes and saves the settings.",
   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.",
@@ -379,6 +383,8 @@ var STYLES = `
 .dshvpn-disclosure { align-self: flex-start; border: none; background: transparent; color: inherit; padding: 0; cursor: pointer; font-size: 12.5px; opacity: .75; }
 .dshvpn-textarea { width: 100%; box-sizing: border-box; font: 12px ui-monospace, SFMono-Regular, Menlo, monospace; padding: 8px; border-radius: 8px; resize: vertical;
   color: inherit; background: transparent; border: 1px solid var(--dsw-alias-border-l2, rgba(127,127,127,.3)); }
+.dshvpn-detect { display: flex; align-items: center; flex-wrap: wrap; gap: 10px; padding-top: 4px; }
+.dshvpn-detect small { flex: 1; min-width: 220px; }
 .dshvpn-section { display: flex; flex-direction: column; gap: 16px; }
 .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; }
@@ -1305,12 +1311,12 @@ function VpnSettingsPage({ view, t, api }) {
       setBusy(null);
     }
   }
-  const detect = async () => {
-    await op("detect", api.detect, (r) => {
-      const res = r.result ?? {};
+  const detect = async (fromForm = true) => {
+    const r = await op("detect", () => api.detect(fromForm ? form : void 0), (r2) => {
+      const res = r2.result ?? {};
       if (res.installed !== true) return { tone: "info", text: t("detectNone") };
-      if (r.links) {
-        setLinks(r.links);
+      if (r2.links) {
+        setLinks(r2.links);
         setRefreshedAt(/* @__PURE__ */ new Date());
       }
       const protocols = (res.protocols ?? []).map((id) => PROTOCOLS.find((p) => p.id === id)?.name ?? id).join("\u3001");
@@ -1319,10 +1325,12 @@ function VpnSettingsPage({ view, t, api }) {
       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));
+    if (r.ok || r.links) {
+      const s = await api.getSettings();
+      if (s.ok) {
+        setSaved(s.settings);
+        setForm(formOf(s.settings));
+      }
     }
   };
   const save = async () => {
@@ -1332,7 +1340,7 @@ ${t("detectSynced")}` : text };
       setForm(formOf(r2.settings));
       return { tone: "success", text: t("saved") };
     });
-    if (r.ok && first) await detect();
+    if (r.ok && first) await detect(false);
   };
   const refreshSettings = async () => {
     const r = await api.getSettings();
@@ -1418,6 +1426,12 @@ ${t("cloudHint")}`;
           ] }, m)) })
         ] }),
         form.auth === "key" && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(KeyPanel, { t, api, form, saved, set, setForm }),
+        /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("div", { className: "dshvpn-wide dshvpn-detect", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Button, { variant: "primary", disabled: disabled || form.host.trim() === "", onClick: () => {
+            void detect();
+          }, children: busy === "detect" ? t("detecting") : t("detect") }),
+          /* @__PURE__ */ (0, import_jsx_runtime.jsx)("small", { className: "dshvpn-muted", children: t("detectHint") })
+        ] }),
         /* @__PURE__ */ (0, import_jsx_runtime.jsxs)("label", { className: "dshvpn-wide", children: [
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)("span", { children: t("linkAddress") }),
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_dsh_client_ui_primitives.Input, { value: form.linkAddress, placeholder: form.host, onChange: (e) => {
@@ -1506,9 +1520,6 @@ ${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

@@ -20483,7 +20483,12 @@ 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),
+    // With form fields: try them as they are (no save needed first); they are
+    // stored only once the login works.
+    "/detect": async (body, signal) => {
+      if (typeof body.host !== "string") return service.detect(signal);
+      return service.detect(signal, applyInput(await service.store.get(), body));
+    },
     "/install": (body, signal) => service.install({ regenerate: body.regenerate === true }, signal),
     "/uninstall": (_body, signal) => service.uninstall(signal)
   };
@@ -20630,31 +20635,42 @@ var VpnService = class {
     return this.exclusive(async () => {
       try {
         const s = await this.settings();
-        const res = await runVpnScript(action, args(s), await targetOf(s, this.keys), signal, this.config.timeoutMs);
-        await this.pin(s, res.hostKey);
-        if (!res.result) {
-          const sudo = /incorrect password|a password is required|not in the sudoers|may not run sudo/i.test(res.log);
-          return {
-            ok: false,
-            error: sudo ? "sudo_failed" : "no_result",
-            message: sudo ? `sudo refused for ${s.username}: ${res.log}` : `script did not report a result (exit ${res.exitCode}): ${res.log}`,
-            log: res.log
-          };
-        }
-        const r = res.result;
-        return {
-          ok: r.ok === true,
-          ...typeof r.error === "string" ? { error: r.error } : {},
-          ...typeof r.message === "string" ? { message: r.message } : {},
-          result: r,
-          ...r.links ? { links: r.links } : {},
-          log: res.log
-        };
+        const { op, hostKey } = await this.runOn(s, action, args(s), signal);
+        await this.pin(s, hostKey);
+        return op;
       } catch (err) {
         return failure(err);
       }
     });
   }
+  /** Run the script against `s` (stored or not); throws SSH and config errors. */
+  async runOn(s, action, args, signal) {
+    const res = await runVpnScript(action, args, await targetOf(s, this.keys), signal, this.config.timeoutMs);
+    if (!res.result) {
+      const sudo = /incorrect password|a password is required|not in the sudoers|may not run sudo/i.test(res.log);
+      return {
+        hostKey: res.hostKey,
+        op: {
+          ok: false,
+          error: sudo ? "sudo_failed" : "no_result",
+          message: sudo ? `sudo refused for ${s.username}: ${res.log}` : `script did not report a result (exit ${res.exitCode}): ${res.log}`,
+          log: res.log
+        }
+      };
+    }
+    const r = res.result;
+    return {
+      hostKey: res.hostKey,
+      op: {
+        ok: r.ok === true,
+        ...typeof r.error === "string" ? { error: r.error } : {},
+        ...typeof r.message === "string" ? { message: r.message } : {},
+        result: r,
+        ...r.links ? { links: r.links } : {},
+        log: res.log
+      }
+    };
+  }
   install(opts, signal) {
     return this.run("install", (s) => {
       const protocols = resolveProtocols(opts.protocols, s.protocols);
@@ -20678,32 +20694,44 @@ var VpnService = class {
     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.
+   * Find an existing installation (e.g. dsh or dsh-vpn was reinstalled and the
+   * local settings are gone, but the node still runs). `candidate` is what the
+   * settings page holds, saved or not: it is stored only once login works, with
+   * the server's protocols and certificate mode adopted so that a later
+   * 安装 / 更新 keeps the node, its keys and its links as they are.
    */
-  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;
+  detect(signal, candidate) {
+    return this.exclusive(async () => {
+      try {
+        const s = candidate ?? await this.settings();
+        const status = await this.runOn(s, "status", [], signal);
+        if (!status.op.ok) return status.op;
+        const r = status.op.result ?? {};
+        const installed = r.installed === true;
+        const protocols = installed ? String(r.protocols ?? "").split(",").filter(isProtocolId) : [];
+        const mode = r.cert?.mode;
+        const certMode = installed && (mode === "ip" || mode === "self") ? mode : void 0;
+        const before = candidate ?? s;
+        const next = {
+          ...before,
+          ...protocols.length > 0 ? { protocols } : {},
+          ...certMode ? { certMode } : {},
+          hostKey: before.hostKey ?? (status.hostKey || void 0)
+        };
+        const synced = next.certMode !== before.certMode || next.protocols.join() !== before.protocols.join();
+        await this.store.update((cur) => candidate || cur ? next : void 0);
+        if (!installed) return { ok: true, result: { installed: false } };
+        const links = await this.runOn(next, "links", ["--server", next.linkAddress ?? next.host], signal);
+        return {
+          ok: links.op.ok,
+          ...links.op.error ? { error: links.op.error, message: links.op.message } : {},
+          result: { installed: true, active: r.active, version: r.version, protocols, certMode, synced },
+          ...links.op.links ? { links: links.op.links } : {}
+        };
+      } catch (err) {
+        return failure(err);
+      }
     });
-    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.8",
+  "version": "0.1.9",
   "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",