v6.4.0 - Removed sc-emitter and replaced with component-emitter

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "socketcluster-client",
   "main": "socketcluster.js",
-  "version": "6.3.0",
+  "version": "6.4.0",
   "homepage": "https://github.com/SocketCluster/socketcluster-client",
   "description": "SocketCluster JavaScript client",
   "authors": [

index.js

@@ -4,7 +4,7 @@ var SCSocketCreator = require('./lib/scsocketcreator');
 module.exports.SCSocketCreator = SCSocketCreator;
 module.exports.SCSocket = SCSocket;
 
-module.exports.SCEmitter = require('sc-emitter').SCEmitter;
+module.exports.Emitter = require('component-emitter');
 
 module.exports.connect = function (options) {
   return SCSocketCreator.connect(options);
@@ -16,4 +16,4 @@ module.exports.destroy = function (options) {
 
 module.exports.connections = SCSocketCreator.connections;
 
-module.exports.version = '6.3.0';
+module.exports.version = '6.4.0';

lib/scsocket.js

@@ -1,4 +1,4 @@
-var SCEmitter = require('sc-emitter').SCEmitter;
+var Emitter = require('component-emitter');
 var SCChannel = require('sc-channel').SCChannel;
 var Response = require('./response').Response;
 var AuthEngine = require('./auth').AuthEngine;
@@ -22,7 +22,7 @@ var isBrowser = typeof window != 'undefined';
 var SCSocket = function (opts) {
   var self = this;
 
-  SCEmitter.call(this);
+  Emitter.call(this);
 
   this.id = null;
   this.state = this.CLOSED;
@@ -137,7 +137,7 @@ var SCSocket = function (opts) {
     this.connect();
   }
 
-  this._channelEmitter = new SCEmitter();
+  this._channelEmitter = new Emitter();
 
   if (isBrowser && this.disconnectOnUnload) {
     var unloadHandler = function () {
@@ -152,7 +152,7 @@ var SCSocket = function (opts) {
   }
 };
 
-SCSocket.prototype = Object.create(SCEmitter.prototype);
+SCSocket.prototype = Object.create(Emitter.prototype);
 
 SCSocket.CONNECTING = SCSocket.prototype.CONNECTING = SCTransport.prototype.CONNECTING;
 SCSocket.OPEN = SCSocket.prototype.OPEN = SCTransport.prototype.OPEN;
@@ -178,7 +178,7 @@ SCSocket.prototype._privateEventHandlerMap = {
     var undecoratedChannelName = this._undecorateChannelName(data.channel);
     var channel = this.channels[undecoratedChannelName];
     if (channel) {
-      SCEmitter.prototype.emit.call(this, 'kickOut', data.message, undecoratedChannelName);
+      Emitter.prototype.emit.call(this, 'kickOut', data.message, undecoratedChannelName);
       channel.emit('kickOut', data.message, undecoratedChannelName);
       this._triggerChannelUnsubscribe(channel);
     }
@@ -214,7 +214,7 @@ SCSocket.prototype._privateEventHandlerMap = {
         response.error(err);
         self._onSCError(err);
       } else {
-        SCEmitter.prototype.emit.call(self, 'removeAuthToken', oldToken);
+        Emitter.prototype.emit.call(self, 'removeAuthToken', oldToken);
         self._changeToUnauthenticatedState();
         response.end();
       }
@@ -242,7 +242,7 @@ SCSocket.prototype.deauthenticate = function (callback) {
       self._onSCError(err);
     } else {
       self.emit('#removeAuthToken');
-      SCEmitter.prototype.emit.call(self, 'removeAuthToken', oldToken);
+      Emitter.prototype.emit.call(self, 'removeAuthToken', oldToken);
       self._changeToUnauthenticatedState();
     }
     callback && callback(err);
@@ -258,7 +258,7 @@ SCSocket.prototype.connect = SCSocket.prototype.open = function () {
     clearTimeout(this._reconnectTimeoutRef);
 
     this.state = this.CONNECTING;
-    SCEmitter.prototype.emit.call(this, 'connecting');
+    Emitter.prototype.emit.call(this, 'connecting');
 
     this._changeToPendingAuthState();
 
@@ -322,7 +322,7 @@ SCSocket.prototype._changeToPendingAuthState = function () {
       oldState: oldState,
       newState: this.authState
     };
-    SCEmitter.prototype.emit.call(this, 'authStateChange', stateChangeData);
+    Emitter.prototype.emit.call(this, 'authStateChange', stateChangeData);
   }
 };
 
@@ -337,11 +337,11 @@ SCSocket.prototype._changeToUnauthenticatedState = function () {
       oldState: oldState,
       newState: this.authState
     };
-    SCEmitter.prototype.emit.call(this, 'authStateChange', stateChangeData);
+    Emitter.prototype.emit.call(this, 'authStateChange', stateChangeData);
     if (oldState == this.AUTHENTICATED) {
-      SCEmitter.prototype.emit.call(this, 'deauthenticate');
+      Emitter.prototype.emit.call(this, 'deauthenticate');
     }
-    SCEmitter.prototype.emit.call(this, 'authTokenChange', this.signedAuthToken);
+    Emitter.prototype.emit.call(this, 'authTokenChange', this.signedAuthToken);
   }
 };
 
@@ -362,10 +362,10 @@ SCSocket.prototype._changeToAuthenticatedState = function (signedAuthToken) {
       this.processPendingSubscriptions();
     }
 
-    SCEmitter.prototype.emit.call(this, 'authStateChange', stateChangeData);
-    SCEmitter.prototype.emit.call(this, 'authenticate', signedAuthToken);
+    Emitter.prototype.emit.call(this, 'authStateChange', stateChangeData);
+    Emitter.prototype.emit.call(this, 'authenticate', signedAuthToken);
   }
-  SCEmitter.prototype.emit.call(this, 'authTokenChange', signedAuthToken);
+  Emitter.prototype.emit.call(this, 'authTokenChange', signedAuthToken);
 };
 
 SCSocket.prototype.decodeBase64 = function (encodedString) {
@@ -506,7 +506,7 @@ SCSocket.prototype._onSCOpen = function (status) {
 
   // If the user invokes the callback while in autoSubscribeOnConnect mode, it
   // won't break anything.
-  SCEmitter.prototype.emit.call(this, 'connect', status, function () {
+  Emitter.prototype.emit.call(this, 'connect', status, function () {
     self.processPendingSubscriptions();
   });
 
@@ -522,7 +522,7 @@ SCSocket.prototype._onSCError = function (err) {
     if (self.listeners('error').length < 1) {
       throw err;
     } else {
-      SCEmitter.prototype.emit.call(self, 'error', err);
+      Emitter.prototype.emit.call(self, 'error', err);
     }
   }, 0);
 };
@@ -605,9 +605,9 @@ SCSocket.prototype._onSCClose = function (code, data, openAbort) {
   }
 
   if (openAbort) {
-    SCEmitter.prototype.emit.call(self, 'connectAbort', code, data);
+    Emitter.prototype.emit.call(self, 'connectAbort', code, data);
   } else {
-    SCEmitter.prototype.emit.call(self, 'disconnect', code, data);
+    Emitter.prototype.emit.call(self, 'disconnect', code, data);
   }
 
   if (!SCSocket.ignoreStatuses[code]) {
@@ -629,7 +629,7 @@ SCSocket.prototype._onSCEvent = function (event, data, res) {
   if (handler) {
     handler.call(this, data, res);
   } else {
-    SCEmitter.prototype.emit.call(this, event, data, function () {
+    Emitter.prototype.emit.call(this, event, data, function () {
       res && res.callback.apply(res, arguments);
     });
   }
@@ -709,7 +709,7 @@ SCSocket.prototype.emit = function (event, data, callback) {
   if (this._localEvents[event] == null) {
     this._emit(event, data, callback);
   } else {
-    SCEmitter.prototype.emit.call(this, event, data);
+    Emitter.prototype.emit.call(this, event, data);
   }
 };
 
@@ -736,8 +736,8 @@ SCSocket.prototype._triggerChannelSubscribe = function (channel, subscriptionOpt
     };
     channel.emit('subscribeStateChange', stateChangeData);
     channel.emit('subscribe', channelName, subscriptionOptions);
-    SCEmitter.prototype.emit.call(this, 'subscribeStateChange', stateChangeData);
-    SCEmitter.prototype.emit.call(this, 'subscribe', channelName, subscriptionOptions);
+    Emitter.prototype.emit.call(this, 'subscribeStateChange', stateChangeData);
+    Emitter.prototype.emit.call(this, 'subscribe', channelName, subscriptionOptions);
   }
 };
 
@@ -749,7 +749,7 @@ SCSocket.prototype._triggerChannelSubscribeFail = function (err, channel, subscr
     channel.state = channel.UNSUBSCRIBED;
 
     channel.emit('subscribeFail', err, channelName, subscriptionOptions);
-    SCEmitter.prototype.emit.call(this, 'subscribeFail', err, channelName, subscriptionOptions);
+    Emitter.prototype.emit.call(this, 'subscribeFail', err, channelName, subscriptionOptions);
   }
 };
 
@@ -810,7 +810,7 @@ SCSocket.prototype._trySubscribe = function (channel) {
         }
       }
     );
-    SCEmitter.prototype.emit.call(this, 'subscribeRequest', channel.name, subscriptionOptions);
+    Emitter.prototype.emit.call(this, 'subscribeRequest', channel.name, subscriptionOptions);
   }
 };
 
