@dainprotocol/tunnel 2.0.1 → 2.0.3

package/dist/client/index.js

@@ -18,6 +18,11 @@ const RECONNECT = {
 const LIMITS = {
     MAX_PENDING_WS_MESSAGES_PER_CONNECTION: 256,
 };
+function emitClientError(emitter, error) {
+    if (emitter.listenerCount("error") > 0) {
+        emitter.emit("error", error);
+    }
+}
 function rawDataToString(message) {
     if (typeof message === "string")
         return message;
@@ -81,7 +86,7 @@ class DainTunnel extends EventEmitter {
                     this.ws.ping();
                 }
                 catch {
-                    this.emit("error", new Error("Heartbeat ping failed"));
+                    emitClientError(this, new Error("Heartbeat ping failed"));
                 }
             }
         }, TIMEOUTS.HEARTBEAT);
@@ -160,7 +165,7 @@ class DainTunnel extends EventEmitter {
                         finish(undefined, new Error("Connection closed before tunnel established"));
                     }
                 });
-                this.ws.on("error", (error) => this.emit("error", error));
+                this.ws.on("error", (error) => emitClientError(this, error));
                 connectionTimeoutId = setTimeout(() => {
                     if (!resolved && (!this.ws || this.ws.readyState !== WebSocket.OPEN)) {
                         finish(undefined, new Error("Connection timeout"));
@@ -552,8 +557,12 @@ class DainTunnel extends EventEmitter {
         }
         if (this.ws) {
             try {
-                if (this.ws.readyState === WebSocket.OPEN)
-                    this.ws.close();
+                if (this.ws.readyState === WebSocket.OPEN || this.ws.readyState === WebSocket.CONNECTING) {
+                    this.ws.close(1000, "Client stopping");
+                }
+                else if (this.ws.readyState !== WebSocket.CLOSED) {
+                    this.ws.terminate();
+                }
             }
             catch { }
             this.ws = null;

package/dist/server/index.js

@@ -20,6 +20,15 @@ const LIMITS = {
     WS_BACKLOG: 100,
     TUNNEL_RETRY_COUNT: 2,
 };
+const DEBUG_TUNNEL = process.env.DAIN_TUNNEL_DEBUG === "1";
+function debugLog(...args) {
+    if (DEBUG_TUNNEL)
+        console.log(...args);
+}
+function debugError(...args) {
+    if (DEBUG_TUNNEL)
+        console.error(...args);
+}
 let idCounter = 0;
 const ID_PREFIX = Date.now().toString(36);
 function fastId() {
@@ -76,7 +85,7 @@ class DainTunnelServer {
             }
         }
         catch (error) {
-            console.error("[Tunnel] SafeSend error:", error);
+            debugError("[Tunnel] SafeSend error:", error);
         }
         return false;
     }
@@ -200,7 +209,7 @@ class DainTunnelServer {
             }
         }
         catch (error) {
-            console.error("[Tunnel] Message error:", error);
+            debugError("[Tunnel] Message error:", error);
             ws.close(1008, "Invalid message");
         }
     }
@@ -296,7 +305,7 @@ class DainTunnelServer {
                 if (!isAlive) {
                     missedPongs++;
                     if (missedPongs >= LIMITS.MAX_MISSED_PONGS) {
-                        console.log(`[Tunnel] ${tunnelId} failed liveness check (${missedPongs} missed pongs), terminating`);
+                        debugLog(`[Tunnel] ${tunnelId} failed liveness check (${missedPongs} missed pongs), terminating`);
                         clearInterval(intervalId);
                         ws.close(1001, "Liveness check failed");
                         return;
@@ -317,13 +326,13 @@ class DainTunnelServer {
             // We track isAlive through the pong handler set up in Bun.serve websocket config
             const tunnelUrl = this.buildTunnelUrl(tunnelId);
             ws.send(JSON.stringify({ type: "tunnelUrl", url: tunnelUrl }));
-            console.log(`[Tunnel] Created: ${tunnelUrl}`);
+            debugLog(`[Tunnel] Created: ${tunnelUrl}`);
             // Store isAlive/missedPongs on ws.data for the pong handler
             ws.data._isAlive = true;
             ws.data._missedPongsReset = () => { isAlive = true; missedPongs = 0; };
         }
         catch (error) {
-            console.error(`Error in handleStartMessage for tunnel ${tunnelId}:`, error);
+            debugError(`Error in handleStartMessage for tunnel ${tunnelId}:`, error);
             ws.close(1011, "Internal server error");
         }
     }
@@ -646,7 +655,7 @@ class DainTunnelServer {
             this.cleanupChallengesForSocket(ws);
         }
         catch (error) {
-            console.error("[Tunnel] Remove error:", error);
+            debugError("[Tunnel] Remove error:", error);
         }
     }
     findAndRemoveTunnel(ws) {
@@ -816,7 +825,7 @@ class DainTunnelServer {
                 backpressureLimit: LIMITS.BACKPRESSURE_THRESHOLD,
             },
         });
-        console.log(`DainTunnel Server is running on ${this.hostname}:${this.port}`);
+        debugLog(`DainTunnel Server is running on ${this.hostname}:${this.port}`);
     }
     async stop() {
         try {
@@ -827,7 +836,7 @@ class DainTunnelServer {
                     tunnel.ws.close(1001, "Server shutting down");
                 }
                 catch (error) {
-                    console.error(`Error closing tunnel ${tunnel.id}:`, error);
+                    debugError(`Error closing tunnel ${tunnel.id}:`, error);
                 }
             }
             this.tunnels.clear();
@@ -855,7 +864,7 @@ class DainTunnelServer {
                     conn.controller.close();
                 }
                 catch (error) {
-                    console.error(`Error closing SSE ${sseId}:`, error);
+                    debugError(`Error closing SSE ${sseId}:`, error);
                 }
                 conn.closed = true;
                 this.sseConnections.delete(sseId);
@@ -865,7 +874,7 @@ class DainTunnelServer {
                     conn.clientSocket.close(1001, "Server shutting down");
                 }
                 catch (error) {
-                    console.error(`Error closing WS ${wsId}:`, error);
+                    debugError(`Error closing WS ${wsId}:`, error);
                 }
                 this.wsConnections.delete(wsId);
             }
