@wooksjs/event-http 0.4.10 → 0.4.12

package/dist/index.mjs

@@ -6,14 +6,13 @@ import http from 'http';
 
 function createHttpContext(data, options) {
     return createEventContext({
-        event: Object.assign(Object.assign({}, data), { type: 'HTTP' }),
+        event: {
+            ...data,
+            type: 'HTTP',
+        },
         options,
     });
 }
-/**
- * Wrapper on useEventContext with HTTP event types
- * @returns set of hooks { getCtx, restoreCtx, clearCtx, hookStore, getStore, setStore }
- */
 function useHttpContext() {
     return useEventContext('HTTP');
 }
@@ -40,20 +39,20 @@ function useRequest() {
     });
     const reqId = useEventId().getId;
     const forwardedIp = () => init('forwardedIp', () => {
-        var _a;
         if (typeof req.headers[xForwardedFor] === 'string' &&
             req.headers[xForwardedFor]) {
-            return (_a = req.headers[xForwardedFor]
+            return req.headers[xForwardedFor]
                 .split(',')
-                .shift()) === null || _a === void 0 ? void 0 : _a.trim();
+                .shift()
+                ?.trim();
         }
         else {
             return '';
         }
     });
-    const remoteIp = () => init('remoteIp', () => { var _a, _b; return ((_a = req.socket) === null || _a === void 0 ? void 0 : _a.remoteAddress) || ((_b = req.connection) === null || _b === void 0 ? void 0 : _b.remoteAddress) || ''; });
+    const remoteIp = () => init('remoteIp', () => req.socket?.remoteAddress || req.connection?.remoteAddress || '');
     function getIp(options) {
-        if (options === null || options === void 0 ? void 0 : options.trustProxy) {
+        if (options?.trustProxy) {
             return forwardedIp() || getIp();
         }
         else {
@@ -61,10 +60,9 @@ function useRequest() {
         }
     }
     const getIpList = () => init('ipList', () => {
-        var _a, _b;
         return {
-            remoteIp: ((_a = req.socket) === null || _a === void 0 ? void 0 : _a.remoteAddress) ||
-                ((_b = req.connection) === null || _b === void 0 ? void 0 : _b.remoteAddress) ||
+            remoteIp: req.socket?.remoteAddress ||
+                req.connection?.remoteAddress ||
                 '',
             forwarded: (req.headers[xForwardedFor] || '')
                 .split(',')
@@ -155,12 +153,12 @@ function useAuthorization() {
         authorization,
         authType,
         authRawCredentials,
-        isBasic: () => { var _a; return ((_a = authType()) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === 'basic'; },
-        isBearer: () => { var _a; return ((_a = authType()) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === 'bearer'; },
+        isBasic: () => authType()?.toLocaleLowerCase() === 'basic',
+        isBearer: () => authType()?.toLocaleLowerCase() === 'bearer',
         basicCredentials: () => init('basicCredentials', () => {
             if (authorization) {
                 const type = authType();
-                if ((type === null || type === void 0 ? void 0 : type.toLocaleLowerCase()) === 'basic') {
+                if (type?.toLocaleLowerCase() === 'basic') {
                     const creds = Buffer.from(authRawCredentials() || '', 'base64').toString('ascii');
                     const [username, password] = creds.split(':');
                     return { username, password };
@@ -211,7 +209,6 @@ function renderCacheControl(data) {
     }
     return attrs;
 }
-// rfc7234#section-5.2.2
 const cacheControlFunc = {
     mustRevalidate: (v) => v ? 'must-revalidate' : '',
     noCache: (v) => v ? (typeof v === 'string' ? `no-cache="${v}"` : 'no-cache') : '',
@@ -229,7 +226,6 @@ const renderExpires = (v) => typeof v === 'string' || typeof v === 'number'
     ? new Date(v).toUTCString()
     : v.toUTCString();
 const renderPragmaNoCache = (v) => (v ? 'no-cache' : '');
-// rfc7234#section-5.2.2
 function useSetCacheControl() {
     const { setHeader } = useSetHeaders();
     const setAge = (value) => {
@@ -373,12 +369,12 @@ function useSetCookie(name) {
         name,
         type: 'cookie',
     }, {
-        get: () => { var _a; return (_a = getCookie(name)) === null || _a === void 0 ? void 0 : _a.value; },
-        set: (value) => { var _a; return setCookie(name, value, (_a = getCookie(name)) === null || _a === void 0 ? void 0 : _a.attrs); },
+        get: () => getCookie(name)?.value,
+        set: (value) => setCookie(name, value, getCookie(name)?.attrs),
     });
     return attachHook(valueHook, {
-        get: () => { var _a; return (_a = getCookie(name)) === null || _a === void 0 ? void 0 : _a.attrs; },
-        set: (attrs) => { var _a; return setCookie(name, ((_a = getCookie(name)) === null || _a === void 0 ? void 0 : _a.value) || '', attrs); },
+        get: () => getCookie(name)?.attrs,
+        set: (attrs) => setCookie(name, getCookie(name)?.value || '', attrs),
     }, 'attrs');
 }
 
@@ -417,58 +413,6 @@ function useSearchParams() {
     };
 }
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise, SuppressedError, Symbol */
-
-
-function __awaiter(thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-}
-
-function __values(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-}
-
-function __asyncValues(o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
-
 class BaseHttpResponseRenderer {
     render(response) {
         if (typeof response.body === 'string' ||
@@ -700,7 +644,10 @@ class BaseHttpResponse {
         for (const cookie of newCookies) {
             removeCookie(cookie.slice(0, cookie.indexOf('=')));
         }
-        this._headers = Object.assign(Object.assign({}, headers()), this._headers);
+        this._headers = {
+            ...headers(),
+            ...this._headers,
+        };
         const setCookie = [...newCookies, ...cookies()];
         if (setCookie && setCookie.length) {
             this._headers['set-cookie'] = setCookie;
@@ -725,96 +672,85 @@ class BaseHttpResponse {
         logger.error(error);
         throw error;
     }
-    respond() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { rawResponse, hasResponded } = useResponse();
-            const { method, rawRequest } = useRequest();
-            const logger = useEventLogger('http-response');
-            if (hasResponded()) {
-                this.panic('The response was already sent.', logger);
+    async respond() {
+        const { rawResponse, hasResponded } = useResponse();
+        const { method, rawRequest } = useRequest();
+        const logger = useEventLogger('http-response');
+        if (hasResponded()) {
+            this.panic('The response was already sent.', logger);
+        }
+        this.mergeHeaders();
+        const res = rawResponse();
+        if (this.body instanceof Readable) {
+            const stream = this.body;
+            this.mergeStatus('ok');
+            res.writeHead(this.status, {
+                ...this._headers,
+            });
+            rawRequest.once('close', () => {
+                stream.destroy();
+            });
+            if (method === 'HEAD') {
+                stream.destroy();
+                res.end();
             }
-            this.mergeHeaders();
-            const res = rawResponse();
-            if (this.body instanceof Readable) {
-                // responding with readable stream
-                const stream = this.body;
-                this.mergeStatus('ok');
-                res.writeHead(this.status, Object.assign({}, this._headers));
-                rawRequest.once('close', () => {
-                    stream.destroy();
-                });
-                if (method === 'HEAD') {
-                    stream.destroy();
-                    res.end();
-                }
-                else {
-                    return new Promise((resolve, reject) => {
-                        stream.on('error', (e) => {
-                            stream.destroy();
-                            res.end();
-                            reject(e);
-                        });
-                        stream.on('close', () => {
-                            stream.destroy();
-                            resolve(undefined);
-                        });
-                        stream.pipe(res);
+            else {
+                return new Promise((resolve, reject) => {
+                    stream.on('error', (e) => {
+                        stream.destroy();
+                        res.end();
+                        reject(e);
                     });
-                }
+                    stream.on('close', () => {
+                        stream.destroy();
+                        resolve(undefined);
+                    });
+                    stream.pipe(res);
+                });
             }
-            else if (globalThis.Response &&
-                this.body instanceof Response /* Fetch Response */) {
-                this.mergeFetchStatus(this.body.status);
-                if (method === 'HEAD') {
-                    res.end();
-                }
-                else {
-                    const additionalHeaders = {};
-                    if (this.body.headers.get('content-length')) {
-                        additionalHeaders['content-length'] = this.body.headers.get('content-length');
-                    }
-                    if (this.body.headers.get('content-type')) {
-                        additionalHeaders['content-type'] = this.body.headers.get('content-type');
-                    }
-                    res.writeHead(this.status, Object.assign(Object.assign({}, additionalHeaders), this._headers));
-                    yield respondWithFetch(this.body.body, res);
-                }
+        }
+        else if (globalThis.Response &&
+            this.body instanceof Response) {
+            this.mergeFetchStatus(this.body.status);
+            if (method === 'HEAD') {
+                res.end();
             }
             else {
-                const renderedBody = this.renderer.render(this);
-                this.mergeStatus(renderedBody);
-                res.writeHead(this.status, Object.assign({ 'content-length': Buffer.byteLength(renderedBody) }, this._headers)).end(method !== 'HEAD' ? renderedBody : '');
-            }
-        });
-    }
-}
-function respondWithFetch(fetchBody, res) {
-    var _a, e_1, _b, _c;
-    return __awaiter(this, void 0, void 0, function* () {
-        if (fetchBody) {
-            try {
-                try {
-                    for (var _d = true, _e = __asyncValues(fetchBody), _f; _f = yield _e.next(), _a = _f.done, !_a; _d = true) {
-                        _c = _f.value;
-                        _d = false;
-                        const chunk = _c;
-                        res.write(chunk);
-                    }
+                const additionalHeaders = {};
+                if (this.body.headers.get('content-length')) {
+                    additionalHeaders['content-length'] = this.body.headers.get('content-length');
                 }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (!_d && !_a && (_b = _e.return)) yield _b.call(_e);
-                    }
-                    finally { if (e_1) throw e_1.error; }
+                if (this.body.headers.get('content-type')) {
+                    additionalHeaders['content-type'] = this.body.headers.get('content-type');
                 }
+                res.writeHead(this.status, {
+                    ...additionalHeaders,
+                    ...this._headers,
+                });
+                await respondWithFetch(this.body.body, res);
             }
-            catch (e) {
-                // ?
+        }
+        else {
+            const renderedBody = this.renderer.render(this);
+            this.mergeStatus(renderedBody);
+            res.writeHead(this.status, {
+                'content-length': Buffer.byteLength(renderedBody),
+                ...this._headers,
+            }).end(method !== 'HEAD' ? renderedBody : '');
+        }
+    }
+}
+async function respondWithFetch(fetchBody, res) {
+    if (fetchBody) {
+        try {
+            for await (const chunk of fetchBody) {
+                res.write(chunk);
             }
         }
-        res.end();
-    });
+        catch (e) {
+        }
+    }
+    res.end();
 }
 
 const preStyles = 'font-family: monospace;' +
@@ -834,9 +770,14 @@ class HttpErrorRenderer extends BaseHttpResponseRenderer {
             `<head><title>${data.statusCode} ${httpStatusCodes[data.statusCode]}</title></head>` +
             `<body><center><h1>${data.statusCode} ${httpStatusCodes[data.statusCode]}</h1></center>` +
             `<center><h4>${data.message}</h1></center><hr color="#666">` +
-            `<center style="color: #666;"> Wooks v${"0.4.10"} </center>` +
+            `<center style="color: #666;"> Wooks v${"0.4.12"} </center>` +
             `${keys.length
-                ? `<pre style="${preStyles}">${JSON.stringify(Object.assign(Object.assign({}, data), { statusCode: undefined, message: undefined, error: undefined }), null, '  ')}</pre>`
+                ? `<pre style="${preStyles}">${JSON.stringify({
+                    ...data,
+                    statusCode: undefined,
+                    message: undefined,
+                    error: undefined,
+                }, null, '  ')}</pre>`
                 : ''}` +
             '</body></html>');
     }
@@ -846,7 +787,12 @@ class HttpErrorRenderer extends BaseHttpResponseRenderer {
         const keys = Object.keys(data).filter((key) => !['statusCode', 'error', 'message'].includes(key));
         return (`${data.statusCode} ${httpStatusCodes[data.statusCode]}\n${data.message}` +
             `\n\n${keys.length
-                ? `${JSON.stringify(Object.assign(Object.assign({}, data), { statusCode: undefined, message: undefined, error: undefined }), null, '  ')}`
+                ? `${JSON.stringify({
+                    ...data,
+                    statusCode: undefined,
+                    message: undefined,
+                    error: undefined,
+                }, null, '  ')}`
                 : ''}`);
     }
     renderJson(response) {
@@ -864,9 +810,8 @@ class HttpErrorRenderer extends BaseHttpResponseRenderer {
                 : ''}}`);
     }
     render(response) {
-        var _a;
         const { acceptsJson, acceptsText, acceptsHtml } = useAccept();
-        response.status = ((_a = response.body) === null || _a === void 0 ? void 0 : _a.statusCode) || 500;
+        response.status = response.body?.statusCode || 500;
         if (acceptsJson()) {
             return this.renderJson(response);
         }
@@ -900,7 +845,12 @@ class HttpError extends Error {
                 message: this.message,
                 error: httpStatusCodes[this.code],
             }
-            : Object.assign(Object.assign({}, this._body), { statusCode: this.code, message: this.message, error: httpStatusCodes[this.code] });
+            : {
+                ...this._body,
+                statusCode: this.code,
+                message: this.message,
+                error: httpStatusCodes[this.code],
+            };
     }
     attachRenderer(renderer) {
         this.renderer = renderer;
@@ -910,11 +860,7 @@ class HttpError extends Error {
     }
 }
 
-function createWooksResponder(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-renderer = new BaseHttpResponseRenderer(), 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-errorRenderer = new HttpErrorRenderer()) {
+function createWooksResponder(renderer = new BaseHttpResponseRenderer(), errorRenderer = new HttpErrorRenderer()) {
     function createResponse(data) {
         const { hasResponded } = useResponse();
         if (hasResponded())
@@ -940,16 +886,16 @@ errorRenderer = new HttpErrorRenderer()) {
     }
     return {
         createResponse,
-        respond: (data) => { var _a; return (_a = createResponse(data)) === null || _a === void 0 ? void 0 : _a.respond(); },
+        respond: (data) => createResponse(data)?.respond(),
     };
 }
 
 class WooksHttp extends WooksAdapterBase {
     constructor(opts, wooks) {
-        super(wooks, opts === null || opts === void 0 ? void 0 : opts.logger, opts === null || opts === void 0 ? void 0 : opts.router);
+        super(wooks, opts?.logger, opts?.router);
         this.opts = opts;
         this.responder = createWooksResponder();
-        this.logger = (opts === null || opts === void 0 ? void 0 : opts.logger) || this.getLogger('wooks-http');
+        this.logger = opts?.logger || this.getLogger('wooks-http');
     }
     all(path, handler) {
         return this.on('*', path, handler);
@@ -975,80 +921,42 @@ class WooksHttp extends WooksAdapterBase {
     options(path, handler) {
         return this.on('OPTIONS', path, handler);
     }
-    /**
-     * Starts the http(s) server.
-     *
-     * Use this only if you rely on Wooks server.
-     */
-    listen(...args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const server = (this.server = http.createServer(this.getServerCb()));
-            return new Promise((resolve, reject) => {
-                server.once('listening', resolve);
-                server.once('error', reject);
-                server.listen(...args);
-            });
+    async listen(...args) {
+        const server = (this.server = http.createServer(this.getServerCb()));
+        return new Promise((resolve, reject) => {
+            server.once('listening', resolve);
+            server.once('error', reject);
+            server.listen(...args);
         });
     }
-    /**
-     * Stops the server if it was attached or passed via argument
-     * @param server
-     */
     close(server) {
         const srv = server || this.server;
         return new Promise((resolve, reject) => {
-            srv === null || srv === void 0 ? void 0 : srv.close((err) => {
+            srv?.close((err) => {
                 if (err)
                     return reject(err);
                 resolve(srv);
             });
         });
     }
-    /**
-     * Returns http(s) server that was attached to Wooks
-     *
-     * See attachServer method docs
-     * @returns Server
-     */
     getServer() {
         return this.server;
     }
-    /**
-     * Attaches http(s) server instance
-     * to Wooks.
-     *
-     * Use it only if you want to `close` method to stop the server.
-     * @param server Server
-     */
     attachServer(server) {
         this.server = server;
     }
     respond(data) {
-        var _a;
-        void ((_a = this.responder.respond(data)) === null || _a === void 0 ? void 0 : _a.catch((e) => {
+        void this.responder.respond(data)?.catch((e) => {
             this.logger.error('Uncought response exception', e);
-        }));
+        });
     }
-    /**
-     * Returns server callback function
-     * that can be passed to any node server:
-     * ```js
-     * import { createHttpApp } from '@wooksjs/event-http'
-     * import http from 'http'
-     *
-     * const app = createHttpApp()
-     * const server = http.createServer(app.getServerCb())
-     * server.listen(3000)
-     * ```
-     */
     getServerCb() {
-        return (req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            const { restoreCtx, clearCtx } = createHttpContext({ req, res }, this.mergeEventOptions((_a = this.opts) === null || _a === void 0 ? void 0 : _a.eventOptions));
+        return async (req, res) => {
+            const { restoreCtx, clearCtx } = createHttpContext({ req, res }, this.mergeEventOptions(this.opts?.eventOptions));
             const { handlers } = this.wooks.lookup(req.method, req.url);
-            if (handlers || ((_b = this.opts) === null || _b === void 0 ? void 0 : _b.onNotFound)) {
+            if (handlers || this.opts?.onNotFound) {
                 try {
-                    yield this.processHandlers(handlers || [(_c = this.opts) === null || _c === void 0 ? void 0 : _c.onNotFound]);
+                    await this.processHandlers(handlers || [this.opts?.onNotFound]);
                 }
                 catch (e) {
                     this.logger.error('Internal error, please report', e);
@@ -1058,48 +966,37 @@ class WooksHttp extends WooksAdapterBase {
                 }
             }
             else {
-                // not found
                 this.logger.debug(`404 Not found (${req.method})${req.url}`);
                 this.respond(new HttpError(404));
                 clearCtx();
             }
-        });
+        };
     }
-    processHandlers(handlers) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { restoreCtx, clearCtx, store } = useHttpContext();
-            for (const [i, handler] of handlers.entries()) {
-                const isLastHandler = handlers.length === i + 1;
-                try {
-                    restoreCtx();
-                    const promise = handler();
-                    clearCtx();
-                    const result = yield promise;
-                    // even if the returned value is an Error instance
-                    // we still want to process it as a response
+    async processHandlers(handlers) {
+        const { restoreCtx, clearCtx, store } = useHttpContext();
+        for (const [i, handler] of handlers.entries()) {
+            const isLastHandler = handlers.length === i + 1;
+            try {
+                restoreCtx();
+                const promise = handler();
+                clearCtx();
+                const result = await promise;
+                restoreCtx();
+                this.respond(result);
+                clearCtx();
+                break;
+            }
+            catch (e) {
+                this.logger.error(`Uncought route handler exception: ${store('event').get('req').url || ''}`, e);
+                if (isLastHandler) {
                     restoreCtx();
-                    this.respond(result);
+                    this.respond(e);
                     clearCtx();
-                    break;
-                }
-                catch (e) {
-                    this.logger.error(`Uncought route handler exception: ${store('event').get('req').url || ''}`, e);
-                    if (isLastHandler) {
-                        restoreCtx();
-                        this.respond(e);
-                        clearCtx();
-                    }
                 }
             }
-        });
+        }
     }
 }
-/**
- * Factory for WooksHttp App
- * @param opts TWooksHttpOptions
- * @param wooks Wooks | WooksAdapterBase
- * @returns WooksHttp
- */
 function createHttpApp(opts, wooks) {
     return new WooksHttp(opts, wooks);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/event-http",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "@wooksjs/event-http",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -8,6 +8,14 @@
   "files": [
     "dist"
   ],
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/wooksjs/wooksjs.git",
@@ -31,12 +39,12 @@
     "url": "https://github.com/wooksjs/wooksjs/issues"
   },
   "peerDependencies": {
-    "wooks": "0.4.10",
+    "wooks": "0.4.12",
     "@prostojs/router": "^0.2.1",
-    "@wooksjs/event-core": "0.4.10"
+    "@wooksjs/event-core": "0.4.12"
   },
   "dependencies": {
-    "@prostojs/logger": "^0.3.7"
+    "@prostojs/logger": "^0.4.0"
   },
   "homepage": "https://github.com/wooksjs/wooksjs/tree/main/packages/event-http#readme"
 }