@dainprotocol/tunnel 1.1.29 → 1.1.30

package/dist/client/index.js

@@ -31,6 +31,9 @@ class DainTunnel extends events_1.EventEmitter {
         this.webSocketClients = new Map();
         this.sseClients = new Map();
         this.heartbeatInterval = null;
+        console.log('[DainTunnel] ========================================');
+        console.log('[DainTunnel] FIXED VERSION WITH X-FORWARDED-HOST SUPPORT');
+        console.log('[DainTunnel] ========================================');
         const parsed = (0, auth_1.parseAPIKey)(apiKey);
         if (!parsed) {
             throw new Error('Invalid API key format. Expected: sk_agent_{agentId}_{orgId}_{secret}');
@@ -270,8 +273,16 @@ class DainTunnel extends events_1.EventEmitter {
             this.safeSend({ type: 'websocket', id: message.id, event, data });
         };
         try {
+            // Preserve original host for JWT audience validation
+            const headers = { ...message.headers };
+            const originalHost = message.headers.host;
+            if (originalHost && !headers['x-forwarded-host']) {
+                headers['x-forwarded-host'] = originalHost;
+                headers['x-forwarded-proto'] = 'https';
+            }
+            delete headers.host; // Remove so WebSocket library doesn't send tunnel host to localhost
             const client = new ws_1.default(`ws://localhost:${this.port}${message.path}`, {
-                headers: message.headers
+                headers
             });
             this.webSocketClients.set(message.id, client);
             client.on('message', (data) => {
@@ -315,8 +326,17 @@ class DainTunnel extends events_1.EventEmitter {
         };
         try {
             const headers = { ...message.headers };
+            // Preserve original host for JWT audience validation
+            const originalHost = message.headers.host;
+            console.log(`[TunnelClient SSE] Original host from request: ${originalHost}`);
+            if (originalHost && !headers['x-forwarded-host']) {
+                headers['x-forwarded-host'] = originalHost;
+                headers['x-forwarded-proto'] = 'https';
+                console.log(`[TunnelClient SSE] Set x-forwarded-host: ${originalHost}`);
+            }
             delete headers.host;
             headers['accept-encoding'] = 'identity';
+            console.log(`[TunnelClient SSE] Forwarding to localhost:${this.port}${message.path} with x-forwarded-host: ${headers['x-forwarded-host']}`);
             const req = http_1.default.request({
                 hostname: 'localhost',
                 port: this.port,
@@ -326,9 +346,11 @@ class DainTunnel extends events_1.EventEmitter {
                 agent: this.httpAgent,
             }, (res) => {
                 if (res.statusCode !== 200) {
+                    console.log(`[TunnelClient SSE] Got non-200 status: ${res.statusCode}`);
                     let errorBody = '';
                     res.on('data', (chunk) => { errorBody += chunk.toString(); });
                     res.on('end', () => {
+                        console.log(`[TunnelClient SSE] Error body: ${errorBody.substring(0, 500)}`);
                         sendSseEvent('error', `Status ${res.statusCode}: ${errorBody.substring(0, 200)}`);
                     });
                     return;
@@ -419,12 +441,23 @@ class DainTunnel extends events_1.EventEmitter {
                     resolve(response);
                 }
             };
+            // Preserve original host for JWT audience validation
+            const headers = { ...request.headers };
+            const originalHost = request.headers.host;
+            console.log(`[TunnelClient] Original host from request: ${originalHost}`);
+            if (originalHost && !headers['x-forwarded-host']) {
+                headers['x-forwarded-host'] = originalHost;
+                headers['x-forwarded-proto'] = 'https';
+                console.log(`[TunnelClient] Set x-forwarded-host: ${originalHost}`);
+            }
+            delete headers.host; // Remove so Node.js doesn't send the tunnel host to localhost
+            console.log(`[TunnelClient] Forwarding to localhost:${this.port}${request.path} with x-forwarded-host: ${headers['x-forwarded-host']}`);
             const options = {
                 hostname: 'localhost',
                 port: this.port,
                 path: request.path,
                 method: request.method,
-                headers: request.headers,
+                headers,
                 agent: this.httpAgent,
                 timeout: TIMEOUTS.REQUEST,
             };

package/package.json

@@ -1,21 +1,12 @@
 {
   "name": "@dainprotocol/tunnel",
-  "version": "1.1.29",
+  "version": "1.1.30",
   "description": "",
   "main": "dist/index.js",
   "private": false,
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "build": "tsc",
-    "build:types": "tsc --emitDeclarationOnly",
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "prepublishOnly": "npm run build && npm run build:types",
-    "start": "node dist/server/start.js",
-    "start-server": "ts-node src/server/start.ts"
-  },
   "keywords": [],
   "author": "Ryan",
   "license": "ISC",
@@ -77,5 +68,13 @@
         "./dist/server/*.d.ts"
       ]
     }
+  },
+  "scripts": {
+    "build": "tsc",
+    "build:types": "tsc --emitDeclarationOnly",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "start": "node dist/server/start.js",
+    "start-server": "ts-node src/server/start.ts"
   }
-}
+}