ssh2shell 1.9.8 → 2.0.1

package/src/ssh2shell.coffee

@@ -9,7 +9,8 @@ Stream = require('stream');
 class SSH2Shell extends Stream
   sshObj:           {}
   command:          ""
-  hosts:            []
+  _hosts:            []
+  _sshToNextHost:    false
   _primaryhostSessionText: ""
   _allSessions:      ""
   _connections:     []
@@ -36,7 +37,7 @@ class SSH2Shell extends Stream
       @.emit 'commandProcessing' , @command, @_buffer, @sshObj, @_stream
       clearTimeout @idleTimer if @idleTimer
       @idleTimer = setTimeout( =>
-          @.emit 'commandTimeout', @.command, @._buffer, @._stream, @._connection
+          @.emit 'commandTimeout', @.command, @._buffer, @._stream, @.connection
       , @idleTime)
     else if @command.length < 1 and not @standardPrompt.test(@_buffer)
       @.emit 'commandProcessing' , @command, @_buffer, @sshObj, @_stream
@@ -50,21 +51,19 @@ class SSH2Shell extends Stream
       
       #remove test coloring from responses like [32m[31m
       unless @.sshObj.disableColorFilter
-        @emit 'msg', "#{@sshObj.server.host}: text formatting filter: "+@sshObj.textColorFilter+", filtered: "+@textColorFilter.test(@_buffer) if @sshObj.verbose and @sshObj.debug
         @_buffer = @_buffer.replace(@textColorFilter, "")
 
       #remove non-standard ascii from terminal responses
       unless @.sshObj.disableASCIIFilter
-        @emit 'msg', "#{@sshObj.server.host}: Non-standard ASCII filtered: "+@asciiFilter.test(@_buffer) if @sshObj.verbose and @sshObj.debug
         @_buffer = @_buffer.replace(@asciiFilter, "")
 
       switch (true)
         #check if sudo password is needed
         when @command.length > 0 and @command.indexOf("sudo ") isnt -1
-          @emit 'msg', "#{@sshObj.server.host}: Sudo command data" if @sshObj.debug          
+          @emit 'msg', "#{@sshObj.server.host}: Sudo command data" if @sshObj.debug
           @_processPasswordPrompt()
         #check if ssh authentication needs to be handled
-        when @command.length > 0 and @command.indexOf("ssh ") isnt -1
+        when @sshObj.sshToNextHost and @command.length > 0 and @command.indexOf("ssh ") is 0
           @emit 'msg', "#{@sshObj.server.host}: SSH command data" if @sshObj.debug 
           @_processSSHPrompt()
         #check for standard prompt from a command
@@ -80,7 +79,7 @@ class SSH2Shell extends Stream
         else
           @emit 'msg', "Data processing: data received timeout" if @sshObj.debug
           @idleTimer = setTimeout( =>
-              @.emit 'commandTimeout', @.command, @._buffer, @._stream, @._connection
+              @.emit 'commandTimeout', @.command, @._buffer, @._stream, @.connection
           , @idleTime)
     , @dataIdleTime)
 
@@ -88,45 +87,52 @@ class SSH2Shell extends Stream
     return @_buffer.replace(@command.substr(0, @_buffer.length), "")
 
   _processPasswordPrompt: =>
-    #First test for password prompt
+    #First test for password prompt    
     response = @_sanitizeResponse().trim()
     passwordPrompt =  @passwordPrompt.test(response)
     standardPrompt = @standardPrompt.test(response)
