dx-server 0.5.0 → 0.5.1

package/README.md

@@ -167,7 +167,8 @@ Until these middlewares are available as native dx-server middlewares, express m
 - [ ] cors
 
 ## Note:
-	`getBuffer, getJson, getRaw, getText, getUrlEncoded, getQuery` are all synchronous functions.
+
+`getBuffer, getJson, getRaw, getText, getUrlEncoded, getQuery` are all synchronous functions.
 The associated results are calculated in the first time they are called and cached for subsequent calls.
 
 If you want to get these values synchronously, you can do as follows:

package/cjs/body.d.ts

@@ -1,15 +1,8 @@
-interface BufferBodyOptions {
-    limit: number;
-}
-export declare function setBufferBodyDefaultOptions(options: Partial<BufferBodyOptions>): void;
-export declare function getBuffer(options?: Partial<BufferBodyOptions>): Promise<any>;
+import { BufferBodyOptions } from './bodyHelpers.js';
 export declare function getJson(options?: Partial<BufferBodyOptions>): Promise<any>;
 export declare function getRaw(options?: Partial<BufferBodyOptions>): Promise<any>;
 export declare function getText(options?: Partial<BufferBodyOptions>): Promise<any>;
-export declare function getUrlEncoded({ simplify, ...options }?: Partial<BufferBodyOptions> & {
-    simplify?: boolean;
-}): Promise<any>;
+export declare function getUrlEncoded(options: Partial<BufferBodyOptions>): Promise<any>;
 export declare function getQuery({ simplify, ...options }?: Partial<BufferBodyOptions> & {
     simplify?: boolean;
 }): Promise<any>;
-export {};

package/cjs/body.js

@@ -1,124 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getQuery = exports.getUrlEncoded = exports.getText = exports.getRaw = exports.getJson = exports.getBuffer = exports.setBufferBodyDefaultOptions = void 0;
-const stream_js_1 = require("./stream.js");
-const qs_1 = require("qs");
-const contentType_js_1 = require("./contentType.js");
+exports.getQuery = exports.getUrlEncoded = exports.getText = exports.getRaw = exports.getJson = void 0;
 const dx_js_1 = require("./dx.js");
-let bufferBodyDefaultOptions = { limit: 100 << 10 }; // 100kb
-function setBufferBodyDefaultOptions(options) {
-    bufferBodyDefaultOptions = { ...bufferBodyDefaultOptions, ...options };
-}
-exports.setBufferBodyDefaultOptions = setBufferBodyDefaultOptions;
+const bodyHelpers_js_1 = require("./bodyHelpers.js");
 const bufferBodySymbol = Symbol('bufferBody');
 async function getBuffer(options) {
-    const { limit } = { ...bufferBodyDefaultOptions, ...options };
-    const req = (0, dx_js_1.getReq)();
-    return req[bufferBodySymbol] ??= (async () => {
-        /**
-         * Check if a request has a request body.
-         * A request with a body __must__ either have `transfer-encoding`
-         * or `content-length` headers set.
-         * http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.3
-         */
-        // 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))
-            return;
-        const contentLength = isNaN(contentLengthParsed) ? undefined : contentLengthParsed;
-        // read
-        const encoding = (req.headers['content-encoding'] ?? 'identity').toLowerCase();
-        const stream = (0, stream_js_1.getContentStream)(req, encoding);
-        return await (0, stream_js_1.readStream)(stream, {
-            length: encoding === 'identity' ? contentLength : undefined,
-            limit,
-        });
-    })();
-}
-exports.getBuffer = getBuffer;
-// if content-type is not as expected, return undefined
-function forceGetContentTypeParams(expected) {
-    const req = (0, dx_js_1.getReq)();
-    const contentTypeRaw = req.headers['content-type'];
-    if (!contentTypeRaw)
-        return;
-    const { mediaType, parameters } = (0, contentType_js_1.parseContentType)(contentTypeRaw);
-    if (mediaType !== expected)
-        return;
-    return parameters;
-}
-function forceGetCharset(expected) {
-    const parameters = forceGetContentTypeParams(expected);
-    if (!parameters)
-        return;
-    // assert charset per RFC 7159 sec 8.1
-    const charset = parameters.charset?.toLowerCase() || 'utf-8';
-    if (!charset.startsWith('utf-'))
-        throw new Error(`unsupported charset "${charset.toUpperCase()}"`);
-    return charset;
+    return (0, dx_js_1.getReq)()[bufferBodySymbol] ??= (0, bodyHelpers_js_1.bufferFromReq)((0, dx_js_1.getReq)(), options);
 }
 const jsonBodySymbol = Symbol('jsonBody');
 async function getJson(options) {
-    return (0, dx_js_1.getReq)()[jsonBodySymbol] ??= (async () => {
-        const charset = forceGetCharset('application/json');
-        if (!charset)
-            return;
-        const buffer = await getBuffer(options);
-        if (buffer) {
-            const str = buffer.toString(charset);
-            return str ? JSON.parse(str) : undefined;
-        }
-    })();
+    return (0, dx_js_1.getReq)()[jsonBodySymbol] ??= (0, bodyHelpers_js_1.jsonFromReq)((0, dx_js_1.getReq)(), options);
 }
 exports.getJson = getJson;
 const rawBodySymbol = Symbol('rawBody');
 async function getRaw(options) {
-    return (0, dx_js_1.getReq)()[rawBodySymbol] ??= (async () => {
-        if (!forceGetContentTypeParams('application/octet-stream'))
-            return;
-        return await getBuffer(options);
-    })();
+    return (0, dx_js_1.getReq)()[rawBodySymbol] ??= (0, bodyHelpers_js_1.rawFromReq)((0, dx_js_1.getReq)(), options);
 }
 exports.getRaw = getRaw;
 const textBodySymbol = Symbol('textBody');
 async function getText(options) {
-    return (0, dx_js_1.getReq)()[textBodySymbol] ??= (async () => {
-        const charset = forceGetCharset('text/plain');
-        if (!charset)
-            return;
-        const buffer = await getBuffer(options);
-        if (buffer)
-            return buffer.toString(charset);
-    })();
+    return (0, dx_js_1.getReq)()[textBodySymbol] ??= (0, bodyHelpers_js_1.textFromReq)((0, dx_js_1.getReq)(), options);
 }
 exports.getText = getText;
 const urlEncodedBodySymbol = Symbol('urlencodedBody');
