bdy 1.22.83-dev → 1.22.84-beta

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.22.83-dev",
+  "version": "1.22.84-beta",
   "type": "commonjs",
   "license": "MIT",
   "homepage": "https://buddy.works/docs/cli",

package/distTs/src/tunnel/agent.js

@@ -9,14 +9,14 @@ const http2_1 = __importDefault(require("http2"));
 const uuid_1 = require("uuid");
 const texts_1 = require("../texts");
 const CONNECTION_TIMEOUT = 5000;
-const HTTP2_MAX_POOL_SIZE = 4;
+const HTTP2_MAX_POOL_SIZE = 8;
 const HTTP2_MAX_CONCURRENT_STREAMS = 100;
 const HTTP2_MAX_LIFETIME_REQUESTS = 1000;
 // noDelay is honored by net.createConnection but missing from AgentOptions in @types/node
 const AGENT_OPTIONS = {
     noDelay: true,
     keepAlive: true,
-    maxSockets: 20,
+    maxSockets: 200,
 };
 class TunnelAgent {
     static httpAgent1;

package/distTs/src/tunnel/http.js

@@ -41,6 +41,7 @@ class TunnelHttp extends events_1.default {
     auth;
     proxyRes;
     proxyReq;
+    decrementConcurrent;
     constructor({ req, res, proto, host, port, hostHeader, serve, timeout, httpIdentify, verify, noCache, httpLog, compression, headers, responseHeaders, auth = null, }) {
         super();
         this.id = (0, uuid_1.v4)();
@@ -402,6 +403,9 @@ class TunnelHttp extends events_1.default {
             if (c.concurrent > 0)
                 c.concurrent -= 1;
         };
+        // Exposed so the timeout / client-disconnect handlers in pipe() can release
+        // the http2 stream slot even after clear() has torn down the 'close' listener.
+        this.decrementConcurrent = decrementConcurrent;
         let r;
         try {
             r = client.request(headers);
@@ -471,6 +475,9 @@ class TunnelHttp extends events_1.default {
             this.proxyRes.removeAllListeners();
             this.proxyRes = null;
         }
+        if (this.decrementConcurrent) {
+            this.decrementConcurrent = null;
+        }
         if (this.httpLog) {
             this.httpLog = null;
         }
@@ -577,8 +584,59 @@ class TunnelHttp extends events_1.default {
             }
             this.proxyReq.setTimeout(this.timeout * 1000);
             this.proxyReq.on('timeout', () => {
+                // Node does NOT abort a request on 'timeout' -> without destroy() the
+                // request stays alive holding its socket out of the keepAlive pool
+                // (http1, maxSockets:20) or its stream slot (http2). output504() only
+                // ends the client-side response and clear() just detaches listeners, so
+                // the target-side socket would hang forever -> pool exhaustion + OOM.
+                const pr = this.proxyReq;
+                const dec = this.decrementConcurrent;
                 this.output504();
+                if (dec) {
+                    try {
+                        dec();
+                    }
+                    catch {
+                        // do nothing
+                    }
+                }
+                if (pr) {
+                    try {
+                        pr.destroy();
+                    }
+                    catch {
+                        // do nothing
+                    }
+                }
             });
+            if (this.res) {
+                this.res.once('close', () => {
+                    // Client disconnected before the target responded (e.g. a scraper
+                    // that gave up). The upstream request is still queued/in-flight and
+                    // would keep its pooled socket / stream slot forever. Once headers
+                    // are sent the response is streaming and pipeline teardown handles it.
+                    if (!this.proxyReq)
+                        return;
+                    if (this.res && this.res.headersSent)
+                        return;
+                    const pr = this.proxyReq;
+                    const dec = this.decrementConcurrent;
+                    if (dec) {
+                        try {
+                            dec();
+                        }
+                        catch {
+                            // do nothing
+                        }
+                    }
+                    try {
+                        pr.destroy();
+                    }
+                    catch {
+                        // do nothing
+                    }
+                });
+            }
             if (this.logRequest) {
                 (0, node_stream_1.pipeline)(this.req, this.logRequest.requestBody, this.proxyReq, (err) => {
                     if (err)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.22.83-dev",
+  "version": "1.22.84-beta",
   "type": "commonjs",
   "license": "MIT",
   "homepage": "https://buddy.works/docs/cli",