Merge pull request #569 from cybusio/master

Fixed error emission on receiver error

Author: 3rd-Eden

lib/WebSocket.js

@@ -873,7 +873,7 @@ function establishConnection(ReceiverClass, SenderClass, socket, upgradeHead) {
   self._receiver.onerror = function onerror(reason, errorCode) {
     // close the connection when the receiver reports a HyBi error code
     self.close(typeof errorCode !== 'undefined' ? errorCode : 1002, '');
-    self.emit('error', reason, errorCode);
+    self.emit('error', (reason instanceof Error) ? reason : (new Error(reason)));
   };
 
   // finalize the client

test/WebSocket.test.js

@@ -46,6 +46,40 @@ describe('WebSocket', function() {
       ws.should.be.an.instanceOf(WebSocket);
       done();
     });
+
+    it('should emit an error object when the receiver throws an error string', function(done) {
+    
+      var wss = new WebSocketServer({port: ++port}, function() {
+
+          var ws = new WebSocket('ws://localhost:' + port);
+          
+          ws.on('open', function () {
+            ws._receiver.error('This is an error string', 1002);
+          });
+
+          ws.on('error', function (error) {
+            error.should.be.an.instanceof(Error);
+            done();
+          });
+      });
+    });
+
+    it('should emit an error object when the receiver throws an error object', function(done) {
+    
+      var wss = new WebSocketServer({port: ++port}, function() {
+
+          var ws = new WebSocket('ws://localhost:' + port);
+          
+          ws.on('open', function () {
+            ws._receiver.error(new Error('This is an error object'), 1002);
+          });
+
+          ws.on('error', function (error) {
+            error.should.be.an.instanceof(Error);
+            done();
+          });
+      });
+    });
   });
 
   describe('options', function() {