Allow socket to be reactivated cleanly if it was previously destroyed

Author: jondubois

lib/scsocket.js

@@ -138,18 +138,16 @@ var SCSocket = function (opts) {
     this.options.query = querystring.parse(this.options.query);
   }
 
-  if (this.options.autoConnect) {
-    this.connect();
-  }
-
   this._channelEmitter = new Emitter();
 
-  if (isBrowser && this.disconnectOnUnload && global.addEventListener) {
-    this._unloadHandler = function () {
-      self.disconnect();
-    };
+  this._unloadHandler = function () {
+    self.disconnect();
+  };
 
-    global.addEventListener('beforeunload', this._unloadHandler, false);
+  if (this.options.autoConnect) {
+    this.connect();
+  } else {
+    this.activate();
   }
 };
 
@@ -256,6 +254,8 @@ SCSocket.prototype.deauthenticate = function (callback) {
 SCSocket.prototype.connect = SCSocket.prototype.open = function () {
   var self = this;
 
+  this.activate();
+
   if (this.state == this.CLOSED) {
     this.pendingReconnect = false;
     this.pendingReconnectTimeout = null;
@@ -316,10 +316,19 @@ SCSocket.prototype.disconnect = function (code, data) {
   }
 };
 
+SCSocket.prototype.activate = function () {
+  if (isBrowser && this.disconnectOnUnload && global.addEventListener && !this.active) {
+    global.addEventListener('beforeunload', this._unloadHandler, false);
+  }
+  this._clientMap[this.clientId] = this;
+  this.active = true;
+};
+
 SCSocket.prototype.destroy = function (code, data) {
-  if (this._unloadHandler) {
+  if (isBrowser && global.removeEventListener) {
     global.removeEventListener('beforeunload', this._unloadHandler, false);
   }
+  this.active = false;
   this.disconnect(code, data);
   delete this._clientMap[this.clientId];
 };