Merge pull request #17 from horgh/horgh/fds

Add option to pass in additional fds

Author: kraih

lib/server-starter.js

@@ -43,13 +43,21 @@ export default class ServerStarter extends EventEmitter {
    * @param {object} [options.env=process.env] - Environment key-value pairs.
    * @param {boolean} [options.stdout=false] - Forward server output from STDOUT to STDOUT.
    * @param {boolean} [options.stderr=true] - Forward server output from STDERR to STDERR.
+   * @param {number[]} [options.fds=[]] - Additional fds to pass to the server process.
    */
   launch(cmd, args, options = {}) {
     if (this._process !== undefined) throw new Error('Server already launched');
     const stdout = options.stdout ?? false;
     const stderr = options.stderr ?? true;
 
-    const spawnOptions = {stdio: ['pipe', 'pipe', 'pipe', this._fd]};
+    const fds = ['pipe', 'pipe', 'pipe', this._fd];
+
+    if (options.fds !== undefined) {
+      fds.push(...options.fds);
+    }
+
+    const spawnOptions = {stdio: fds};
+
     if (options.env !== undefined) spawnOptions.env = options.env;
 
     const proc = (this._process = spawn(cmd, args, spawnOptions));

test/start_fd.js

@@ -93,3 +93,44 @@ t.test('Set env', async t => {
   await server.close();
   t.equal(server.pid, null);
 });
+
+t.test('Use additional fd', async t => {
+  const server = await ServerStarter.newServer();
+  t.equal(server.pid, null);
+
+  const ln = await getListener();
+
+  await server.launch('node', ['test/support/server_fd.js', '-additional-fd'], {fds: [ln.fd]});
+  t.equal(typeof server.pid, 'number');
+
+  await new Promise(resolve => ln.srv.close(resolve));
+
+  const ua = new UserAgent({baseURL: server.url()});
+  const res = await ua.get('/');
+  t.equal(res.isSuccess, true);
+  t.equal(res.get('Content-Type'), 'text/plain');
+  t.equal(await res.text(), 'Hello World!');
+
+  const ua2 = new UserAgent({baseURL: `http://127.0.0.1:${ln.port}`});
+  const res2 = await ua2.get('/');
+  t.equal(res2.isSuccess, true);
+  t.equal(res2.get('Content-Type'), 'text/plain');
+  t.equal(await res2.text(), 'Hello again World!');
+
+  await server.close();
+  t.equal(server.pid, null);
+});
+
+function getListener() {
+  return new Promise((resolve, reject) => {
+    const srv = net.createServer();
+    srv.on('error', reject);
+    srv.listen(0, () => {
+      resolve({
+        fd: srv._handle.fd,
+        port: srv.address().port,
+        srv: srv
+      });
+    });
+  });
+}

test/support/server_fd.js

@@ -8,3 +8,14 @@ const server = http.createServer((req, res) => {
   res.end('Hello World!');
 });
 server.listen({fd: 3});
+
+if (process.argv.length > 2 && process.argv[2] === '-additional-fd') {
+  const server2 = http.createServer((req, res) => {
+    res.writeHead(200, {
+      'Content-Type': 'text/plain',
+      'X-Env': JSON.stringify(process.env)
+    });
+    res.end('Hello again World!');
+  });
+  server2.listen({fd: 4});
+}