dx-server 0.13.0 → 0.14.0-alpha.1

package/lib/body.js

@@ -1,5 +1,5 @@
 import { getReq, makeDxContext } from './dx.js';
-import { bufferFromReq, jsonFromReq, queryFromReq, rawFromReq, textFromReq, urlEncodedFromReq } from './bodyHelpers.js';
+import { bufferFromReq, jsonFromReq, queryFromReq, rawFromReq, textFromReq, urlEncodedFromReq, } from './bodyHelpers.js';
 export const getBuffer = makeDxContext((options) => bufferFromReq(getReq(), options));
 export const getJson = makeDxContext((options) => jsonFromReq(getReq(), options));
 export const getRaw = makeDxContext((options) => rawFromReq(getReq(), options));

package/lib/body.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"body.js","sourceRoot":"","sources":["../src/body.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,aAAa,EAAC,MAAM,SAAS,CAAA;AAC7C,OAAO,EAEN,aAAa,EACb,WAAW,EACX,YAAY,EACZ,UAAU,EACV,WAAW,EACX,iBAAiB,GACjB,MAAM,kBAAkB,CAAA;AAEzB,MAAM,CAAC,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,OAAoC,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC,CAAA;AAClH,MAAM,CAAC,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,OAAoC,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC,CAAA;AAC9G,MAAM,CAAC,MAAM,MAAM,GAAG,aAAa,CAAC,CAAC,OAAoC,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC,CAAA;AAC5G,MAAM,CAAC,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,OAAoC,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC,CAAA;AAC9G,MAAM,CAAC,MAAM,aAAa,GAAG,aAAa,CAAC,CAAC,OAAoC,EAAE,EAAE,CACnF,iBAAiB,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CACpC,CAAA;AACD,MAAM,CAAC,MAAM,QAAQ,GAAG,aAAa,CAAC,CAAC,OAAoC,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC,CAAA;AAEhH,wBAAwB;AACxB,mCAAmC","sourcesContent":["import {getReq, makeDxContext} from './dx.js'\nimport {\n\ttype BufferBodyOptions,\n\tbufferFromReq,\n\tjsonFromReq,\n\tqueryFromReq,\n\trawFromReq,\n\ttextFromReq,\n\turlEncodedFromReq,\n} from './bodyHelpers.js'\n\nexport const getBuffer = makeDxContext((options?: Partial<BufferBodyOptions>) => bufferFromReq(getReq(), options))\nexport const getJson = makeDxContext((options?: Partial<BufferBodyOptions>) => jsonFromReq(getReq(), options))\nexport const getRaw = makeDxContext((options?: Partial<BufferBodyOptions>) => rawFromReq(getReq(), options))\nexport const getText = makeDxContext((options?: Partial<BufferBodyOptions>) => textFromReq(getReq(), options))\nexport const getUrlEncoded = makeDxContext((options?: Partial<BufferBodyOptions>) =>\n\turlEncodedFromReq(getReq(), options),\n)\nexport const getQuery = makeDxContext((options?: Partial<BufferBodyOptions>) => queryFromReq(getReq(), options))\n\n// to getFile use busboy\n// https://github.com/mscdex/busboy\n"]}

package/lib/bodyHelpers.js