-    @.emit 'msg', "#{@sshObj.server.host}: Password previously sent: #{@sshObj.pwSent}" if @sshObj.verbose 
-    @.emit 'msg', "#{@sshObj.server.host}: Password prompt: Password previously sent: #{@sshObj.pwSent}" if @sshObj.debug
-    @.emit 'msg', "#{@sshObj.server.host}: Response: #{response}" if @sshObj.verbose
-    @.emit 'msg', "#{@sshObj.server.host}: Sudo Password Prompt: #{passwordPrompt}" if @sshObj.verbose
-    @.emit 'msg', "#{@sshObj.server.host}: Sudo Password: #{@sshObj.server.password}" if @sshObj.verbose
-    #normal prompt so continue with next command
-    if standardPrompt
-      @.emit 'msg', "#{@sshObj.server.host}: Password prompt: Standard prompt detected" if @sshObj.debug
-      @_commandComplete()
-      @sshObj.pwSent = true
-    #Password prompt detection
-    else unless @sshObj.pwSent
-      if passwordPrompt
-        @.emit 'msg', "#{@sshObj.server.host}: Password prompt: Buffer: #{response}" if @sshObj.verbose
-        @.emit 'msg', "#{@sshObj.server.host}: Password prompt: Send password " if @sshObj.debug
-        @.emit 'msg', "#{@sshObj.server.host}: Sent password: #{@sshObj.server.password}" if @sshObj.verbose
+    @.emit 'msg', "#{@sshObj.server.host}: Sudo Password prompt detected: #{passwordPrompt}" if @sshObj.debug
+    @.emit 'msg', "#{@sshObj.server.host}: Sudo Password prompt: Password sent: #{@sshObj.pwSent}" if @sshObj.debug
+    @.emit 'msg', "#{@sshObj.server.host}: Sudo Password: #{@sshObj.server.password}" if @sshObj.debug
+    @.emit 'msg', "#{@sshObj.server.host}: Sudo Response: #{response}" if @sshObj.verbose
+        
+    #Prompt detection
+    #no password
+    switch (true)    
+      when passwordPrompt and not @sshObj.server.password
+        @.emit 'msg', "#{@sshObj.server.host}: Sudo password prompt no password set" if @sshObj.debug
+        @_resetFromSudoError()
+      when passwordPrompt and not @sshObj.pwSent
+        @.emit 'msg', "#{@sshObj.server.host}: Sudo password prompt: Buffer: #{response}" if @sshObj.verbose
+        @.emit 'msg', "#{@sshObj.server.host}: Sudo password prompt: Send password " if @sshObj.debug
+        @.emit 'msg', "#{@sshObj.server.host}: Sudo sent password: #{@sshObj.server.password}" if @sshObj.verbose
         #send password
         @sshObj.pwSent = true
         @_runCommand("#{@sshObj.server.password}")
-      else
-        @.emit 'msg', "#{@sshObj.server.host}: Password prompt: not detected" if @sshObj.debug
-        @.emit 'msg', "#{@sshObj.server.host}: Password prompt #{@sshObj.passwordPrompt}" if @sshObj.verbose        
-        @_runExit()
-    #password sent so either check for failure or run next command
-    else if passwordPrompt
+      when passwordPrompt and @sshObj.pwSent
         @.emit 'msg', "#{@sshObj.server.host}: Sudo password faied: response: #{response}" if @sshObj.verbose
-        @.emit 'error', "#{@sshObj.server.host}: Sudo password was incorrect for #{@sshObj.server.userName}", "Sudo authentication" if @sshObj.debug
-        @.emit 'msg', "#{@sshObj.server.host}: Failed password prompt: Password: [#{@sshObj.server.password}]" if @sshObj.debug
+        @.emit 'error', "#{@sshObj.server.host}: Sudo password was incorrect for #{@sshObj.server.userName}, Sudo authentication" if @sshObj.debug
+        @.emit 'msg', "#{@sshObj.server.host}: Sudo failed password prompt: Password: [#{@sshObj.server.password}]" if @sshObj.debug
+        @sshObj.pwSent = false
         #add buffer to sessionText so the sudo response can be seen