@@ -875,7 +884,7 @@ class DainTunnelServer {
             }
         }
         catch (error) {
-            console.error('Error during server shutdown:', error);
+            debugError('Error during server shutdown:', error);
         }
     }
 }

package/package.json

@@ -1,18 +1,22 @@
 {
   "name": "@dainprotocol/tunnel",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "",
   "main": "dist/index.js",
   "private": false,
+  "packageManager": "bun@1.3.13",
   "publishConfig": {
     "access": "public"
   },
   "scripts": {
-    "build": "tsc",
-    "build:production": "tsc && bun build dist/server/start.js --outdir dist-prod --target bun --minify --sourcemap=external",
-    "build:types": "tsc --emitDeclarationOnly",
-    "test": "bun test",
-    "prepublishOnly": "npm run build && npm run build:types",
+    "build": "bunx --bun tsc",
+    "build:production": "bun run build && bun build dist/server/start.js --outdir dist-prod --target bun --minify --sourcemap=external",
+    "build:types": "bunx --bun tsc --emitDeclarationOnly",
+    "test": "bun test --parallel=4",
+    "test:serial": "bun test --isolate",
+    "test:watch": "bun test --watch",
+    "test:coverage": "bun test --coverage --isolate",
+    "prepublishOnly": "bun run build && bun run build:types",
     "start": "bun dist/server/start.js",
     "start-server": "bun src/server/start.ts"
   },
@@ -20,22 +24,23 @@
   "author": "Ryan",
   "license": "ISC",
   "dependencies": {
-    "@dainprotocol/service-sdk": "2.0.91",
-    "@types/node": "^22.5.4",
-    "@types/ws": "^8.5.12",
-    "hono": "^4.7.0",
-    "ws": "^8.18.0"
+    "@dainprotocol/service-sdk": "^2.0.95",
+    "hono": "^4.12.14",
+    "ws": "^8.20.0"
   },
   "devDependencies": {
-    "@types/bun": "^1.2.0",
-    "typescript": "^5.0.0"
+    "@types/bun": "^1.3.12",
+    "@types/node": "^25.6.0",
+    "@types/ws": "^8.18.1",
+    "eventsource": "^4.1.0",
+    "typescript": "^6.0.3"
   },
   "files": [
     "dist",
     "README.md"
   ],
   "engines": {
-    "bun": ">=1.1.0"
+    "bun": ">=1.3.13"
   },
   "exports": {
     ".": "./dist/index.js",