ssh2shell 2.0.3 → 2.0.6

package/README.md

@@ -4,14 +4,39 @@ ssh2shell
 
 Ssh2shell uses [ssh2](https://www.npmjs.org/package/ssh2) to open a ssh shell session to a host/s to run multiple commands and process the responses.
 
-Installation:
+Index:
+------------
+* [Instalation](#installation-)
+* [Minimal Example](#minimal-example-)
+* [Host Configuration](#host-configuration-)
+* [ssh2shell API](#ssh2shell-api-)
+* [Usage](#usage-)
+* [Authentication](#authentication-)
+* [Default Cyphers](#default-cyphers-)
+* [Fingerprint Validation](#fingerprint-validation-)
+* [Keyboard-interactive](#keyboard-interactive-)
+* [Trouble shooting](#trouble-shooting-)
+* [Verbose and Debug](#verbose-and-debug-)
+* [Notification commands](#notification-commands-)
+* [Sudo and su Commands](#sudo-and-su-commands-)
+* [Prompt detection override](#prompt-detection-override-)
+* [Text regular expression filters](#text-regular-expression-filters-)
+* [Responding to non-standard command prompts](#responding-to-non-standard-command-prompts-)
+* [Command Time-out event](#command-time-out-event-)
+* [Multiple Primary Hosts](#multiple-primary-hosts-)
+* [Tunnelling nested host objects](#tunnelling-nested-host-objects-)
+* [Event Handlers](#event-handlers-)
+* [Bash scripts on the fly](#bash-scripts-on-the-fly-)
+
+
+[Installation: ^](#index)
 ------------
 ```
 npm install ssh2shell
 ```
 
 
-Minimal Example:
+[Minimal Example: ^](#index)
 ------------
 ```javascript
 //host configuration with connection settings and commands
@@ -35,7 +60,7 @@ SSH.connect(callback);
 ``` 
 
 
-Host Configuration:
+[Host Configuration: ^](#index)
 ------------
 SSH2Shell requires an object with the following structure:
 ```javascript
@@ -109,8 +134,9 @@ host = {
   readyMessage:        "Ready",
   closedMessage:       "Closed",
   
-  //Optional: Host event handlers .
-  //Host defined event handlers are set as the default event handlers.
+  //Optional: Host event handlers.
+  //Host defined event handlers are cleared with each change of host.
+  //Default and instance event handlers are global to all hosts and are not cleared.
   
   //Optional: 
   onKeyboardInteractive: function(name, instructions, instructionsLang, prompts, finish){
@@ -191,7 +217,7 @@ host = {
   variables and the current array of commands for the host. The sshObj.commands array changes with each host connection.
 
 
-ssh2shell API
+[ssh2shell API: ^](#index)
 -------------
 SSH2Shell extends events.EventEmitter
 
@@ -214,11 +240,9 @@ SSH2Shell extends events.EventEmitter
 * .command is the current command being run until a new prompt is detected and the next command replaces it.
 
 
-Usage:
-======
-Connecting to a single host:
-----------------------------
-
+[Usage: ^](#index)
+--------
+*Connecting to a single host*
 
 *app.js*
 ```javascript
@@ -248,7 +272,7 @@ SSH.connect(callback);
 ```
 
 
-Authentication:
+[Authentication: ^](#index)
 ---------------
 * Each host authenticates with its own host.server parameters.
 * When using key authentication you may require a valid pass phrase if your key was created with one.
@@ -258,7 +282,7 @@ Authentication:
   function...) or host.onKeyboardInteractive() must be defined.
 * Set the default cyphers and keys.
 
-Default Cyphers:
+[Default Cyphers: ^](#index)
 ---------------
 Default Cyphers and Keys used in the initial ssh connection can be redefined by setting the ssh2.connect.algorithms through the host.server.algorithms option. 
 As with this property all ssh2.connect properties are set in the host.server object.
@@ -298,7 +322,7 @@ var host = {
 }
 ```
 
-Fingerprint Validation:
+[Fingerprint Validation: ^](#index)
 ---------------
 At connection time the hash of the server’s public key can be compared with the hash the client had previously recorded
 for that server. This stops "man in the middle" attacks where you are redirected to a different server as you connect
@@ -366,14 +390,14 @@ host.server.hashMethod only supports md5 or sha1 according to the current SSH2 d
 undesired results.__
 
 
-Keyboard-interactive
+[Keyboard-interactive: ^](#index)
 ----------------------
 Keyboard-interactive authentication is available when both host.server.tryKeyboard is set to true and the event handler
 keyboard-interactive is defined as below. The keyboard-interactive event handler can only be used on the first connection.
 
 Also see [test/keyboard-interactivetest.js](https://github.com/cmp-202/ssh2shell/blob/master/test/keyboard-interactivetest.js) for the full example 
 
-*Defining the event handler:*
+*Defining the event handler*
 ```javascript
 //this is required
 host.server.tryKeyboard = true;
@@ -420,7 +444,7 @@ host = {
 ```
 
 
-Trouble shooting:
+[Trouble shooting: ^](#index)
 -----------------
 
 * Adding msg command `"msg:Doing something"` to your commands array at key points will help you track the sequence of
@@ -440,7 +464,7 @@ Trouble shooting:
   (1000 = 1 sec)
 
 
-Verbose and Debug:
+[Verbose and Debug: ^](#index)
 ------------------
 * When host.verbose is set to true each command complete raises a msg event outputting the response text.
 * When host.debug is set to true each process step raises a msg event to help identify what the internal processes were.
@@ -454,7 +478,7 @@ Add your own verbose messages as follows:
 Add your own debug messages as follows:
 `if(this.sshObj.debug){this.emit("msg", this.sshObj.server.host + ": eventName");} //where eventName is the text identifying what happened`
 
-Notification commands:
+[Notification commands: ^](#index)
 ----------------------
 There are two notification commands that are added to the host.commands array but are not run as a command on the host.
 
@@ -463,7 +487,7 @@ There are two notification commands that are added to the host.commands array bu
  * The reason for not using echo or printf commands as a normal command is that you see both the command and the message in the sessionText which is pointless when all you want is the message.
 
 
-Sudo and su Commands:
+[Sudo and su Commands: ^](#index)
 --------------
 It is possible to use `sudo [command]`, `sudo su`, `su [username]` and `sudo -u [username] -i`. 
 Sudo commands uses the password for the current session and is processed by ssh2shell. Su on the other hand uses the password
@@ -475,7 +499,7 @@ See: [su VS sudo su VS sudo -u -i](http://johnkpaul.tumblr.com/post/19841381351/
 See: [test/sudosutest.js](https://github.com/cmp-202/ssh2shell/blob/master/test/sudosutest.js) for a working code example.
 
 
-Prompt detection override:
+[Prompt detection override: ^](#index)
 -------------------------
 Used to detect different prompts. 
 
@@ -487,7 +511,7 @@ These are optional settings.
  ``` 
  
  
-Text regular expression filters:
+[Text regular expression filters: ^](#index)
 -------------------------------
 There are two regular expression filters that remove unwanted text from response data.
  
@@ -502,7 +526,7 @@ host.textColorFilter = "(\[{1}[0-9;]+m{1})"
  ```
 
  
-Responding to non-standard command prompts:
+[Responding to non-standard command prompts: ^](#index)
 ----------------------
 In host.onCommandProcessing event handler the prompt can be detected and a response can be sent via `stream.write("y\n")`.
 
@@ -542,7 +566,7 @@ __*Note:*
 If no prompt is detected `commandTimeout` will be raised after the idleTimeOut period.__
 
 
-Command Time-out event
+[Command Time-out event: ^](#index)
 ---------------
 When onCommandTimeout event triggers after the host.idleTimeOut is exceeded. 
 This is because there is no new data and no prompt is detected to run the next command.
@@ -611,7 +635,79 @@ SSH.connect();
 ```
 
 
-Tunnelling nested host objects:
+[Multiple Primary Hosts: ^](#index)
+-----------------------
+Multiple hosts can be connected to one after the other as you would connecting to a single host.
+Each host config is independant of each other but can share thingsa like commands and handlers.
+Each host config is added to an array of hosts that is passed to the constructor.
+The final `sessionText` contains the output from all the hosts. 
+
+```javascript
+var dotenv = require('dotenv').config(),
+  debug = false,
+  verbose = false 
+ 
+
+//Host objects:
+var host1 = {
+  server: {
+    host:         process.env.HOST,
+    port:         process.env.PORT,
+    userName:     process.env.USER_NAME,
+    password:     process.env.PASSWORD
+  },
+  commands:     ["echo Host_1"],
+  connectedMessage: "Connected to host1",
+  debug: debug,
+  verbose: verbose
+},
+
+host2 = {
+  server: {
+    host:         process.env.SERVER2_HOST,
+    port:         process.env.PORT,
+    userName:     process.env.SERVER2_USER_NAME,
+    password:     process.env.SERVER2_PASSWORD
+  },
+  commands:     ["echo Host_2"],
+  connectedMessage: "Connected to host2",
+  debug: debug,
+  verbose: verbose
+},
+
+host3 = {
+  server: {
+    host:         process.env.SERVER3_HOST,
+    port:         process.env.PORT,
+    userName:     process.env.SERVER3_USER_NAME,
+    password:     process.env.SERVER3_PASSWORD
+  },
+  commands:     ["echo Host_3"],
+  connectedMessage: "Connected to host3",
+  debug: debug,
+  verbose: verbose,
+  //Event handler only used by this host
+  onCommandComplete: function( command, response, sshObj ) {
+    this.emit("msg", sshObj.server.host + ": commandComplete only used on this host");
+  }
+}
+
+var SSH2Shell = require ('ssh2shell'),
+    SSH = new SSH2Shell([host1,host2,host3]),
+    callback = function( sessionText ){
+          console.log ( "-----Callback session text:\n" + sessionText);
+          console.log ( "-----Callback end" );
+    }
+
+SSH.on ('end', function( sessionText, sshObj ) {
+    this.emit("msg", sshObj.server.host + ": onEnd every host");
+  })
+  
+SSH.connect(callback);
+```
+
+
+[Tunnelling nested host objects: ^](#index)
 ---------------------------------
 `hosts: [ host1, host2]` setting can make multiple host connections possible. 
 Each host config object has its own server settings, commands, command handlers and
@@ -820,7 +916,7 @@ SSH.connect();
 ```
 
 
-Event Handlers:
+[Event Handlers: ^](#index)
 ---------------
 There are a number of event handlers that enable you to add your own code to be run when those events are triggered. 
 Most of these you have already encountered in the host object. You do not have to add event handlers unless you want
@@ -940,7 +1036,7 @@ ssh2shell.on ("Unpipe", function onUnpipe(source){
 });
 ```
 
-Bash scripts on the fly:
+[Bash scripts on the fly: ^](#index)
 ------------------------
 If the commands you need to run would be better suited to a bash script as part of the process it is possible to generate
 or get the script on the fly. You can echo/printf the script content into a file as a command, ensure it is executable, 

package/first.log

@@ -0,0 +1,30 @@
+Welcome to Ubuntu 18.04.1 LTS (GNU/Linux 4.15.0-191-generic x86_64)
+
+ * Documentation:  https://help.ubuntu.com
+ * Management:     https://landscape.canonical.com
+ * Support:        https://ubuntu.com/advantage
+
+  System information as of Wed Aug 17 20:13:26 NZST 2022
+
+  System load:  0.29              Processes:             100
+  Usage of /:   63.3% of 6.28GB   Users logged in:       0
+  Memory usage: 5%                IP address for enp0s3: 192.168.0.117
+  Swap usage:   0%
+
+ * Super-optimized for small spaces - read how we shrank the memory
+   footprint of MicroK8s to make it the smallest full K8s around.
+
+   https://ubuntu.com/blog/microk8s-memory-optimisation
+
+130 packages can be updated.
+3 updates are security updates.
+
+New release '20.04.4 LTS' available.
+Run 'do-release-upgrade' to upgrade to it.
+
+
+banner content
+Last login: Wed Aug 17 20:13:10 2022 from 192.168.0.6
+user@ubuntu:~$ echo host pipe
+host pipe
+user@ubuntu:~$ 

package/lib/ssh2shell.js

@@ -420,7 +420,7 @@
       if (this.sshObj.debug) {
         this.emit('msg', this.sshObj.server.host + ": Remove previous event handlers");
       }
-      this._removeEvents();
+      this._removeListeners();
       this._connections.push(this.sshObj);
       this.sshObj = nextHost;
       return this._initiate(this._sshConnect);
@@ -435,7 +435,8 @@
           if (this.sshObj.debug) {
             this.emit('msg', this.sshObj.server.host + ": Remove previous event handlers");
           }
-          this._removeEvents();
+          this.emit('end', this._primaryhostSessionText, this.sshObj);
+          this._removeListeners();
         }
         this.sshObj = this._hosts.shift();
         this._primaryhostSessionText = this.sshObj.server.host + ": ";
@@ -553,7 +554,7 @@
       return this._stream.close();
     };
 
-    SSH2Shell.prototype._removeEvents = function() {
+    SSH2Shell.prototype._removeListeners = function() {
 
       /*
       if @sshObj.debug
@@ -568,19 +569,36 @@
         @.emit 'msg', "commandTimeout: " + (@.listenerCount 'commandTimeout')
         @.emit 'msg', "msg: " + (@.listenerCount 'msg')
        */
+      if (typeof this.sshObj.onKeyboardInteractive === 'function') {
+        this.removeListener("keyboard-interactive", this.sshObj.onKeyboardInteractive);
+      }
+      if (typeof this.sshObj.onStderrData === 'function') {
+        this.removeListener("stderrData", this.sshObj.onStderrData);
+      }
       if (typeof this.sshObj.onData === 'function') {
         this.removeListener("data", this.sshObj.onData);
       }
-      this.removeAllListeners("error");
+      if (typeof this.sshObj.onError === 'function') {
+        this.removeListener("error", this.sshObj.onError);
+      }
       if (typeof this.sshObj.onStderrData === 'function') {
         this.removeListener("stderrData", this.sshObj.onStderrData);
       }
-      this.removeAllListeners('end');
-      this.removeAllListeners('keyboard-interactive');
-      this.removeAllListeners('commandProcessing');
-      this.removeAllListeners('commandComplete');
-      this.removeAllListeners('commandTimeout');
-      this.removeAllListeners('msg');
+      if (typeof this.sshObj.onEnd === 'function') {
+        this.removeListener("end", this.sshObj.onEnd);
+      }
+      if (typeof this.sshObj.onCommandProcessing === 'function') {
+        this.removeListener("commandProcessing", this.sshObj.onCommandProcessing);
+      }
+      if (typeof this.sshObj.onCommandComplete === 'function') {
+        this.removeListener("commandComplete", this.sshObj.onCommandComplete);
+      }
+      if (typeof this.sshObj.onCommandTimeout === 'function') {
+        this.removeListener("commandTimeout", this.sshObj.onCommandTimeout);
+      }
+      if (typeof this.sshObj.msg === 'function') {
+        this.removeListener("msg", this.sshObj.msg);
+      }
       if (this.idleTimer) {
         clearTimeout(this.idleTimer);
       }
@@ -594,7 +612,7 @@
       this.connect = bind(this.connect, this);
       this._loadDefaults = bind(this._loadDefaults, this);
       this._initiate = bind(this._initiate, this);
-      this._removeEvents = bind(this._removeEvents, this);
+      this._removeListeners = bind(this._removeListeners, this);
       this.close = bind(this.close, this);
       this._runExit = bind(this._runExit, this);
       this._sshConnect = bind(this._sshConnect, this);
@@ -623,6 +641,11 @@
         this._hosts = [hosts];
       }
       this.ssh2Client = require('ssh2').Client;
+      this.on("msg", (function(_this) {
+        return function(message) {
+          return console.log(message);
+        };
+      })(this));
       this.on("newPrimmaryHost", this._nextPrimaryHost);
       this.on("data", (function(_this) {
         return function(data) {
@@ -684,8 +707,12 @@
     SSH2Shell.prototype._loadDefaults = function() {
       var ref, ref1, ref2, ref3, ref4, ref5, ref6;
       if (this.sshObj.msg && this.sshObj.msg.send && typeof this.sshObj.msg.send === 'function') {
-        this.on("msg", this.sshObj.msg.send);
-      } else if (this.sshObj.msg && typeof this.sshObj.msg === 'function') {
+        this.sshObj.msg = this.sshObj.msg.send;
+      }
+      if (this.listenerCount("msg") > 0) {
+        this.removeAllListeners("msg");
+      }
+      if (typeof this.sshObj.msg === 'function') {
         this.on("msg", this.sshObj.msg);
       } else {
         this.on("msg", (function(_this) {
@@ -831,7 +858,7 @@
       if (typeof this.sshObj.onEnd === 'function') {
         this.on("end", this.sshObj.onEnd);
       }
-      if (this.sshObj.verbose) {
+      if (this.sshObj.debug) {
         this.emit('msg', this.sshObj.server.host + ": Host loaded");
       }
       if (this.sshObj.verbose) {
@@ -913,9 +940,8 @@
               _this._primaryhostSessionText += _this.sshObj.sessionText + "\n";
               _this._allSessions += _this._primaryhostSessionText;
               if (_this._hosts.length === 0) {
-                _this.emit('end', _this._allSessions, _this.sshObj);
+                return _this.emit('end', _this._allSessions, _this.sshObj);
               }
-              return _this._removeEvents();
             });
             return _this._stream.on("close", function(code, signal) {
               if (_this.sshObj.debug) {
@@ -952,7 +978,8 @@
           }
           if (_this._hosts.length === 0) {
             if (typeof _this._callback === 'function') {
-              return _this._callback(_this._allSessions);
+              _this._callback(_this._allSessions);
+              return _this._removeListeners();
             }
           } else {
             return _this.emit("newPrimaryHost", _this._nextPrimaryHost(_this._connect));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssh2shell",
-  "version": "2.0.3",
+  "version": "2.0.6",
   "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",

package/second.log

@@ -0,0 +1,30 @@
+Welcome to Ubuntu 18.04.1 LTS (GNU/Linux 4.15.0-191-generic x86_64)
+
+ * Documentation:  https://help.ubuntu.com
+ * Management:     https://landscape.canonical.com
+ * Support:        https://ubuntu.com/advantage
+
+  System information as of Wed Aug 17 20:13:26 NZST 2022
+
+  System load:  0.29              Processes:             100
+  Usage of /:   63.3% of 6.28GB   Users logged in:       0
+  Memory usage: 5%                IP address for enp0s3: 192.168.0.117
+  Swap usage:   0%
+
+ * Super-optimized for small spaces - read how we shrank the memory
+   footprint of MicroK8s to make it the smallest full K8s around.
+
+   https://ubuntu.com/blog/microk8s-memory-optimisation
+
+130 packages can be updated.
+3 updates are security updates.
+
+New release '20.04.4 LTS' available.
+Run 'do-release-upgrade' to upgrade to it.
+
+
+banner content
+Last login: Wed Aug 17 20:13:10 2022 from 192.168.0.6
+user@ubuntu:~$ echo host pipe
+host pipe
+user@ubuntu:~$ 

package/src/ssh2shell.coffee

@@ -284,7 +284,7 @@ class SSH2Shell extends Stream
     @.emit 'msg', "#{@sshObj.server.host}: SSH to #{nextHost.server.host}" if @sshObj.debug
     @.emit 'msg', "#{@sshObj.server.host}: Clearing previous event handlers" if @sshObj.debug
     @.emit 'msg', "#{@sshObj.server.host}: Remove previous event handlers" if @sshObj.debug
-    @_removeEvents()
+    @_removeListeners()
       
     @_connections.push(@sshObj) 
    
@@ -294,16 +294,17 @@ class SSH2Shell extends Stream
     
     
   _nextPrimaryHost: ( connect )=>
-    
     if @_hosts.length > 0
-      if @sshObj.server 
+      #check this is not loading the first primary host before removing listeners
+      if @sshObj.server
         @.emit 'msg', "#{@sshObj.server.host}: Current primary host" if @sshObj.debug
         @.emit 'msg', "#{@sshObj.server.host}: Remove previous event handlers" if @sshObj.debug
-        @_removeEvents()
-      @sshObj = @_hosts.shift()      
-      @_primaryhostSessionText = "#{@sshObj.server.host}: " 
+        @.emit 'end', @_primaryhostSessionText, @sshObj
+        @_removeListeners()
+      @sshObj = @_hosts.shift()
+      @_primaryhostSessionText = "#{@sshObj.server.host}: "
       
-      @.emit 'msg', "#{@sshObj.server.host}: Next primary host" if @sshObj.debug      
+      @.emit 'msg', "#{@sshObj.server.host}: Next primary host" if @sshObj.debug
       
       @_initiate(connect)
     else
@@ -369,7 +370,7 @@ class SSH2Shell extends Stream
     @.emit 'msg', "#{@sshObj.server.host}: Exit command: Stream: close" if @sshObj.debug
     @_stream.close() #"exit#{@sshObj.enter}"
 
-  _removeEvents: =>
+  _removeListeners: =>
     ###
     if @sshObj.debug
       @.emit 'msg', "#{@sshObj.server.host}: Event handler count:"
@@ -383,15 +384,17 @@ class SSH2Shell extends Stream
       @.emit 'msg', "commandTimeout: " + (@.listenerCount 'commandTimeout')
       @.emit 'msg', "msg: " + (@.listenerCount 'msg')    
     ###
+    #changed to removing host defined listeners instead of all listeners
+    @.removeListener "keyboard-interactive", @sshObj.onKeyboardInteractive if typeof @sshObj.onKeyboardInteractive == 'function'
+    @.removeListener "stderrData", @sshObj.onStderrData if typeof @sshObj.onStderrData == 'function'
     @.removeListener "data", @sshObj.onData if typeof @sshObj.onData == 'function'
-    @.removeAllListeners "error"
+    @.removeListener "error", @sshObj.onError if typeof @sshObj.onError == 'function'
     @.removeListener "stderrData", @sshObj.onStderrData if typeof @sshObj.onStderrData == 'function'
-    @.removeAllListeners 'end'
-    @.removeAllListeners 'keyboard-interactive'
-    @.removeAllListeners 'commandProcessing'
-    @.removeAllListeners 'commandComplete'
-    @.removeAllListeners 'commandTimeout'
-    @.removeAllListeners 'msg'
+    @.removeListener "end", @sshObj.onEnd if typeof @sshObj.onEnd == 'function'
+    @.removeListener "commandProcessing", @sshObj.onCommandProcessing if typeof @sshObj.onCommandProcessing == 'function'
+    @.removeListener "commandComplete", @sshObj.onCommandComplete if typeof @sshObj.onCommandComplete == 'function'
+    @.removeListener "commandTimeout", @sshObj.onCommandTimeout if typeof @sshObj.onCommandTimeout == 'function'
+    @.removeListener "msg", @sshObj.msg  if typeof @sshObj.msg == 'function'
   
     clearTimeout @idleTimer if @idleTimer
     clearTimeout @dataReceivedTimer if @dataReceivedTimer
@@ -402,15 +405,20 @@ class SSH2Shell extends Stream
       @_hosts = hosts
     else
       @_hosts = [hosts]
+    
     @ssh2Client = require('ssh2').Client
     
+    #defined here to support msg events before the host is loaded
+    @.on "msg", ( message ) =>
+        console.log message
+        
     @.on "newPrimmaryHost", @_nextPrimaryHost
     
-    @.on "data", (data) =>      
+    @.on "data", (data) =>
       @_onData( data )
       
     @.on "stderrData", (data) =>
-      console.error data    
+      console.error data
      
     @.on "error", (err, type, close = false, callback) =>
       @.emit 'msg', "Class.error: #{err}, #{type}" if @sshObj.debug
@@ -444,9 +452,14 @@ class SSH2Shell extends Stream
       
   _loadDefaults: () =>
     
+    #old hubot leftovers
     if @sshObj.msg and @sshObj.msg.send and typeof @sshObj.msg.send == 'function'
-      @.on "msg", @sshObj.msg.send
-    else if @sshObj.msg and typeof @sshObj.msg == 'function'
+      @sshObj.msg = @sshObj.msg.send
+    
+    if @.listenerCount("msg") > 0
+      @.removeAllListeners "msg"
+    
+    if typeof @sshObj.msg == 'function'
       @.on "msg", @sshObj.msg
     else
       @.on "msg", ( message ) =>
@@ -514,7 +527,7 @@ class SSH2Shell extends Stream
     @.on "commandTimeout", @sshObj.onCommandTimeout
     @.on "end", @sshObj.onEnd if typeof @sshObj.onEnd == 'function'
     
-    @.emit 'msg', "#{@sshObj.server.host}: Host loaded" if @sshObj.verbose
+    @.emit 'msg', "#{@sshObj.server.host}: Host loaded" if @sshObj.debug
     @.emit 'msg', @sshObj if @sshObj.verbose
     
     
@@ -570,9 +583,7 @@ class SSH2Shell extends Stream
           @_primaryhostSessionText += @sshObj.sessionText+"\n"
           @_allSessions += @_primaryhostSessionText
           if @_hosts.length == 0
-            @.emit 'end', @_allSessions, @sshObj          
-          @_removeEvents() 
-
+            @.emit 'end', @_allSessions, @sshObj
           
         @_stream.on "close", (code, signal) =>
           @.emit 'msg', "#{@sshObj.server.host}: Stream.close" if @sshObj.debug
@@ -595,7 +606,8 @@ class SSH2Shell extends Stream
       if @_hosts.length == 0
         if typeof @_callback == 'function'
           @_callback @_allSessions
-      else      
+          @_removeListeners()
+      else        
         @.emit "newPrimaryHost", @_nextPrimaryHost(@_connect)