Merge branch 'pr/53'

Author: emgee3

lib/ddp-client.js

@@ -25,6 +25,7 @@ var DDPClient = function(opts) {
   self.port = opts.port || 3000;
   self.path = opts.path;
   self.ssl  = opts.ssl  || self.port === 443;
+  self.tlsOpts = opts.tlsOpts || {};
   self.useSockJs = opts.useSockJs || false;
   self.autoReconnect = ("autoReconnect" in opts) ? opts.autoReconnect : true;
   self.autoReconnectTimer = ("autoReconnectTimer" in opts) ? opts.autoReconnectTimer : 500;
@@ -329,7 +330,8 @@ DDPClient.prototype._makeSockJSConnection = function() {
   var path = pathJoin("/", self.path || "", "sockjs/info");
   var url = protocol + self.host + ":" + self.port + path;
 
-  request.get(url, function(err, res, body) {
+  var requestOpts = {'url': url, 'agentOptions': self.tlsOpts}
+  request.get(requestOpts, function(err, res, body) {
     if (err) {
       self._recoverNetworkError();
     } else if (body) {
@@ -373,7 +375,7 @@ DDPClient.prototype._buildWsUrl = function(path) {
 
 DDPClient.prototype._makeWebSocketConnection = function(url) {
   var self = this;
-  self.socket = new WebSocket.Client(url);
+  self.socket = new WebSocket.Client(url, null, self.tlsOpts);
   self._prepareHandlers();
 };
 

test/ddp-client.js

@@ -30,33 +30,44 @@ describe("Connect to remote server", function() {
     assert(wsConstructor.calledOnce);
     assert(wsConstructor.calledWithNew());
     assert(wsConstructor.call);
-    assert.deepEqual(wsConstructor.args, [['ws://localhost:3000/websocket']]);
+    assert.deepEqual(wsConstructor.args, [['ws://localhost:3000/websocket', null, {}]]);
   });
 
   it('should connect to the provided host', function() {
     new DDPClient({'host': 'myserver.com'}).connect();
-    assert.deepEqual(wsConstructor.args, [['ws://myserver.com:3000/websocket']]);
+    assert.deepEqual(wsConstructor.args, [['ws://myserver.com:3000/websocket', null, {}]]);
   });
 
   it('should connect to the provided host and port', function() {
     new DDPClient({'host': 'myserver.com', 'port': 42}).connect();
-    assert.deepEqual(wsConstructor.args, [['ws://myserver.com:42/websocket']]);
+    assert.deepEqual(wsConstructor.args, [['ws://myserver.com:42/websocket', null, {}]]);
   });
 
   it('should use ssl if the port is 443', function() {
     new DDPClient({'host': 'myserver.com', 'port': 443}).connect();
-    assert.deepEqual(wsConstructor.args, [['wss://myserver.com:443/websocket']]);
+    assert.deepEqual(wsConstructor.args, [['wss://myserver.com:443/websocket', null, {}]]);
   });
+
+  it('should propagate tls options if specified', function() {
+    var tlsOpts = {
+      'ca': ['fake_pem_content']
+    }
+    new DDPClient({'host': 'myserver.com', 'port': 443, 'tlsOpts': tlsOpts}).connect();
+    assert.deepEqual(wsConstructor.args, [['wss://myserver.com:443/websocket', null, tlsOpts]]);
+  });
+
   it('should connect to the provided url', function() {
     new DDPClient({'url': 'wss://myserver.com/websocket'}).connect();
-    assert.deepEqual(wsConstructor.args, [['wss://myserver.com/websocket']]);
+    assert.deepEqual(wsConstructor.args, [['wss://myserver.com/websocket', null, {} ]]);
   });
+
   it('should fallback to sockjs if url and useSockJs:true are provided', function() {
     var ddpclient = new DDPClient({'url': 'wss://myserver.com/websocket', 'useSockJs': true});
     ddpclient._makeSockJSConnection = sinon.stub();
     ddpclient.connect();
     assert.ok(ddpclient._makeSockJSConnection.called);
   });
+
   it('should clear event listeners on close', function(done) {
     var ddpclient = new DDPClient();
     var callback = sinon.stub();
@@ -297,8 +308,8 @@ describe("SockJS", function() {
   describe("after info hit", function() {
     var request = require("request");
     it("should connect to the correct url", function(done) {
-      var get = function(url, callback) {
-        assert.equal(url, "http://the-host:9000/sockjs/info");
+      var get = function(opts, callback) {
+        assert.equal(opts.url, "http://the-host:9000/sockjs/info");
         done();
       };
 
@@ -313,8 +324,8 @@ describe("SockJS", function() {
     });
 
     it("should support custom paths", function(done) {
-      var get = function(url, callback) {
-        assert.equal(url, "http://the-host:9000/search/sockjs/info");
+      var get = function(opts, callback) {
+        assert.equal(opts.url, "http://the-host:9000/search/sockjs/info");
         done();
       };
 
@@ -331,7 +342,7 @@ describe("SockJS", function() {
 
     it("should retry if there is an error", function() {
       var error = { message: "error" };
-      var get = function(url, callback) {
+      var get = function(opts, callback) {
         callback(error);
       };
 
@@ -345,7 +356,7 @@ describe("SockJS", function() {
 
     it("should use direct WS if there is no body", function() {
       var info = null;
-      var get = function(url, callback) {
+      var get = function(opts, callback) {
         callback(null, null, info);
       };
 
@@ -361,7 +372,7 @@ describe("SockJS", function() {
 
     it("should use direct WS if there is no base_url", function() {
       var info = '{}';
-      var get = function(url, callback) {
+      var get = function(opts, callback) {
         callback(null, null, info);
       };
 
@@ -377,7 +388,7 @@ describe("SockJS", function() {
 
     it("should use full base url if it's starts with http", function() {
       var info = '{"base_url": "https://somepath"}';
-      var get = function(url, callback) {
+      var get = function(opts, callback) {
         callback(null, null, info);
       };
 
@@ -393,7 +404,7 @@ describe("SockJS", function() {
 
     it("should compute url based on the base_url if it's not starts with http", function() {
       var info = '{"base_url": "/somepath"}';
-      var get = function(url, callback) {
+      var get = function(opts, callback) {
         callback(null, null, info);
       };
 
@@ -406,6 +417,25 @@ describe("SockJS", function() {
         assert.ok(ddpclient._makeWebSocketConnection.calledWith(wsUrl));
       });
     });
+
+    it("should propagate tls options", function(done) {
+      var tlsOpts = {'ca': ['fake_pem_content']};
+      var get = function(opts, callback) {
+        assert.equal(opts.agentOptions, tlsOpts);
+        done();
+      };
+
+      WithRequestGet(get, function() {
+        var opts = {
+          host: "the-host",
+          port: 9000,
+          path: "search",
+          tlsOpts: tlsOpts
+        };
+        var ddpclient = new DDPClient(opts);
+        ddpclient._makeSockJSConnection();
+      });
+    });
   });
 });