-        @sshObj.sessionText += "#{@_buffer}"
-        @_buffer = ""
-        #@sshObj.commands = []
-        @command = ""
-        @_stream.write '\x03'
-      
+        @_resetFromSudoError()
+      when standardPrompt
+        @.emit 'msg', "#{@sshObj.server.host}: Sudo password accepted" if @sshObj.debug
+        @sshObj.pwSent = false
+        @.emit 'msg', "#{@sshObj.server.host}: Sudo Standard Response: #{response}" if @sshObj.verbose
+        @_commandComplete()
+      else
+        @idleTimer = setTimeout( =>
+              @.emit 'commandTimeout', @.command, response, @._stream, @._connection
+          , @idleTime)
+
+  _resetFromSudoError: =>
+    @sshObj.pwSent = false
+    @sshObj.sessionText += "#{@_buffer}"
+    @_buffer = ""
+    @command = ""
+    #cancal command on host
+    @_stream.write '\x03'
 
   _processSSHPrompt: =>
     #not authenticated yet so detect prompts
@@ -156,25 +162,30 @@ class SSH2Shell extends Stream
         @_runCommand("#{@sshObj.server.passPhrase}")
       #normal prompt so continue with next command
       else if standardPrompt
-        @.emit 'msg', "#{@sshObj.server.host}: SSH: standard prompt: connection failed" if @sshObj.debug
+        @.emit 'msg', "#{@sshObj.server.host}: SSH standard prompt: connection failed" if @sshObj.debug
         @.emit 'msg', "#{@sshObj.server.host}: SSH connection failed" 
         @.emit 'msg', "#{@sshObj.server.host}: SSH failed response: #{response}"
         @sshObj.sessionText += "#{@sshObj.server.host}: SSH failed: response: #{response}"
         @_runExit()
       else
-        @.emit 'msg', "#{@sshObj.server.host}: SSH: no prompt was not detected"
-        @.emit 'msg', "#{@sshObj.server.host}: Password prompt #{@sshObj.passwordPrompt}" if @sshObj.verbose and not @sshObj.server.hasOwnProperty("passPhrase")        
-        @.emit 'msg', "#{@sshObj.server.host}: Passphrase prompt #{@sshObj.passphrasePrompt}" if @sshObj.verbose and @sshObj.server.hasOwnProperty("passPhrase")
-        @.emit 'msg', "#{@sshObj.server.host}: Standard prompt #{@sshObj.standardPrompt}" if @sshObj.verbose
+        @.emit 'msg', "#{@sshObj.server.host}: SSH no prompt was not detected"
+        @.emit 'msg', "#{@sshObj.server.host}: SSH response: #{response}" if @sshObj.verbose
+        @.emit 'msg', "#{@sshObj.server.host}: SSH password prompt: #{@sshObj.passwordPrompt}" if @sshObj.verbose and not @sshObj.server.hasOwnProperty("password")        
+        @.emit 'msg', "#{@sshObj.server.host}: SSH passphrase prompt: #{@sshObj.passphrasePrompt}" if @sshObj.verbose and @sshObj.server.hasOwnProperty("passPhrase")
+        @.emit 'msg', "#{@sshObj.server.host}: SSH standard prompt: #{@sshObj.standardPrompt}" if @sshObj.verbose
         @_runExit()        
     else
       @.emit 'msg', "#{@sshObj.server.host}: SSH post authentication prompt detection" if @sshObj.debug
-      #normal prompt after authentication, start running commands.
+      #@sshObj.sshToNextHost = false
+      
       if standardPrompt
-        @.emit 'msg', "#{@sshObj.server.host}: SSH complete: normal prompt" if @sshObj.debug        
+        @.emit 'msg', "#{@sshObj.server.host}: SSH complete: normal prompt" if @sshObj.debug
+        @sshObj.sessionText += "\n #{response}" if @sshObj.showBanner
         @sshObj.exitCommands.push "exit"
         @.emit 'msg', "#{@sshObj.connectedMessage}"
         @.emit 'msg', "#{@sshObj.readyMessage}"
+        @.emit 'msg', "#{@sshObj.server.host}: SSH complete: next command" if @sshObj.debug
+        @sshObj.sshToNextHost = false
         @_nextCommand()
       #Password or passphase detected a second time after authentication indicating failure.
       else if (passwordPrompt or passphrasePrompt)