@@ -851,8 +851,8 @@ SCSocket.prototype._triggerChannelUnsubscribe = function (channel, newState) {
     };
     channel.emit('subscribeStateChange', stateChangeData);
     channel.emit('unsubscribe', channelName);
-    SCEmitter.prototype.emit.call(this, 'subscribeStateChange', stateChangeData);
-    SCEmitter.prototype.emit.call(this, 'unsubscribe', channelName);
+    Emitter.prototype.emit.call(this, 'subscribeStateChange', stateChangeData);
+    Emitter.prototype.emit.call(this, 'unsubscribe', channelName);
   }
 };
 

lib/sctransport.js

@@ -1,4 +1,4 @@
-var SCEmitter = require('sc-emitter').SCEmitter;
+var Emitter = require('component-emitter');
 var Response = require('./response').Response;
 var querystring = require('querystring');
 var WebSocket;
@@ -36,7 +36,7 @@ var SCTransport = function (authEngine, codecEngine, options) {
   this.open();
 };
 
-SCTransport.prototype = Object.create(SCEmitter.prototype);
+SCTransport.prototype = Object.create(Emitter.prototype);
 
 SCTransport.CONNECTING = SCTransport.prototype.CONNECTING = 'connecting';
 SCTransport.OPEN = SCTransport.prototype.OPEN = 'open';
