ssh2shell 1.9.9 → 1.9.10

package/README.md

@@ -139,8 +139,7 @@ host = {
   commands:           ["cd /var/logs", "ls -al", "msg:Listed dir", "cd /home/user"],
   
   //Optional: Used by this.emit("msg", "my message") to output a message
-  msg:                {
-    send: function( message ) {
+  msg:                function( message ) {
       console.log(message);
     }
   }, 

package/lib/ssh2shell.js

@@ -609,8 +609,10 @@
 
     SSH2Shell.prototype._initiate = function(callback) {
       this._removeEvents();
-      if (typeof this.sshObj.msg === 'function') {
+      if (this.sshObj.msg && this.sshObj.msg.send && typeof this.sshObj.msg.send === 'function') {
         this.on("msg", this.sshObj.msg.send);
+      } else if (typeof this.sshObj.msg === 'function') {
+        this.on("msg", this.sshObj.msg);
       } else {
         this.on("msg", (function(_this) {
           return function(message) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ssh2shell",
-  "version": "1.9.9",
+  "version": "1.9.10",
   "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/src/ssh2shell.coffee

@@ -398,9 +398,11 @@ class SSH2Shell extends Stream
   _initiate: (callback)=>
     @_removeEvents()
     
-    if typeof @sshObj.msg == 'function'
-      @.on "msg", @sshObj.msg.send 
-    else 
+    if @sshObj.msg and @sshObj.msg.send and typeof @sshObj.msg.send == 'function'
+      @.on "msg", @sshObj.msg.send
+    else if typeof @sshObj.msg == 'function'
+      @.on "msg", @sshObj.msg
+    else
       @.on "msg", ( message ) =>
         console.log message 
         

package/test/notificationstest.js

@@ -1,6 +1,6 @@
 var dotenv = require('dotenv').config()
 
-var sshObj = {
+var sshObj1 = {
   server:             {     
     host:         process.env.HOST,
     port:         process.env.PORT,
@@ -8,7 +8,7 @@ var sshObj = {
     password:     process.env.PASSWORD
   },
   commands: [
-    "ls -l",
+    "msg: using msg.send",
     "`All done!`",
   ],
   msg: {
@@ -17,17 +17,43 @@ var sshObj = {
     }
   },
   verbose: false,
-  debug: false,
-  onEnd: function( sessionText, sshObj ){
-     //show the full session output. This could be emailed or saved to a log file.
-    this.emit("msg", "\nThis is the full session response:\n\n" + sessionText);
-  }
+  debug: false
 };
 
+var callback = function( sessionText, sshObj ){
+       
+    }
+  
 //until npm published use the cloned dir path.
 var SSH2Shell = require ('../lib/ssh2shell');
 
 //run the commands in the shell session
-var SSH = new SSH2Shell(sshObj);
+var SSH = new SSH2Shell(sshObj1);
 
-SSH.connect();
+var callback = function( sessionText, sshObj ){
+          
+     //show the full session output. This could be emailed or saved to a log file.
+    this.emit("msg", "\nThis is the full session response: 2\n\n" + sessionText);
+    sshObj1.msg = function( message ) {
+      console.log(message);
+    }
+    sshObj1.commands = [
+        "msg: using msg",
+        "`All done!`",
+      ]
+    var SSH = new SSH2Shell(sshObj1);
+    var callback = function( sessionText, sshObj ){
+         //show the full session output. This could be emailed or saved to a log file.
+        this.emit("msg", "\nThis is the full session response: 3\n\n" + sessionText);
+        sshObj1.msg = undefined
+        sshObj1.commands = [
+            "msg: using default msg",
+            "`All done!`",
+          ]
+        var SSH = new SSH2Shell(sshObj1);
+        SSH.connect();
+      }
+    SSH.connect(callback);
+  }
+  
+SSH.connect(callback);