@@ -183,14 +194,14 @@ class SSH2Shell extends Stream
         @.emit 'msg', "#{@sshObj.server.host}: SSH: failed response: #{response}" if @sshObj.verbose
         @sshObj.sshAuth = false
         using = switch
-          when passwordPrompt then "password: #{@sshObj.server.password}"
-          when passphrasePrompt then "passphrase: #{@sshObj.server.passPhrase}"
+          when passwordPrompt then "SSH password: #{@sshObj.server.password}"
+          when passphrasePrompt then "SSH passphrase: #{@sshObj.server.passPhrase}"
         @.emit 'error', "#{@sshObj.server.host}: SSH authentication failed for #{@sshObj.server.userName}@#{@sshObj.server.host}", "Nested host authentication"
         @.emit 'msg', "#{@sshObj.server.host}: SSH auth failed: Using " + using if @sshObj.debug
         
         #no connection so drop back to first host settings if there was one
         #@sshObj.sessionText += "#{@_buffer}"
-        @.emit 'msg', "#{@sshObj.server.host}: SSH resonse: #{response}" if @sshObj.verbose
+        @.emit 'msg', "#{@sshObj.server.host}: SSH response: #{response}" if @sshObj.verbose
         if @_connections.length > 0
           return @_previousHost()
           
@@ -218,18 +229,13 @@ class SSH2Shell extends Stream
         @_checkCommand()
 
   _commandComplete: =>
-    response = @_buffer.trim() #replace(@command, "")
+    response = @_buffer.trim()
     #check sudo su has been authenticated and add an extra exit command
-
-    if @command isnt "" and @command isnt "exit" and @command.indexOf("ssh ") is -1
+    if @command isnt "" and @command isnt "exit" and @sshObj.sshToNextHost isnt true
       @.emit 'msg', "#{@sshObj.server.host}: Command complete:\nCommand:\n #{@command}\nResponse: #{response}" if @sshObj.verbose
       @sshObj.sessionText += response
       @.emit 'msg', "#{@sshObj.server.host}: Raising commandComplete event" if @sshObj.debug
       @.emit 'commandComplete', @command, @_buffer, @sshObj
-
-    #if @command.indexOf("exit") != -1
-    #  @_runExit()
-    #else
     @_nextCommand()
 
   _nextCommand: =>
@@ -263,10 +269,12 @@ class SSH2Shell extends Stream
     @.emit 'msg', "#{@sshObj.server.host}: Load previous host config" if @sshObj.debug
     @.emit 'end', "#{@sshObj.server.host}: \n#{@sshObj.sessionText}", @sshObj
     @.emit 'msg', "#{@sshObj.server.host}: Previous hosts: #{@_connections.length}" if @sshObj.debug
+    
     if @_connections.length > 0
       @sshObj = @_connections.pop()
       @.emit 'msg', "#{@sshObj.server.host}: Reload previous host" if @sshObj.debug
-      @_loadDefaults(@_runExit)
+      #@_loadDefaults(@_runExit)
+      @_runExit()
     else
       @_runExit()
       
@@ -275,31 +283,36 @@ class SSH2Shell extends Stream
     nextHost = @sshObj.hosts.shift()
     @.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()
+      
     @_connections.push(@sshObj) 
    
-    @sshObj = nextHost 
+    @sshObj = nextHost
+    
     @_initiate(@_sshConnect)
     
     
-  _nextPrimaryHost: ( callback )=>
+  _nextPrimaryHost: ( connect )=>
     
-    if typeIsArray(@hosts) and @hosts.length > 0
+    if @_hosts.length > 0
       if @sshObj.server 
         @.emit 'msg', "#{@sshObj.server.host}: Current primary host" if @sshObj.debug
