v5.2.0 - Ping and pong messages now pass through formatter/codec

Author: jondubois

package.json

@@ -1,6 +1,6 @@
 {
   "name": "socketcluster-server",
-  "version": "5.1.6",
+  "version": "5.2.0",
   "description": "Server module for SocketCluster",
   "main": "index.js",
   "dependencies": {
@@ -12,7 +12,7 @@
     "sc-domain": "1.x.x",
     "sc-emitter": "1.0.x",
     "sc-errors": "1.0.x",
-    "sc-formatter": "2.0.x",
+    "sc-formatter": "3.0.x",
     "sc-simple-broker": "1.2.x",
     "uws": "0.11.0",
     "ws": "1.1.1"

scsocket.js

@@ -78,16 +78,15 @@ var SCSocket = function (id, server, socket) {
 
     SCEmitter.prototype.emit.call(self, 'message', message);
 
-    // If pong, we don't need to decode the message.
-    // We just check the token expiry and deauthenticate the socket if it has expired.
-    if (message == '#2') {
+    var obj = self.decode(message);
+
+    // If pong
+    if (obj == '#2') {
       var token = self.getAuthToken();
       if (self.server.isAuthTokenExpired(token)) {
         self.deauthenticate();
       }
     } else {
-      var obj = self.decode(message);
-
       if (obj == null) {
         var err = new InvalidMessageError('Received empty message');
         SCEmitter.prototype.emit.call(self, 'error', err);
@@ -147,7 +146,7 @@ SCSocket.errorStatuses = scErrors.socketProtocolErrorStatuses;
 
 SCSocket.prototype._sendPing = function () {
   if (this.state != this.CLOSED) {
-    this.send('#1');
+    this.sendObject('#1');
   }
 };