@@ -17,17 +17,28 @@ export async function bufferFromReq(req, options) {
      */
     // https://github.com/jshttp/type-is/blob/cdcfe23e9833872e425b0aaf71ca0311373b6116/index.js#L92
     const contentLengthParsed = parseInt(req.headers['content-length'] ?? '', 10);
-    if (req.headers['transfer-encoding'] === undefined
-        && isNaN(contentLengthParsed))
+    if (req.headers['transfer-encoding'] === undefined && isNaN(contentLengthParsed))
         return;
     const contentLength = isNaN(contentLengthParsed) ? undefined : contentLengthParsed;
     // read
     const encoding = (req.headers['content-encoding'] ?? 'identity').toLowerCase();
     const stream = getContentStream(req, encoding);
-    return await readStream(stream, {
-        length: encoding === 'identity' ? contentLength : undefined,
-        limit: bodyLimit,
-    });
+    try {
+        return await readStream(stream, {
+            length: encoding === 'identity' ? contentLength : undefined,
+            limit: bodyLimit,
+        });
+    }
+    catch (e) {
+        // On rejection (e.g. body limit exceeded) tear down the decompressor and unpipe it
+        // from req. Otherwise req keeps feeding the decompressor and a zip-bomb keeps inflating
+        // long after the limit fired. req itself is left alive so error middleware can respond.
+        if (stream !== req) {
+            req.unpipe(stream);
+            stream.destroy();
+        }
+        throw e;
+    }
 }
 // if content-type is not as expected, return undefined
 function forceGetContentTypeParams(req, expected) {
@@ -45,7 +56,9 @@ function forceGetCharset(req, expected) {
         return;
     // assert charset per RFC 7159 sec 8.1
     const charset = parameters.charset?.toLowerCase() || 'utf-8';
-    if (!charset.startsWith('utf-'))
+    // positive allowlist: utf-7 etc. would pass a `startsWith('utf-')` check but is not a valid
+    // Buffer encoding (and utf-7 is an XSS smuggling vector)
+    if (!['utf-8', 'utf8', 'utf-16le', 'utf16le'].includes(charset))
         throw new Error(`unsupported charset "${charset.toUpperCase()}"`);
     return charset;
 }
@@ -78,12 +91,12 @@ export async function urlEncodedFromReq(req, options) {
         return;
     const buffer = await bufferFromReq(req, options);
     if (buffer) {
-        return (bodyDefaultOptions.urlEncodedParser ?? options?.urlEncodedParser ?? defaultQueryParser)(buffer.toString(charset));
+        return (options?.urlEncodedParser ?? bodyDefaultOptions.urlEncodedParser ?? defaultQueryParser)(buffer.toString(charset));
     }
 }
 export function urlFromReq(req) {
     return new URL(req.url ?? '', 'https://example.com');
 }
 export function queryFromReq(req, options) {
-    return (bodyDefaultOptions.queryParser ?? options?.queryParser ?? defaultQueryParser)(urlFromReq(req).searchParams.toString());
+    return (options?.queryParser ?? bodyDefaultOptions.queryParser ?? defaultQueryParser)(urlFromReq(req).searchParams.toString());
 }

package/lib/bodyHelpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bodyHelpers.js","sourceRoot":"","sources":["../src/bodyHelpers.ts"],"names":[],"mappings":"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","sourcesContent":["import {IncomingMessage} from 'node:http'\nimport {getContentStream, readStream} from './stream.js'\nimport {parseContentType} from './vendors/contentType.js'\n\nexport interface BufferBodyOptions {\n\tbodyLimit: number\n\turlEncodedParser?(search: string): any\n\tqueryParser?(search: string): any\n}\n\nfunction defaultQueryParser(search: string) {\n\treturn Object.fromEntries(new URLSearchParams(search)) // support both leading ? and not\n}\n\nlet bodyDefaultOptions: BufferBodyOptions = {bodyLimit: 100 << 10} // 100kb\nexport function setBufferBodyDefaultOptions(options: Partial<BufferBodyOptions>) {\n\tbodyDefaultOptions = {...bodyDefaultOptions, ...options}\n}\n\nexport async function bufferFromReq(req: IncomingMessage, options?: Partial<BufferBodyOptions>) {\n\tconst {bodyLimit} = {...bodyDefaultOptions, ...options}\n\t/**\n\t * Check if a request has a request body.\n\t * A request with a body __must__ either have `transfer-encoding`\n\t * or `content-length` headers set.\n\t * http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.3\n\t */\n\t// https://github.com/jshttp/type-is/blob/cdcfe23e9833872e425b0aaf71ca0311373b6116/index.js#L92\n\tconst contentLengthParsed = parseInt(req.headers['content-length'] ?? '', 10)\n\tif (req.headers['transfer-encoding'] === undefined && isNaN(contentLengthParsed)) return\n\tconst contentLength = isNaN(contentLengthParsed) ? undefined : contentLengthParsed\n\n\t// read\n\tconst encoding = (req.headers['content-encoding'] ?? 'identity').toLowerCase()\n\tconst stream = getContentStream(req, encoding)\n\ttry {\n\t\treturn await readStream(stream, {\n\t\t\tlength: encoding === 'identity' ? contentLength : undefined,\n\t\t\tlimit: bodyLimit,\n\t\t})\n\t} catch (e) {\n\t\t// On rejection (e.g. body limit exceeded) tear down the decompressor and unpipe it\n\t\t// from req. Otherwise req keeps feeding the decompressor and a zip-bomb keeps inflating\n\t\t// long after the limit fired. req itself is left alive so error middleware can respond.\n\t\tif (stream !== req) {\n\t\t\treq.unpipe(stream as NodeJS.WritableStream)\n\t\t\tstream.destroy()\n\t\t}\n\t\tthrow e\n\t}\n}\n\n// if content-type is not as expected, return undefined\nfunction forceGetContentTypeParams(req: IncomingMessage, expected: string) {\n\tconst contentTypeRaw = req.headers['content-type']\n\tif (!contentTypeRaw) return\n\tconst {mediaType, parameters} = parseContentType(contentTypeRaw)\n\tif (mediaType !== expected) return\n\n\treturn parameters\n}\nfunction forceGetCharset(req: IncomingMessage, expected: string) {\n\tconst parameters = forceGetContentTypeParams(req, expected)\n\tif (!parameters) return\n\t// assert charset per RFC 7159 sec 8.1\n\tconst charset = (parameters.charset?.toLowerCase() as BufferEncoding) || 'utf-8'\n\t// positive allowlist: utf-7 etc. would pass a `startsWith('utf-')` check but is not a valid\n\t// Buffer encoding (and utf-7 is an XSS smuggling vector)\n\tif (!['utf-8', 'utf8', 'utf-16le', 'utf16le'].includes(charset))\n\t\tthrow new Error(`unsupported charset \"${charset.toUpperCase()}\"`)\n\n\treturn charset\n}\n\nexport async function jsonFromReq(req: IncomingMessage, options?: Partial<BufferBodyOptions>) {\n\tconst charset = forceGetCharset(req, 'application/json')\n\tif (!charset) return\n\tconst buffer = await bufferFromReq(req, options)\n\tif (buffer) {\n\t\tconst str = buffer.toString(charset)\n\t\treturn str ? JSON.parse(str) : undefined\n\t}\n}\n\nexport async function rawFromReq(req: IncomingMessage, options?: Partial<BufferBodyOptions>) {\n\tif (!forceGetContentTypeParams(req, 'application/octet-stream')) return\n\treturn await bufferFromReq(req, options)\n}\n\nexport async function textFromReq(req: IncomingMessage, options?: Partial<BufferBodyOptions>) {\n\tconst charset = forceGetCharset(req, 'text/plain')\n\tif (!charset) return\n\tconst buffer = await bufferFromReq(req, options)\n\tif (buffer) return buffer.toString(charset)\n}\n\nexport async function urlEncodedFromReq(req: IncomingMessage, options?: Partial<BufferBodyOptions>) {\n\tconst charset = forceGetCharset(req, 'application/x-www-form-urlencoded')\n\tif (!charset) return\n\tconst buffer = await bufferFromReq(req, options)\n\tif (buffer) {\n\t\treturn (bodyDefaultOptions.urlEncodedParser ?? options?.urlEncodedParser ?? defaultQueryParser)(\n\t\t\tbuffer.toString(charset),\n\t\t)\n\t}\n}\n\nexport function urlFromReq(req: IncomingMessage) {\n\treturn new URL(req.url ?? '', 'https://example.com')\n}\n\nexport function queryFromReq(req: IncomingMessage, options?: Partial<BufferBodyOptions>) {\n\treturn (bodyDefaultOptions.queryParser ?? options?.queryParser ?? defaultQueryParser)(\n\t\turlFromReq(req).searchParams.toString(),\n\t)\n}\n"]}

package/lib/dx.d.ts

@@ -17,7 +17,7 @@ export declare function dxServer(req: IncomingMessage, res: ServerResponse, opti
     disableEtag?: boolean;
 }): Chainable;
 export declare function getReq(): IncomingMessage;
-export declare function getRes(): ServerResponse;
+export declare function getRes(): ServerResponse<IncomingMessage>;
 export declare function setText(text: string, { status }?: {
     status?: number;
 }): void;

package/lib/dx.js

@@ -14,17 +14,19 @@ export function makeDxContext(maker) {
         return promiseMap.get(req);
     });
     Object.defineProperty(context, 'value', {
-        get() { return valueMap.get(getReq()); },
+        get() {
+            return valueMap.get(getReq());
+        },
         set(value) {
             const req = getReq();
             promiseMap.set(req, Promise.resolve(value));
             valueMap.set(req, value);
-        }
+        },
     });