-      
-      @sshObj = @hosts.shift()      
+        @.emit 'msg', "#{@sshObj.server.host}: Remove previous event handlers" if @sshObj.debug
+        @_removeEvents()
+      @sshObj = @_hosts.shift()      
       @_primaryhostSessionText = "#{@sshObj.server.host}: " 
       
       @.emit 'msg', "#{@sshObj.server.host}: Next primary host" if @sshObj.debug      
-        
-      @_initiate(callback)      
+      
+      @_initiate(connect)
     else
       @.emit 'msg', "#{@sshObj.server.host}: No more primary hosts" if @sshObj.debug
       @_runExit
       
     
   _sshConnect: =>
+    
     #add ssh commandline options from host.server.ssh
     sshFlags   = "-x"
     sshOptions = ""
@@ -321,6 +334,7 @@ class SSH2Shell extends Stream
     sshOptions += ' -o "StrictHostKeyChecking=no"'
     sshOptions += " -p #{@sshObj.server.port}"
     @sshObj.sshAuth = false
+    @sshObj.sshToNextHost = true
     @command = "ssh #{sshFlags} #{sshOptions} #{@sshObj.server.userName}@#{@sshObj.server.host}"
     @.emit 'msg', "#{@sshObj.server.host}: SSH command: connect" if @sshObj.debug
     @_runCommand(@command)
@@ -331,7 +345,8 @@ class SSH2Shell extends Stream
     if @sshObj.exitCommands and @sshObj.exitCommands.length > 0
       @.emit 'msg', "#{@sshObj.server.host}: Queued exit commands: #{@sshObj.exitCommands.length}" if @sshObj.debug
       @command = @sshObj.exitCommands.pop()
-      if @_connections and @_connections.length > 0      
+      if @_connections and @_connections.length > 0
+        @.emit 'msg', "#{@sshObj.server.host}: Primary host: #{@_connections[0].server.host}" if @sshObj.verbose
         @_connections[0].sessionText += "\n#{@sshObj.server.host}: #{@sshObj.sessionText}"
       @_runCommand(@command)
     #more hosts to connect to so process the next one
@@ -343,9 +358,7 @@ class SSH2Shell extends Stream
       @.emit 'msg', "#{@sshObj.server.host}: load previous host" if @sshObj.debug
       @.emit 'msg', "#{@sshObj.server.host}: #{@sshObj.closedMessage}"
       @_previousHost()
-    #else if typeIsArray(@hosts) and @hosts.length > 0
-      #@connection.end()
-    else if @command == "exit"
+    else if @command is "exit"
       @.emit 'msg', "#{@sshObj.server.host}: Manual exit command" if @sshObj.debug
       @_runCommand("exit")
       #Nothing more to do so end the stream with last exit
@@ -357,81 +370,92 @@ class SSH2Shell extends Stream
     @_stream.close() #"exit#{@sshObj.enter}"
 
   _removeEvents: =>
-    @.emit 'msg', "#{@sshObj.server.host}: Clearing host event handlers" if @sshObj.debug
-
-    @.removeAllListeners 'keyboard-interactive'
+    ###
+    if @sshObj.debug
+      @.emit 'msg', "#{@sshObj.server.host}: Event handler count:"
+      @.emit 'msg', "keyboard-interactive: " + (@.listenerCount 'keyboard-interactive')
+      @.emit 'msg', "error: " + (@.listenerCount "error")
+      @.emit 'msg', "data: " + (@.listenerCount "data")
+      @.emit 'msg', "stderrData: " + (@.listenerCount "stderrData")
+      @.emit 'msg', "end: " + (@.listenerCount 'end')
+      @.emit 'msg', "commandProcessing: " + (@.listenerCount 'commandProcessing')
+      @.emit 'msg', "commandComplete: " + (@.listenerCount 'commandComplete')
+      @.emit 'msg', "commandTimeout: " + (@.listenerCount 'commandTimeout')
+      @.emit 'msg', "msg: " + (@.listenerCount 'msg')    
+    ###
+    @.removeListener "data", @sshObj.onData if typeof @sshObj.onData == 'function'
     @.removeAllListeners "error"
