uri connection option. Closes hapijs#2249

Eran Hammer · Eran Hammer · commit fbeac4a9f6a9 · 2014-12-04T00:56:24.000-08:00
diff --git a/docs/Reference.md b/docs/Reference.md
@@ -273,8 +273,9 @@ the sole connection where:
     - `'https'` - HTTPS.
     - `'socket'` - UNIX domain socket or Windows named pipe.
 - `uri` - a string representing the connection (e.g. 'http://example.com:8080' or
-  'socket:/unix/domain/socket/path'). If no `port` is available or set to `0`, the `uri` will not
-  include a port component.
+  'socket:/unix/domain/socket/path'). Contains the `uri` setting if provided, otherwise constructed
+  from the available settings. If no `port` is available or set to `0`, the `uri` will not include
+  a port component.
 
 When the server contains more than one connection, each [`server.connections`](#serverconnections)
 array member provides its own `connection.info`.
@@ -753,6 +754,8 @@ Adds an incoming server connection where:
   uses an available port when the server is started (and assigned to `server.info.port`). If `port`
   is a string containing a '/' character, it is used as a UNIX domain socket path and if it starts
   with '\\.\pipe' as a Windows named pipe.
+- `uri` - the full public URI without the path (e.g. 'http://example.com:8080'). If present, used
+  as the connection `info.uri` otherwise constructed from the connection settings.
 - `listener` - optional node.js HTTP (or HTTPS)
   [`http.Server`](http://nodejs.org/api/http.html#http_class_http_server) object or any compatible
   object. If the `listener` needs to be manually started, set `autoListen` to `false`.
diff --git a/lib/connection.js b/lib/connection.js
@@ -98,7 +98,7 @@ exports = module.exports = internals.Connection = function (server, options) {
         id: Os.hostname() + ':' + process.pid + ':' + now.toString(36)
     };
 
-    this.info.uri = this.info.protocol + ':' + (this.type === 'tcp' ? '//' + this.info.host + (this.info.port ? ':' + this.info.port : '') : this.info.port);
+    this.info.uri = (this.settings.uri || (this.info.protocol + ':' + (this.type === 'tcp' ? '//' + this.info.host + (this.info.port ? ':' + this.info.port : '') : this.info.port)));
 };
 
 Hoek.inherits(internals.Connection, Events.EventEmitter);
@@ -118,7 +118,7 @@ internals.Connection.prototype._init = function () {
             var address = self.listener.address();
             self.info.address = address.address;
             self.info.port = address.port;
-            self.info.uri = self.info.protocol + '://' + self.info.host + ':' + self.info.port;
+            self.info.uri = (self.settings.uri || (self.info.protocol + '://' + self.info.host + ':' + self.info.port));
         }
     });
 
diff --git a/lib/schema.js b/lib/schema.js
@@ -199,7 +199,8 @@ internals.connection = internals.connectionBase.keys({
         Joi.string().regex(/^\\\\\.\\pipe\\/)   // Windows named pipe
     ])
         .allow(null),
-    tls: Joi.object().allow(null)
+    tls: Joi.object().allow(null),
+    uri: Joi.string().regex(/[^/]$/)
 });
 
 
diff --git a/test/connection.js b/test/connection.js
@@ -98,6 +98,30 @@ describe('Connection', function () {
         });
     });
 
+    it('uses uri when present instead of host and port', function (done) {
+
+        var server = new Hapi.Server();
+        server.connection({ host: 'no.such.domain.hapi', address: 'localhost', uri: 'http://uri.example.com:8080' });
+        expect(server.info.uri).to.equal('http://uri.example.com:8080');
+        server.start(function () {
+
+            expect(server.info.host).to.equal('no.such.domain.hapi');
+            expect(server.info.address).to.equal('127.0.0.1');
+            expect(server.info.uri).to.equal('http://uri.example.com:8080');
+            done();
+        });
+    });
+
+    it('throws on uri ending with /', function (done) {
+
+        var server = new Hapi.Server();
+        expect(function () {
+
+            server.connection({ uri: 'http://uri.example.com:8080/' });
+        }).to.throw(/Invalid connection options/);
+        done();
+    });
+
     it('creates a server listening on a unix domain socket', { skip: process.platform === 'win32' }, function (done) {
 
         var port = Path.join(__dirname, 'hapi-server.socket');
