@tunnelbox/core 0.1.9 → 0.1.11

package/README.md

@@ -1,28 +1,28 @@
-# @tunnelbox/core
-
-[English](README.md) · [简体中文](README.zh-CN.md)
-
-Shared core for tunnelbox, reused by the agent adapters:
-
-| Module | Description |
-|---|---|
-| `types.ts` | Unified protocol types + `envelope()` (interoperable with relay/web mirrors) |
-| `relay.ts` | `RelayClient`: outbound WS with exponential-backoff **silent** reconnect |
-| `state.ts` | State persistence (`remote-state[.type].json`, isolated per agent) + pairing files |
-| `env.ts` | `injectedRelayUrl()`: default relay injected at build time via esbuild `__TB_DEFAULT_RELAY__` (no URL literals in source) |
-| `qr.ts` | `printPairing`: terminal QR code + pairing code printing |
-
-## Usage
-
-```ts
-import { RelayClient, envelope, loadState, printPairing, injectedRelayUrl } from "@tunnelbox/core";
-
-const state = loadState("dsh"); // multiple agents: each adapter keeps its own state file
-// Relay resolution: explicit (TUNNELBOX_RELAY_URL / config) > injectedRelayUrl() (default injected by build --env).
-// Config files live in plugin/env/.env.{development,test,production}; state.relayUrl is informational only.
-const ws = new RelayClient();
-ws.connect(`${injectedRelayUrl()}/ws/agent`, { Authorization: `Bearer ${state.agentId}` }, { … });
-ws.send(envelope("agent.info", { name: "host", type: "dsh", version: "0.1.0" }));
-```
-
-Consumers (`plugin/opencode` / `plugin/dsh-tunnelbox` / the adapters) bundle this package's TS source directly with a bundler (esbuild/vite); no separate build step is needed.
+# @tunnelbox/core
+
+[English](README.md) · [简体中文](README.zh-CN.md)
+
+Shared core for tunnelbox, reused by the agent adapters:
+
+| Module | Description |
+|---|---|
+| `types.ts` | Unified protocol types + `envelope()` (interoperable with relay/web mirrors) |
+| `relay.ts` | `RelayClient`: outbound WS with exponential-backoff **silent** reconnect |
+| `state.ts` | State persistence (`remote-state[.type].json`, isolated per agent) + pairing files |
+| `env.ts` | `injectedRelayUrl()`: default relay injected at build time via esbuild `__TB_DEFAULT_RELAY__` (no URL literals in source) |
+| `qr.ts` | `printPairing`: terminal QR code + pairing code printing |
+
+## Usage
+
+```ts
+import { RelayClient, envelope, loadState, printPairing, injectedRelayUrl } from "@tunnelbox/core";
+
+const state = loadState("dsh"); // multiple agents: each adapter keeps its own state file
+// Relay resolution: explicit (TUNNELBOX_RELAY_URL / config) > injectedRelayUrl() (default injected by build --env).
+// Config files live in plugin/env/.env.{development,test,production}; state.relayUrl is informational only.
+const ws = new RelayClient();
+ws.connect(`${injectedRelayUrl()}/ws/agent`, { Authorization: `Bearer ${state.agentId}` }, { … });
+ws.send(envelope("agent.info", { name: "host", type: "dsh", version: "0.1.0" }));
+```
+
+Consumers (`plugin/opencode` / `plugin/dsh-tunnelbox` / the adapters) bundle this package's TS source directly with a bundler (esbuild/vite); no separate build step is needed.

package/README.zh-CN.md