@@ -135,7 +135,7 @@ SCTransport.prototype._onOpen = function () {
       self.socket.close(4003);
     } else {
       self.state = self.OPEN;
-      SCEmitter.prototype.emit.call(self, 'open', status);
+      Emitter.prototype.emit.call(self, 'open', status);
       self._resetPingTimeout();
     }
   });
@@ -199,18 +199,18 @@ SCTransport.prototype._onClose = function (code, data) {
 
   if (this.state == this.OPEN) {
     this.state = this.CLOSED;
-    SCEmitter.prototype.emit.call(this, 'close', code, data);
+    Emitter.prototype.emit.call(this, 'close', code, data);
     this._abortAllPendingEventsDueToBadConnection('disconnect');
 
   } else if (this.state == this.CONNECTING) {
     this.state = this.CLOSED;
-    SCEmitter.prototype.emit.call(this, 'openAbort', code, data);
+    Emitter.prototype.emit.call(this, 'openAbort', code, data);
     this._abortAllPendingEventsDueToBadConnection('connectAbort');
   }
 };
 
 SCTransport.prototype._onMessage = function (message) {
-  SCEmitter.prototype.emit.call(this, 'event', 'message', message);
+  Emitter.prototype.emit.call(this, 'event', 'message', message);
 
   var obj = this.decode(message);
 
@@ -225,7 +225,7 @@ SCTransport.prototype._onMessage = function (message) {
 
     if (event) {
       var response = new Response(this, obj.cid);
-      SCEmitter.prototype.emit.call(this, 'event', event, obj.data, response);
+      Emitter.prototype.emit.call(this, 'event', event, obj.data, response);
     } else if (obj.rid != null) {
 
       var eventObject = this._callbackMap[obj.rid];
@@ -240,13 +240,13 @@ SCTransport.prototype._onMessage = function (message) {
         }
       }
     } else {
-      SCEmitter.prototype.emit.call(this, 'event', 'raw', obj);
+      Emitter.prototype.emit.call(this, 'event', 'raw', obj);
     }
   }
 };
 
 SCTransport.prototype._onError = function (err) {
-  SCEmitter.prototype.emit.call(this, 'error', err);
+  Emitter.prototype.emit.call(this, 'error', err);
 };
 
 SCTransport.prototype._resetPingTimeout = function () {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "socketcluster-client",
   "description": "SocketCluster JavaScript client",
-  "version": "6.3.0",
+  "version": "6.4.0",
   "homepage": "http://socketcluster.io",
   "contributors": [
     {
@@ -18,14 +18,14 @@
   },
   "dependencies": {
     "base-64": "0.1.0",
-    "linked-list": "0.1.0",
     "clone": "2.1.1",
+    "component-emitter": "1.2.1",
+    "linked-list": "0.1.0",
     "querystring": "0.2.0",
-    "sc-channel": "~1.0.6",
-    "sc-emitter": "~1.1.0",
+    "sc-channel": "~1.1.0",
     "sc-errors": "~1.3.3",
     "sc-formatter": "~3.0.0",
-    "ws": "3.0.0"
+    "ws": "3.1.0"
   },
   "browser": {
     "ws": "./lib/ws-browser.js"
@@ -34,6 +34,6 @@
   "license": "MIT",
   "devDependencies": {
     "browserify": "^13.3.0",
-    "uglify-js": "^2.7.5"
+    "uglify-js": "^2.8.29"
   }
 }