@dsh-remote/relay 3.1.7 → 3.1.9

package/README.md

@@ -18,19 +18,21 @@ curl -s http://127.0.0.1:8787/healthz
 
 ### 常用配置
 
-| 变量                          | 必填 | 默认        | 说明                                                                                             |
-| ----------------------------- | ---- | ----------- | ------------------------------------------------------------------------------------------------ |
-| `DRC_HOST_TOKEN`              | ✅   | —           | 主机出站认证凭据。`openssl rand -hex 32` 生成。**与主机插件那份必须逐字一致**                    |
-| `DRC_PORT`                    |      | `8787`      | 监听端口。`0` = 让系统分配（测试与容器用）                                                       |
-| `DRC_BIND`                    |      | `127.0.0.1` | 绑定地址。默认只绑回环：TLS 由反代终止。**只有自己就是边缘（容器直接发布端口）时才设 `0.0.0.0`** |
-| `DRC_PUBLIC_URL`              |      | 空          | `/api/info` 返回的对外地址。公网填 `wss://你的域名`                                              |
-| `DRC_LOG_LEVEL`               |      | `info`      | `debug` / `info` / `warn` / `error` / `silent`。**区分大小写**                                   |
-| `DRC_PAIR_TTL_MS`             |      | `120000`    | 配对码的**服务端权威**寿命（毫秒）                                                               |
-| `DRC_STATE_FILE`              |      | 空（关闭）  | 会话表落盘路径。默认关闭 = 纯内存；配上后启动先读它、会话表有增删时写回                          |
-| `DRC_STATE_SAVE_MS`           |      | `60000`     | 周期补写状态文件的间隔（只为刷新 `lastActivityAt`）                                              |
-| `DRC_MAX_BUFFERED_BYTES`      |      | `1048576`   | 慢消费者阈值：发送缓冲区**连续**超限达**本角色窗口**才 1008 断开                                 |
-| `DRC_SLOW_CONSUMER_HOST_MS`   |      | `10000`     | **主机**侧慢消费者窗口（毫秒）。主机卡住就是所有人卡住，所以窗口短                               |
-| `DRC_SLOW_CONSUMER_CLIENT_MS` |      | `45000`     | **客户端**侧慢消费者窗口（毫秒）。**必须大于手机自己的重连周期**（≈42.5 秒）                     |
+| 变量                          | 必填 | 默认        | 说明                                                                                                     |
+| ----------------------------- | ---- | ----------- | -------------------------------------------------------------------------------------------------------- |
+| `DRC_HOST_TOKEN`              | ✅   | —           | 主机出站认证凭据。`openssl rand -hex 32` 生成。**与主机插件那份必须逐字一致**                            |
+| `DRC_PORT`                    |      | `8787`      | 监听端口。`0` = 让系统分配（测试与容器用）                                                               |
+| `DRC_BIND`                    |      | `127.0.0.1` | 绑定地址。默认只绑回环：TLS 由反代终止。**只有自己就是边缘（容器直接发布端口）时才设 `0.0.0.0`**         |
+| `DRC_PUBLIC_URL`              |      | 空          | `/api/info` 返回的对外地址。公网填 `wss://你的域名`                                                      |
+| `DRC_LOG_LEVEL`               |      | `info`      | `debug` / `info` / `warn` / `error` / `silent`。**区分大小写**                                           |
+| `DRC_PAIR_TTL_MS`             |      | `120000`    | 配对码的**服务端权威**寿命（毫秒）                                                                       |
+| `DRC_MP_APPID`                |      | —           | 小程序 appid。与 `DRC_MP_SECRET` 同时配置才启用 `GET /code`（生成小程序码）；不配则插件回退旧 `dshr:` 码 |
+| `DRC_MP_SECRET`               |      | —           | 小程序 secret。**只放在中继**，永不进插件包；换了 secret 记得同步这里                                    |
+| `DRC_STATE_FILE`              |      | 空（关闭）  | 会话表落盘路径。默认关闭 = 纯内存；配上后启动先读它、会话表有增删时写回                                  |
+| `DRC_STATE_SAVE_MS`           |      | `60000`     | 周期补写状态文件的间隔（只为刷新 `lastActivityAt`）                                                      |
+| `DRC_MAX_BUFFERED_BYTES`      |      | `1048576`   | 慢消费者阈值：发送缓冲区**连续**超限达**本角色窗口**才 1008 断开                                         |
+| `DRC_SLOW_CONSUMER_HOST_MS`   |      | `10000`     | **主机**侧慢消费者窗口（毫秒）。主机卡住就是所有人卡住，所以窗口短                                       |
+| `DRC_SLOW_CONSUMER_CLIENT_MS` |      | `45000`     | **客户端**侧慢消费者窗口（毫秒）。**必须大于手机自己的重连周期**（≈42.5 秒）                             |
 
 ### 端点
 