-    context.chain = ((...params) => (async (next) => {
+    context.chain = ((...params) => async (next) => {
         await context(...params);
         return next();
-    }));
+    });
     context.set = (req, value) => {
         promiseMap.set(req, Promise.resolve(value));
         valueMap.set(req, value);
@@ -46,8 +48,12 @@ export function dxServer(req, res, options = {}) {
 // url: full url without server, protocol, port.
 // headers: if headers are repeated, they are joined by comma. Header names are lowercased.
 // rawHeaders: list of header name and value in a flat array. Case is preserved.
-export function getReq() { return requestStorage.getStore().req; }
-export function getRes() { return requestStorage.getStore().res; }
+export function getReq() {
+    return requestStorage.getStore().req;
+}
+export function getRes() {
+    return requestStorage.getStore().res;
+}
 export function setText(text, { status } = {}) {
     const res = getRes();
     const dx = dxContext.value;

package/lib/dx.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dx.js","sourceRoot":"","sources":["../src/dx.ts"],"names":[],"mappings":"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","sourcesContent":["import {Readable} from 'node:stream'\nimport type {IncomingMessage, ServerResponse} from 'node:http'\nimport {AsyncLocalStorage} from 'node:async_hooks'\nimport {type DxContext, writeRes} from './dxHelpers.js'\nimport type {SendFileOptions} from './staticHelpers.js'\n\nexport interface Chainable<R = any, Next = (...np: any[]) => any> {\n\t(next: Next): R\n}\n\nexport interface Context<T, Params extends any[] = any[], R = any, Next = (...np: any[]) => any> {\n\tvalue: Awaited<T> // can be undefined\n\tget(req: IncomingMessage): T\n\tset(req: IncomingMessage, value: T): void\n\t(...params: Params): Promise<T>\n\tchain(...params: Params): Chainable<R, Next>\n}\nexport function makeDxContext<T, Params extends any[] = any[], R = any, Next = (...np: any[]) => any>(\n\tmaker: (...params: Params) => T | Promise<T>,\n): Context<T, Params, R, Next> {\n\tconst promiseMap = new WeakMap<IncomingMessage, Promise<T>>()\n\tconst valueMap = new WeakMap<IncomingMessage, T>()\n\tconst context = ((...params: Params) => {\n\t\tconst req = getReq()\n\t\tif (!promiseMap.has(req))\n\t\t\tpromiseMap.set(\n\t\t\t\treq,\n\t\t\t\t(async () => {\n\t\t\t\t\tconst value = await maker(...params)\n\t\t\t\t\tvalueMap.set(req, value)\n\t\t\t\t\treturn value\n\t\t\t\t})(),\n\t\t\t)\n\t\treturn promiseMap.get(req)!\n\t}) as Context<T, Params, R, Next>\n\tObject.defineProperty(context, 'value', {\n\t\tget() {\n\t\t\treturn valueMap.get(getReq())\n\t\t},\n\t\tset(value) {\n\t\t\tconst req = getReq()\n\t\t\tpromiseMap.set(req, Promise.resolve(value))\n\t\t\tvalueMap.set(req, value)\n\t\t},\n\t})\n\tcontext.chain = ((...params: Params) =>\n\t\tasync (next: Next) => {\n\t\t\tawait context(...params)\n\t\t\treturn (next as (...args: any[]) => any)()\n\t\t}) as Context<T, Params, R, Next>['chain']\n\tcontext.set = (req, value) => {\n\t\tpromiseMap.set(req, Promise.resolve(value))\n\t\tvalueMap.set(req, value)\n\t}\n\tcontext.get = req => valueMap.get(req) as T\n\treturn context\n}\n\nconst requestStorage = new AsyncLocalStorage<{\n\treq: IncomingMessage\n\tres: ServerResponse\n}>()\nconst dxContext = makeDxContext<DxContext>(options => ({...options}) as DxContext)\nexport function dxServer(\n\treq: IncomingMessage,\n\tres: ServerResponse,\n\toptions: {\n\t\tjsonBeautify?: boolean\n\t\tdisableEtag?: boolean\n\t} = {},\n): Chainable {\n\treturn async next => {\n\t\tdxContext.set(req, {...options} as DxContext)\n\t\tconst result = await requestStorage.run({req, res}, next)\n\t\tawait writeRes(req, res, dxContext.get(req))\n\t\treturn result\n\t}\n}\n\n// method: verb\n// url: full url without server, protocol, port.\n// headers: if headers are repeated, they are joined by comma. Header names are lowercased.\n// rawHeaders: list of header name and value in a flat array. Case is preserved.\nexport function getReq() {\n\treturn requestStorage.getStore()!.req\n}\nexport function getRes() {\n\treturn requestStorage.getStore()!.res\n}\n\nexport function setText(text: string, {status}: {status?: number} = {}) {\n\tconst res = getRes()\n\tconst dx = dxContext.value\n\tif (status) res.statusCode = status\n\tdx.data = text\n\tdx.type = 'text'\n}\n\nexport function setEmpty({status}: {status?: number} = {}) {\n\tconst res = getRes()\n\tconst dx = dxContext.value\n\tif (status) res.statusCode = status\n\tdx.data = undefined\n\tdx.type = 'empty'\n}\n\nexport function setHtml(html: string, opts: {status?: number} = {}) {\n\tsetText(html, opts)\n\tconst dx = dxContext.value\n\tdx.type = 'html'\n}\n\nexport function setFile(filePath: string, options?: SendFileOptions) {\n\tconst dx = dxContext.value\n\tdx.data = filePath\n\tdx.type = 'file'\n\tdx.options = options\n}\n\nexport function setBuffer(buffer: Buffer, {status}: {status?: number} = {}) {\n\tconst res = getRes()\n\tconst dx = dxContext.value\n\tif (status) res.statusCode = status\n\tdx.data = buffer\n\tdx.type = 'buffer'\n}\n\nexport function setNodeStream(stream: Readable, {status}: {status?: number} = {}) {\n\tconst res = getRes()\n\tconst dx = dxContext.value\n\tif (status) res.statusCode = status\n\tdx.data = stream\n\tdx.type = 'nodeStream'\n}\n\nexport function setWebStream(stream: ReadableStream, {status}: {status?: number} = {}) {\n\tconst res = getRes()\n\tconst dx = dxContext.value\n\tif (status) res.statusCode = status\n\tdx.data = stream\n\tdx.type = 'webStream'\n}\n\nexport function setJson(json: any, {status}: {status?: number} = {}) {\n\tconst res = getRes()\n\tif (status) res.statusCode = status\n\n\tconst dx = dxContext.value\n\tdx.data = json\n\tdx.type = 'json'\n}\n\nexport function setRedirect(url: string, status: 301 | 302) {\n\tconst res = getRes()\n\tconst dx = dxContext.value\n\tres.statusCode = status\n\tdx.data = url\n\tdx.type = 'redirect'\n}\n\n// for download, set content-disposition header\n// res.setHeader('Content-disposition', 'attachment; filename=my-movie.MOV')\n\n// res.setHeader('Content-type', 'video/quicktime')\n// fileStream.pipe(res)\n// or\n// send(req, filePath, options).pipe(res) // which will set content-type, content-length, and other cache related headers like staticHelpers.sendFile\n\n// implementing this require a strict validation for the type (attachment) and filename.\n// For example: express relies on this\n// https://github.com/jshttp/content-disposition/blob/1037e24e4790273da96645ad250061f39e77968c/index.js#L186\n// because in most applications, users can specify a simple filename which usually doesn't need to be validated.\n// we leave setDownload() implementation for users, for now.\n"]}

package/lib/dxHelpers.d.ts

@@ -1,5 +1,6 @@
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import { Readable } from 'node:stream';
+import type { ReadableStream as WebReadableStream } from 'node:stream/web';
 import { type SendFileOptions } from './staticHelpers.js';
 export type DxContext = {
     charset?: BufferEncoding;
@@ -35,7 +36,7 @@ export type DxContext = {
     options: undefined;
 } | {
     type: 'webStream';
-    data: ReadableStream;
+    data: WebReadableStream;
     options: undefined;
 } | {
     type: 'file';

package/lib/dxHelpers.js

@@ -1,117 +1,135 @@
 import { Readable } from 'node:stream';
+import { pipeline } from 'node:stream/promises';
 import { promisify } from 'node:util';
 import { entityTag, isFreshETag } from './vendors/etag.js';
 import { sendFileTrusted } from './staticHelpers.js';
 export async function writeRes(req, res, { type, data, charset, jsonBeautify, disableEtag, options }) {
-    const setContentType = (contentType) => {
-        if (res.headersSent || res.getHeader('content-type'))
-            return;
-        res.setHeader('content-type', `${contentType}${charset ? `; charset=${charset}` : ''}`);
-    };
-    let bufferOrStream;
+    if (res.headersSent)
+        return;
+    let buffer;
     switch (type) {
         case 'text':
-            setContentType('text/plain');
         case 'html':
-            setContentType('text/html');
-            // shared with text
-            bufferOrStream = Buffer.from(data ?? '', charset);
+            setContentType(type === 'html' ? 'text/html' : 'text/plain');
+            buffer = Buffer.from(data ?? '', charset);
             break;
         case 'buffer':
             setContentType('application/octet-stream');
-            bufferOrStream = data ?? Buffer.from('', charset);
-            break;
-        case 'nodeStream':
-            setContentType('application/octet-stream');
-            bufferOrStream = data ?? Buffer.from('', charset);
-            break;
-        case 'webStream':
-            setContentType('application/octet-stream');
-            bufferOrStream = Readable.fromWeb(data ?? new ReadableStream());
+            buffer = data ?? Buffer.from('', charset);
             break;
         case 'json':
             setContentType('application/json');
-            bufferOrStream = data === undefined
-                ? Buffer.from('', charset)
-                : Buffer.from(jsonBeautify ? JSON.stringify(data, null, 2) : JSON.stringify(data), charset);
+            buffer =
+                data === undefined
+                    ? Buffer.from('', charset)
+                    : Buffer.from(jsonBeautify ? JSON.stringify(data, null, 2) : JSON.stringify(data), charset);
             break;
-        case 'redirect': // https://stackoverflow.com/a/8059718/1398479
-            res.setHeader('location', data);
-            bufferOrStream = Buffer.from('', charset);
+        case 'redirect':
+        case 'empty':
+            if (type === 'redirect')
+                res.setHeader('location', data);
+            buffer = Buffer.from('', charset);
             break;
+        // Streaming paths own res.end() themselves (via pipeline/sendFileTrusted) and must be
+        // awaited to fulfil the "chain resolves after flush" invariant.
+        case 'nodeStream':
+        case 'webStream':
+            if (!data) {
+                buffer = Buffer.from('', charset);
+                break;
+            }
         case 'file':
+            setContentType('application/octet-stream');
             try {
-                await sendFileTrusted(req, res, data, options);
+                if (type === 'file')
+                    await sendFileTrusted(req, res, data, options);
+                else if (type === 'nodeStream')
+                    await pipeline(data, res);
+                else if (type === 'webStream')
+                    await pipeline(Readable.fromWeb(data), res);
             }
             catch (e) {
-                // do nothing
+                // A streaming helper (pipeline/sendFileTrusted) may already have destroyed res on
+                // error (e.g. fs open EACCES mid-stream). Calling res.end() on a destroyed response
+                // never resolves, so skip it — otherwise the chain hangs forever.
+                if (res.destroyed) {
+                    // nothing to flush; res is already torn down
+                }
+                else if (!res.headersSent) {
+                    res.statusCode = e?.statusCode ?? 500;
+                    await promisify(res.end.bind(res))();
+                }
+                else if (!res.writableEnded)
+                    res.destroy(e);
             }
+            await awaitResFinished(res);
+            return;
         case undefined:
-            // skip response. Some middleware may handle it outside the chain. For example, express middleware
+            // No setter was called. End the response with 404 instead of leaving it hung.
+            if (!res.headersSent)
+                res.statusCode = 404;
+            if (!res.writableEnded)
+                await promisify(res.end.bind(res))();
+            await awaitResFinished(res);
             return;
-        case 'empty':
-            bufferOrStream = Buffer.from('', charset);
-            break;
         default:
-            if (!res.getHeader('content-type'))
-                res.setHeader('content-type', 'text/plain');
-            throw new Error(`unsupported response type ${type}`);
+            // Unknown type: programming error. Surface it via console.error but still finish
+            // res so the invariant holds (chain resolves only after flush).
+            console.error(new Error(`unsupported response type ${type}`));
+            if (!res.headersSent)
+                res.statusCode = 500;
+            if (!res.writableEnded)
+                await promisify(res.end.bind(res))();
+            await awaitResFinished(res);
+            return;
     }
-    if (res.headersSent) {
-        // for example, chainStatic or setFile send the response directly
-        if (res.writableFinished) {
-            // skipped: response is already finished
+    // 204 No Content and 304 Not Modified must not carry a body or Content-Length.
+    if (res.statusCode !== 204 && res.statusCode !== 304) {
+        // Content-Length and ETag mirror what a GET would send, so a HEAD reports them too.
+        res.setHeader('content-length', buffer.length);
+        // no ETag for redirects: the empty body would share the empty-body tag with other empty
+        // responses, so a cached If-None-Match could wrongly 304 a redirect (dropping Location)
+        if (!disableEtag && type !== 'redirect') {
+            const etag = entityTag(buffer);
+            res.setHeader('ETag', etag);
+            if (isFreshETag(req, etag))
+                res.statusCode = 304;
         }
-        else if (res.writableEnded) {
-            // const defer = Promise.withResolvers()
-            // res.addListener('finish', defer.resolve)
-            // res.addListener('error', defer.reject)
-            // await defer.promise
-            // skipped: response is already ended
-            // chunk is not fully flushed yet
-        }
-        else
-            await promisify(res.end.bind(res))();
     }
-    else {
+    // 204/304 carry no body or representation/framing metadata (ETag is a validator, so it stays).
+    // This catches both an explicitly-set 204/304 and the freshETag -> 304 transition above.
+    if (res.statusCode === 204 || res.statusCode === 304) {
         // https://github.com/expressjs/express/blob/980d881e3b023db079de60477a2588a91f046ca5/lib/response.js#L210
-        // if (res.statusCode === 204) { // No Content
-        // 	res.removeHeader('content-type')
-        // 	res.removeHeader('content-length')
-        // 	res.removeHeader('transfer-encoding')
-        // 	// write nothing
-        // }
-        // if (res.statusCode === 205) { // reset content. Tell client to clear the form, etc.
-        // 	res.setHeader('content-length', 0)
-        // 	res.removeHeader('transfer-encoding')
-        // } else
-        if (req.method !== 'HEAD') {
-            if (Buffer.isBuffer(bufferOrStream)) {
-                // support: 304 (etag), zipping, file etag and last modified
-                res.setHeader('content-length', bufferOrStream.length);
-                if (!disableEtag) {
-                    const etag = entityTag(bufferOrStream);
-                    // const lastModified = res.getHeader('last-modified')
-                    res.setHeader('ETag', etag);
-                    if (isFreshETag(req, etag)) {
-                        res.removeHeader('content-type');
-                        res.removeHeader('content-length');
-                        res.removeHeader('transfer-encoding');
-                        res.statusCode = 304;
-                        // write nothing
-                    }
-                    else
-                        res.write(bufferOrStream);
-                }
-                else
-                    res.write(bufferOrStream);
-            }
-            else {
-                bufferOrStream.pipe(res);
-                return; // no res.end()
-            }
-            // we do not support content-encoding (gzip, deflate, br) and leave it to reverse proxy or CDN
-        }
-        await promisify(res.end.bind(res))();
+        res.removeHeader('content-type');
+        res.removeHeader('content-length');
+        res.removeHeader('transfer-encoding');
     }
+    else if (req.method !== 'HEAD')
+        res.write(buffer);
+    // we do not support content-encoding (gzip, deflate, br) and leave it to reverse proxy or CDN
+    await promisify(res.end.bind(res))();
+    await awaitResFinished(res);
+    function setContentType(contentType) {
+        if (res.headersSent || res.getHeader('content-type'))
+            return;
+        // only text/* carries a charset; binary (octet-stream) and JSON (always UTF-8 per RFC 8259) do not
+        const cs = charset ?? (contentType.startsWith('text/') ? 'utf-8' : undefined);
+        res.setHeader('content-type', `${contentType}${cs ? `; charset=${cs}` : ''}`);
+    }
+}
+// Resolves when res is fully flushed (finish) or the socket is gone (close).
+// Used as the universal "we're done with this response" signal so every code path
+// in writeRes can guarantee the chain doesn't unwind before bytes hit the wire.
+function awaitResFinished(res) {
+    if (res.writableFinished || res.destroyed)
+        return Promise.resolve();
+    return new Promise(resolve => {
+        res.once('finish', done);
+        res.once('close', done);
+        function done() {
+            res.off('finish', done);
+            res.off('close', done);
+            resolve();
+        }
+    });
 }

package/lib/dxHelpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dxHelpers.js","sourceRoot":"","sources":["../src/dxHelpers.ts"],"names":[],"mappings":"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","sourcesContent":["import type {IncomingMessage, ServerResponse} from 'node:http'\nimport {Readable} from 'node:stream'\nimport type {ReadableStream as WebReadableStream} from 'node:stream/web'\nimport {pipeline} from 'node:stream/promises'\nimport {promisify} from 'node:util'\nimport {entityTag, isFreshETag} from './vendors/etag.js'\nimport {sendFileTrusted, type SendFileOptions, type HttpError} from './staticHelpers.js'\n\nexport type DxContext = {\n\tcharset?: BufferEncoding // not for redirect\n\tjsonBeautify?: boolean // json only\n\tdisableEtag?: boolean\n} & (\n\t| {\n\t\t\ttype: 'empty'\n\t\t\tdata: undefined\n\t\t\toptions: undefined\n\t  }\n\t| {\n\t\t\ttype: 'text'\n\t\t\tdata: string\n\t\t\toptions: undefined\n\t  }\n\t| {\n\t\t\ttype: 'html'\n\t\t\tdata: string\n\t\t\toptions: undefined\n\t  }\n\t| {\n\t\t\ttype: 'buffer'\n\t\t\tdata: Buffer\n\t\t\toptions: undefined\n\t  }\n\t| {\n\t\t\ttype: 'json'\n\t\t\tdata: any\n\t\t\toptions: undefined\n\t  }\n\t| {\n\t\t\ttype: 'redirect'\n\t\t\tdata: string\n\t\t\toptions: undefined\n\t  }\n\t| {\n\t\t\ttype: 'nodeStream'\n\t\t\tdata: Readable\n\t\t\toptions: undefined\n\t  }\n\t| {\n\t\t\ttype: 'webStream'\n\t\t\tdata: WebReadableStream\n\t\t\toptions: undefined\n\t  }\n\t| {\n\t\t\ttype: 'file'\n\t\t\tdata: string\n\t\t\toptions?: SendFileOptions\n\t  }\n)\n\nexport async function writeRes(\n\treq: IncomingMessage,\n\tres: ServerResponse,\n\t{type, data, charset, jsonBeautify, disableEtag, options}: DxContext,\n) {\n\tif (res.headersSent) return\n\n\tlet buffer: Buffer | undefined\n\n\tswitch (type) {\n\t\tcase 'text':\n\t\tcase 'html':\n\t\t\tsetContentType(type === 'html' ? 'text/html' : 'text/plain')\n\t\t\tbuffer = Buffer.from(data ?? '', charset)\n\t\t\tbreak\n\t\tcase 'buffer':\n\t\t\tsetContentType('application/octet-stream')\n\t\t\tbuffer = data ?? Buffer.from('', charset)\n\t\t\tbreak\n\t\tcase 'json':\n\t\t\tsetContentType('application/json')\n\t\t\tbuffer =\n\t\t\t\tdata === undefined\n\t\t\t\t\t? Buffer.from('', charset)\n\t\t\t\t\t: Buffer.from(jsonBeautify ? JSON.stringify(data, null, 2) : JSON.stringify(data), charset)\n\t\t\tbreak\n\t\tcase 'redirect':\n\t\tcase 'empty':\n\t\t\tif (type === 'redirect') res.setHeader('location', data)\n\t\t\tbuffer = Buffer.from('', charset)\n\t\t\tbreak\n\t\t// Streaming paths own res.end() themselves (via pipeline/sendFileTrusted) and must be\n\t\t// awaited to fulfil the \"chain resolves after flush\" invariant.\n\t\tcase 'nodeStream':\n\t\tcase 'webStream':\n\t\t\tif (!data) {\n\t\t\t\tbuffer = Buffer.from('', charset)\n\t\t\t\tbreak\n\t\t\t}\n\t\tcase 'file':\n\t\t\tsetContentType('application/octet-stream')\n\t\t\ttry {\n\t\t\t\tif (type === 'file') await sendFileTrusted(req, res, data, options)\n\t\t\t\telse if (type === 'nodeStream') await pipeline(data, res)\n\t\t\t\telse if (type === 'webStream') await pipeline(Readable.fromWeb(data), res)\n\t\t\t} catch (e) {\n\t\t\t\t// A streaming helper (pipeline/sendFileTrusted) may already have destroyed res on\n\t\t\t\t// error (e.g. fs open EACCES mid-stream). Calling res.end() on a destroyed response\n\t\t\t\t// never resolves, so skip it — otherwise the chain hangs forever.\n\t\t\t\tif (res.destroyed) {\n\t\t\t\t\t// nothing to flush; res is already torn down\n\t\t\t\t} else if (!res.headersSent) {\n\t\t\t\t\tres.statusCode = (e as Partial<HttpError>)?.statusCode ?? 500\n\t\t\t\t\tawait promisify(res.end.bind(res))()\n\t\t\t\t} else if (!res.writableEnded) res.destroy(e as Error)\n\t\t\t\tconsole.error(e)\n\t\t\t}\n\t\t\tawait awaitResFinished(res)\n\t\t\treturn\n\t\tcase undefined:\n\t\t\t// No setter was called. End the response with 404 instead of leaving it hung.\n\t\t\tif (!res.headersSent) res.statusCode = 404\n\t\t\tif (!res.writableEnded) await promisify(res.end.bind(res))()\n\t\t\tawait awaitResFinished(res)\n\t\t\treturn\n\t\tdefault:\n\t\t\t// Unknown type: programming error. Surface it via console.error but still finish\n\t\t\t// res so the invariant holds (chain resolves only after flush).\n\t\t\tconsole.error(new Error(`unsupported response type ${type satisfies never}`))\n\t\t\tif (!res.headersSent) res.statusCode = 500\n\t\t\tif (!res.writableEnded) await promisify(res.end.bind(res))()\n\t\t\tawait awaitResFinished(res)\n\t\t\treturn\n\t}\n\n\t// https://github.com/expressjs/express/blob/980d881e3b023db079de60477a2588a91f046ca5/lib/response.js#L210\n\t// if (res.statusCode === 204) { // No Content\n\t// \tres.removeHeader('content-type')\n\t// \tres.removeHeader('content-length')\n\t// \tres.removeHeader('transfer-encoding')\n\t// \t// write nothing\n\t// }\n\t// if (res.statusCode === 205) { // reset content. Tell client to clear the form, etc.\n\t// \tres.setHeader('content-length', 0)\n\t// \tres.removeHeader('transfer-encoding')\n\t// } else\n\tif (req.method !== 'HEAD') {\n\t\tres.setHeader('content-length', buffer.length)\n\t\t// no ETag for redirects: the empty body would share the empty-body tag with other empty\n\t\t// responses, so a cached If-None-Match could wrongly 304 a redirect (dropping Location)\n\t\tif (!disableEtag && type !== 'redirect') {\n\t\t\tconst etag = entityTag(buffer)\n\t\t\tres.setHeader('ETag', etag)\n\t\t\tif (isFreshETag(req, etag)) {\n\t\t\t\tres.removeHeader('content-type')\n\t\t\t\tres.removeHeader('content-length')\n\t\t\t\tres.removeHeader('transfer-encoding')\n\t\t\t\tres.statusCode = 304\n\t\t\t} else res.write(buffer)\n\t\t} else res.write(buffer)\n\t\tawait promisify(res.end.bind(res))()\n\t}\n\t// we do not support content-encoding (gzip, deflate, br) and leave it to reverse proxy or CDN\n\n\tawait promisify(res.end.bind(res))()\n\n\tawait awaitResFinished(res)\n\n\tfunction setContentType(contentType: string) {\n\t\tif (res.headersSent || res.getHeader('content-type')) return\n\t\tres.setHeader('content-type', `${contentType}${charset ? `; charset=${charset}` : ''}`)\n\t}\n}\n\n// Resolves when res is fully flushed (finish) or the socket is gone (close).\n// Used as the universal \"we're done with this response\" signal so every code path\n// in writeRes can guarantee the chain doesn't unwind before bytes hit the wire.\nfunction awaitResFinished(res: ServerResponse) {\n\tif (res.writableFinished || res.destroyed) return Promise.resolve()\n\treturn new Promise<void>(resolve => {\n\t\tres.once('finish', done)\n\t\tres.once('close', done)\n\t\tfunction done() {\n\t\t\tres.off('finish', done)\n\t\t\tres.off('close', done)\n\t\t\tresolve()\n\t\t}\n\t})\n}\n"]}

package/lib/helpers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAA;AACvC,OAAO,EACN,2BAA2B,EAC3B,aAAa,EACb,WAAW,EACX,UAAU,EACV,WAAW,EACX,iBAAiB,EACjB,YAAY,GACZ,MAAM,kBAAkB,CAAA","sourcesContent":["export {writeRes} from './dxHelpers.js'\nexport {\n\tsetBufferBodyDefaultOptions,\n\tbufferFromReq,\n\tjsonFromReq,\n\trawFromReq,\n\ttextFromReq,\n\turlEncodedFromReq,\n\tqueryFromReq,\n} from './bodyHelpers.js'\n"]}

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 export { getReq, getRes, setHtml, setNodeStream, setWebStream, setJson, setBuffer, setRedirect, setText, setEmpty, setFile, makeDxContext, } from './dx.js';
 import { dxServer } from './dx.js';
-export { getBuffer, getJson, getRaw, getText, getUrlEncoded, getQuery, } from './body.js';
+export { getBuffer, getJson, getRaw, getText, getUrlEncoded, getQuery } from './body.js';
 export { router } from './router.js';
 export { chainStatic } from './static.js';
 export { logJson, default as logger } from './logger.js';

package/lib/index.js

@@ -1,6 +1,6 @@
 export { getReq, getRes, setHtml, setNodeStream, setWebStream, setJson, setBuffer, setRedirect, setText, setEmpty, setFile, makeDxContext, } from './dx.js';
 import { dxServer } from './dx.js';
-export { getBuffer, getJson, getRaw, getText, getUrlEncoded, getQuery, } from './body.js';
+export { getBuffer, getJson, getRaw, getText, getUrlEncoded, getQuery } from './body.js';
 export { router } from './router.js';
 export { chainStatic } from './static.js';
 export { logJson, default as logger } from './logger.js';

package/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,MAAM,EACN,MAAM,EACN,OAAO,EACP,aAAa,EACb,YAAY,EACZ,OAAO,EACP,SAAS,EACT,WAAW,EACX,OAAO,EACP,QAAQ,EACR,OAAO,EACP,aAAa,GACb,MAAM,SAAS,CAAA;AAChB,OAAO,EAAC,QAAQ,EAAC,MAAM,SAAS,CAAA;AAChC,OAAO,EAAC,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAC,MAAM,WAAW,CAAA;AACtF,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAA;AAClC,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAA;AACvC,OAAO,EAAC,OAAO,EAAE,OAAO,IAAI,MAAM,EAAC,MAAM,aAAa,CAAA;AAEtD,eAAe,QAAQ,CAAA","sourcesContent":["export {\n\tgetReq,\n\tgetRes,\n\tsetHtml,\n\tsetNodeStream,\n\tsetWebStream,\n\tsetJson,\n\tsetBuffer,\n\tsetRedirect,\n\tsetText,\n\tsetEmpty,\n\tsetFile,\n\tmakeDxContext,\n} from './dx.js'\nimport {dxServer} from './dx.js'\nexport {getBuffer, getJson, getRaw, getText, getUrlEncoded, getQuery} from './body.js'\nexport {router} from './router.js'\nexport {chainStatic} from './static.js'\nexport {logJson, default as logger} from './logger.js'\n\nexport default dxServer\n"]}

package/lib/logger.d.ts

@@ -1,3 +1,4 @@
 export declare function logJson(json: any): void;
-declare const _default: (log?: typeof logJson) => (next: () => any) => any;
-export default _default;
+export default function makeLogger(log?: typeof logJson, { timezoneOffset }?: {
+    timezoneOffset?: number | undefined;
+}): (next: () => any) => any;

package/lib/logger.js

@@ -4,53 +4,61 @@ export function logJson(json) {
     console.log(JSON.stringify(json));
 }
 let requestCount = 0;
-export default (log = logJson) => function logger(next) {
-    const res = getRes();
-    const req = getReq();
-    const logId = requestCount++;
-    const start = hrtime.bigint();
-    const now = new Date(Date.now() + 9 * 60 * 60 * 1000); // jst
-    log({
-        level: 'info',
-        id: logId,
-        timestamp: [
-            [
-                now.getUTCFullYear(),
-                String(now.getUTCMonth() + 1).padStart(2, '0'),
-                String(now.getUTCDate()).padStart(2, '0'),
-            ].join('-'),
-            [
-                String(now.getUTCHours()).padStart(2, '0'),
-                String(now.getUTCMinutes()).padStart(2, '0'),
-                [String(now.getUTCSeconds()).padStart(2, '0'), String(now.getUTCMilliseconds()).padStart(3, '0')].join('.'),
-            ].join(':'),
-        ].join('T'),
-        remoteAddress: req.socket.remoteAddress,
-        method: req.method,
-        url: req.url,
-        httpVersion: `HTTP/${req.httpVersion}`,
-        headers: process.env.NODE_ENV === 'production'
-            ? req.headers
-            : Object.fromEntries(Object.entries(req.headers).filter(([k]) => [
-                'host',
-                'referer',
-                'referrer',
-                'user-agent',
-                'x-forwarded-proto',
-                'x-forwarded-host',
-                'x-forwarded-for',
-            ].includes(k))),
-    });
-    res.once('finish', end).once('close', end).once('error', end);
-    return next();
-    function end() {
-        res.off('finish', end).off('close', end).off('error', end);
-        const durationNs = hrtime.bigint() - start;
+export default function makeLogger(log = logJson, { timezoneOffset = 0 } = {}) {
+    // offset designator so a shifted timestamp is unambiguous (e.g. +09:00, -05:00, +00:00)
+    const offsetMin = Math.round(timezoneOffset * 60);
+    const offset = `${offsetMin < 0 ? '-' : '+'}${[
+        String(Math.floor(Math.abs(offsetMin) / 60)).padStart(2, '0'),
+        String(Math.abs(offsetMin) % 60).padStart(2, '0'),
+    ].join(':')}`;
+    return function logger(next) {
+        const res = getRes();
+        const req = getReq();
+        const logId = requestCount++;
+        const start = hrtime.bigint();
+        const now = new Date(Date.now() + timezoneOffset * 60 * 60 * 1000);
         log({
             level: 'info',
             id: logId,
-            duration: Number(durationNs) / 1e6, // ms
-            headers: res.getHeaders(),
+            timestamp: [
+                [
+                    now.getUTCFullYear(),
+                    String(now.getUTCMonth() + 1).padStart(2, '0'),
+                    String(now.getUTCDate()).padStart(2, '0'),
+                ].join('-'),
+                [
+                    String(now.getUTCHours()).padStart(2, '0'),
+                    String(now.getUTCMinutes()).padStart(2, '0'),
+                    [String(now.getUTCSeconds()).padStart(2, '0'), String(now.getUTCMilliseconds()).padStart(3, '0')].join('.'),
+                ].join(':'),
+            ].join('T') + offset,
+            remoteAddress: req.socket.remoteAddress,
+            method: req.method,
+            url: req.url,
+            httpVersion: `HTTP/${req.httpVersion}`,
+            headers: process.env.NODE_ENV === 'production'
+                ? req.headers
+                : Object.fromEntries(Object.entries(req.headers).filter(([k]) => [
+                    'host',
+                    'referer',
+                    'referrer',
+                    'user-agent',
+                    'x-forwarded-proto',
+                    'x-forwarded-host',
+                    'x-forwarded-for',
+                ].includes(k))),
         });
-    }
-};
+        res.once('finish', end).once('close', end).once('error', end);
+        return next();
+        function end() {
+            res.off('finish', end).off('close', end).off('error', end);
+            const durationNs = hrtime.bigint() - start;
+            log({
+                level: 'info',
+                id: logId,
+                duration: Number(durationNs) / 1e6, // ms
+                headers: res.getHeaders(),
+            });
+        }
+    };
+}

package/lib/logger.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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","sourcesContent":["import {getReq, getRes} from './dx.js'\nimport {hrtime} from 'node:process'\n\nexport function logJson(json: any) {\n\tconsole.log(JSON.stringify(json))\n}\n\nlet requestCount = 0\nexport default function makeLogger(log = logJson, {timezoneOffset = 0} = {}) {\n\treturn function logger(next: () => any) {\n\t\tconst res = getRes()\n\t\tconst req = getReq()\n\t\tconst logId = requestCount++\n\n\t\tconst start = hrtime.bigint()\n\t\tconst now = new Date(Date.now() + timezoneOffset * 60 * 60 * 1000)\n\n\t\tlog({\n\t\t\tlevel: 'info',\n\t\t\tid: logId,\n\t\t\ttimestamp: [\n\t\t\t\t[\n\t\t\t\t\tnow.getUTCFullYear(),\n\t\t\t\t\tString(now.getUTCMonth() + 1).padStart(2, '0'),\n\t\t\t\t\tString(now.getUTCDate()).padStart(2, '0'),\n\t\t\t\t].join('-'),\n\t\t\t\t[\n\t\t\t\t\tString(now.getUTCHours()).padStart(2, '0'),\n\t\t\t\t\tString(now.getUTCMinutes()).padStart(2, '0'),\n\t\t\t\t\t[String(now.getUTCSeconds()).padStart(2, '0'), String(now.getUTCMilliseconds()).padStart(3, '0')].join('.'),\n\t\t\t\t].join(':'),\n\t\t\t].join('T'),\n\t\t\tremoteAddress: req.socket.remoteAddress,\n\t\t\tmethod: req.method,\n\t\t\turl: req.url,\n\t\t\thttpVersion: `HTTP/${req.httpVersion}`,\n\t\t\theaders:\n\t\t\t\tprocess.env.NODE_ENV === 'production'\n\t\t\t\t\t? req.headers\n\t\t\t\t\t: Object.fromEntries(\n\t\t\t\t\t\t\tObject.entries(req.headers).filter(([k]) =>\n\t\t\t\t\t\t\t\t[\n\t\t\t\t\t\t\t\t\t'host',\n\t\t\t\t\t\t\t\t\t'referer',\n\t\t\t\t\t\t\t\t\t'referrer',\n\t\t\t\t\t\t\t\t\t'user-agent',\n\t\t\t\t\t\t\t\t\t'x-forwarded-proto',\n\t\t\t\t\t\t\t\t\t'x-forwarded-host',\n\t\t\t\t\t\t\t\t\t'x-forwarded-for',\n\t\t\t\t\t\t\t\t].includes(k),\n\t\t\t\t\t\t\t),\n\t\t\t\t\t\t),\n\t\t})\n\n\t\tres.once('finish', end).once('close', end).once('error', end)\n\n\t\treturn next()\n\n\t\tfunction end() {\n\t\t\tres.off('finish', end).off('close', end).off('error', end)\n\t\t\tconst durationNs = hrtime.bigint() - start\n\t\t\tlog({\n\t\t\t\tlevel: 'info',\n\t\t\t\tid: logId,\n\t\t\t\tduration: Number(durationNs) / 1e6, // ms\n\t\t\t\theaders: res.getHeaders(),\n\t\t\t})\n\t\t}\n\t}\n}\n"]}

package/lib/router.js

@@ -1,15 +1,15 @@
 import { getReq } from './dx.js';
 import { urlFromReq } from './bodyHelpers.js';
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods
-const allMethods = [
-    'get', 'head', 'post', 'put', 'delete', 'connect', 'options', 'trace', 'patch'
-];
+const allMethods = ['get', 'head', 'post', 'put', 'delete', 'connect', 'options', 'trace', 'patch'];
 function makeRouter(method, // undefined means any method
 routes, { prefix = '' } = {}) {
     const routeWithUrlPatterns = routes.map(([pattern, handler]) => [new URLPattern({ pathname: `${prefix}${pattern}` }), handler]);
     return next => {
         const req = getReq();
-        if (method !== undefined && req.method !== method.toUpperCase())
+        const want = method?.toUpperCase();
+        // a GET route also answers HEAD: HEAD must behave like GET, and writeRes strips the body
+        if (want !== undefined && req.method !== want && (want !== 'GET' || req.method !== 'HEAD'))
             return next();
         for (const [urlPattern, handler] of routeWithUrlPatterns) {
             // '' matches nothing
@@ -37,7 +37,7 @@ export const router = {
         return typeof params[0] === 'string'
             ? makeRouter(undefined, [[params[0], params[1]]], params[2])
             : makeRouter(undefined, Object.entries(params[0]), params[1]);
-    }
+    },
 };
 for (const method of allMethods)
     router[method] = router.method.bind(router, method);