Allow the usage of options.url to connect to server

Author: juanramb

README.markdown

@@ -55,7 +55,10 @@ var ddpclient = new DDPClient({
   // from projects like meteorhacks:cluster
   // (for load balancing and service discovery)
   // do not use `path` option when you are using useSockJs
-  useSockJs: true
+  useSockJs: true,
+  // Use a full url instead of a set of `host`, `port` and `ssl`
+  // do not set `useSockJs` option if `url` is used
+  url: 'wss://example.com/websocket'
 });
 
 /*

examples/example.js

@@ -16,7 +16,10 @@ var ddpclient = new DDPClient({
   // from projects like meteorhacks:cluster
   // (load balancing and service discovery)
   // do not use `path` option when you are using useSockJs
-  useSockJs: true
+  useSockJs: true,
+  // Use a full url instead of a set of `host`, `port` and `ssl`
+  // do not set `useSockJs` option if `url` is used
+  url: 'wss://example.com/websocket'
 });
 
 /*

lib/ddp-client.js

@@ -29,7 +29,7 @@ var DDPClient = function(opts) {
   self.autoReconnect = ("autoReconnect" in opts) ? opts.autoReconnect : true;
   self.autoReconnectTimer = ("autoReconnectTimer" in opts) ? opts.autoReconnectTimer : 500;
   self.maintainCollections = ("maintainCollections" in opts) ? opts.maintainCollections : true;
-
+  self.url  = opts.url;
   // support multiple ddp versions
   self.ddpVersion = ("ddpVersion" in opts) ? opts.ddpVersion : "1";
   self.supportedDdpVersions = ["1", "pre2", "pre1"];
@@ -359,11 +359,15 @@ DDPClient.prototype._makeSockJSConnection = function() {
 
 DDPClient.prototype._buildWsUrl = function(path) {
   var self = this;
+  var url;
   path = path || self.path || "websocket";
   var protocol = self.ssl ? "wss://" : "ws://";
-  var url = protocol + self.host + ":" + self.port;
-  url += (path.indexOf("/") === 0)? path : "/" + path;
-
+  if (self.url && !self.useSockJs) {
+    url = self.url;
+  } else {
+    url = protocol + self.host + ":" + self.port;
+    url += (path.indexOf("/") === 0)? path : "/" + path;
+  }
   return url;
 };
 

test/ddp-client.js

@@ -47,7 +47,16 @@ 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 connect to the provided url', function() {
+    new DDPClient({'url': 'wss://myserver.com/websocket'}).connect();
+    assert.deepEqual(wsConstructor.args, [['wss://myserver.com/websocket']]);
+  });
+  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();
@@ -408,4 +417,4 @@ function WithRequestGet(getFn, fn) {
   fn();
 
   request.get = originalGet;
-}
+}