roster-server 3.0.0 → 3.0.2

package/index.js

@@ -985,7 +985,7 @@ class Roster {
             socket.setTimeout(0);
             const site = servername && this._isolatedSiteFor(routes, servername);
             if (site) {
-                site.handoff(port, head, socket);
+                site.handoff(port, head, socket, () => this._sockets.delete(socket));
                 return;
             }
             socket.unshift(head);

package/lib/isolated-site.js

@@ -108,8 +108,10 @@ class IsolatedSite {
 
     /**
      * Pass an accepted client socket, with the bytes already read from it, to the site process.
+     * `onHandedOff` runs once the site process owns the connection; the main process never
+     * sees a 'close' event for it.
      */
-    handoff(port, head, socket) {
+    handoff(port, head, socket, onHandedOff) {
         const child = this.child;
         if (!this.ready || this.pending >= this.isolation.backlog) {
             socket.destroy();
@@ -119,6 +121,7 @@ class IsolatedSite {
         child.send({ type: 'connection', port, head: head.toString('base64') }, socket, error => {
             if (this.child === child) this.pending--;
             if (error) socket.destroy();
+            else onHandedOff();
         });
     }
 

package/lib/site-worker.js

@@ -138,6 +138,8 @@ process.on('disconnect', shutdown);
 process.on('message', (message, handle) => {
     if (message.type === 'start') start(message);
     else if (message.type === 'connection') {
+        // A connection can close while its socket is being transferred over IPC.
+        if (!handle) return;
         if (roster) roster.accept(message.port, Buffer.from(message.head, 'base64'), handle);
         else handle.destroy();
     } else if (message.type === 'certificate') roster.settleCertificate(message);

package/package.json

@@ -1,54 +1,54 @@
 {
-    "name": "roster-server",
-    "version": "3.0.0",
-    "description": "👾 RosterServer - A domain host router to host multiple HTTPS.",
-    "main": "index.js",
-    "scripts": {
-        "test": "node --test 'test/**/*.test.js'"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/clasen/RosterServer.git"
-    },
-    "keywords": [
-        "greenlock",
-        "https",
-        "domain",
-        "multi-domain",
-        "letsencrypt",
-        "hosting",
-        "ssl",
-        "host",
-        "vhost",
-        "virtual-host",
-        "socket.io",
-        "websocket",
-        "express",
-        "greenlock-express",
-        "shotx",
-        "bun",
-        "clasen"
-    ],
-    "author": "Martin Clasen",
-    "license": "MIT",
-    "bugs": {
-        "url": "https://github.com/clasen/RosterServer/issues"
-    },
-    "homepage": "https://github.com/clasen/RosterServer#readme",
-    "dependencies": {
-        "@greenlock/manager": "^3.1.0",
-        "@root/acme": "^3.1.0",
-        "@root/csr": "^0.8.1",
-        "@root/encoding": "^1.0.1",
-        "@root/keypairs": "^0.10.0",
-        "@root/mkdirp": "^1.0.0",
-        "@root/request": "^1.6.1",
-        "acme-dns-01-cli": "^3.0.7",
-        "acme-http-01-standalone": "^3.0.5",
-        "cert-info": "^1.5.1",
-        "greenlock-store-fs": "^3.2.2",
-        "lemonlog": "^1.2.0",
-        "redirect-https": "^1.3.1",
-        "safe-replace": "^1.1.0"
-    }
-}
+  "name": "roster-server",
+  "version": "3.0.2",
+  "description": "👾 RosterServer - A domain host router to host multiple HTTPS.",
+  "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/clasen/RosterServer.git"
+  },
+  "keywords": [
+    "greenlock",
+    "https",
+    "domain",
+    "multi-domain",
+    "letsencrypt",
+    "hosting",
+    "ssl",
+    "host",
+    "vhost",
+    "virtual-host",
+    "socket.io",
+    "websocket",
+    "express",
+    "greenlock-express",
+    "shotx",
+    "bun",
+    "clasen"
+  ],
+  "author": "Martin Clasen",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/clasen/RosterServer/issues"
+  },
+  "homepage": "https://github.com/clasen/RosterServer#readme",
+  "dependencies": {
+    "@greenlock/manager": "^3.1.0",
+    "@root/acme": "^3.1.0",
+    "@root/csr": "^0.8.1",
+    "@root/encoding": "^1.0.1",
+    "@root/keypairs": "^0.10.0",
+    "@root/mkdirp": "^1.0.0",
+    "@root/request": "^1.6.1",
+    "acme-dns-01-cli": "^3.0.7",
+    "acme-http-01-standalone": "^3.0.5",
+    "cert-info": "^1.5.1",
+    "greenlock-store-fs": "^3.2.2",
+    "lemonlog": "^1.2.0",
+    "redirect-https": "^1.3.1",
+    "safe-replace": "^1.1.0"
+  },
+  "scripts": {
+    "test": "node --test 'test/**/*.test.js'"
+  }
+}

package/test/isolation.test.js

@@ -131,6 +131,29 @@ it('routes each SNI host to its own process with the client address and headers
     assert.equal(redirect.headers.location, 'https://a.example.com/path');
 });
 
+it('keeps serving in the same worker when a connection arrives without a socket', { timeout: 20000 }, async t => {
+    const { roster, port } = await startProduction(t, {
+        'disconnected.example.com': `${REPORT_SITE}
+            process.on('message', message => {
+                if (message.type === 'connection' && message.head === '') process.send({ type: 'observed' });
+            });`
+    }, { certificates: ['disconnected.example.com'] });
+    const first = JSON.parse((await get(port, 'disconnected.example.com')).body);
+    const child = roster._isolatedSites[0].child;
+    const observed = Promise.race([
+        once(child, 'message').then(([message]) => message.type),
+        once(child, 'exit').then(() => 'exited')
+    ]);
+    await new Promise((resolve, reject) => {
+        child.send({ type: 'connection', port: 443, head: '' }, error => error ? reject(error) : resolve());
+    });
+    assert.equal(await observed, 'observed', 'worker exited on a connection without a socket');
+    const response = await get(port, 'disconnected.example.com');
+    assert.equal(response.status, 200);
+    assert.equal(JSON.parse(response.body).pid, first.pid);
+    assert.equal(child.exitCode, null);
+});
+
 it('keeps serving other sites while one blocks its event loop', { timeout: 20000 }, async t => {
     const { port } = await startProduction(t, {
         'busy.example.com': `module.exports = () => (req, res) => {