changed regexing around

.gitignore

@@ -3,3 +3,5 @@ lib-cov/
 *.log
 *.swp
 *.swo
+*.iml
+.idea/

lib/telnet-client.js

@@ -21,14 +21,59 @@ Telnet.prototype.connect = function(opts) {
   var host = (typeof opts.host !== 'undefined' ? opts.host : '127.0.0.1');
   var port = (typeof opts.port !== 'undefined' ? opts.port : 23);
   this.timeout = (typeof opts.timeout !== 'undefined' ? opts.timeout : 500);
-  this.shellPrompt = (typeof opts.shellPrompt !== 'undefined'
-    ? opts.shellPrompt : /(?:\/ )?#\s/);
-  this.loginPrompt = (typeof opts.loginPrompt !== 'undefined'
-    ? opts.loginPrompt : /login[: ]*$/i);
-  this.passwordPrompt = (typeof opts.passwordPrompt !== 'undefined'
-    ? opts.passwordPrompt : /Password: /i);
-  this.failedLoginPrompt = (typeof opts.failedLoginPrompt !== 'undefined'
-    ? opts.failedLoginPrompt : undefined);
+
+  // Set prompt regex defaults
+  this.shellPrompt = /(?:\/ )?#\s/;
+  this.loginPrompt = /login[: ]*$/i;
+  this.passwordPrompt = /Password: /i;
+  this.failedLoginPrompt = undefined;
+
+
+  if (opts.shellPrompt){
+    if (opts.shellPrompt instanceof RegExp) {
+      // if they sent a regex obj, use it
+      self.shellPrompt = opts.shellPrompt;
+    } else {
+      // otherwise, convert their string to the equivalent regex
+      self.shellPrompt = new RegExp(regexEscape(opts.shellPrompt));
+    }
+  }
+  if (opts.loginPrompt){
+    if (opts.loginPrompt instanceof RegExp) {
+      // if they sent a regex obj, use it
+      self.loginPrompt = opts.loginPrompt;
+    } else {
+      // otherwise, convert their string to the equivalent regex
+      self.loginPrompt = new RegExp(regexEscape(opts.loginPrompt));
+    }
+  }
+  if (opts.passwordPrompt){
+    if (opts.passwordPrompt instanceof RegExp) {
+      // if they sent a regex obj, use it
+      self.passwordPrompt = opts.passwordPrompt;
+    } else {
+      // otherwise, convert their string to the equivalent regex
+      self.passwordPrompt = new RegExp(regexEscape(opts.passwordPrompt));
+    }
+  }
+  if (opts.failedLoginPrompt){
+    if (opts.failedLoginPrompt instanceof RegExp) {
+      // if they sent a regex obj, use it
+      self.failedLoginPrompt = opts.failedLoginPrompt;
+    } else {
+      // otherwise, convert their string to the equivalent regex
+      self.failedLoginPrompt = new RegExp(regexEscape(opts.failedLoginPrompt));
+    }
+  }
+
+  //this.shellPrompt = (typeof opts.shellPrompt !== 'undefined'
+  //  ? opts.shellPrompt : /(?:\/ )?#\s/);
+  //this.loginPrompt = (typeof opts.loginPrompt !== 'undefined'
+  //  ? opts.loginPrompt : /login[: ]*$/i);
+  //this.passwordPrompt = (typeof opts.passwordPrompt !== 'undefined'
+  //  ? opts.passwordPrompt : /Password: /i);
+  //this.failedLoginPrompt = (typeof opts.failedLoginPrompt !== 'undefined'
+  //  ? opts.failedLoginPrompt : undefined);
   this.username = (typeof opts.username !== 'undefined' ? opts.username : 'root');
   this.password = (typeof opts.password !== 'undefined' ? opts.password : 'guest');
   this.irs = (typeof opts.irs !== 'undefined' ? opts.irs : '\r\n');
@@ -99,6 +144,7 @@ Telnet.prototype.exec = function(cmd, opts, callback) {
         if (callback && self.cmdOutput !== 'undefined') {
           callback(self.cmdOutput.join('\n'));
         }
+        // FIXME: should this be callback()?
         else if (callback && self.cmdOutput === 'undefined') callback;
 
         // reset stored response
@@ -117,6 +163,7 @@ Telnet.prototype.destroy = function() {
 }
 
 function parseData(chunk, telnetObj) {
+  //console.log('chunk', chunk.toString())
   var promptIndex = '';
 
   if (chunk[0] === 255 && chunk[1] !== 255) {
@@ -133,19 +180,20 @@ function parseData(chunk, telnetObj) {
 
   if (telnetObj.telnetState === 'getprompt') {
     var stringData = chunk.toString();
-    var promptIndex = stringData.search(regexEscape(telnetObj.shellPrompt));
+    var promptIndex = stringData.search(telnetObj.shellPrompt);
 
     if (promptIndex !== -1) {
-      telnetObj.shellPrompt = stringData.substring(promptIndex);
+      //telnetObj.shellPrompt = stringData.substring(promptIndex);
       telnetObj.telnetState = 'sendcmd';
       telnetObj.stringData = '';
-      telnetObj.emit('ready', telnetObj.shellPrompt);
+      //telnetObj.emit('ready', telnetObj.shellPrompt);
+      telnetObj.emit('ready', stringData.substring(promptIndex));
     }
-    else if (stringData.search(regexEscape(telnetObj.loginPrompt)) !== -1) {
+    else if (stringData.search(telnetObj.loginPrompt) !== -1) {
       telnetObj.telnetState = 'login';
       login(telnetObj, 'username');
     }
-    else if (stringData.search(regexEscape(telnetObj.passwordPrompt)) !== -1) {
+    else if (stringData.search(telnetObj.passwordPrompt) !== -1) {
       telnetObj.telnetState = 'login';
       login(telnetObj, 'password');
     }
@@ -159,7 +207,7 @@ function parseData(chunk, telnetObj) {
   else if (telnetObj.telnetState === 'response') {
     var stringData = chunk.toString();
     telnetObj.stringData += stringData;
-    promptIndex = stringData.search(regexEscape(telnetObj.shellPrompt));
+    promptIndex = stringData.search(telnetObj.shellPrompt);
 
     if (promptIndex === -1 && stringData.length !== 0) {
       if (stringData.search(regexEscape(telnetObj.pageSeparator)) !== -1) {