webhoster 0.3.0 → 0.3.1

package/package.json

@@ -50,5 +50,5 @@
     "posttestall": "c8 report"
   },
   "type": "module",
-  "version": "0.3.0"
+  "version": "0.3.1"
 }

package/scripts/check-teapot.mjs

@@ -0,0 +1,40 @@
+import http from 'node:http';
+import * as starter from '../templates/starter.js';
+
+async function run() {
+  const throwingMiddleware = [() => { throw new Error('brew failed'); }];
+  const teapotHandler = {
+    onError(transaction) {
+      transaction.response.status = 418;
+      return "I'm a teapot";
+    },
+  };
+
+  const listener = await starter.start({ middleware: throwingMiddleware, errorHandlers: [teapotHandler], host: '127.0.0.1', port: 0 });
+  try {
+    const addr = listener.httpServer.address();
+    const port = typeof addr === 'object' ? addr.port : addr;
+    const result = await new Promise((resolve, reject) => {
+      const req = http.get({ port, path: '/' }, (res) => {
+        let data = '';
+        res.setEncoding('utf8');
+        res.on('data', (c) => { data += c; });
+        res.on('end', () => resolve({ status: res.statusCode, body: data }));
+      });
+      req.on('error', reject);
+    });
+
+    // Print a concise confirmation
+    // (CI will show this output in the terminal)
+    // eslint-disable-next-line no-console
+    console.log('TEAPOT_CHECK_RESULT', JSON.stringify(result));
+  } finally {
+    await listener.stopHttpServer();
+  }
+}
+
+run().catch((err) => {
+  // eslint-disable-next-line no-console
+  console.error('check-teapot failed', err);
+  process.exit(1);
+});

package/templates/starter.js

@@ -32,7 +32,9 @@ export async function start(options) {
     // Push by reference to allow post modification
     HttpHandler.defaultInstance.middleware.push(options.middleware);
   }
-  if (!options.errorHandlers) {
+  if (options.errorHandlers) {
+    HttpHandler.defaultInstance.errorHandlers.push(...options.errorHandlers);
+  } else {
     HttpHandler.defaultInstance.errorHandlers.push(
       {
         onError() {

package/test/templates/error-teapot.js

@@ -0,0 +1,47 @@
+import test from 'ava';
+import http from 'node:http';
+import HttpListener from '../../helpers/HttpListener.js';
+import HttpHandler from '../../lib/HttpHandler.js';
+import * as starter from '../../templates/starter.js';
+
+test.serial('custom error handler returns 418 I\'m a teapot', async (t) => {
+  const handler = HttpHandler.defaultInstance;
+  const listener = HttpListener.defaultInstance;
+
+  const mwLen = handler.middleware.length;
+  const ehLen = handler.errorHandlers.length;
+
+  const throwingMiddleware = [() => { throw new Error('brew failed'); }];
+  const teapotHandler = {
+    onError(transaction) {
+      // set custom status and body
+      transaction.response.status = 418;
+      return "I'm a teapot";
+    },
+  };
+
+  await starter.start({ middleware: throwingMiddleware, errorHandlers: [teapotHandler], host: '127.0.0.1', port: 0 });
+
+  t.truthy(listener.httpServer, 'server started');
+  const addr = listener.httpServer.address();
+  t.truthy(addr && addr.port, 'server bound');
+
+  const result = await new Promise((resolve, reject) => {
+    const req = http.get({ port: addr.port, path: '/' }, (res) => {
+      let data = '';
+      res.setEncoding('utf8');
+      res.on('data', (chunk) => { data += chunk; });
+      res.on('end', () => resolve({ status: res.statusCode, body: data }));
+    });
+    req.on('error', reject);
+  });
+
+  t.is(result.status, 418);
+  t.true(result.body.includes("teapot"));
+
+  await listener.stopHttpServer();
+
+  // restore global handler state
+  handler.middleware.splice(mwLen);
+  handler.errorHandlers.splice(ehLen);
+});

package/test/templates/starter.js

@@ -82,9 +82,9 @@ test.serial('starter.start respects provided errorHandlers and pushes middleware
   const lastMw = handler.middleware.at(-1);
   t.is(lastMw, customMiddleware);
 
-  // The implementation does not automatically append provided `errorHandlers`;
-  // it only avoids adding the default when `options.errorHandlers` is supplied.
-  t.is(handler.errorHandlers.length, ehLength);
+  // Provided errorHandlers are appended to the handler.
+  t.is(handler.errorHandlers.length, ehLength + customHandlers.length);
+  t.is(handler.errorHandlers.at(-1), customHandlers.at(-1));
 
   await listener.stopHttpServer();