bdy 1.7.59-dev → 1.7.60-dev

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.7.59-dev",
+  "version": "1.7.60-dev",
   "type": "commonjs",
   "license": "MIT",
   "dependencies": {

package/src/ssh/client.js

@@ -88,12 +88,20 @@ class SshClient extends EventEmitter {
   async processStream(stream, info) {
     if (stream.readableFlowing) stream.pause();
     stream.on('error', () => {
-      stream.removeAllListeners();
       try {
-        stream.close();
+        stream.removeAllListeners();
+        stream.once('error', () => {});
+        stream.end();
       } catch (err) {
         // do nothing
       }
+      setTimeout(() => {
+        try {
+          stream.destroy();
+        } catch {
+          // do nothing
+        }
+      }, 1000);
     });
     stream.on('close', () => {
       stream.removeAllListeners();

package/src/tunnel/http/stream.js

@@ -29,6 +29,7 @@ class TunnelHttpStream extends Transform {
     while(this.backPressure.length > 0) {
       const chunk = this.backPressure.shift();
       if (!this.push(chunk)) {
+        this.removeAllListeners('drain');
         this.once('drain', () => {
           this._pushBackPressure();
         });

package/src/tunnel/latency.js

@@ -20,9 +20,15 @@ class TunnelLatency extends EventEmitter {
     let ts = null;
     const clear = () => {
       clearTimeout(ts);
-      socket.removeAllListeners();
-      socket.once('error', () => {});
-      socket.end();
+      try {
+        socket.removeAllListeners();
+        socket.once('error', () => {
+        });
+        socket.end();
+        socket.destroy();
+      } catch {
+        // do nothing
+      }
       socket = null;
       this.isChecking = false;
     };

package/src/tunnel/tcp.js

@@ -28,6 +28,7 @@ class TunnelTcp extends EventEmitter {
     } catch (err) {
       // do nothing
     }
+    const s1 = this.stream;
     try {
       this.socket.removeAllListeners();
       this.socket.once('error', () => {});
@@ -35,6 +36,19 @@ class TunnelTcp extends EventEmitter {
     } catch(err) {
       // do nothing
     }
+    const s2 = this.socket;
+    setTimeout(() => {
+      try {
+        s1.destroy();
+      } catch {
+        // do nothing
+      }
+      try {
+        s2.destroy();
+      } catch {
+        // do nothing
+      }
+    }, 1000);
     this.socket = null;
     this.stream = null;
     this.host = null;

package/src/tunnel.js

@@ -510,9 +510,26 @@ class Tunnel extends EventEmitter {
     return this.type === TUNNEL_HTTP;
   }
 
+  safeEndStream(stream) {
+    try {
+      stream.removeAllListeners();
+      stream.once('error', () => {});
+      stream.end();
+    } catch {
+      // do nothing
+    }
+    setTimeout(() => {
+      try {
+        stream.destroy();
+      } catch {
+        // do nothing
+      }
+    }, 1000);
+  }
+
   sshStreamTcp(stream) {
     if (!this.canStreamTcp()) {
-      stream.end();
+      this.safeEndStream(stream);
       return;
     }
     logger.debug(LOG_TUNNEL_TCP_STREAM(this.id));
@@ -524,7 +541,7 @@ class Tunnel extends EventEmitter {
 
   sshStreamHttp1(stream, info, ip) {
     if (!this.canStreamHttp()) {
-      stream.end();
+      this.safeEndStream(stream);
       return;
     }
     logger.debug(LOG_TUNNEL_HTTP1_STREAM(this.id));
@@ -532,12 +549,12 @@ class Tunnel extends EventEmitter {
       this.http1server.handleSshTunnel(stream, info, ip);
       return;
     }
-    stream.end();
+    this.safeEndStream(stream);
   }
 
   sshStreamHttp2(stream, info, ip) {
     if (!this.canStreamHttp()) {
-      stream.end();
+      this.safeEndStream(stream);
       return;
     }
     logger.debug(LOG_TUNNEL_HTTP2_STREAM(this.id));
@@ -545,12 +562,12 @@ class Tunnel extends EventEmitter {
       this.http2server.handleSshTunnel(stream, info, ip);
       return;
     }
-    stream.end();
+    this.safeEndStream(stream);
   }
 
   sshStreamSsh(stream) {
     if (!this.canStreamSsh()) {
-      stream.end();
+      this.safeEndStream(stream);
       return;
     }
     logger.debug(LOG_TUNNEL_SSH_STREAM(this.id));
@@ -558,12 +575,12 @@ class Tunnel extends EventEmitter {
       this.sshServer.handleSshTunnel(stream);
       return;
     }
-    stream.end();
+    this.safeEndStream(stream);
   }
 
   sshStreamTls(stream) {
     if (!this.canStreamTls()) {
-      stream.end();
+      this.safeEndStream(stream);
       return;
     }
     if (this.terminate === TLS_TERMINATE_AT_TARGET) {
@@ -581,7 +598,7 @@ class Tunnel extends EventEmitter {
       this.tls.handleSshTunnel(stream);
       return;
     }
-    stream.end();
+    this.safeEndStream(stream);
   }
 
   start() {