@@ -1,28 +1,28 @@
-# @tunnelbox/core
-
-[English](README.md) · [简体中文](README.zh-CN.md)
-
-tunnelbox 共享核心，供各智能体适配器复用：
-
-| 模块 | 说明 |
-|---|---|
-| `types.ts` | 统一协议类型 + `envelope()`（与 relay/web 镜像互通） |
-| `relay.ts` | `RelayClient`：出站 WS + 指数退避**静默**重连 |
-| `state.ts` | 状态持久化（`remote-state[.type].json`，多 agent 隔离）+ 配对文件 |
-| `env.ts` | `injectedRelayUrl()`：构建期 esbuild `__TB_DEFAULT_RELAY__` 注入的默认中继（源码无 URL 字面量） |
-| `qr.ts` | `printPairing`：终端二维码 + 配对码打印 |
-
-## 使用
-
-```ts
-import { RelayClient, envelope, loadState, printPairing, injectedRelayUrl } from "@tunnelbox/core";
-
-const state = loadState("dsh"); // 多智能体：各适配器独立状态文件
-// 中继地址解析：显式(TUNNELBOX_RELAY_URL/配置) > injectedRelayUrl()（构建 --env 注入的默认）。
-// 配置文件见 plugin/env/.env.{development,test,production}；state.relayUrl 仅信息用途。
-const ws = new RelayClient();
-ws.connect(`${injectedRelayUrl()}/ws/agent`, { Authorization: `Bearer ${state.agentId}` }, { … });
-ws.send(envelope("agent.info", { name: "host", type: "dsh", version: "0.1.0" }));
-```
-
-消费方（`plugin/opencode` / `plugin/dsh-tunnelbox` / 各适配器）通过 bundler（esbuild/vite）直接打包本包 TS 源码；无需独立构建步骤。
+# @tunnelbox/core
+
+[English](README.md) · [简体中文](README.zh-CN.md)
+
+tunnelbox 共享核心，供各智能体适配器复用：
+
+| 模块 | 说明 |
+|---|---|
+| `types.ts` | 统一协议类型 + `envelope()`（与 relay/web 镜像互通） |
+| `relay.ts` | `RelayClient`：出站 WS + 指数退避**静默**重连 |
+| `state.ts` | 状态持久化（`remote-state[.type].json`，多 agent 隔离）+ 配对文件 |
+| `env.ts` | `injectedRelayUrl()`：构建期 esbuild `__TB_DEFAULT_RELAY__` 注入的默认中继（源码无 URL 字面量） |
+| `qr.ts` | `printPairing`：终端二维码 + 配对码打印 |
+
+## 使用
+
+```ts
+import { RelayClient, envelope, loadState, printPairing, injectedRelayUrl } from "@tunnelbox/core";
+
+const state = loadState("dsh"); // 多智能体：各适配器独立状态文件
+// 中继地址解析：显式(TUNNELBOX_RELAY_URL/配置) > injectedRelayUrl()（构建 --env 注入的默认）。
+// 配置文件见 plugin/env/.env.{development,test,production}；state.relayUrl 仅信息用途。
+const ws = new RelayClient();
+ws.connect(`${injectedRelayUrl()}/ws/agent`, { Authorization: `Bearer ${state.agentId}` }, { … });
+ws.send(envelope("agent.info", { name: "host", type: "dsh", version: "0.1.0" }));
+```
+
+消费方（`plugin/opencode` / `plugin/dsh-tunnelbox` / 各适配器）通过 bundler（esbuild/vite）直接打包本包 TS 源码；无需独立构建步骤。

package/dist/index.js