-    @.removeListener "data", @sshObj.onData if typeof @sshObj.onData == 'function'    
     @.removeListener "stderrData", @sshObj.onStderrData if typeof @sshObj.onStderrData == 'function'
     @.removeAllListeners 'end'
+    @.removeAllListeners 'keyboard-interactive'
     @.removeAllListeners 'commandProcessing'
     @.removeAllListeners 'commandComplete'
     @.removeAllListeners 'commandTimeout'
     @.removeAllListeners 'msg'
-    
+  
     clearTimeout @idleTimer if @idleTimer
     clearTimeout @dataReceivedTimer if @dataReceivedTimer
     
-    
   constructor: (hosts) ->
-    if typeIsArray(hosts)
-      @hosts = hosts
+    super hosts
+    if typeIsArray(hosts) and hosts.length > 0
+      @_hosts = hosts
     else
-      @hosts = [hosts]
-    @ssh2Client = require('ssh2').Client  
+      @_hosts = [hosts]
+    @ssh2Client = require('ssh2').Client
+    
     @.on "newPrimmaryHost", @_nextPrimaryHost
-    @.on "data", (data) =>
-      #@.emit 'msg', "#{@sshObj.server.host}: data event: #{data}" if @sshObj.verbose
+    
+    @.on "data", (data) =>      
       @_onData( data )
+      
     @.on "stderrData", (data) =>
-      console.error data
-    
-    @_allSessions = ""
-    
-    
-  _initiate: (callback)=>
-    @_removeEvents()
-    
-    if typeof @sshObj.msg == 'function'
-      @.on "msg", @sshObj.msg.send 
-    else 
-      @.on "msg", ( message ) =>
-        console.log message 
-        
-    @_loadDefaults()
-    
-    @.emit 'msg', "#{@sshObj.server.host}: initiate" if @sshObj.debug
-    
-    #event handlers
-    @.on "keyboard-interactive", ( name, instructions, instructionsLang, prompts, finish ) =>
-      @.emit 'msg', "#{@sshObj.server.host}: Class.keyboard-interactive" if @sshObj.debug
-      if @sshObj.verbose
-        @.emit 'msg', "name: " + name
-        @.emit 'msg', "instructions: " + instructions
-        str = JSON.stringify(prompts, null, 4)
-        @.emit 'msg', "Prompts object: " + str
-
+      console.error data    
+     
     @.on "error", (err, type, close = false, callback) =>
-      @.emit 'msg', "#{@sshObj.server.host}: Class.error" if @sshObj.debug
+      @.emit 'msg', "Class.error: #{err}, #{type}" if @sshObj.debug
       if ( err instanceof Error )
         @.emit 'msg', "Error: " + err.message + ", Level: " + err.level
       else
         @.emit 'msg', "#{type} error: " + err
-      callback(err, type) if typeof callback == 'function'
-      @connection.end() if close
-     
-    @.on "end", ( sessionText, sshObj ) =>
-      @.emit 'msg', "#{@sshObj.server.host}: Class.end" if @sshObj.debug
       
-    if typeof callback == 'function'
-      callback()
+      @_stream.close() if close
+      
+    if @_hosts[0].server.tryKeyboard 
+      @.on "keyboard-interactive", ( name, instructions, instructionsLang, prompts, finish ) =>
+        @.emit 'msg', "#{@sshObj.server.host}: Class.keyboard-interactive" if @sshObj.debug
+        if @sshObj.verbose
+          @.emit 'msg', "name: " + name
+          @.emit 'msg', "instructions: " + instructions
+          str = JSON.stringify(prompts, null, 4)
+          @.emit 'msg', "Prompts object: " + str
+          
+    @_allSessions = ""
     
-  _loadDefaults: (callback) =>
     