package/dist/bundle/main.js

@@ -23443,7 +23443,7 @@ function date4(params) {
   return _coercedDate(ZodDate, params);
 }
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.1.6/node_modules/@dsh-remote/protocol/dist/src/wire/limits.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.1.9/node_modules/@dsh-remote/protocol/dist/src/wire/limits.js
 var MAX_RELAY_MESSAGE_BYTES = 1024 * 1024;
 var MAX_CIPHERTEXT_BYTES = MAX_RELAY_MESSAGE_BYTES - 8 * 1024;
 var MAX_IMAGE_ATTACHMENTS = 4;
@@ -23452,7 +23452,7 @@ var MAX_ATTACHMENT_BYTES = 512 * 1024;
 var MAX_ATTACHMENT_TOTAL_BYTES = 512 * 1024;
 var IDEMPOTENCY_WINDOW_MS = 5 * 60 * 1e3;
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.1.6/node_modules/@dsh-remote/protocol/dist/src/wire/frames.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.1.9/node_modules/@dsh-remote/protocol/dist/src/wire/frames.js
 var PROTOCOL_VERSION = 1;
 var PAIRING_TOKEN_RE = /^\d{6}$/;
 var nonEmpty = external_exports.string().min(1);
@@ -23481,13 +23481,40 @@ var helloFrame = external_exports.object({
   clientId: external_exports.string().min(1).max(128).optional(),
   clientMeta: clientMeta.optional()
 });