@@ -8,6 +8,8 @@ function envelope(type, payload, id) {
 // src/relay.ts
 var BASE_DELAY = 1e3;
 var MAX_DELAY = 15e3;
+var KEEPALIVE_INTERVAL_MS = 15e3;
+var KEEPALIVE_TIMEOUT_MS = 25e3;
 var RelayClient = class {
   ws = null;
   url = "";
@@ -17,6 +19,11 @@ var RelayClient = class {
   retry = 0;
   stopped = false;
   connected = false;
+  reconnectScheduled = false;
+  /** 保活心跳定时器（onopen 启动 / onclose 停止） */
+  keepaliveTimer = null;
+  /** 最近一次收到服务端帧的时间（含心跳回执 pong），用于静默断流检测 */
+  lastInbound = 0;
   get isConnected() {
     return this.connected;
   }
@@ -26,6 +33,8 @@ var RelayClient = class {
     this.handlers = handlers;
     this.stopped = false;
     this.retry = 0;
+    this.reconnectScheduled = false;
+    this.stopKeepalive();
     this.open();
   }
   send(env) {
@@ -41,6 +50,8 @@ var RelayClient = class {
   }
   close() {
     this.stopped = true;
+    this.reconnectScheduled = false;
+    this.stopKeepalive();
     if (this.timer) clearTimeout(this.timer);
     this.timer = null;
     if (this.ws) {
@@ -60,11 +71,14 @@ var RelayClient = class {
       ws.onopen = () => {
         this.connected = true;
         this.retry = 0;
+        this.startKeepalive();
         this.handlers?.onOpen();
       };
       ws.onmessage = (ev) => {
+        this.lastInbound = Date.now();
         try {
           const msg = JSON.parse(String(ev.data));
+          if (msg.type === "pong") return;
           this.handlers?.onMessage(msg);
         } catch {
         }
@@ -73,6 +87,7 @@ var RelayClient = class {
       ws.onclose = () => {
         this.connected = false;
         this.ws = null;
+        this.stopKeepalive();
         this.handlers?.onClose();
         this.scheduleReconnect();
       };
@@ -82,10 +97,52 @@ var RelayClient = class {
     }
   }
   scheduleReconnect() {
-    if (this.stopped) return;
+    if (this.stopped || this.reconnectScheduled) return;
+    this.reconnectScheduled = true;
     const delay = Math.min(BASE_DELAY * 2 ** this.retry, MAX_DELAY);
     this.retry++;
-    this.timer = setTimeout(() => this.open(), delay);
+    this.timer = setTimeout(() => {
+      this.reconnectScheduled = false;
+      this.open();
+    }, delay);
+  }
+  /** 启动保活心跳：每周期发 ping，长时间收不到任何帧则判定断流主动重连。 */
+  startKeepalive() {
+    this.stopKeepalive();
+    this.lastInbound = Date.now();
+    this.keepaliveTimer = setInterval(() => {
+      if (!this.connected || !this.ws) return;
+      const now = Date.now();
+      if (now - this.lastInbound > KEEPALIVE_TIMEOUT_MS) {
+        this.forceReconnect();
+        return;
+      }
+      try {
+        this.ws.send(JSON.stringify({ type: "ping", payload: {}, ts: now }));
+      } catch {
+      }
+    }, KEEPALIVE_INTERVAL_MS);
+  }
+  stopKeepalive() {
+    if (this.keepaliveTimer !== null) {
+      clearInterval(this.keepaliveTimer);
+      this.keepaliveTimer = null;
+    }
+  }
+  /** 判定连接已死：关闭当前 socket 并调度重连（沿用指数退避，onclose 去重）。 */
+  forceReconnect() {
+    if (this.stopped) return;
+    this.connected = false;
+    this.stopKeepalive();
+    const w = this.ws;
+    this.ws = null;
+    if (w) {
+      try {
+        w.close();
+      } catch {
+      }
+    }
+    this.scheduleReconnect();
   }
 };
 
@@ -112,6 +169,7 @@ var zh_CN_default = {
   "agent.log.pendingResent": "session.pending: \u8865\u53D1 {session} \u79EF\u538B\u8BF7\u6C42 {count} \u6761",
   "agent.log.unhandledType": "\u672A\u5904\u7406\u7684\u6D88\u606F\u7C7B\u578B: {type}",
   "events.log.fwdPermission": "\u8F6C\u53D1\u6743\u9650\u8BF7\u6C42\u5230\u624B\u673A (id={id} tool={tool} {version})",
+  "events.log.sessionDeleted": "\u8F6C\u53D1 session.deleted \u5230\u624B\u673A (session={session})",
   "events.log.permissionReplied": "opencode \u56DE\u6267 permission.replied (id={id} {response})",
   "events.log.questionRejected": "opencode \u56DE\u6267 question.rejected (id={id})",
   "events.log.questionReplied": "opencode \u56DE\u6267 question.replied (id={id})",
@@ -279,6 +337,7 @@ var zh_TW_default = {
   "agent.log.pendingResent": "session.pending: \u88DC\u767C {session} \u7A4D\u58D3\u8ACB\u6C42 {count} \u689D",
   "agent.log.unhandledType": "\u672A\u8655\u7406\u7684\u8A0A\u606F\u985E\u578B: {type}",
   "events.log.fwdPermission": "\u8F49\u767C\u6B0A\u9650\u8ACB\u6C42\u5230\u624B\u6A5F (id={id} tool={tool} {version})",
+  "events.log.sessionDeleted": "\u8F49\u767C session.deleted \u5230\u624B\u6A5F (session={session})",
   "events.log.permissionReplied": "opencode \u56DE\u57F7 permission.replied (id={id} {response})",
   "events.log.questionRejected": "opencode \u56DE\u57F7 question.rejected (id={id})",
   "events.log.questionReplied": "opencode \u56DE\u57F7 question.replied (id={id})",
@@ -446,6 +505,7 @@ var en_US_default = {
   "agent.log.pendingResent": "session.pending: resent {count} pending request(s) for {session}",
   "agent.log.unhandledType": "Unhandled message type: {type}",
   "events.log.fwdPermission": "Forwarded permission request to phone (id={id} tool={tool} {version})",
+  "events.log.sessionDeleted": "Forwarded session.deleted to phone (session={session})",
   "events.log.permissionReplied": "opencode acked permission.replied (id={id} {response})",
   "events.log.questionRejected": "opencode acked question.rejected (id={id})",
   "events.log.questionReplied": "opencode acked question.replied (id={id})",
@@ -613,6 +673,7 @@ var ja_JP_default = {
   "agent.log.pendingResent": "session.pending: {session} \u306E\u4FDD\u7559\u30EA\u30AF\u30A8\u30B9\u30C8 {count} \u4EF6\u3092\u518D\u9001",
   "agent.log.unhandledType": "\u672A\u51E6\u7406\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u30BF\u30A4\u30D7: {type}",
   "events.log.fwdPermission": "\u6A29\u9650\u30EA\u30AF\u30A8\u30B9\u30C8\u3092\u643A\u5E2F\u3078\u8EE2\u9001 (id={id} tool={tool} {version})",
+  "events.log.sessionDeleted": "session.deleted \u3092\u643A\u5E2F\u3078\u8EE2\u9001 (session={session})",
   "events.log.permissionReplied": "opencode \u5FDC\u7B54 permission.replied (id={id} {response})",
   "events.log.questionRejected": "opencode \u5FDC\u7B54 question.rejected (id={id})",
   "events.log.questionReplied": "opencode \u5FDC\u7B54 question.replied (id={id})",
@@ -780,6 +841,7 @@ var ko_KR_default = {
   "agent.log.pendingResent": "session.pending: {session} \uBCF4\uB958 \uC694\uCCAD {count}\uAC74 \uC7AC\uC804\uC1A1",
   "agent.log.unhandledType": "\uCC98\uB9AC\uB418\uC9C0 \uC54A\uC740 \uBA54\uC2DC\uC9C0 \uC720\uD615: {type}",
   "events.log.fwdPermission": "\uAD8C\uD55C \uC694\uCCAD\uC744 \uD734\uB300\uD3F0\uC73C\uB85C \uC804\uB2EC (id={id} tool={tool} {version})",
+  "events.log.sessionDeleted": "session.deleted\uB97C \uD734\uB300\uD3F0\uC73C\uB85C \uC804\uB2EC (session={session})",
   "events.log.permissionReplied": "opencode \uC751\uB2F5 permission.replied (id={id} {response})",
   "events.log.questionRejected": "opencode \uC751\uB2F5 question.rejected (id={id})",
   "events.log.questionReplied": "opencode \uC751\uB2F5 question.replied (id={id})",
@@ -947,6 +1009,7 @@ var fr_FR_default = {
   "agent.log.pendingResent": "session.pending : renvoi de {count} demande(s) en attente pour {session}",
   "agent.log.unhandledType": "Type de message non g\xE9r\xE9 : {type}",
   "events.log.fwdPermission": "Demande d'autorisation transmise au t\xE9l\xE9phone (id={id} tool={tool} {version})",
+  "events.log.sessionDeleted": "session.deleted transmise au t\xE9l\xE9phone (session={session})",
   "events.log.permissionReplied": "opencode a accus\xE9 permission.replied (id={id} {response})",
   "events.log.questionRejected": "opencode a accus\xE9 question.rejected (id={id})",
   "events.log.questionReplied": "opencode a accus\xE9 question.replied (id={id})",
@@ -1114,6 +1177,7 @@ var de_DE_default = {
   "agent.log.pendingResent": "session.pending: {count} ausstehende Anfrage(n) f\xFCr {session} erneut gesendet",
   "agent.log.unhandledType": "Nicht behandelter Nachrichtentyp: {type}",
   "events.log.fwdPermission": "Berechtigungsanfrage an Telefon weitergeleitet (id={id} tool={tool} {version})",
+  "events.log.sessionDeleted": "session.deleted an Telefon weitergeleitet (session={session})",
   "events.log.permissionReplied": "opencode quittierte permission.replied (id={id} {response})",
   "events.log.questionRejected": "opencode quittierte question.rejected (id={id})",
   "events.log.questionReplied": "opencode quittierte question.replied (id={id})",
@@ -1281,6 +1345,7 @@ var es_ES_default = {
   "agent.log.pendingResent": "session.pending: reenviadas {count} solicitud(es) pendientes para {session}",
   "agent.log.unhandledType": "Tipo de mensaje no gestionado: {type}",
   "events.log.fwdPermission": "Solicitud de permiso reenviada al tel\xE9fono (id={id} tool={tool} {version})",
+  "events.log.sessionDeleted": "session.deleted reenviada al tel\xE9fono (session={session})",
   "events.log.permissionReplied": "opencode confirm\xF3 permission.replied (id={id} {response})",
   "events.log.questionRejected": "opencode confirm\xF3 question.rejected (id={id})",
   "events.log.questionReplied": "opencode confirm\xF3 question.replied (id={id})",
@@ -1643,7 +1708,7 @@ async function printPairing(code, type, name, lang) {
 }
 
 // src/messages.ts
-var DEFAULT_PAGE_SIZE = 50;
+var DEFAULT_PAGE_SIZE = 20;
 var MAX_PART_TEXT = 16e3;
 var MAX_PART_ARGS = 4e3;
 var MAX_PAGE_BYTES = 15e5;