@dsh-remote/relay 3.2.8 → 3.2.10

package/dist/bundle/main.js

@@ -23443,7 +23443,7 @@ function date4(params) {
   return _coercedDate(ZodDate, params);
 }
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.2.7/node_modules/@dsh-remote/protocol/dist/src/wire/limits.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.2.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.2.7/node_modules/@dsh-remote/protocol/dist/src/wire/frames.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.2.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);
@@ -23479,7 +23479,26 @@ var helloFrame = external_exports.object({
   label: external_exports.string().max(128).optional(),
   /** 安装 id，弱随机、非秘密；缺省时由中继分配。上限防一条超长字符串白占内存。 */
   clientId: external_exports.string().min(1).max(128).optional(),
-  clientMeta: clientMeta.optional()
+  clientMeta: clientMeta.optional(),
+  /**
+   * 发送方的**软件版本**（2026-10-22）：主机填插件版本，小程序填小程序版本。
+   *
+   * ## 为什么加它
+   * 排查"为什么这人的两端配不上"时，最缺的**就是**版本号 ——
+   * 3.1.x 的插件配不上 3.2.x 的小程序，而**两端都不报错**
+   * （见 `packages/client/core/version.js` 的头注：这是 2026-10-21 线上事故的形状）。
+   * 有了它，中继就能按版本分组，一眼看出"这批全是老版本"。
+   *
+   * ## ⚠️ 为什么**默认不带**（零知识）
+   * `hello` 是**明文**控制帧 ⇒ 中继**看得见**这个字段。
+   * ⇒ **默认两端都不填**（⇒ 行为与加这个字段之前**逐字节相同**），
+   * 只有**显式开启**（`DRC_REPORT_VERSION=1`）的部署才会填。
+   * ⇒ **开源版默认不带** ⇒ 不因为加了这个字段而多暴露任何东西。
+   *
+   * 它**不是**协议协商位：两端**永远不因它不同而拒连**（版本兼容性由各自的应用层判，
+   * 见小程序的 `MIN_PLUGIN_VERSION`）⇒ 它只是给人看的读数。
+   */
+  softwareVersion: external_exports.string().min(1).max(64).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({
@@ -23724,6 +23743,13 @@ function parseEndpointFrame(value) {
   return parsed.success ? parsed.data : null;
 }
 
+// node_modules/.pnpm/@dsh-remote+protocol@3.2.9/node_modules/@dsh-remote/protocol/dist/src/wire/report-version.js
+var REPORT_VERSION_ENV = "DRC_REPORT_VERSION";
+function reportSoftwareVersion(env) {
+  const raw = (env[REPORT_VERSION_ENV] ?? "").trim().toLowerCase();
+  return raw === "1" || raw === "true";
+}
+
 // src/limits.ts
 var Budget = class {
   constructor(perWindow, windowMs = 1e3) {
@@ -23927,6 +23953,10 @@ function loadConfig(env, version2) {
     ),
     logLevel: level,
     pairStatusEnabled: env.DRC_PAIR_STATUS === "1" || env.DRC_PAIR_STATUS === "true",
+    // 默认关 ⇒ 开源版不记对端版本（零知识不变）；私有部署开这个才记。
+    // ⚠️ 判定**走 protocol 的共享实现**（插件/中继/小程序三处同一份）
+    // ⇒ 不会出现"我开了但没生效"这种极难查的分叉。
+    reportSoftwareVersion: reportSoftwareVersion(env),
     // 空串显式当作"关闭"：DRC_STATE_FILE= 也要能关掉，而不是被 ?? 还原成默认路径。
     stateFile: env.DRC_STATE_FILE ?? "",
     stateSaveMs: integer2(env.DRC_STATE_SAVE_MS, 6e4, "DRC_STATE_SAVE_MS", problems),
@@ -23965,7 +23995,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.2.7/node_modules/@dsh-remote/protocol/dist/src/identity/ids.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.2.9/node_modules/@dsh-remote/protocol/dist/src/identity/ids.js
 import { randomBytes, randomUUID } from "node:crypto";
 var CONVERSATION_ID_PREFIX = "c_";
 function newConversationId() {
@@ -23975,7 +24005,7 @@ function newHostId() {
   return randomBytes(4).toString("hex");
 }
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.2.7/node_modules/@dsh-remote/protocol/dist/src/wire/negotiate.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.2.9/node_modules/@dsh-remote/protocol/dist/src/wire/negotiate.js
 function negotiateProtocol(peerProtocol, own2 = PROTOCOL_VERSION) {
   if (peerProtocol === void 0 || peerProtocol === null) {
     return {
@@ -24095,16 +24125,16 @@ function createMpCodeIssuer(options) {
   };
 }
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.2.7/node_modules/@dsh-remote/protocol/dist/src/wire/errors.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.2.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.2.7/node_modules/@dsh-remote/protocol/dist/src/platform/sleep.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.2.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.2.7/node_modules/@dsh-remote/protocol/dist/src/wire/payloads.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.2.9/node_modules/@dsh-remote/protocol/dist/src/wire/payloads.js
 var SESSION_STATES = [
   "idle",
   "running",
@@ -24544,7 +24574,7 @@ var PAYLOAD_TYPES = {
   evSessionHistory: "ev.session_history"
 };
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.2.7/node_modules/@dsh-remote/protocol/dist/src/wire/outbound.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.2.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 } };
 }
@@ -24631,7 +24661,7 @@ function encBatchToRelay(sessionId, items) {
   return { t: "enc-batch", sessionId, items: items.map((item) => ({ ...item })) };
 }
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.2.7/node_modules/@dsh-remote/protocol/dist/src/wire/registry.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.2.9/node_modules/@dsh-remote/protocol/dist/src/wire/registry.js
 var ENDPOINT_FRAME_NAMES = [
   "hello",
   "pair-begin",
@@ -24696,7 +24726,7 @@ var EV_TYPES = [
 ];
 var PAYLOAD_TYPE_SET = /* @__PURE__ */ new Set([...CMD_TYPES, ...EV_TYPES]);
 
-// node_modules/.pnpm/@dsh-remote+protocol@3.2.7/node_modules/@dsh-remote/protocol/dist/src/wire/classify.js
+// node_modules/.pnpm/@dsh-remote+protocol@3.2.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;
@@ -25665,6 +25695,9 @@ function createRelay(config2) {
       peer.hostId = hostId;
       sendToPeer(peer, helloOkForHost(hostId, frame.protocol));
       log.info("host online", { hostId, label: frame.label ?? "", replaced: replaced ? 1 : 0 });
+      if (config2.reportSoftwareVersion && frame.softwareVersion) {
+        log.info("host software version", { hostId, version: frame.softwareVersion });
+      }
       if (replaced) replaced.close(CLOSE_REPLACED, "replaced_by_newer_socket");
       return;
     }
@@ -25680,6 +25713,9 @@ function createRelay(config2) {
       }
       sendToPeer(peer, helloOkForClient(clientId, frame.protocol));
       log.info("client online", { clientId, platform: frame.clientMeta?.platform });
+      if (config2.reportSoftwareVersion && frame.softwareVersion) {
+        log.info("client software version", { clientId, version: frame.softwareVersion });
+      }
       return;
     }
   }
@@ -26464,7 +26500,7 @@ function registerSignalHandlers(shutdown) {
 
 // src/main.ts
 function readVersion() {
-  if ("3.2.8") return "3.2.8";
+  if ("3.2.10") return "3.2.10";
   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.2.8",
+  "version": "3.2.10",
   "description": "DSH Remote Control 的零知识 WebSocket 中继：只做路由，不碰载荷明文。可自托管的单文件产物。",
   "type": "module",
   "license": "MIT",