-            
+  _initiate: (action)=>
+    @.emit 'msg', "#{@sshObj.server.host}: initiate" if @sshObj.debug
+        
+    @_loadDefaults()
+    #event handlers
+          
+    if typeof action == 'function'
+      action()
+      
+  _loadDefaults: () =>
+    
+    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'
+      @.on "msg", @sshObj.msg
+    else
+      @.on "msg", ( message ) =>
+        console.log message
+        
     @.emit 'msg', "#{@sshObj.server.host}: Load Defaults" if @sshObj.debug
     @command = ""
     @_buffer = ""
+    @sshObj.sshToNextHost = false
     @sshObj.connectedMessage  = "Connected" unless @sshObj.connectedMessage
     @sshObj.readyMessage      = "Ready" unless @sshObj.readyMessage
     @sshObj.closedMessage     = "Closed" unless @sshObj.closedMessage
@@ -466,7 +490,7 @@ class SSH2Shell extends Stream
     @passwordPrompt            = new RegExp(@sshObj.passPromptText+".*" + @sshObj.passwordPrompt + "\\s?$","i") unless @passwordPrompt
     @passphrasePrompt          = new RegExp(@sshObj.passPromptText+".*" + @sshObj.passphrasePrompt + "\\s?$","i") unless @passphrasePrompt
     @standardPrompt           = new RegExp("[" + @sshObj.standardPrompt + "]\\s?$") unless @standardPrompt
-    #@_callback                = @sshObj.callback if @sshObj.callback
+    
 
     @sshObj.onCommandProcessing  = @sshObj.onCommandProcessing ? ( command, response, sshObj, stream ) =>
 
@@ -477,10 +501,9 @@ class SSH2Shell extends Stream
       response = response.replace(@command, "")
       @.emit 'msg', "#{@sshObj.server.host}: Class.commandTimeout" if @sshObj.debug
       @.emit 'msg', "#{@sshObj.server.host}: Timeout command: #{command} response: #{response}" if @sshObj.verbose
-      @_runExit()
+      
       @.emit "error", "#{@sshObj.server.host}: Command timed out after #{@.idleTime/1000} seconds", "Timeout", true, (err, type)=>
-        @sshObj.sessionText += @_buffer
-  
+      @sshObj.sessionText += @_buffer
       
     @.on "keyboard-interactive",  @sshObj.onKeyboardInteractive if typeof @sshObj.onKeyboardInteractive == 'function'  
     @.on "error", @sshObj.onError if typeof @sshObj.onError == 'function'
@@ -494,8 +517,7 @@ class SSH2Shell extends Stream
     @.emit 'msg', "#{@sshObj.server.host}: Host loaded" if @sshObj.verbose
     @.emit 'msg', @sshObj if @sshObj.verbose
     
-    if typeof callback == 'function'
-      callback() 
+    
     
   connect: (callback)=>
     @_callback = callback if typeof callback == 'function'
@@ -547,10 +569,8 @@ class SSH2Shell extends Stream
           
           @_primaryhostSessionText += @sshObj.sessionText+"\n"
           @_allSessions += @_primaryhostSessionText
-          
-          if typeIsArray(@hosts) and @hosts.length == 0
-            @.emit 'end', @_allSessions, @sshObj            
-            
+          if @_hosts.length == 0
+            @.emit 'end', @_allSessions, @sshObj          
           @_removeEvents() 
 
           
@@ -565,11 +585,14 @@ class SSH2Shell extends Stream
 
     @connection.on "close", (had_error) =>
       @.emit 'msg', "#{@sshObj.server.host}: Connection.close" if @sshObj.debug
+      clearTimeout @idleTimer if @idleTimer
+      clearTimeout @dataReceivedTimer if @dataReceivedTimer
       if had_error
         @.emit "error", had_error, "Connection close"
       else
         @.emit 'msg', @sshObj.closedMessage
-      if typeIsArray(@hosts) and @hosts.length == 0  
+      
+      if @_hosts.length == 0
         if typeof @_callback == 'function'
           @_callback @_allSessions
       else      

package/test/Multiple primary hosts.js

