update tunnel ssh

Author: jdaviderb

index.js

@@ -2,7 +2,7 @@
 
 var RSVP = require('rsvp');
 var fs = require('fs');
-var tunnelSsh = require('tunnel-ssh');
+var { createTunnel } = require('tunnel-ssh');
 var untildify = require('untildify');
 
 var DeployPluginBase = require('ember-cli-deploy-plugin');
@@ -13,6 +13,7 @@ var MIN_PORT_NUMBER = 49151;
 module.exports = {
   name: 'ember-cli-deploy-ssh-tunnel',
 
+  
   createDeployPlugin: function(options) {
     var DeployPlugin = DeployPluginBase.extend({
       name: options.name,
@@ -24,10 +25,6 @@ module.exports = {
             var range = MAX_PORT_NUMBER - MIN_PORT_NUMBER + 1;
             return Math.floor(Math.random() * range) + MIN_PORT_NUMBER;
           },
-          tunnelClient: function(context) {
-            // if you want to provide your own ssh client to be used instead of one from this plugin
-            return context.tunnelClient || tunnelSsh;
-          }
       },
 
       requiredConfig: ['host', 'username'],
@@ -39,38 +36,41 @@ module.exports = {
           throw 'Port ' + srcPort + ' is not available to open a SSH connection on.\n' + 'Please choose a port between ' + MIN_PORT_NUMBER + ' and ' + MAX_PORT_NUMBER + '.';
         }
 
-        var sshConfig = {
+        const tunnelOptions = {
+          autoClose: true
+        };
+
+        const serverOptions = {
+          port: srcPort
+        };
+
+        const sshOptions = {
           host: this.readConfig('host'),
           port: this.readConfig('port'),
-          dstPort: this.readConfig('dstPort'),
-          dstHost: this.readConfig('dstHost'),
           username: this.readConfig('username'),
-          localPort: srcPort
+          privateKey: fs.readFileSync(untildify(this.readConfig('privateKeyPath')))
         };
 
-        var password = this.readConfig('password');
-        var privateKey = this.readConfig('privateKeyPath');
-        var tunnel = this.readConfig('tunnelClient');
-
-        if (password) {
-          sshConfig.password = password;
-        } else if (privateKey) {
-          sshConfig.privateKey = fs.readFileSync(untildify(privateKey));
-        }
+        const forwardOptions = {
+          srcAddr: 'localhost',
+          srcPort: this.readConfig('srcPort'),
+          dstAddr: this.readConfig('dstHost'),
+          dstPort: this.readConfig('dstPort')
+        };
 
         return new RSVP.Promise(function(resolve, reject) {
-          var sshTunnel = tunnel(sshConfig, function(error /*, result */) {
-            if (error) {
-              reject(error);
-            } else {
+          createTunnel(tunnelOptions, serverOptions, sshOptions, forwardOptions)
+            .then(([server, conn]) => {
               resolve({
                 tunnel: {
-                  handler: sshTunnel,
+                  handler: server,
                   srcPort: srcPort
                 }
               });
-            }
-          });
+            })
+            .catch((error) => {
+              reject(error);
+            });
         });
       },
 

package.json

@@ -30,7 +30,7 @@
   ],
   "dependencies": {
     "ember-cli-deploy-plugin": "^0.2.6",
-    "tunnel-ssh": "^1.0.1",
+    "tunnel-ssh": "^5.0.5",
     "untildify": "^2.0.0"
   }
 }