-async function getUrlEncoded({ simplify, ...options } = {}) {
-    return (0, dx_js_1.getReq)()[urlEncodedBodySymbol] ??= (async () => {
-        const charset = forceGetCharset('application/x-www-form-urlencoded');
-        if (!charset)
-            return;
-        const buffer = await getBuffer(options);
-        if (buffer) {
-            const str = buffer.toString(charset);
-            return simplify
-                ? Object.fromEntries(new URLSearchParams(str))
-                : (0, qs_1.parse)(str);
-        }
-    })();
+async function getUrlEncoded(options) {
+    return (0, dx_js_1.getReq)()[urlEncodedBodySymbol] ??= (0, bodyHelpers_js_1.urlEncodedFromReq)((0, dx_js_1.getReq)(), options);
 }
 exports.getUrlEncoded = getUrlEncoded;
 const querySymbol = Symbol('query');
 async function getQuery({ simplify, ...options } = {}) {
-    return (0, dx_js_1.getReq)()[querySymbol] ??= (async () => {
-        const query = (0, dx_js_1.getReq)().url?.split('?', 2)?.[1];
-        return query
-            ? simplify
-                ? Object.fromEntries(new URLSearchParams(query))
-                : (0, qs_1.parse)(query)
-            : {};
-    })();
+    return (0, dx_js_1.getReq)()[querySymbol] ??= (0, bodyHelpers_js_1.queryFromReq)((0, dx_js_1.getReq)(), options);
 }
 exports.getQuery = getQuery;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm9keS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9ib2R5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDJDQUF3RDtBQUN4RCwyQkFBd0I7QUFDeEIscURBQWlEO0FBQ2pELG1DQUE4QjtBQUs5QixJQUFJLHdCQUF3QixHQUFzQixFQUFDLEtBQUssRUFBRSxHQUFHLElBQUksRUFBRSxFQUFDLENBQUEsQ0FBQyxRQUFRO0FBQzdFLFNBQWdCLDJCQUEyQixDQUFDLE9BQW1DO0lBQzlFLHdCQUF3QixHQUFHLEVBQUMsR0FBRyx3QkFBd0IsRUFBRSxHQUFHLE9BQU8sRUFBQyxDQUFBO0FBQ3JFLENBQUM7QUFGRCxrRUFFQztBQUNELE1BQU0sZ0JBQWdCLEdBQUcsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFBO0FBQ3RDLEtBQUssVUFBVSxTQUFTLENBQUMsT0FBb0M7SUFDbkUsTUFBTSxFQUFDLEtBQUssRUFBQyxHQUFHLEVBQUMsR0FBRyx3QkFBd0IsRUFBRSxHQUFHLE9BQU8sRUFBQyxDQUFBO0lBQ3pELE1BQU0sR0FBRyxHQUFHLElBQUEsY0FBTSxHQUFFLENBQUE7SUFDcEIsT0FBTyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxDQUFDLEtBQUssSUFBSSxFQUFFO1FBQzVDOzs7OztXQUtHO1FBQ0YsK0ZBQStGO1FBQ2hHLE1BQU0sbUJBQW1CLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUE7UUFDN0UsSUFDQyxHQUFHLENBQUMsT0FBTyxDQUFDLG1CQUFtQixDQUFDLEtBQUssU0FBUztlQUMzQyxLQUFLLENBQUMsbUJBQW1CLENBQUM7WUFDNUIsT0FBTTtRQUNSLE1BQU0sYUFBYSxHQUFHLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLG1CQUFtQixDQUFBO1FBRWxGLE9B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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm9keS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9ib2R5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLG1DQUE4QjtBQUM5QixxREFReUI7QUFFekIsTUFBTSxnQkFBZ0IsR0FBRyxNQUFNLENBQUMsWUFBWSxDQUFDLENBQUE7QUFDN0MsS0FBSyxVQUFVLFNBQVMsQ0FBQyxPQUFvQztJQUM1RCxPQUFPLElBQUEsY0FBTSxHQUFFLENBQUMsZ0JBQWdCLENBQUMsS0FBSyxJQUFBLDhCQUFhLEVBQUMsSUFBQSxjQUFNLEdBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQTtBQUN2RSxDQUFDO0FBRUQsTUFBTSxjQUFjLEdBQUcsTUFBTSxDQUFDLFVBQVUsQ0FBQyxDQUFBO0FBQ2xDLEtBQUssVUFBVSxPQUFPLENBQUMsT0FBb0M7SUFDakUsT0FBTyxJQUFBLGNBQU0sR0FBRSxDQUFDLGNBQWMsQ0FBQyxLQUFLLElBQUEsNEJBQVcsRUFBQyxJQUFBLGNBQU0sR0FBRSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0FBQ25FLENBQUM7QUFGRCwwQkFFQztBQUVELE1BQU0sYUFBYSxHQUFHLE1BQU0sQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUNoQyxLQUFLLFVBQVUsTUFBTSxDQUFDLE9BQW9DO0lBQ2hFLE9BQU8sSUFBQSxjQUFNLEdBQUUsQ0FBQyxhQUFhLENBQUMsS0FBSyxJQUFBLDJCQUFVLEVBQUMsSUFBQSxjQUFNLEdBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQTtBQUNqRSxDQUFDO0FBRkQsd0JBRUM7QUFFRCxNQUFNLGNBQWMsR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUE7QUFDbEMsS0FBSyxVQUFVLE9BQU8sQ0FBQyxPQUFvQztJQUNqRSxPQUFPLElBQUEsY0FBTSxHQUFFLENBQUMsY0FBYyxDQUFDLEtBQUssSUFBQSw0QkFBVyxFQUFDLElBQUEsY0FBTSxHQUFFLEVBQUUsT0FBTyxDQUFDLENBQUE7QUFDbkUsQ0FBQztBQUZELDBCQUVDO0FBRUQsTUFBTSxvQkFBb0IsR0FBRyxNQUFNLENBQUMsZ0JBQWdCLENBQUMsQ0FBQTtBQUM5QyxLQUFLLFVBQVUsYUFBYSxDQUFDLE9BQW1DO0lBQ3RFLE9BQU8sSUFBQSxjQUFNLEdBQUUsQ0FBQyxvQkFBb0IsQ0FBQyxLQUFLLElBQUEsa0NBQWlCLEVBQUMsSUFBQSxjQUFNLEdBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQTtBQUMvRSxDQUFDO0FBRkQsc0NBRUM7QUFFRCxNQUFNLFdBQVcsR0FBRyxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUE7QUFDNUIsS0FBSyxVQUFVLFFBQVEsQ0FBQyxFQUFDLFFBQVEsRUFBRSxHQUFHLE9BQU8sS0FBdUQsRUFBRTtJQUM1RyxPQUFPLElBQUEsY0FBTSxHQUFFLENBQUMsV0FBVyxDQUFDLEtBQUssSUFBQSw2QkFBWSxFQUFDLElBQUEsY0FBTSxHQUFFLEVBQUUsT0FBTyxDQUFDLENBQUE7QUFDakUsQ0FBQztBQUZELDRCQUVDIn0=

package/cjs/bodyHelpers.d.ts

@@ -0,0 +1,16 @@
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+import { IncomingMessage } from 'node:http';
+import qs from 'qs';
+export interface BufferBodyOptions {
+    bodyLimit: number;
+    simplifyUrlEncodedBody?: boolean;
+    simplifyQuery?: boolean;
+}
+export declare function setBufferBodyDefaultOptions(options: Partial<BufferBodyOptions>): void;
+export declare function bufferFromReq(req: IncomingMessage, options?: Partial<BufferBodyOptions>): Promise<Buffer | undefined>;
+export declare function jsonFromReq(req: IncomingMessage, options?: Partial<BufferBodyOptions>): Promise<any>;
+export declare function rawFromReq(req: IncomingMessage, options?: Partial<BufferBodyOptions>): Promise<Buffer | undefined>;
+export declare function textFromReq(req: IncomingMessage, options?: Partial<BufferBodyOptions>): Promise<string | undefined>;
+export declare function urlEncodedFromReq(req: IncomingMessage, options?: Partial<BufferBodyOptions>): Promise<qs.ParsedQs | undefined>;
+export declare function queryFromReq(req: IncomingMessage, options?: Partial<BufferBodyOptions>): Promise<qs.ParsedQs>;

package/cjs/bodyHelpers.js

@@ -0,0 +1,102 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.queryFromReq = exports.urlEncodedFromReq = exports.textFromReq = exports.rawFromReq = exports.jsonFromReq = exports.bufferFromReq = exports.setBufferBodyDefaultOptions = void 0;
+const stream_js_1 = require("./stream.js");
+const contentType_js_1 = require("./contentType.js");
+const qs_1 = __importDefault(require("qs"));
+let bodyDefaultOptions = { bodyLimit: 100 << 10 }; // 100kb
+function setBufferBodyDefaultOptions(options) {
+    bodyDefaultOptions = { ...bodyDefaultOptions, ...options };
+}
+exports.setBufferBodyDefaultOptions = setBufferBodyDefaultOptions;
+async function bufferFromReq(req, options) {
+    const { bodyLimit } = { ...bodyDefaultOptions, ...options };
+    /**
+     * Check if a request has a request body.
+     * A request with a body __must__ either have `transfer-encoding`
+     * or `content-length` headers set.
+     * http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.3
+     */
+    // 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))
+        return;
+    const contentLength = isNaN(contentLengthParsed) ? undefined : contentLengthParsed;
+    // read
+    const encoding = (req.headers['content-encoding'] ?? 'identity').toLowerCase();
+    const stream = (0, stream_js_1.getContentStream)(req, encoding);
+    return await (0, stream_js_1.readStream)(stream, {
+        length: encoding === 'identity' ? contentLength : undefined,
+        limit: bodyLimit,
+    });
+}
+exports.bufferFromReq = bufferFromReq;
+// if content-type is not as expected, return undefined
+function forceGetContentTypeParams(req, expected) {
+    const contentTypeRaw = req.headers['content-type'];
+    if (!contentTypeRaw)
+        return;
+    const { mediaType, parameters } = (0, contentType_js_1.parseContentType)(contentTypeRaw);
+    if (mediaType !== expected)
+        return;
+    return parameters;
+}
+function forceGetCharset(req, expected) {
+    const parameters = forceGetContentTypeParams(req, expected);
+    if (!parameters)
+        return;
+    // assert charset per RFC 7159 sec 8.1
+    const charset = parameters.charset?.toLowerCase() || 'utf-8';
+    if (!charset.startsWith('utf-'))
+        throw new Error(`unsupported charset "${charset.toUpperCase()}"`);
+    return charset;
+}
+async function jsonFromReq(req, options) {
+    const charset = forceGetCharset(req, 'application/json');
+    if (!charset)
+        return;
+    const buffer = await bufferFromReq(req, options);
+    if (buffer) {
+        const str = buffer.toString(charset);
+        return str ? JSON.parse(str) : undefined;
+    }
+}
+exports.jsonFromReq = jsonFromReq;
+async function rawFromReq(req, options) {
+    if (!forceGetContentTypeParams(req, 'application/octet-stream'))
+        return;
+    return await bufferFromReq(req, options);
+}
+exports.rawFromReq = rawFromReq;
+async function textFromReq(req, options) {
+    const charset = forceGetCharset(req, 'text/plain');
+    if (!charset)
+        return;
+    const buffer = await bufferFromReq(req, options);
+    if (buffer)
+        return buffer.toString(charset);
+}
+exports.textFromReq = textFromReq;
+async function urlEncodedFromReq(req, options) {
+    const charset = forceGetCharset(req, 'application/x-www-form-urlencoded');
+    if (!charset)
+        return;
+    const buffer = await bufferFromReq(req, options);
+    if (buffer) {
+        const str = buffer.toString(charset);
+        const { simplifyUrlEncodedBody } = { ...bodyDefaultOptions, ...options };
+        return simplifyUrlEncodedBody ? Object.fromEntries(new URLSearchParams(str)) : qs_1.default.parse(str);
+    }
+}
+exports.urlEncodedFromReq = urlEncodedFromReq;
+async function queryFromReq(req, options) {
+    const query = new URL(req.url ?? '', 'https://example.com').searchParams.toString();
+    const { simplifyQuery } = { ...bodyDefaultOptions, ...options };
+    return simplifyQuery ? Object.fromEntries(new URLSearchParams(query)) : qs_1.default.parse(query);
+}
+exports.queryFromReq = queryFromReq;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYm9keUhlbHBlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvYm9keUhlbHBlcnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7O0FBQ0EsMkNBQXdEO0FBQ3hELHFEQUFpRDtBQUNqRCw0Q0FBbUI7QUFRbkIsSUFBSSxrQkFBa0IsR0FBc0IsRUFBQyxTQUFTLEVBQUUsR0FBRyxJQUFJLEVBQUUsRUFBQyxDQUFBLENBQUMsUUFBUTtBQUMzRSxTQUFnQiwyQkFBMkIsQ0FBQyxPQUFtQztJQUM5RSxrQkFBa0IsR0FBRyxFQUFDLEdBQUcsa0JBQWtCLEVBQUUsR0FBRyxPQUFPLEVBQUMsQ0FBQTtBQUN6RCxDQUFDO0FBRkQsa0VBRUM7QUFFTSxLQUFLLFVBQVUsYUFBYSxDQUFDLEdBQW9CLEVBQUUsT0FBb0M7SUFDN0YsTUFBTSxFQUFDLFNBQVMsRUFBQyxHQUFHLEVBQUMsR0FBRyxrQkFBa0IsRUFBRSxHQUFHLE9BQU8sRUFBQyxDQUFBO0lBQ3ZEOzs7OztPQUtHO0lBQ0YsK0ZBQStGO0lBQ2hHLE1BQU0sbUJBQW1CLEdBQUcsUUFBUSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUE7SUFDN0UsSUFDQyxHQUFHLENBQUMsT0FBTyxDQUFDLG1CQUFtQixDQUFDLEtBQUssU0FBUztXQUMzQyxLQUFLLENBQUMsbUJBQW1CLENBQUM7UUFDNUIsT0FBTTtJQUNSLE1BQU0sYUFBYSxHQUFHLEtBQUssQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLG1CQUFtQixDQUFBO0lBRWxGLE9BQU87SUFDUCxNQUFNLFFBQVEsR0FBRyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsa0JBQWtCLENBQUMsSUFBSSxVQUFVLENBQUMsQ0FBQyxXQUFXLEVBQUUsQ0FBQTtJQUM5RSxNQUFNLE1BQU0sR0FBRyxJQUFBLDRCQUFnQixFQUFD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

package/cjs/dx.d.ts

@@ -27,9 +27,8 @@ export declare function setNodeStream(stream: Readable, { status }?: {
 export declare function setWebStream(stream: ReadableStream, { status }?: {
     status?: number;
 }): void;
-export declare function setJson(json: any, { status, beautify }?: {
+export declare function setJson(json: any, { status }?: {
     status?: number;
-    beautify?: boolean;
 }): void;
 export declare function setRedirect(url: string, status: 301 | 302): void;
 export {};

package/cjs/dx.js

@@ -1,14 +1,8 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setRedirect = exports.setJson = exports.setWebStream = exports.setNodeStream = exports.setBuffer = exports.setHtml = exports.setText = exports.getRes = exports.getReq = exports.dxServer = void 0;
-const jdefer_1 = __importDefault(require("jdefer"));
-const node_util_1 = require("node:util");
-const etag_js_1 = require("./etag.js");
-const node_stream_1 = require("node:stream");
 const node_async_hooks_1 = require("node:async_hooks");
+const dxHelpers_js_1 = require("./dxHelpers.js");
 const reqStorage = new node_async_hooks_1.AsyncLocalStorage();
 const resStorage = new node_async_hooks_1.AsyncLocalStorage();
 const dxStorage = new node_async_hooks_1.AsyncLocalStorage();
@@ -16,106 +10,7 @@ function dxServer(req, res, options = {}) {
     return async (next) => {
         const dx = { ...options };
         const result = await dxStorage.run(dx, () => reqStorage.run(req, () => resStorage.run(res, next)));
-        const { type, data, charset, jsonBeautify, disableEtag } = dx;
-        const setContentType = (contentType) => {
-            if (res.headersSent || res.getHeader('content-type'))
-                return;
-            res.setHeader('content-type', `${contentType}${charset ? `; charset=${charset}` : ''}`);
-        };
-        let bufferOrStream;
-        switch (type) {
-            case 'text':
-                setContentType('text/plain');
-            case 'html':
-                setContentType('text/html');
-                // shared with text
-                bufferOrStream = Buffer.from(data, charset);
-                break;
-            case 'buffer':
-                setContentType('application/octet-stream');
-                bufferOrStream = data;
-                break;
-            case 'nodeStream':
-                setContentType('application/octet-stream');
-                bufferOrStream = data;
-                break;
-            case 'webStream':
-                setContentType('application/octet-stream');
-                bufferOrStream = node_stream_1.Readable.fromWeb(data);
-                break;
-            case 'json':
-                setContentType('application/json');
-                bufferOrStream = Buffer.from(jsonBeautify ? JSON.stringify(data, null, 2) : JSON.stringify(data), charset);
-                break;
-            case 'redirect':
-                res.setHeader('location', data);
-                bufferOrStream = Buffer.from('', charset);
-                break;
-            case undefined:
-                // skip response. Some middleware may handle it outside the chain. For example, express middleware
-                return result;
-            default:
-                if (!res.getHeader('content-type'))
-                    res.setHeader('content-type', 'text/plain');
-                throw new Error(`unsupported response type ${type}`);
-        }
-        if (res.headersSent) {
-            if (res.writableFinished) {
-                // skipped: response is already finished
-            }
-            else if (res.writableEnded) {
-                const defer = (0, jdefer_1.default)();
-                res.addListener('finish', defer.resolve);
-                await defer.promise;
-                // skipped: response is already ended
-                // chunk is not fully flushed yet
-            }
-            else
-                await (0, node_util_1.promisify)(res.end.bind(res))(undefined); // to be consistent, we end the response immediately
-        }
-        else {
-            // 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') {
-                // write nothing
-            }
-            else {
-                if (Buffer.isBuffer(bufferOrStream)) {
-                    // support: 304 (etag), zipping, file etag and last modified
-                    res.setHeader('content-length', bufferOrStream.length);
-                    if (!disableEtag) {
-                        const etag = (0, etag_js_1.entityTag)(bufferOrStream);
-                        const lastModified = res.getHeader('last-modified');
-                        res.setHeader('ETag', etag);
-                        if ((0, etag_js_1.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);
-                }
-                // we do not support content-encoding (gzip, deflate, br) and leave it to reverse proxy or CDN
-            }
-            await (0, node_util_1.promisify)(res.end.bind(res))(undefined); // some express middleware, such as express-session, requires explicitly passing chunk
-        }
+        await (0, dxHelpers_js_1.writeRes)(req, res, dx);
         return result;
     };
 }
@@ -175,15 +70,13 @@ function setWebStream(stream, { status } = {}) {
     dx.type = 'webStream';
 }
 exports.setWebStream = setWebStream;
-function setJson(json, { status, beautify } = {}) {
+function setJson(json, { status } = {}) {
     const res = getRes();
     if (status)
         res.statusCode = status;
     const dx = dxStorage.getStore();
     dx.data = json;
     dx.type = 'json';
-    if (beautify !== undefined)
-        dx.jsonBeautify = beautify;
 }
 exports.setJson = setJson;
 function setRedirect(url, status) {
@@ -194,4 +87,4 @@ function setRedirect(url, status) {
     dx.type = 'redirect';
 }
 exports.setRedirect = setRedirect;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dx.js","sourceRoot":"","sources":["../src/dx.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZHgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBRUEsdURBQWtEO0FBQ2xELGlEQUF1RDtBQVV2RCxNQUFNLFVBQVUsR0FBRyxJQUFJLG9DQUFpQixFQUFtQixDQUFBO0FBQzNELE1BQU0sVUFBVSxHQUFHLElBQUksb0NBQWlCLEVBQWtCLENBQUE7QUFDMUQsTUFBTSxTQUFTLEdBQUcsSUFBSSxvQ0FBaUIsRUFBYSxDQUFBO0FBQ3BELFNBQWdCLFFBQVEsQ0FDdkIsR0FBb0IsRUFDcEIsR0FBbUIsRUFDbkIsVUFHSSxFQUFFO0lBRU4sT0FBTyxLQUFLLEVBQUMsSUFBSSxFQUFDLEVBQUU7UUFDbkIsTUFBTSxFQUFFLEdBQWMsRUFBQyxHQUFHLE9BQU8sRUFBQyxDQUFBO1FBQ2xDLE1BQU0sTUFBTSxHQUFHLE1BQU0sU0FBUyxDQUFDLEdBQUcsQ0FDakMsRUFBRSxFQUNGLEdBQUcsRUFBRSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQ25CLEdBQUcsRUFDSCxHQUFHLEVBQUUsQ0FBQyxVQUFVLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsQ0FDL0IsQ0FDRCxDQUFBO1FBQ0QsTUFBTSxJQUFBLHVCQUFRLEVBQUMsR0FBRyxFQUFFLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQTtRQUM1QixPQUFPLE1BQU0sQ0FBQTtJQUNkLENBQUMsQ0FBQTtBQUNGLENBQUM7QUFwQkQsNEJBb0JDO0FBRUQsZUFBZTtBQUNmLGdEQUFnRDtBQUNoRCwyRkFBMkY7QUFDM0YsZ0ZBQWdGO0FBQ2hGLFNBQWdCLE1BQU07SUFDckIsT0FBTyxVQUFVLENBQUMsUUFBUSxFQUFHLENBQUE7QUFDOUIsQ0FBQztBQUZELHdCQUVDO0FBQ0QsU0FBZ0IsTUFBTTtJQUNyQixPQUFPLFVBQVUsQ0FBQyxRQUFRLEVBQUcsQ0FBQTtBQUM5QixDQUFDO0FBRkQsd0JBRUM7QUFFRCxxREFBcUQ7QUFFckQs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

package/cjs/dxHelpers.d.ts

@@ -0,0 +1,32 @@
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+import type { IncomingMessage, ServerResponse } from 'node:http';
+import { Readable } from 'node:stream';
+export type DxContext = {
+    charset?: BufferEncoding;
+    jsonBeautify?: boolean;
+    disableEtag?: boolean;
+} & ({
+    type: 'text';
+    data: string;
+} | {
+    type: 'html';
+    data: string;
+} | {
+    type: 'buffer';
+    data: Buffer;
+} | {
+    type: 'json';
+    data: any;
+} | {
+    type: 'redirect';
+    data: string;
+} | {
+    type: 'nodeStream';
+    data: Readable;
+} | {
+    type: 'webStream';
+    data: ReadableStream;
+});
+export declare function writeRes(req: IncomingMessage, res: ServerResponse, { type, data, charset, jsonBeautify, disableEtag }: DxContext): Promise<void>;

package/cjs/dxHelpers.js

@@ -0,0 +1,113 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeRes = void 0;
+const node_stream_1 = require("node:stream");
+const jdefer_1 = __importDefault(require("jdefer"));
+const node_util_1 = require("node:util");
+const etag_js_1 = require("./etag.js");
+async function writeRes(req, res, { type, data, charset, jsonBeautify, disableEtag }) {
+    const setContentType = (contentType) => {
+        if (res.headersSent || res.getHeader('content-type'))
+            return;
+        res.setHeader('content-type', `${contentType}${charset ? `; charset=${charset}` : ''}`);
+    };
+    let bufferOrStream;
+    switch (type) {
+        case 'text':
+            setContentType('text/plain');
+        case 'html':
+            setContentType('text/html');
+            // shared with text
+            bufferOrStream = Buffer.from(data, charset);
+            break;
+        case 'buffer':
+            setContentType('application/octet-stream');
+            bufferOrStream = data;
+            break;
+        case 'nodeStream':
+            setContentType('application/octet-stream');
+            bufferOrStream = data;
+            break;
+        case 'webStream':
+            setContentType('application/octet-stream');
+            bufferOrStream = node_stream_1.Readable.fromWeb(data);
+            break;
+        case 'json':
+            setContentType('application/json');
+            bufferOrStream = Buffer.from(jsonBeautify ? JSON.stringify(data, null, 2) : JSON.stringify(data), charset);
+            break;
+        case 'redirect':
+            res.setHeader('location', data);
+            bufferOrStream = Buffer.from('', charset);
+            break;
+        case undefined:
+            // skip response. Some middleware may handle it outside the chain. For example, express middleware
+            return;
+        default:
+            if (!res.getHeader('content-type'))
+                res.setHeader('content-type', 'text/plain');
+            throw new Error(`unsupported response type ${type}`);
+    }
+    if (res.headersSent) {
+        if (res.writableFinished) {
+            // skipped: response is already finished
+        }
+        else if (res.writableEnded) {
+            const defer = (0, jdefer_1.default)();
+            res.addListener('finish', defer.resolve);
+            await defer.promise;
+            // skipped: response is already ended
+            // chunk is not fully flushed yet
+        }
+        else
+            await (0, node_util_1.promisify)(res.end.bind(res))(undefined); // to be consistent, we end the response immediately
+    }
+    else {
+        // 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') {
+            // write nothing
+        }
+        else {
+            if (Buffer.isBuffer(bufferOrStream)) {
+                // support: 304 (etag), zipping, file etag and last modified
+                res.setHeader('content-length', bufferOrStream.length);
+                if (!disableEtag) {
+                    const etag = (0, etag_js_1.entityTag)(bufferOrStream);
+                    const lastModified = res.getHeader('last-modified');
+                    res.setHeader('ETag', etag);
+                    if ((0, etag_js_1.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);
+            }
+            // we do not support content-encoding (gzip, deflate, br) and leave it to reverse proxy or CDN
+        }
+        await (0, node_util_1.promisify)(res.end.bind(res))(undefined); // some express middleware, such as express-session, requires explicitly passing chunk
+    }
+}
+exports.writeRes = writeRes;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHhIZWxwZXJzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2R4SGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7QUFDQSw2Q0FBb0M7QUFDcEMsb0RBQThCO0FBQzlCLHlDQUFtQztBQUNuQyx1Q0FBZ0Q7QUFvQ3pDLEtBQUssVUFBVSxRQUFRLENBQUMsR0FBb0IsRUFBRSxHQUFtQixFQUFFLEVBQUMsSUFBSSxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsWUFBWSxFQUFFLFdBQVcsRUFBWTtJQUNwSSxNQUFNLGNBQWMsR0FBRyxDQUFDLFdBQW1CLEVBQUUsRUFBRTtRQUM5QyxJQUFJLEdBQUcsQ0FBQyxXQUFXLElBQUksR0FBRyxDQUFDLFNBQVMsQ0FBQyxjQUFjLENBQUM7WUFBRSxPQUFNO1FBQzVELEdBQUcsQ0FBQyxTQUFTLENBQUMsY0FBYyxFQUFFLEdBQUcsV0FBVyxHQUFHLE9BQU8sQ0FBQyxDQUFDLENBQUMsYUFBYSxPQUFPLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQTtJQUN4RixDQUFDLENBQUE7SUFDRCxJQUFJLGNBQWMsQ0FBQTtJQUVsQixRQUFRLElBQUksRUFBRSxDQUFDO1FBQ2QsS0FBSyxNQUFNO1lBQ1YsY0FBYyxDQUFDLFlBQVksQ0FBQyxDQUFBO1FBQzdCLEtBQUssTUFBTTtZQUNWLGNBQWMsQ0FBQyxXQUFXLENBQUMsQ0FBQTtZQUMzQixtQkFBbUI7WUFDbkIsY0FBYyxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLE9BQU8sQ0FBQyxDQUFBO1lBQzNDLE1BQUs7UUFDTixLQUFLLFFBQVE7WUFDWixjQUFjLENBQUMsMEJBQTBCLENBQUMsQ0FBQTtZQUMxQyxjQUFjLEdBQUcsSUFBSSxDQUFBO1lBQ3JCLE1BQUs7UUFDTixLQUFLLFlBQVk7WUFDaEIsY0FBYyxDQUFDLDBCQUEwQixDQUFDLENBQUE7WUFDMUMsY0FBYyxHQUFHLElBQUksQ0FBQTtZ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

package/cjs/helpers.d.ts

@@ -0,0 +1,2 @@
+export { writeRes } from './dxHelpers.js';
+export { setBufferBodyDefaultOptions, bufferFromReq, jsonFromReq, rawFromReq, textFromReq, urlEncodedFromReq, queryFromReq, } from './bodyHelpers.js';