Use ROOT_URL instead of endpoint to generate sockjs path

Fixes #67

Author: arunoda

lib/server/balancer/utils.js

@@ -104,8 +104,10 @@ function _sendSockJsInfo(req, res, cookies) {
 
   var endpointHash = Cluster.discovery.endpointToHash(endpoint);
   // when no balancer url is provided, 
-  // using endpoint's absolute path instead of relative path
-  var balancer = Cluster.discovery.pickBalancer(endpointHash) || endpoint || "";
+  // using ROOT_URL instead of relative path
+  var balancer = 
+    Cluster.discovery.pickBalancer(endpointHash) || 
+    process.env.ROOT_URL;
   // add tail backslash if path not end with it
   balancer = (/\/$/).test(balancer)? balancer : balancer + '/';
 

tests/server/balancer/utils.js

@@ -407,17 +407,19 @@ function(test) {
   var req = {url: "/web/sockjs/info"};
   var res = {writeHead: sinon.stub(), end: sinon.stub()};
 
-  WithCluster({_uiService: uiService}, function() {
-    WithDiscovery(discovery, function() {
-      Balancer._sendSockJsInfo(req, res, cookies);
-
-      test.isTrue(discovery.endpointToHash.calledWith(endpoint));
-      var info = JSON.parse(res.end.firstCall.args[0]);
-      test.equal(info.base_url, format(endpoint + "/cluster-ddp/%s/web", hash));
-      test.equal(info.websocket, true);
-
-      balancerMock.verify();
-      balancerMock.restore();
+  WithNew(process.env, {"ROOT_URL": endpoint}, function() {
+    WithCluster({_uiService: uiService}, function() {
+      WithDiscovery(discovery, function() {
+        Balancer._sendSockJsInfo(req, res, cookies);
+
+        test.isTrue(discovery.endpointToHash.calledWith(endpoint));
+        var info = JSON.parse(res.end.firstCall.args[0]);
+        test.equal(info.base_url, format(endpoint + "/cluster-ddp/%s/web", hash));
+        test.equal(info.websocket, true);
+
+        balancerMock.verify();
+        balancerMock.restore();
+      });
     });
   });
 });
@@ -447,17 +449,19 @@ function(test) {
   var req = {url: "/web/sockjs/info"};
   var res = {writeHead: sinon.stub(), end: sinon.stub()};
 
-  WithCluster({_uiService: uiService}, function() {
-    WithDiscovery(discovery, function() {
-      Balancer._sendSockJsInfo(req, res, cookies);
+  WithNew(process.env, {"ROOT_URL": endpoint}, function() {
+    WithCluster({_uiService: uiService}, function() {
+      WithDiscovery(discovery, function() {
+        Balancer._sendSockJsInfo(req, res, cookies);
 
-      test.isTrue(discovery.endpointToHash.calledWith(endpoint));
-      var info = JSON.parse(res.end.firstCall.args[0]);
-      test.equal(info.base_url, format(endpoint + "/cluster-ddp/%s/web", hash));
-      test.equal(info.websocket, true);
+        test.isTrue(discovery.endpointToHash.calledWith(endpoint));
+        var info = JSON.parse(res.end.firstCall.args[0]);
+        test.equal(info.base_url, format(endpoint + "/cluster-ddp/%s/web", hash));
+        test.equal(info.websocket, true);
 
-      balancerMock.verify();
-      balancerMock.restore();
+        balancerMock.verify();
+        balancerMock.restore();
+      });
     });
   });
 });