@@ -19,15 +19,13 @@ var conParamsHost1 = {
   userName:     process.env.SERVER3_USER_NAME,
   password:     process.env.SERVER3_PASSWORD
  },
- debug = false,
+ debug = true,
  verbose = false
 
 //Host objects:
 var host1 = {
   server:       conParamsHost1,
-  commands:     [
-    "echo Host_1"
-  ],
+  commands:     ["echo Host_1"],
   connectedMessage: "Connected to host1",
   debug: debug,
   verbose: verbose
@@ -35,18 +33,14 @@ var host1 = {
 
 host2 = {
   server:       conParamsHost2,
-  commands:     [
-    "echo Host_2"
-  ],
+  commands:     ["echo Host_2"],
   debug: debug,
   verbose: verbose
 },
 
 host3 = {
   server:       conParamsHost3,
-  commands:     [
-    "echo Host_3"
-  ],
+  commands:     ["echo Host_3"],
   debug: debug,
   verbose: verbose
 }

package/test/devtest.js

@@ -1,6 +1,6 @@
 var dotenv = require('dotenv').config()
 
-var sshObj = {
+var host = {
   server:             {     
     host:         process.env.HOST,
     port:         process.env.PORT,
@@ -42,8 +42,10 @@ var sshObj = {
 var SSH2Shell = require ('../lib/ssh2shell');
 
 //run the commands in the shell session
-var SSH = new SSH2Shell(sshObj);
+var SSH = new SSH2Shell(host);
+
 SSH.on('end', function( sessionText, sshObj ){
-      this.emit('msg', sessionText);
+      this.emit('msg', "Session Text " + sessionText);
   })
+  
 SSH.connect();

package/test/issue69.js

@@ -1,14 +1,14 @@
 var dotenv = require('dotenv').config(),
-debug = false,
-verbose = false
+debug = true,
+verbose = true
 
 var host1 = {
-server: {
-		host:         process.env.HOST,
-		port:         process.env.PORT,
-		userName:     process.env.USER_NAME,
-		password:     process.env.PASSWORD
-	},
+    server: {
+            host:         process.env.HOST,
+            port:         process.env.PORT,
+            userName:     process.env.USER_NAME,
+            password:     process.env.PASSWORD
+        },
 	connectedMessage:'connected to host1',
   debug: debug,
   verbose: verbose
@@ -16,26 +16,26 @@ server: {
 };
 
 var host2 = {
-server: {
-	  host:         process.env.SERVER2_HOST,
-	  port:         process.env.PORT,
-	  userName:     process.env.SERVER2_USER_NAME,
-	  password:     process.env.SERVER2_PASSWORD
-	 
-	},
+    server: {
+          host:         process.env.SERVER2_HOST,
+          port:         process.env.PORT,
+          userName:     process.env.SERVER2_USER_NAME,
+          password:     process.env.SERVER2_PASSWORD
+         
+        },
 	connectedMessage: 'connected to host2',
   debug: debug,
   verbose: verbose
 };
 
 var host3 = {
-server: {
-	  host:         process.env.SERVER3_HOST,
-	  port:         process.env.PORT,
-	  userName:     process.env.SERVER3_USER_NAME,
-	  password:     process.env.SERVER3_PASSWORD
-	 
-	},
+    server: {
+          host:         process.env.SERVER3_HOST,
+          port:         process.env.PORT,
+          userName:     process.env.SERVER3_USER_NAME,
+          password:     process.env.SERVER3_PASSWORD
+         
+        },
 	commands: ['echo server3'],
 	connectedMessage:'connected to host3',
   debug: debug,
@@ -47,11 +47,11 @@ host1.hosts = [host2];
 
 var SSH2Shell = require ('../lib/ssh2shell'),
 
-_SSH = new SSH2Shell(host1);
+SSH = new SSH2Shell(host1);
 
 var callback = function( sessionText ){
           console.log ( "-----Callback session text:\n" + sessionText);
           console.log ( "-----Callback end" );
       }
 
-_SSH.connect(callback);
+SSH.connect(callback);