ssh_tunnel_proxy 1.2.3 → 1.2.5

package/.vscode/launch.json

@@ -28,7 +28,7 @@
                 "<node_internals>/**"
             ],
             "program": "${file}",
-            "args":["-c","-d"]
+            "args":["-c","-S"]
         }
     ]
 }

package/lib/index.js

@@ -17,6 +17,7 @@ License: MIT
 */
 
 const net = require('net');
+const process = require('process');
 const { Client } = require('electron-ssh2');
 
 const KeypairStorage = require('./keypair_storage');
@@ -32,6 +33,7 @@ class SSHTunnelProxy extends Client {
         this.retries = 0;
         this.debug_en = false;
         this.debug_ssh = false;
+        this._tunnelReadyTimeout = undefined;
     }
 
     // function to close all active sockets for tunnel restart and exception handling
@@ -61,20 +63,29 @@ class SSHTunnelProxy extends Client {
                 return;
             }
 
+            stream.on('end', () => {
+                socket.resume();
+            });
+
             // pipe the data from the local socket to the remote port and visa versa
-            socket.pipe(stream);
-            stream.pipe(socket);
+            stream.pipe(socket).pipe(stream);
+
+            const shutdown_forward = () => {
+                stream.unpipe(socket);
+                socket.unpipe(stream);
+                stream.end();
+            }
 
             // if socket ends, close stream and pipes
             socket.on('close', () => {
-                stream.end();
+                shutdown_forward();
             });
 
             // if socket error, emit error and close stream
             socket.on('error', (err) => {
                 _this.emit('debug', err);
                 _this.debug_en && _this.debug('socket on error:', err);
-                stream.end();
+                shutdown_forward();
             });
         }
 
@@ -104,7 +115,7 @@ class SSHTunnelProxy extends Client {
             // create local socket server
             const server = this.listener[server_name][proxy_port];
             if (server && server.listening) {
-                this.debug_en && this.debug('SSH Server :: closing forward:', proxy_port)
+                this.debug_en && this.debug('SSH Server :: closing forward 2:', proxy_port)
                 server.close();
             }
             this.listener[server_name][proxy_port] = null;
@@ -122,6 +133,8 @@ class SSHTunnelProxy extends Client {
 
             // start listening on port
             try {
+                var status_msg = 'SSH Server :: before listen on ' + local_port;
+                _this.emit('debug', status_msg);
                 _this.listener[server_name][proxy_port].listen(local_port, () => {
 
                     // emit server listening on port message
@@ -130,7 +143,11 @@ class SSHTunnelProxy extends Client {
 
                     // if all listeners have been successfully established, resolve setup connection
                     if (listeners++ >= proxy_ports.length - 1) {
-                        _this.emit('ready', {});
+                        _this.emit('ssh_tunnel_ready', {});
+                        if (_this._tunnelReadyTimeout) {
+                            clearTimeout(this._tunnelReadyTimeout);
+                            _this._tunnelReadyTimeout = undefined
+                        }
                         resolve();
                     }
                 });
@@ -140,6 +157,35 @@ class SSHTunnelProxy extends Client {
         });
     }
 
+    // handle remote shell stream processing
+    remote_shell(err, stream) {
+        const _this = this;
+        if (err) throw err;
+
+        // disable local echo of input chars, use remote output only
+        process.stdin.setRawMode(true);
+
+        // forward data from local terminal to remote host
+        const stdinListener = (data) => {
+            stream.stdin.write(data);
+        };
+
+        // shutdown this process when stream ends (user logs out)
+        stream.on('close', function () {
+            process.stdin.setRawMode(false);
+            process.stdin.removeListener("data", stdinListener);
+            process.exit();
+        }).stderr.on('data', function (data) {
+            _this.debug_en && _this.debug('shell' + data);
+        });
+
+        // skip next stops double printing of input
+        stream.stdout.on("data", (data) => {
+            process.stdout.write(data);
+        })
+        process.stdin.on("data", stdinListener)
+    }
+
     // handle setting up ssh client and proxy forward ports
     do_ssh_connect(opts) {
 
@@ -159,7 +205,18 @@ class SSHTunnelProxy extends Client {
             }
 
             _this.on('ready', () => {
+
+                // if shell requested, enable remote terminal
+                if (opts.shell) {
+                    _this.shell(_this.remote_shell);
+                }
+
+                // setup local forwarding ports to remote host
                 _this.on_ssh_client_ready(opts.server_name, opts.proxy_ports, resolve);
+                if (_this._tunnelReadyTimeout) {
+                    clearTimeout(this._tunnelReadyTimeout);
+                    _this._tunnelReadyTimeout = undefined
+                }
             });
 
             _this.on('end', () => {
@@ -176,6 +233,10 @@ class SSHTunnelProxy extends Client {
                 _this.debug_en && _this.debug('SSH Client :: error :: ' + err);
                 _this.emit('debug', err);
                 if (_this.listener[opts.server_name]) _this.listener[opts.server_name].isConnected = false;
+                if (_this._tunnelReadyTimeout) {
+                    clearTimeout(this._tunnelReadyTimeout);
+                    _this._tunnelReadyTimeout = undefined
+                }
                 _this.ssh_retry_connect(opts);
                 resolve();
             });
@@ -239,12 +300,13 @@ class SSHTunnelProxy extends Client {
     }
 
     // on network error, attempt to re-establish connection until 10 retries
+    //clearTimeout(this._readyTimeout);
     ssh_retry_connect(opts) {
         const _this = this;
         const invoke = () => {
             _this.connectSSH(opts);
         }
-        if (this.retries++ < 10) setTimeout(invoke, 5000);
+        if (this.retries++ < 10) this._tunnelReadyTimeout = setTimeout(invoke, 5000);
     }
 
     // attempt to establish ssh tunnel to server with supplied parameters.
@@ -259,7 +321,7 @@ class SSHTunnelProxy extends Client {
                     const msg = 'SSH connection to ' + opts.server_name + ' established at ' + hostport;
                     _this.debug(msg);
                 }
-                _this.emit('status', '', 'ready', hostport);
+                //_this.emit('status', '', 'ready', hostport);
                 _this.retries = 0;
                 resolve();
             });

package/main.js

@@ -17,6 +17,7 @@ var ngrokAPIKey = null;
 var privateKey = null;
 var service = null;
 var account = null;
+var shell = null;
 
 function get_key_from_file(filename) {
     try {
@@ -83,6 +84,10 @@ function main(args) {
             case '--service':
                 service = value;
                 break;
+            case '-S':
+            case '--shell':
+                shell = true;
+                break;
             case '--a':
                 account = value;
                 break;
@@ -139,6 +144,9 @@ function main(args) {
         else if (config.private_key) {
             config.private_key = get_key_from_file(config.private_key);
         }
+        if (shell) {
+            config.shell=true;
+        }
 
         // create new tunnel and start connection
         var sshTunnelProxy = new SSHTunnelProxy();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssh_tunnel_proxy",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "obtain ngrok host port from api and establish a ssh connection",
   "main": "lib/index.js",
   "scripts": {