Merge pull request #49 from nnevala/handle-econnrefused

Handle socket errors occurring before connection is established

Author: emgee3

lib/ddp-client.js

@@ -40,6 +40,8 @@ var DDPClient = function(opts) {
   }
 
   // internal stuff to track callbacks
+  self._isConnecting = false;
+  self._isReconnecting = false;
   self._nextId = 0;
   self._callbacks = {};
   self._updatedCallbacks = {};
@@ -65,6 +67,11 @@ DDPClient.prototype._prepareHandlers = function() {
   });
 
   self.socket.on("error", function(error) {
+    // error received before connection was established
+    if (self._isConnecting) {
+      self.emit("failed", error.message);
+    }
+
     self.emit("socket-error", error);
   });
 
@@ -283,6 +290,7 @@ DDPClient.prototype._removeObserver = function(observer) {
  */
 DDPClient.prototype.connect = function(connected) {
   var self = this;
+  self._isConnecting = true;
   self._connectionFailed = false;
   self._isClosing = false;
 
@@ -291,9 +299,11 @@ DDPClient.prototype.connect = function(connected) {
       self._clearReconnectTimeout();
 
       connected(undefined, self._isReconnecting);
+      self._isConnecting = false;
       self._isReconnecting = false;
     });
     self.addListener("failed", function(error) {
+      self._isConnecting = false;
       self._connectionFailed = true;
       connected(error, self._isReconnecting);
     });

test/ddp-client.js

@@ -47,6 +47,49 @@ describe("Connect to remote server", function() {
     new DDPClient({'host': 'myserver.com', 'port': 443}).connect();
     assert.deepEqual(wsConstructor.args, [['wss://myserver.com:443/websocket']]);
   });
+
+  it('should clear event listeners on close', function(done) {
+    var ddpclient = new DDPClient();
+    var callback = sinon.stub();
+
+    ddpclient.connect(callback);
+    ddpclient.close();
+    ddpclient.connect(callback);
+
+    setTimeout(function() {
+      assert.equal(ddpclient.listeners('connected').length, 1);
+      assert.equal(ddpclient.listeners('failed').length, 1);
+      done();
+    }, 15);
+  });
+
+  it('should call the connection callback when connection is established', function(done) {
+    var ddpclient = new DDPClient();
+    var callback = sinon.spy();
+
+    ddpclient.connect(callback);
+    wsMock.emit('message', { data: '{ "msg": "connected" }' });
+
+    setTimeout(function() {
+      assert(callback.calledWith(undefined, false));
+      done();
+    }, 15);
+  });
+
+  it('should pass socket errors occurring during connection to the connection callback', function(done) {
+    var ddpclient = new DDPClient();
+    var callback = sinon.spy();
+
+    var socketError = "Network error: ws://localhost:3000/websocket: connect ECONNREFUSED";
+
+    ddpclient.connect(callback);
+    wsMock.emit('error', { message: socketError });
+
+    setTimeout(function() {
+      assert(callback.calledWith(socketError, false));
+      done();
+    }, 15);
+  });
 });
 
 
@@ -91,21 +134,6 @@ describe('Automatic reconnection', function() {
       done();
     }, 15);
   });
-
-  it('should clear event listeners on close', function(done) {
-    var ddpclient = new DDPClient();
-    var callback = sinon.stub();
-
-    ddpclient.connect(callback);
-    ddpclient.close();
-    ddpclient.connect(callback);
-
-    setTimeout(function() {
-      assert.equal(ddpclient.listeners('connected').length, 1);
-      assert.equal(ddpclient.listeners('failed').length, 1);
-      done();
-    }, 15);
-  })
 });