+var publicKeyB64 = external_exports.string().regex(/^[A-Za-z0-9+/]{43}=$/, "\u5FC5\u987B\u662F 32 \u5B57\u8282 base64 \u516C\u94A5");
 var pairBeginFrame = external_exports.object({
   t: external_exports.literal("pair-begin"),
   pairingToken
 });
 var pairClaimFrame = external_exports.object({
   t: external_exports.literal("pair-begin-client"),
-  pairingToken
+  pairingToken,
+  clientPub: publicKeyB64.optional()
+});
+var pairRequestFrame = external_exports.object({
+  t: external_exports.literal("pair-request"),
+  pairingToken,
+  clientPub: publicKeyB64,
+  /**
+   * 认领这条码时**新开的会话号**。中继在 claim 的同一时刻就知道它，一并带来：
+   * 主机回 `pair-grant` 必须带会话号（见 pairGrantFrame），否则中继无处可送。
+   */
+  sessionId: nonEmpty,
+  hostId: nonEmpty.optional()
+});
+var pairGrantFrame = external_exports.object({
+  t: external_exports.literal("pair-grant"),
+  /**
+   * **带 sessionId 而不是 pairingToken**（2026-10-21 拍板）。
+   *
+   * 中继在 `claim()` 之后就没有 token→会话 的映射了（pendingPairs 当场消费），
+   * 若按 token 转发就得再养一张 60s 的短命表。而主机在 `peer-joined` 里**已经拿到
+   * sessionId**，让它把会话号原样带回来，中继按会话成员转发即可，零新状态。
+   */
+  sessionId: nonEmpty,
+  hostPub: publicKeyB64,
+  nonce: nonEmpty,
+  wrappedPsk: nonEmpty
 });
 var encFrame = external_exports.object({
   t: external_exports.literal("enc"),
@@ -23525,6 +23552,8 @@ var endpointFrame = external_exports.discriminatedUnion("t", [
   helloFrame,
   pairBeginFrame,
   pairClaimFrame,
+  // 主机发出去的：psk 密文（中继原样转交给手机）
+  pairGrantFrame,
   resyncFrame,
   encFrame,
   encBatchFrame,
@@ -23678,6 +23707,9 @@ var pongFrame = external_exports.object({ t: external_exports.literal("pong"), t
 var relayFrame = external_exports.discriminatedUnion("t", [
   helloOkFrame,
   pairReadyFrame,
+  // 中继发出的两条：认领请求带给主机、psk 密文带给手机
+  pairRequestFrame,
+  pairGrantFrame,
   pairedFrame,
   pairFailFrame,
   peerJoinedFrame,
@@ -23844,6 +23876,8 @@ function loadConfig(env, version2) {
   }
   const config2 = {
     hostToken,
+    mpAppId: (env.DRC_MP_APPID ?? "").trim(),
+    mpSecret: (env.DRC_MP_SECRET ?? "").trim(),
     port: portNumber(env.DRC_PORT, 8787, "DRC_PORT", problems),
     // 默认只绑回环：TLS 由反代终止，中继没理由出现在局域网里。
     // 只有自己就是边缘（容器直接发布端口）时才设 DRC_BIND=0.0.0.0。
@@ -23930,7 +23964,7 @@ var import_subprotocol = __toESM(require_subprotocol(), 1);
 var import_websocket = __toESM(require_websocket(), 1);
 var import_websocket_server = __toESM(require_websocket_server(), 1);
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.1.6/node_modules/@dsh-remote/protocol/dist/src/identity/ids.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.1.9/node_modules/@dsh-remote/protocol/dist/src/identity/ids.js
 import { randomBytes, randomUUID } from "node:crypto";
 var CONVERSATION_ID_PREFIX = "c_";
 function newConversationId() {
@@ -23940,7 +23974,7 @@ function newHostId() {
   return randomBytes(4).toString("hex");
 }
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.1.6/node_modules/@dsh-remote/protocol/dist/src/wire/negotiate.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.1.9/node_modules/@dsh-remote/protocol/dist/src/wire/negotiate.js
 function negotiateProtocol(peerProtocol, own2 = PROTOCOL_VERSION) {
   if (peerProtocol === void 0 || peerProtocol === null) {
     return {
@@ -23976,16 +24010,84 @@ function negotiateProtocol(peerProtocol, own2 = PROTOCOL_VERSION) {
   return { ok: true, version: peerProtocol };
 }
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.1.6/node_modules/@dsh-remote/protocol/dist/src/wire/errors.js
+// src/mpcode.ts
+var TOKEN_URL = "https://api.weixin.qq.com/cgi-bin/token";
+var CODE_URL = "https://api.weixin.qq.com/wxa/getwxacodeunlimit";
+var LANDING_PAGE = "pages/sessions/sessions";
+var TOKEN_SKEW_MS = 6e4;
+var DEFAULT_TOKEN_TTL_MS = 7e6;
+function createMpCodeIssuer(options) {
+  const appId = options.appId.trim();
+  const secret = options.secret.trim();
+  const doFetch = options.fetch ?? ((...args) => fetch(...args));
+  const now = options.now ?? (() => Date.now());
+  let cachedToken;
+  const images = /* @__PURE__ */ new Map();
+  const IMAGE_TTL_MS = 36e5;
+  async function fetchToken() {
+    const url2 = `${TOKEN_URL}?grant_type=client_credential&appid=${encodeURIComponent(appId)}&secret=${encodeURIComponent(secret)}`;
+    const response = await doFetch(url2);
+    const body = await response.json();
+    if (typeof body.access_token !== "string" || body.access_token === "") {
+      throw new Error(`\u5FAE\u4FE1 access_token \u83B7\u53D6\u5931\u8D25\uFF1A${body.errcode ?? "?"} ${body.errmsg ?? ""}`.trim());
+    }
+    const ttl = typeof body.expires_in === "number" && body.expires_in > 0 ? body.expires_in * 1e3 : DEFAULT_TOKEN_TTL_MS;
+    cachedToken = { value: body.access_token, expiresAt: now() + Math.max(0, ttl - TOKEN_SKEW_MS) };
+    return body.access_token;
+  }
+  async function token() {
+    if (cachedToken !== void 0 && cachedToken.expiresAt > now()) return cachedToken.value;
+    return fetchToken();
+  }
+  async function requestCode(accessToken, pairingToken2) {
+    const response = await doFetch(`${CODE_URL}?access_token=${encodeURIComponent(accessToken)}`, {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ scene: pairingToken2, page: LANDING_PAGE })
+    });
+    const bytes = new Uint8Array(await response.arrayBuffer());
+    if (bytes.length > 2 && bytes[0] === 255 && bytes[1] === 216) return bytes;
+    try {
+      const parsed = JSON.parse(new TextDecoder().decode(bytes));
+      return { errcode: typeof parsed.errcode === "number" ? parsed.errcode : -1 };
+    } catch {
+      return { errcode: -1 };
+    }
+  }
+  return {
+    enabled: appId !== "" && secret !== "",
+    async codeFor(pairingToken2) {
+      if (appId === "" || secret === "") throw new Error("\u672A\u914D\u7F6E DRC_MP_APPID / DRC_MP_SECRET");
+      const hit = images.get(pairingToken2);
+      if (hit !== void 0 && hit.expiresAt > now()) return hit.bytes;
+      let accessToken = await token();
+      let result = await requestCode(accessToken, pairingToken2);
+      if (!(result instanceof Uint8Array) && (result.errcode === 40001 || result.errcode === 42001)) {
+        accessToken = await fetchToken();
+        result = await requestCode(accessToken, pairingToken2);
+      }
+      if (!(result instanceof Uint8Array)) {
+        throw new Error(`\u5C0F\u7A0B\u5E8F\u7801\u751F\u6210\u5931\u8D25\uFF1Aerrcode=${result.errcode}`);
+      }
+      images.set(pairingToken2, { bytes: result, expiresAt: now() + IMAGE_TTL_MS });
+      if (images.size > 512) {
+        for (const [key, value] of images) if (value.expiresAt <= now()) images.delete(key);
+      }
+      return result;
+    }
+  };
+}
+
+// node_modules/.pnpm/@dsh-remote+protocol@3.1.9/node_modules/@dsh-remote/protocol/dist/src/wire/errors.js
 var WAIT_HINTABLE = /* @__PURE__ */ new Set(["rate_limited", "pair_table_full"]);
 function wantsRetryAfter(code) {
   return typeof code === "string" && WAIT_HINTABLE.has(code);
 }
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.1.6/node_modules/@dsh-remote/protocol/dist/src/platform/sleep.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.1.9/node_modules/@dsh-remote/protocol/dist/src/platform/sleep.js
 var SLEEP_BACKENDS = ["caffeinate", "systemd-inhibit", "unsupported"];
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.1.6/node_modules/@dsh-remote/protocol/dist/src/wire/payloads.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.1.9/node_modules/@dsh-remote/protocol/dist/src/wire/payloads.js
 var SESSION_STATES = [
   "idle",
   "running",
@@ -24411,7 +24513,7 @@ var PAYLOAD_TYPES = {
   evSessionHistory: "ev.session_history"
 };
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.1.6/node_modules/@dsh-remote/protocol/dist/src/wire/outbound.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.1.9/node_modules/@dsh-remote/protocol/dist/src/wire/outbound.js
 function helloOkForClient(clientId, protocol) {
   return { t: "hello-ok", role: "client", clientId, ...protocol === void 0 ? {} : { protocol } };
 }
@@ -24427,6 +24529,15 @@ function pairReady(pairingToken2, ttlMs) {
 function paired(sessionId, hostId) {
   return { t: "paired", sessionId, hostId };
 }
+function pairRequest(pairingToken2, clientPub, sessionId, hostId) {
+  return {
+    t: "pair-request",
+    pairingToken: pairingToken2,
+    clientPub,
+    sessionId,
+    ...hostId === void 0 ? {} : { hostId }
+  };
+}
 function pairFail(reason, pairingToken2) {
   return { t: "pair-fail", reason, ...pairingToken2 === void 0 ? {} : { pairingToken: pairingToken2 } };
 }
@@ -24489,11 +24600,12 @@ function encBatchToRelay(sessionId, items) {
   return { t: "enc-batch", sessionId, items: items.map((item) => ({ ...item })) };
 }
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.1.6/node_modules/@dsh-remote/protocol/dist/src/wire/registry.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.1.9/node_modules/@dsh-remote/protocol/dist/src/wire/registry.js
 var ENDPOINT_FRAME_NAMES = [
   "hello",
   "pair-begin",
   "pair-begin-client",
+  "pair-grant",
   "resync",
   "enc",
   "enc-batch",
@@ -24503,6 +24615,8 @@ var ENDPOINT_FRAME_NAMES = [
 var RELAY_FRAME_NAMES = [
   "hello-ok",
   "pair-ready",
+  "pair-request",
+  "pair-grant",
   "paired",
   "pair-fail",
   "peer-joined",
@@ -24551,7 +24665,7 @@ var EV_TYPES = [
 ];
 var PAYLOAD_TYPE_SET = /* @__PURE__ */ new Set([...CMD_TYPES, ...EV_TYPES]);
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.1.6/node_modules/@dsh-remote/protocol/dist/src/wire/classify.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.1.9/node_modules/@dsh-remote/protocol/dist/src/wire/classify.js
 function frameTypeOf(value) {
   if (typeof value !== "object" || value === null || Array.isArray(value))
     return void 0;
@@ -25616,6 +25730,12 @@ function createRelay(config2) {
     }
     sendToPeer(peer, paired(claimed.conversationId, claimed.hostId));
     sendToPeer(peerOfHost(claimed.hostId), peerJoinedForHost(claimed.conversationId, peer.clientId, frame.pairingToken));
+    if (frame.clientPub !== void 0) {
+      const hostPeer = peerOfHost(claimed.hostId);
+      if (hostPeer !== void 0) {
+        sendToPeer(hostPeer, pairRequest(frame.pairingToken, frame.clientPub, claimed.conversationId, claimed.hostId));
+      }
+    }
     markStateChanged();
     log.info("paired", {
       sessionId: claimed.conversationId,
@@ -25701,6 +25821,29 @@ function createRelay(config2) {
         return handlePairBegin(peer, frame);
       case "pair-begin-client":
         return handlePairClaim(peer, frame);
+      /**
+       * 主机 → 中继 → 手机：psk 的密文（2026-10-21）。
+       *
+       * **只有主机能发**；中继按 `sessionId` 找会话成员，把帧原样转过去。
+       * 它不解析 `wrappedPsk`，也没有能解开的密钥 —— 零知识的前提不变。
+       */
+      case "pair-grant": {
+        if (peer.role !== "host" || !peer.hostId) {
+          sendError(peer, "need_host");
+          return;
+        }
+        const conv = state.conversations.get(frame.sessionId);
+        if (conv === void 0) {
+          log.info("pair-grant dropped, unknown session", { sessionId: frame.sessionId });
+          return;
+        }
+        for (const clientId of conv.clients) {
+          const clientPeer = state.clients.get(clientId);
+          const socket = clientPeer?.ws;
+          if (socket !== void 0) sendTo(socket, frame);
+        }
+        return;
+      }
       case "resync": {
         if (peer.role !== "host" || !peer.hostId) {
           sendError(peer, "need_host");
@@ -26059,7 +26202,7 @@ function createRelay(config2) {
     log.info("host token claimed", { ip, hostId: rawHostId, hostTokens: state.hostTokens.size });
     res.end(JSON.stringify({ token, hostId: rawHostId, rotatedAt: new Date(now).toISOString() }));
   }
-  function httpHandler(req, res) {
+  async function httpHandler(req, res) {
     try {
       const url2 = new URL(req.url ?? "/", "http://relay.invalid");
       res.setHeader("content-type", "application/json; charset=utf-8");
@@ -26078,6 +26221,31 @@ function createRelay(config2) {
         });
         return;
       }
+      if (url2.pathname === "/code") {
+        if (!mpCodes.enabled) {
+          res.statusCode = 501;
+          res.end(JSON.stringify({ error: "mp_not_configured" }));
+          return;
+        }
+        const token = url2.searchParams.get("token") ?? "";
+        if (!/^\d{6}$/.test(token)) {
+          res.statusCode = 400;
+          res.end(JSON.stringify({ error: "bad_token" }));
+          return;
+        }
+        try {
+          const bytes = await mpCodes.codeFor(token);
+          res.statusCode = 200;
+          res.setHeader("content-type", "image/jpeg");
+          res.setHeader("cache-control", "no-store");
+          res.end(Buffer.from(bytes));
+        } catch (error62) {
+          log.warn("mp code generation failed", { error: String(error62?.message ?? error62).slice(0, 160) });
+          res.statusCode = 502;
+          res.end(JSON.stringify({ error: "mp_code_failed" }));
+        }
+        return;
+      }
       if (url2.pathname === "/api/info") {
         res.end(JSON.stringify({ publicUrl: config2.publicUrl, protocol: PROTOCOL_VERSION }));
         return;
@@ -26113,6 +26281,7 @@ function createRelay(config2) {
       }
     }
   }
+  const mpCodes = createMpCodeIssuer({ appId: config2.mpAppId, secret: config2.mpSecret });
   const http = createServer(httpHandler);
   http.on("error", (error62) => {
     log.warn("http server error", { message: String(error62?.message ?? error62) });
@@ -26264,7 +26433,7 @@ function registerSignalHandlers(shutdown) {
 
 // src/main.ts
 function readVersion() {
-  if ("3.1.7") return "3.1.7";
+  if ("3.1.9") return "3.1.9";
   try {
     const pkg = JSON.parse(readFileSync2(new URL("../../package.json", import.meta.url), "utf8"));
     if (typeof pkg.version === "string") return pkg.version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-remote/relay",
-  "version": "3.1.7",
+  "version": "3.1.9",
   "description": "DSH Remote Control 的零知识 WebSocket 中继：只做路由，不碰载荷明文。可自托管的单文件产物。",
   "type": "module",
   "license": "MIT",