@wenbin_wb/dsh-bridge 1.0.4 → 1.0.5

package/lib/tunnel-client.mjs

@@ -151,54 +151,66 @@ export class CustomTunnelClient {
   
   _handleHttpRequest(msg) {
     const { requestId, method, path, headers } = msg;
-    
-    // Proxy to local DSH
+
+    // 过滤掉会干扰本地 HTTP 的 hop-by-hop 头
+    const SKIP_HEADERS = new Set([
+      'transfer-encoding', 'connection', 'keep-alive',
+      'proxy-authenticate', 'proxy-authorization',
+      'te', 'trailer', 'upgrade',
+    ]);
+    const safeHeaders = Object.fromEntries(
+      Object.entries(headers ?? {}).filter(([k]) => !SKIP_HEADERS.has(k.toLowerCase()))
+    );
+
     const req = httpRequest({
       host: '127.0.0.1',
       port: this.localPort,
       method,
-      path,
+      path: path || '/',
       headers: {
-        ...headers,
+        ...safeHeaders,
         host: `127.0.0.1:${this.localPort}`,
       },
     }, (res) => {
       const chunks = [];
-      
-      res.on('data', (chunk) => {
-        chunks.push(chunk);
+      res.on('data', (chunk) => { chunks.push(chunk); });
+      res.on('error', (err) => {
+        this.logger?.error('Response read error: %s', err.message);
+        this._sendMessage({
+          type: 'response', requestId,
+          statusCode: 502,
+          headers: { 'content-type': 'text/plain' },
+          body: Buffer.from('Response Error').toString('base64'),
+        });
       });
-      
       res.on('end', () => {
-        const body = Buffer.concat(chunks).toString('base64');
-        
+        // 过滤响应头里的 hop-by-hop，防止外层 HTTP 解析出错
+        const respHeaders = Object.fromEntries(
+          Object.entries(res.headers).filter(([k]) => !SKIP_HEADERS.has(k.toLowerCase()))
+        );
         this._sendMessage({
           type: 'response',
           requestId,
           statusCode: res.statusCode,
-          headers: res.headers,
-          body,
+          headers: respHeaders,
+          body: Buffer.concat(chunks).toString('base64'),
         });
       });
     });
-    
+
     req.on('error', (err) => {
       this.logger?.error('Local request failed: %s', err.message);
-      
       this._sendMessage({
-        type: 'response',
-        requestId,
+        type: 'response', requestId,
         statusCode: 502,
         headers: { 'content-type': 'text/plain' },
-        body: Buffer.from('Bad Gateway').toString('base64'),
+        body: Buffer.from(`Bad Gateway: ${err.message}`).toString('base64'),
       });
     });
-    
-    // Send request body if present
+
     if (msg.body) {
       req.write(Buffer.from(msg.body, 'base64'));
     }
-    
     req.end();
   }
   

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenbin_wb/dsh-bridge",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "DSH 多渠道接入桥：局域网二维码、自建隧道、机器人集成",
   "type": "module",
   "main": "lib/index.js",