Updates

lib/stream.js

@@ -34,7 +34,6 @@ var CONNECTED    = 'connected';
 
 
 var CLOSE_NORMAL  = 1000;
-var CLOSE_BAD_KEY = 4403;
 var CLOSE_TIMEOUT = 1011;
 
 
@@ -196,9 +195,11 @@ Stream.prototype.opened = function () {
     delete this.retry.timeout;
   }
 
-  if (!this.subscriptions.empty) {
-    this.subscribe(this.subscriptions.all.slice());
-  }
+  // The resubscribe is broken, so just disable it
+  // by clearing the previous subscriptions on each reconnect.
+  // if (!this.subscriptions.empty) {
+  //   this.subscribe(this.subscriptions.all.slice());
+  // }
 
   this.subscriptions.clear();
 
@@ -222,19 +223,15 @@ Stream.prototype.closed = function (code, message) {
 
   assert(this.socket.readyState === WS.CLOSED);
 
-  if (code === CLOSE_NORMAL || code === CLOSE_BAD_KEY) {
-    debug('websocket closed');
+  debug('websocket closed unexpectedly, retry in %dms', this.retry.delay);
 
-  } else {
-    debug('websocket closed unexpectedly, retry in %dms', this.retry.delay);
+  if (this.retry.timeout) {
+    clearTimeout(this.retry.timeout);
+    delete this.retry.timeout;
+  }
 
-    if (this.retry.timeout) {
-      clearTimeout(this.retry.timeout);
-      delete this.retry.timeout;
-    }
+  this.retry.timeout = setTimeout(this.open, this.retry.delay);
 
-    this.retry.timeout = setTimeout(this.open, this.retry.delay);
-  }
 
   if (this.idle.timeout) {
     clearTimeout(this.idle.timeout);
@@ -464,6 +461,7 @@ Stream.prototype.error = function (error) {
 
   debug(error.message);
   this.emit('error', error);
+  this.socket.close();
 
   return this;
 };