bdy 1.9.31-dev → 1.9.33-beta

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.9.31-dev",
+  "version": "1.9.33-beta",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {

package/distTs/src/server/http2.js

@@ -36,7 +36,10 @@ class ServerHttp2 extends events_1.default {
         const address = this.server.address();
         if (!address || !address.port)
             return;
-        let client = http2_1.default.connect(`http://localhost:${address.port}`);
+        let client = http2_1.default.connect(`http://localhost:${address.port}`, {
+            maxSessionMemory: 100,
+            noDelay: true
+        });
         let req = client.request(logRequest.headers);
         if (logRequest.requestBody.data.length > 0)
             req.write(logRequest.requestBody.data);

package/distTs/src/ssh/client.js

@@ -39,7 +39,7 @@ class SshClient extends events_1.default {
                         hmac: ['hmac-sha2-256-etm@openssh.com'],
                         kex: ['ecdh-sha2-nistp256'],
                     },
-                    keepaliveInterval: 60000,
+                    keepaliveInterval: 30000,
                     host: this.ip,
                     port: this.port,
                     username: this.username,
@@ -69,6 +69,7 @@ class SshClient extends events_1.default {
         return Buffer.concat([data, newData]);
     }
     async processStream(stream, info) {
+        stream.allowHalfOpen = false;
         if (stream.readableFlowing)
             stream.pause();
         stream.on('error', () => {

package/distTs/src/tunnel/agent.js

@@ -9,14 +9,14 @@ const http2_1 = __importDefault(require("http2"));
 const uuid_1 = require("uuid");
 const texts_js_1 = require("../texts.js");
 const CONNECTION_TIMEOUT = 5000;
-const STREAM_LIMIT = 100;
+const STREAM_LIMIT = 10;
 class TunnelAgent {
     static getHttp1() {
         if (!this.httpAgent1) {
             this.httpAgent1 = new http_1.default.Agent({
                 noDelay: true,
                 keepAlive: true,
-                maxSockets: 200,
+                maxSockets: 20,
             });
         }
         return this.httpAgent1;
@@ -26,7 +26,7 @@ class TunnelAgent {
             this.httpsAgent1 = new https_1.default.Agent({
                 noDelay: true,
                 keepAlive: true,
-                maxSockets: 200,
+                maxSockets: 20,
             });
         }
         return this.httpsAgent1;
@@ -39,6 +39,7 @@ class TunnelAgent {
             }, CONNECTION_TIMEOUT);
             const client = http2_1.default.connect(authority, {
                 rejectUnauthorized: verify,
+                maxSessionMemory: 100,
                 noDelay: true,
                 servername,
             });

package/distTs/src/tunnel/http.js

@@ -121,25 +121,27 @@ class TunnelHttp extends events_1.default {
         }
         return h;
     }
-    getClearedHeaders(headers = {}, compressionMethod) {
+    getClearedHeaders(headers = {}, compressionMethod, allowUpgrade = false) {
         const hop = [
             ':method',
             ':path',
             ':scheme',
             ':authority',
             ':status',
-            'keep-alive',
             'host',
-            'connection',
             'proxy-authenticate',
             'proxy-connection',
-            'Proxy-authorization',
+            'proxy-authorization',
             'trailer',
-            'upgrade',
             'transfer-encoding',
             'strict-transport-security',
             'te',
         ];
+        if (!(allowUpgrade && headers.connection === 'Upgrade')) {
+            hop.push('upgrade');
+            hop.push('connection');
+            hop.push('keep-alive');
+        }
         const tmp = {};
         if (compressionMethod &&
             compressionMethod !== utils_1.TUNNEL_COMPRESSION_METHOD_IDENTITY) {
@@ -152,6 +154,15 @@ class TunnelHttp extends events_1.default {
                 tmp[name] = headers[name];
             }
         });
+        tmp['access-control-allow-origin'] = '*';
+        if (tmp['set-cookie']) {
+            const setCookie = [];
+            const h = (this.req.headers.host || this.req.headers[':authority'] || '').split(':')[0];
+            tmp['set-cookie'].forEach((cookie) => {
+                setCookie.push(cookie.replaceAll(/([dD]omain)=[\w_\-\\.]+/ig, `$1=${h}`));
+            });
+            tmp['set-cookie'] = setCookie;
+        }
         return tmp;
     }
     getPath() {
@@ -169,7 +180,7 @@ class TunnelHttp extends events_1.default {
         const method = this.getMethod();
         const path = this.getPath();
         const headers = {
-            ...this.getClearedHeaders(reqHeaders),
+            ...this.getClearedHeaders(reqHeaders, null, true),
             ...this.headers,
             ...this.getRequestHeaders(false),
         };
@@ -184,6 +195,7 @@ class TunnelHttp extends events_1.default {
             headers,
         });
         this.logRequest = this.httpLog.newRequest(method, headers, path, utils_1.TUNNEL_IDENTIFIED_HTTP1, this.req);
+        r.on('upgrade', (proxyRes, socket, head) => this.upgrade(proxyRes, socket, head));
         r.on('response', (proxyRes) => {
             this.proxyRes = proxyRes;
             const statusCode = this.proxyRes.statusCode;
@@ -209,7 +221,7 @@ class TunnelHttp extends events_1.default {
         const reqHeaders = this.req.headers;
         const method = this.getMethod();
         const headers = {
-            ...this.getClearedHeaders(reqHeaders),
+            ...this.getClearedHeaders(reqHeaders, null, true),
             ...this.headers,
             ...this.getRequestHeaders(false),
         };
@@ -226,6 +238,7 @@ class TunnelHttp extends events_1.default {
             headers,
         });
         this.logRequest = this.httpLog.newRequest(method, headers, path, utils_1.TUNNEL_IDENTIFIED_HTTP1, this.req);
+        r.on('upgrade', (proxyRes, socket, head) => this.upgrade(proxyRes, socket, head));
         r.on('response', (proxyRes) => {
             this.proxyRes = proxyRes;
             const statusCode = this.proxyRes.statusCode;
@@ -339,6 +352,47 @@ class TunnelHttp extends events_1.default {
             this.logRequest = null;
         }
     }
+    upgrade(proxyRes, socket, head) {
+        const resHeaders = proxyRes.headers;
+        const reqSocket = this.req.socket;
+        this.httpLog.newResponse(this.req, 101, resHeaders, this.logRequest);
+        this.clear();
+        socket.setTimeout(0);
+        const headers = this.getClearedHeaders(resHeaders, null, true);
+        let msg = 'HTTP/1.1 101 Web Socket Protocol Handshake\r\n';
+        Object.keys(headers).forEach((k) => {
+            const v = headers[k];
+            if (Array.isArray(v)) {
+                v.forEach((vv) => {
+                    msg += `${k}: ${vv}\r\n`;
+                });
+            }
+            else {
+                msg += `${k}: ${v}\r\n`;
+            }
+        });
+        msg += '\r\n';
+        reqSocket.removeAllListeners();
+        socket.removeAllListeners();
+        reqSocket.on('close', () => {
+            reqSocket.removeAllListeners();
+            this.emit(utils_1.HTTP1_SOCKET_CLOSED, reqSocket);
+        });
+        socket.on('close', () => {
+            socket.removeAllListeners();
+            try {
+                reqSocket.destroy();
+            }
+            catch {
+                // do nothing
+            }
+        });
+        if (head && head.length) {
+            socket.unshift(head);
+        }
+        reqSocket.write(msg);
+        reqSocket.pipe(socket).pipe(reqSocket);
+    }
     async pipe() {
         if (this.serve) {
             try {

package/distTs/src/tunnel.js

@@ -426,6 +426,7 @@ class Tunnel extends events_1.default {
             httpIdentify: this.identify.type,
             httpLog: this.httpLog,
         });
+        http.once(utils_js_1.HTTP1_SOCKET_CLOSED, (socket) => this.httpConnectionClosed(socket));
         http.pipe().then();
     }
     tlsSocket(tlsSocket) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.9.31-dev",
+  "version": "1.9.33-beta",
   "type": "commonjs",
   "license": "MIT",
   "scripts": {