[chore] add JSON extension to require (#3234)

* fix(socket): Fixes socket.use error packet which drops nodejs due to nuances of Nodejs' EventEmitter

* fix(socket): Fixes missing error event on socket

* fix(socket): test fix, should listen for clientSocket instead of server socket

* minor update

History.md

@@ -1,4 +1,20 @@
 
+1.7.4 / 2017-05-07
+===================
+
+  * [chore] Bump engine.io to version 1.8.4
+
+1.7.3 / 2017-02-17
+===================
+
+  * [chore] Bump engine.io to version 1.8.3
+
+1.7.2 / 2016-12-11
+===================
+
+  * [chore] Bump engine.io to version 1.8.2 (#2782)
+  * [fix] Fixes socket.use error packet (#2772)
+
 1.7.1 / 2016-11-28
 ===================
 

lib/index.js

@@ -7,7 +7,7 @@ var http = require('http');
 var read = require('fs').readFileSync;
 var engine = require('engine.io');
 var client = require('socket.io-client');
-var clientVersion = require('socket.io-client/package').version;
+var clientVersion = require('socket.io-client/package.json').version;
 var Client = require('./client');
 var Emitter = require('events').EventEmitter;
 var Namespace = require('./namespace');

lib/socket.js

@@ -498,7 +498,7 @@ Socket.prototype.dispatch = function(event){
   this.run(event, function(err){
     process.nextTick(function(){
       if (err) {
-        return self.emit('error', err.data || err.message);
+        return self.error(err.data || err.message);
       }
       emit.apply(self, event);
     });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "socket.io",
-  "version": "1.7.1",
+  "version": "1.7.4",
   "description": "node.js realtime framework server",
   "keywords": [
     "realtime",
@@ -25,11 +25,11 @@
   },
   "dependencies": {
     "debug": "2.3.3",
-    "engine.io": "1.8.1",
+    "engine.io": "~1.8.4",
     "has-binary": "0.1.7",
     "object-assign": "4.1.0",
     "socket.io-adapter": "0.5.0",
-    "socket.io-client": "1.7.1",
+    "socket.io-client": "1.7.4",
     "socket.io-parser": "2.3.1"
   },
   "devDependencies": {

test/socket.io.js

@@ -2273,9 +2273,14 @@ describe('socket.io', function(){
       var sio = io(srv);
 
       srv.listen(function(){
-        var socket = client(srv, { multiplex: false });
+        var clientSocket = client(srv, { multiplex: false });
 
-        socket.emit('join', 'woot');
+        clientSocket.emit('join', 'woot');
+
+        clientSocket.on('error', function(err){
+          expect(err).to.be('Authentication error');
+          done();
+        });
 
         sio.on('connection', function(socket){
           socket.use(function(event, next){
@@ -2288,10 +2293,6 @@ describe('socket.io', function(){
           socket.on('join', function(){
             done(new Error('nope'));
           });
-          socket.on('error', function(err){
-            expect(err).to.be('Authentication error');
-            done();
-          });
         });
       });
     });
@@ -2301,9 +2302,14 @@ describe('socket.io', function(){
       var sio = io(srv);
 
       srv.listen(function(){
-        var socket = client(srv, { multiplex: false });
+        var clientSocket = client(srv, { multiplex: false });
 
-        socket.emit('join', 'woot');
+        clientSocket.emit('join', 'woot');
+
+        clientSocket.on('error', function(err){
+          expect(err).to.eql({ a: 'b', c: 3 });
+          done();
+        });
 
         sio.on('connection', function(socket){
           socket.use(function(event, next){
@@ -2315,10 +2321,6 @@ describe('socket.io', function(){
           socket.on('join', function(){
             done(new Error('nope'));
           });
-          socket.on('error', function(err){
-            expect(err).to.eql({ a: 'b', c: 3 });
-            done();
-          });
         });
       });
     });