ssh2shell 1.9.6 → 1.9.7

package/lib/ssh2shell.js

@@ -583,7 +583,7 @@
       } else {
         this.hosts = [hosts];
       }
-      this.ssh2Client = require('ssh2');
+      this.ssh2Client = require('ssh2').Client;
       this.on("newPrimmaryHost", this._nextPrimaryHost);
       this.on("data", (function(_this) {
         return function(data) {
@@ -927,34 +927,16 @@
       })(this));
       if (this.sshObj.server && this.sshObj.commands) {
         try {
-          this.connection.connect({
-            host: this.sshObj.server.host,
-            port: this.sshObj.server.port,
-            forceIPv4: this.sshObj.server.forceIPv4,
-            forceIPv6: this.sshObj.server.forceIPv6,
-            hostHash: this.sshObj.server.hashMethod,
-            hostVerifier: this.sshObj.server.hostVerifier,
-            username: this.sshObj.server.userName,
-            password: this.sshObj.server.password,
-            agent: this.sshObj.server.agent,
-            agentForward: this.sshObj.server.agentForward,
-            privateKey: this.sshObj.server.privateKey,
-            passphrase: this.sshObj.server.passPhrase,
-            localHostname: this.sshObj.server.localHostname,
-            localUsername: this.sshObj.server.localUsername,
-            localAddress: this.sshObj.server.localAddress,
-            localPort: this.sshObj.server.localPort,
-            authHandler: this.sshObj.server.authHandler,
-            tryKeyboard: this.sshObj.server.tryKeyboard,
-            keepaliveInterval: this.sshObj.server.keepaliveInterval,
-            keepaliveCountMax: this.sshObj.server.keepaliveCountMax,
-            readyTimeout: this.sshObj.server.readyTimeout,
-            sock: this.sshObj.server.sock,
-            strictVendor: this.sshObj.server.strictVendor,
-            algorithms: this.sshObj.server.algorithms,
-            compress: this.sshObj.server.compress,
-            debug: this.sshObj.server.debug
-          });
+          if (!this.sshObj.server.username) {
+            this.sshObj.server.username = this.sshObj.server.userName;
+          }
+          if (!this.sshObj.server.hostHash) {
+            this.sshObj.server.hostHash = this.sshObj.server.hashMethod;
+          }
+          if (!this.sshObj.server.passphrase) {
+            this.sshObj.server.passphrase = this.sshObj.server.passPhrase;
+          }
+          this.connection.connect(this.sshObj.server);
         } catch (error) {
           e = error;
           this.emit('error', e + " " + e.stack, "Connection.connect", true);

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "ssh2shell",
-  "version": "1.9.6",
+  "version": "1.9.7",
   "author": "cmp-202",
   "description": "A wrapper class for ssh2 to run multiple sequential commands in an SSH shell session, handle command responses, and tunnel through to other hosts using nested host objects",
   "main": "./lib/ssh2shell.js",
   "engines": {
-    "node": ">=4.5.0"
+    "node": ">=14.18.0"
   },
   "dependencies": {
     "ssh2": "^1.4.0"
   },
   "devDependencies": {
     "coffee-script": "^1.12.7",
-    "dotenv": "^8.2.0"
+    "dotenv": "^8.6.0"
   },
   "scripts": {},
   "keywords": [

package/src/ssh2shell.coffee

@@ -378,7 +378,7 @@ class SSH2Shell extends Stream
       @hosts = hosts
     else
       @hosts = [hosts]
-    @ssh2Client = require('ssh2')  
+    @ssh2Client = require('ssh2').Client  
     @.on "newPrimmaryHost", @_nextPrimaryHost
     @.on "data", (data) =>
       #@.emit 'msg', "#{@sshObj.server.host}: data event: #{data}" if @sshObj.verbose
@@ -578,33 +578,10 @@ class SSH2Shell extends Stream
 
     if @sshObj.server and @sshObj.commands
       try
-        @connection.connect
-          host:             @sshObj.server.host
-          port:             @sshObj.server.port
-          forceIPv4:        @sshObj.server.forceIPv4
-          forceIPv6:        @sshObj.server.forceIPv6
-          hostHash:         @sshObj.server.hashMethod
-          hostVerifier:     @sshObj.server.hostVerifier
-          username:         @sshObj.server.userName
-          password:         @sshObj.server.password
-          agent:            @sshObj.server.agent
-          agentForward:     @sshObj.server.agentForward
-          privateKey:       @sshObj.server.privateKey
-          passphrase:       @sshObj.server.passPhrase
-          localHostname:    @sshObj.server.localHostname
-          localUsername:    @sshObj.server.localUsername
-          localAddress:     @sshObj.server.localAddress
-          localPort:        @sshObj.server.localPort
-          authHandler:      @sshObj.server.authHandler
-          tryKeyboard:      @sshObj.server.tryKeyboard
-          keepaliveInterval:@sshObj.server.keepaliveInterval
-          keepaliveCountMax:@sshObj.server.keepaliveCountMax
-          readyTimeout:     @sshObj.server.readyTimeout
-          sock:             @sshObj.server.sock
-          strictVendor:     @sshObj.server.strictVendor
-          algorithms:       @sshObj.server.algorithms
-          compress:         @sshObj.server.compress
-          debug:            @sshObj.server.debug
+        @sshObj.server.username = @sshObj.server.userName unless @sshObj.server.username
+        @sshObj.server.hostHash = @sshObj.server.hashMethod unless @sshObj.server.hostHash
+        @sshObj.server.passphrase = @sshObj.server.passPhrase unless @sshObj.server.passphrase
+        @connection.connect @sshObj.server
       catch e
         @.emit 'error', "#{e} #{e.stack}", "Connection.connect", true
     else