roster-server 3.4.1 → 3.4.2

package/index.js

@@ -785,6 +785,12 @@ class Roster {
         }
     }
 
+    // Names the production site and the local URL that serves it, e.g. `example.com:3334 → tcp://localhost:6702`.
+    _describeLocalSite(domain, sitePort, localPort, scheme) {
+        const site = `${domain}${sitePort !== this.defaultPort ? ':' + sitePort : ''}`;
+        return `${site} → ${scheme}://${localHostForDomain(normalizeDomainForLocalHost(domain))}:${localPort}`;
+    }
+
     parseDomainWithPort(domainString) {
         const parts = domainString.split(':');
         if (parts.length === 2) {
@@ -1632,8 +1638,7 @@ class Roster {
                 });
 
                 await this._listen(httpServer, port, this.hostname);
-                const cleanDomain = normalizeDomainForLocalHost(domain);
-                log.info(`🌐 ${domain} → http://${localHostForDomain(cleanDomain)}:${port}`);
+                log.info(`🌐 ${this._describeLocalSite(domain, Number(sitePort), port, 'http')}`);
             }
         }
 

package/lib/site-worker.js

@@ -56,15 +56,16 @@ class SiteWorkerRoster extends Roster {
         for (const key of this._site.keys) {
             if (key.startsWith('www.')) continue;
             const { domain, port } = this.parseDomainWithPort(key);
+            const localPort = this._site.localPorts[`${domain}:${port}`];
             const server = net.createServer({ pauseOnConnect: true });
-            const listening = this._listen(server, this._site.localPorts[`${domain}:${port}`], this.hostname);
+            const listening = this._listen(server, localPort, this.hostname);
             server.on('connection', socket => {
                 // The site owns the connection from here; it may pass it to another process.
                 this._sockets.delete(socket);
                 this._handOff(head, socket);
             });
             await listening;
-            log.info(`🌐 ${domain} → tcp://localhost:${this._site.localPorts[`${domain}:${port}`]} (socket site)`);
+            log.info(`🌐 ${this._describeLocalSite(domain, port, localPort, 'tcp')} (socket site)`);
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "roster-server",
-    "version": "3.4.1",
+    "version": "3.4.2",
     "description": "👾 RosterServer - A domain host router to host multiple HTTPS.",
     "main": "index.js",
     "scripts": {

package/test/roster-server.test.js

@@ -372,6 +372,14 @@ describe('Roster', () => {
         });
     });
 
+    describe('local site description', () => {
+        it('names the production port only when it differs from the default', () => {
+            const roster = new Roster({ local: true });
+            assert.strictEqual(roster._describeLocalSite('truco.example.com', 443, 6701, 'http'), 'truco.example.com → http://truco.localhost:6701');
+            assert.strictEqual(roster._describeLocalSite('truco.example.com', 3334, 6702, 'tcp'), 'truco.example.com:3334 → tcp://truco.localhost:6702');
+        });
+    });
+
     describe('getUrl (exact domain)', () => {
         it('returns http://localhost:PORT in local mode for registered domain', () => {
             const roster = new Roster({ local: true });