Merge 9d9dfde into 25cddf6

lib/nats.js

@@ -23,7 +23,7 @@ var net    = require('net'),
  * Constants
  */
 
-var VERSION = '0.7.18',
+var VERSION = '0.7.20',
 
     DEFAULT_PORT = 4222,
     DEFAULT_PRE  = 'nats://localhost:',
@@ -91,6 +91,9 @@ var VERSION = '0.7.18',
     NATS_PROTOCOL_ERR = 'NATS_PROTOCOL_ERR',
     REQ_TIMEOUT = 'REQ_TIMEOUT',
     REQ_TIMEOUT_MSG_PREFIX = 'The request timed out for subscription id: ',
+    STALE_CONNECTION_ERR = "stale connection",
+    PERMISSIONS_ERR = "permissions violation",
+    AUTHORIZATION_TIMEOUT_ERR = "authorization timeout",
 
     // Pedantic Mode support
     //Q_SUB = /^([^\.\*>\s]+|>$|\*)(\.([^\.\*>\s]+|>$|\*))*$/, // TODO: remove / never used
@@ -415,7 +418,7 @@ Client.prototype.setupHandlers = function() {
   });
 
   stream.on('close', function(hadError) {
-    client.closeStream();
+      client.closeStream();
     client.emit('disconnect');
     if (client.closed === true ||
         client.options.reconnect === false ||
@@ -427,7 +430,7 @@ Client.prototype.setupHandlers = function() {
   });
 
   stream.on('error', function(exception) {
-    // If we were connected just return, close event will process
+      // If we were connected just return, close event will process
     if (client.wasConnected === true && client.currentServer.didConnect === true) {
       return;
     }
@@ -552,8 +555,14 @@ Client.prototype.createConnection = function() {
 
   // Select a server to connect to.
   this.selectServer();
-  // Create the stream.
-  this.stream = net.createConnection(this.url.port, this.url.hostname);
+    // See #45 if we have a stream release the listeners
+  // otherwise in addition to the leak events will fire fire
+  if(this.stream) {
+      this.stream.removeAllListeners();
+      this.stream.end();
+  }
+    // Create the stream
+    this.stream = net.createConnection(this.url.port, this.url.hostname);
   // Setup the proper handlers.
   this.setupHandlers();
 };
@@ -603,7 +612,7 @@ Client.prototype.closeStream = function() {
   if (this.stream !== null) {
     this.stream.end();
     this.stream.destroy();
-    this.stream  = null;
+    this.stream = null;
   }
   if (this.connected === true || this.closed === true) {
     this.pongs     = null;
@@ -756,6 +765,11 @@ Client.prototype.processInbound = function() {
   // For optional yield
   var start;
 
+  if(! client.stream) {
+      // if we are here, the stream was reaped and errors raised
+      // if we continue.
+      return;
+  }
   // unpause if needed.
   // FIXME(dlc) client.stream.isPaused() causes 0.10 to fail
   client.stream.resume();
@@ -785,7 +799,8 @@ Client.prototype.processInbound = function() {
       } else if ((m = OK.exec(buf)) !== null) {
         // Ignore for now..
       } else if ((m = ERR.exec(buf)) !== null) {
-        client.emit('error', new NatsError(m[1], NATS_PROTOCOL_ERR));
+          client.processErr(m[1]);
+          return;
       } else if ((m = PONG.exec(buf)) !== null) {
         var cb = client.pongs && client.pongs.shift();
         if (cb) { cb(); } // FIXME: Should we check for exceptions?
@@ -835,6 +850,11 @@ Client.prototype.processInbound = function() {
 		tlsOpts[key] = client.options.tls[key];
 	      }
 	    }
+	    // if we have a stream, this is from an old connection, reap it
+	    if(client.stream) {
+            client.stream.removeAllListeners();
+            client.stream.end();
+        }
 	    client.stream = tls.connect(tlsOpts, function() {
 	      client.flushPending();
 	    });
@@ -986,6 +1006,25 @@ Client.prototype.processMsg = function() {
   }
 };
 
+/**
+ * ProcessErr processes any error messages from the server
+ *
+ * @api private
+ */
+Client.prototype.processErr = function(s) {
+    // current NATS clients, will raise an error and close on any errors
+    // except stale connection and permission errors
+    var m = s ? s.toLowerCase() : '';
+    if(m.indexOf(STALE_CONNECTION_ERR) !== -1) {
+      this.scheduleReconnect();
+    } else if(m.indexOf(PERMISSIONS_ERR) !== -1) {
+      this.emit('permission_error', new NatsError(s, NATS_PROTOCOL_ERR));
+    } else {
+      this.emit('error', new NatsError(s, NATS_PROTOCOL_ERR));
+      this.closeStream();
+    }
+};
+
 /**
  * Push a new cluster server.
  *

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nats",
-  "version": "0.7.18",
+  "version": "0.7.20",
   "description": "Node.js client for NATS, a lightweight, high-performance cloud native messaging system",
   "keywords": [
     "nats",