@chatroomcp/chatroom 0.1.6 → 0.1.7

package/dist/plugins/cloud/tunnel-client.d.ts

@@ -1,4 +1,8 @@
 import { type CloudLeaseState } from "./types.js";
+interface TunnelTimings {
+    readyTimeoutMs: number;
+    heartbeatIntervalMs: number;
+}
 export declare class CloudTunnelClient {
     private lease;
     private readonly identity;
@@ -6,11 +10,15 @@ export declare class CloudTunnelClient {
     private readonly callbacks;
     private socket;
     private reconnectTimer;
+    private readyTimer;
+    private heartbeatTimer;
+    private awaitingPong;
     private stopped;
     private attempts;
     private closeWhenIdle;
     private acceptingServices;
     private readonly streams;
+    private readonly timings;
     constructor(lease: CloudLeaseState, identity: {
         devicePrivateKey: string;
     }, local: {
@@ -20,7 +28,7 @@ export declare class CloudTunnelClient {
         onConnected(): void;
         onDisconnected(): void;
         onError(error: Error): void;
-    });
+    }, timings?: Partial<TunnelTimings>);
     start(): void;
     stop(): void;
     drainAndStop(): void;
@@ -32,5 +40,11 @@ export declare class CloudTunnelClient {
     private handleBinary;
     private send;
     private sendBinary;
+    private startReadyTimeout;
+    private clearReadyTimeout;
+    private startHeartbeat;
+    private clearSocketTimers;
+    private failSocket;
     private scheduleReconnect;
 }
+export {};

package/dist/plugins/cloud/tunnel-client.js

@@ -5,6 +5,8 @@ import { cloudServiceForPublicService, } from "./types.js";
 const PROTOCOL = "chatroom-tunnel-v1";
 const HIGH_WATER = 8 * 1024 * 1024;
 const LOW_WATER = 2 * 1024 * 1024;
+const READY_TIMEOUT_MS = 10_000;
+const HEARTBEAT_INTERVAL_MS = 20_000;
 export class CloudTunnelClient {
     lease;
     identity;
@@ -12,17 +14,25 @@ export class CloudTunnelClient {
     callbacks;
     socket = null;
     reconnectTimer = null;
+    readyTimer = null;
+    heartbeatTimer = null;
+    awaitingPong = false;
     stopped = true;
     attempts = 0;
     closeWhenIdle = null;
     acceptingServices;
     streams = new Map();
-    constructor(lease, identity, local, callbacks) {
+    timings;
+    constructor(lease, identity, local, callbacks, timings = {}) {
         this.lease = lease;
         this.identity = identity;
         this.local = local;
         this.callbacks = callbacks;
         this.acceptingServices = new Set(lease.services);
+        this.timings = {
+            readyTimeoutMs: timings.readyTimeoutMs ?? READY_TIMEOUT_MS,
+            heartbeatIntervalMs: timings.heartbeatIntervalMs ?? HEARTBEAT_INTERVAL_MS,
+        };
     }
     start() {
         if (!this.stopped)
@@ -39,6 +49,7 @@ export class CloudTunnelClient {
         if (this.reconnectTimer)
             clearTimeout(this.reconnectTimer);
         this.reconnectTimer = null;
+        this.clearSocketTimers();
         this.socket?.close();
         this.socket = null;
         for (const stream of this.streams.values())
@@ -51,6 +62,7 @@ export class CloudTunnelClient {
         if (this.reconnectTimer)
             clearTimeout(this.reconnectTimer);
         this.reconnectTimer = null;
+        this.clearSocketTimers();
         if (this.streams.size === 0) {
             this.closeWhenIdle = null;
             this.socket?.close();
@@ -86,6 +98,7 @@ export class CloudTunnelClient {
         const socket = new WebSocket(this.lease.tunnelUrl, PROTOCOL);
         this.socket = socket;
         socket.binaryType = "nodebuffer";
+        this.startReadyTimeout(socket);
         socket.on("message", (data, isBinary) => {
             try {
                 if (isBinary)
@@ -98,9 +111,15 @@ export class CloudTunnelClient {
                 socket.close();
             }
         });
-        socket.on("close", () => {
+        socket.on("pong", () => {
             if (this.socket === socket)
+                this.awaitingPong = false;
+        });
+        socket.on("close", () => {
+            if (this.socket === socket) {
+                this.clearSocketTimers();
                 this.socket = null;
+            }
             this.closeWhenIdle = null;
             for (const stream of this.streams.values())
                 stream.request.destroy();
@@ -109,7 +128,7 @@ export class CloudTunnelClient {
             if (!this.stopped)
                 this.scheduleReconnect();
         });
-        socket.on("error", (error) => this.callbacks.onError(error));
+        socket.on("error", (error) => this.failSocket(socket, error));
     }
     handleControl(message) {
         if (message.type === "challenge") {
@@ -122,6 +141,9 @@ export class CloudTunnelClient {
         }
         if (message.type === "ready") {
             this.attempts = 0;
+            this.clearReadyTimeout();
+            if (this.socket)
+                this.startHeartbeat(this.socket);
             this.callbacks.onConnected();
             return;
         }
@@ -248,6 +270,50 @@ export class CloudTunnelClient {
         socket.send(frame, { binary: true });
         return socket.bufferedAmount < HIGH_WATER;
     }
+    startReadyTimeout(socket) {
+        this.clearReadyTimeout();
+        this.readyTimer = setTimeout(() => {
+            this.readyTimer = null;
+            this.failSocket(socket, new Error("Tunnel connection timed out"));
+        }, this.timings.readyTimeoutMs);
+        this.readyTimer.unref();
+    }
+    clearReadyTimeout() {
+        if (this.readyTimer)
+            clearTimeout(this.readyTimer);
+        this.readyTimer = null;
+    }
+    startHeartbeat(socket) {
+        if (this.heartbeatTimer)
+            clearInterval(this.heartbeatTimer);
+        this.awaitingPong = false;
+        this.heartbeatTimer = setInterval(() => {
+            if (this.socket !== socket || socket.readyState !== WebSocket.OPEN)
+                return;
+            if (this.awaitingPong) {
+                this.failSocket(socket, new Error("Tunnel heartbeat timed out"));
+                return;
+            }
+            this.awaitingPong = true;
+            socket.ping();
+        }, this.timings.heartbeatIntervalMs);
+        this.heartbeatTimer.unref();
+    }
+    clearSocketTimers() {
+        this.clearReadyTimeout();
+        if (this.heartbeatTimer)
+            clearInterval(this.heartbeatTimer);
+        this.heartbeatTimer = null;
+        this.awaitingPong = false;
+    }
+    failSocket(socket, error) {
+        if (this.socket !== socket)
+            return;
+        this.callbacks.onError(error);
+        this.clearSocketTimers();
+        this.socket = null;
+        socket.terminate();
+    }
     scheduleReconnect() {
         if (this.reconnectTimer || this.stopped)
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatroomcp/chatroom",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "type": "module",
   "description": "Local MCP runtime for ChatGPT with workspace, process, Cloud, and WebUI controls.",
   "bin": {