@wenbin_wb/dsh-bridge 2.8.7 → 2.9.0

package/lib/tunnel-client.mjs

@@ -2,12 +2,19 @@
 import { WebSocket } from 'ws';
 import { request as httpRequest } from 'node:http';
 import { connect as netConnect } from 'node:net';
-import { gzipSync } from 'node:zlib';
+import { promisify } from 'node:util';
+import { gzip as gzipCallback } from 'node:zlib';
+
+const gzipAsync = promisify(gzipCallback);
 
 const HEARTBEAT_INTERVAL = 30000;
 const RECONNECT_DELAY = 5000;
 const MAX_RECONNECT_ATTEMPTS = 5;
 
+// 单响应内存上限：隧道把整个 body 缓冲进内存再 base64 传输，无上限会在大文件
+// 下载时把进程内存拖垮（一份 body 三份内存：chunks + Buffer + base64 字符串）
+const MAX_RESPONSE_BYTES = 32 * 1024 * 1024; // 32MB
+
 // 大响应 gzip 压缩阈值（超过此大小的可压缩响应将被 gzip）
 const GZIP_THRESHOLD = 102400; // 100KB
 // 可压缩的 content-type 前缀
@@ -215,15 +222,31 @@ export class CustomTunnelClient {
         return;
       }
 
-      res.on('data', (c) => chunks.push(c));
-      res.on('error', () => {
+      let responded = false;
+      const sendResponse = (statusCode, headers, body) => {
+        if (responded) return;
+        responded = true;
         this._sendMessage({
-          type: 'response', requestId, statusCode: 502,
-          headers: { 'content-type': 'text/plain' },
-          body: Buffer.from('Response Error').toString('base64'),
+          type: 'response', requestId, statusCode, headers,
+          body: Buffer.from(body).toString('base64'),
         });
+      };
+
+      let total = 0;
+      res.on('data', (c) => {
+        chunks.push(c);
+        total += c.length;
+        if (total > MAX_RESPONSE_BYTES) {
+          sendResponse(502, { 'content-type': 'text/plain' },
+            `Response too large for tunnel (>${Math.round(MAX_RESPONSE_BYTES / 1024 / 1024)}MB cap)`);
+          res.destroy();
+        }
+      });
+      res.on('error', () => {
+        sendResponse(502, { 'content-type': 'text/plain' }, 'Response Error');
       });
       res.on('end', () => {
+        if (responded) return;
         const respHeaders = Object.fromEntries(
           Object.entries(res.headers).filter(([k]) => !SKIP.has(k.toLowerCase()))
         );
@@ -249,21 +272,22 @@ export class CustomTunnelClient {
           } catch {} // 解析失败则原样发送
         }
 
-        // 大响应 gzip 压缩：减少隧道 WebSocket 传输量
+        // 大响应 gzip 压缩：异步执行，避免 gzipSync 卡住整个事件循环
         const respCt = String(res.headers['content-type'] ?? '').toLowerCase();
         const alreadyEncoded = String(res.headers['content-encoding'] ?? '').toLowerCase();
         const compressible = COMPRESSIBLE_TYPES.some((t) => respCt.startsWith(t));
         if (bodyBuf.length > GZIP_THRESHOLD && compressible && !alreadyEncoded) {
-          bodyBuf = gzipSync(bodyBuf);
-          respHeaders['content-encoding'] = 'gzip';
-          respHeaders['content-length'] = String(bodyBuf.length);
+          gzipAsync(bodyBuf).then((zipped) => {
+            respHeaders['content-encoding'] = 'gzip';
+            respHeaders['content-length'] = String(zipped.length);
+            sendResponse(res.statusCode, respHeaders, zipped);
+          }).catch(() => {
+            sendResponse(res.statusCode, respHeaders, bodyBuf);
+          });
+          return;
         }
 
-        this._sendMessage({
-          type: 'response', requestId,
-          statusCode: res.statusCode, headers: respHeaders,
-          body: bodyBuf.toString('base64'),
-        });
+        sendResponse(res.statusCode, respHeaders, bodyBuf);
       });
     });
     req.on('error', err => {