@tunnelbox/core 0.1.9 → 0.1.11

package/src/relay.ts

@@ -13,6 +13,11 @@ export interface RelayClientHandlers {
 
 const BASE_DELAY = 1000;
 const MAX_DELAY = 15000;
+/** 保活心跳周期（ms）：连接存活期间定时发 ping，让 relay 回 pong 刷新收帧时间戳。 */
+const KEEPALIVE_INTERVAL_MS = 15000;
+/** 静默断流判定窗口（ms）：超过该时长收不到任何帧（含 pong）→ 判定连接已死并主动重连，
+ *  避免半开连接（NAT/换网静默丢包）只能等系统 TCP 超时（可达数分钟）。 */
+const KEEPALIVE_TIMEOUT_MS = 25000;
 
 export class RelayClient {
   private ws: WebSocket | null = null;
@@ -23,6 +28,11 @@ export class RelayClient {
   private retry = 0;
   private stopped = false;
   private connected = false;
+  private reconnectScheduled = false;
+  /** 保活心跳定时器（onopen 启动 / onclose 停止） */
+  private keepaliveTimer: ReturnType<typeof setInterval> | null = null;
+  /** 最近一次收到服务端帧的时间（含心跳回执 pong），用于静默断流检测 */
+  private lastInbound = 0;
 
   get isConnected(): boolean {
     return this.connected;
@@ -34,6 +44,8 @@ export class RelayClient {
     this.handlers = handlers;
     this.stopped = false;
     this.retry = 0;
+    this.reconnectScheduled = false;
+    this.stopKeepalive();
     this.open();
   }
 
@@ -51,6 +63,8 @@ export class RelayClient {
 
   close(): void {
     this.stopped = true;
+    this.reconnectScheduled = false;
+    this.stopKeepalive();
     if (this.timer) clearTimeout(this.timer);
     this.timer = null;
     if (this.ws) {
@@ -74,11 +88,14 @@ export class RelayClient {
       ws.onopen = () => {
         this.connected = true;
         this.retry = 0;
+        this.startKeepalive();
         this.handlers?.onOpen();
       };
       ws.onmessage = (ev) => {
+        this.lastInbound = Date.now(); // 任何服务端帧都视为连接存活（含心跳回执 pong）
         try {
           const msg = JSON.parse(String(ev.data)) as Envelope;
+          if (msg.type === "pong") return; // 心跳回执：吞掉，不回传处理器
           this.handlers?.onMessage(msg);
         } catch {
           /* 忽略非 JSON 帧 */
@@ -88,6 +105,7 @@ export class RelayClient {
       ws.onclose = () => {
         this.connected = false;
         this.ws = null;
+        this.stopKeepalive();
         this.handlers?.onClose();
         this.scheduleReconnect();
       };
@@ -98,9 +116,56 @@ export class RelayClient {
   }
 
   private scheduleReconnect(): void {
-    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，长时间收不到任何帧则判定断流主动重连。 */
+  private 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);
+  }
+
+  private stopKeepalive() {
+    if (this.keepaliveTimer !== null) {
+      clearInterval(this.keepaliveTimer);
+      this.keepaliveTimer = null;
+    }
+  }
+
+  /** 判定连接已死：关闭当前 socket 并调度重连（沿用指数退避，onclose 去重）。 */
+  private forceReconnect() {
+    if (this.stopped) return;
+    this.connected = false;
+    this.stopKeepalive();
+    const w = this.ws;
+    this.ws = null;
+    if (w) {
+      try {
+        w.close();
+      } catch {
+        /* ignore */
+      }
+    }
+    this.scheduleReconnect();
   }
 }