@wooksjs/event-http 0.2.18 → 0.2.20

package/README.md

@@ -10,10 +10,11 @@
 </p>
 
 As a part of `wooks` event processing framework, `@wooksjs/event-http` implements http events and provides composables that let you:
-- parse urls search params
-- parse cookies
-- parse request body (json, url-encoded, form, ...)
-- serve files
+
+-   parse urls search params
+-   parse cookies
+-   parse request body (json, url-encoded, form, ...)
+-   serve files
 
 ### The main ideas behind composable functions are:
 
@@ -24,9 +25,9 @@ As a part of `wooks` event processing framework, `@wooksjs/event-http` implement
 
 ### Official Wooks HTTP composables:
 
-- [@wooksjs/http-body](https://github.com/wooksjs/wooksjs/tree/main/packages/http-body) - to parse body
-- [@wooksjs/http-static](https://github.com/wooksjs/wooksjs/tree/main/packages/http-static) - to serve static files
-- [@wooksjs/http-proxy](https://github.com/wooksjs/wooksjs/tree/main/packages/http-proxy) - to proxy requests
+-   [@wooksjs/http-body](https://github.com/wooksjs/wooksjs/tree/main/packages/http-body) - to parse body
+-   [@wooksjs/http-static](https://github.com/wooksjs/wooksjs/tree/main/packages/http-static) - to serve static files
+-   [@wooksjs/http-proxy](https://github.com/wooksjs/wooksjs/tree/main/packages/http-proxy) - to proxy requests
 
 ## Install
 
@@ -40,12 +41,14 @@ import { createHttpApp } from '@wooksjs/event-http'
 
 const app = createHttpApp()
 
-app.on('GET', 'hello/:name', () => `Hello ${ useRouteParams().get('name') }!`)
+app.on('GET', 'hello/:name', () => `Hello ${useRouteParams().get('name')}!`)
 
 // shortcuts for some methods are supported:
 // app.get('hello/:name', () => `Hello ${ useRouteParams().get('name') }!`)
 
-app.listen(3000, () => { console.log('Wooks Server is up on port 3000') })
+app.listen(3000, () => {
+    console.log('Wooks Server is up on port 3000')
+})
 ```
 
 ## Documentation

package/dist/index.cjs

@@ -39,8 +39,11 @@ function useRequest() {
     const reqId = eventCore.useEventId().getId;
     const forwardedIp = () => init('forwardedIp', () => {
         var _a;
-        if (typeof req.headers[xForwardedFor] === 'string' && req.headers[xForwardedFor]) {
-            return (_a = req.headers[xForwardedFor].split(',').shift()) === null || _a === void 0 ? void 0 : _a.trim();
+        if (typeof req.headers[xForwardedFor] === 'string' &&
+            req.headers[xForwardedFor]) {
+            return (_a = req.headers[xForwardedFor]
+                .split(',')
+                .shift()) === null || _a === void 0 ? void 0 : _a.trim();
         }
         else {
             return '';
@@ -58,8 +61,12 @@ 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) || '',
-            forwarded: (req.headers[xForwardedFor] || '').split(',').map(s => s.trim()),
+            remoteIp: ((_a = req.socket) === null || _a === void 0 ? void 0 : _a.remoteAddress) ||
+                ((_b = req.connection) === null || _b === void 0 ? void 0 : _b.remoteAddress) ||
+                '',
+            forwarded: (req.headers[xForwardedFor] || '')
+                .split(',')
+                .map((s) => s.trim()),
         };
     });
     return {
@@ -168,7 +175,7 @@ function convertTime(time, unit = 'ms') {
     const rg = /(\d+)(\w+)/g;
     let t = 0;
     let r;
-    while (r = rg.exec(time)) {
+    while ((r = rg.exec(time))) {
         t += Number(r[1]) * (units[r[2]] || 0);
     }
     return t / units[unit];
@@ -206,9 +213,9 @@ function renderCacheControl(data) {
 const cacheControlFunc = {
     mustRevalidate: (v) => v ? 'must-revalidate' : '',
     noCache: (v) => v ? (typeof v === 'string' ? `no-cache="${v}"` : 'no-cache') : '',
-    noStore: (v) => v ? 'no-store' : '',
-    noTransform: (v) => v ? 'no-transform' : '',
-    public: (v) => v ? 'public' : '',
+    noStore: (v) => (v ? 'no-store' : ''),
+    noTransform: (v) => (v ? 'no-transform' : ''),
+    public: (v) => (v ? 'public' : ''),
     private: (v) => v ? (typeof v === 'string' ? `private="${v}"` : 'private') : '',
     proxyRevalidate: (v) => v ? 'proxy-revalidate' : '',
     maxAge: (v) => 'max-age=' + convertTime(v, 's').toString(),
@@ -216,8 +223,10 @@ const cacheControlFunc = {
 };
 
 const renderAge = (v) => convertTime(v, 's').toString();
-const renderExpires = (v) => (typeof v === 'string' || typeof v === 'number' ? new Date(v).toUTCString() : v.toUTCString());
-const renderPragmaNoCache = (v) => v ? 'no-cache' : '';
+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();
@@ -248,7 +257,7 @@ function useResponse() {
     const responded = store('response').hook('responded');
     const statusCode = store('status').hook('code');
     function status(code) {
-        return statusCode.value = code ? code : statusCode.value;
+        return (statusCode.value = code ? code : statusCode.value);
     }
     const rawResponse = (options) => {
         if (!options || !options.passthrough)
@@ -260,7 +269,7 @@ function useResponse() {
         hasResponded: () => responded.value || !res.writable || res.writableEnded,
         status: eventCore.attachHook(status, {
             get: () => statusCode.value,
-            set: (code) => statusCode.value = code,
+            set: (code) => (statusCode.value = code),
         }),
     };
 }
@@ -284,12 +293,15 @@ function renderCookie(key, data) {
     return `${key}=${encodeURIComponent(data.value)}${attrs}`;
 }
 const cookieAttrFunc = {
-    expires: (v) => 'Expires=' + (typeof v === 'string' || typeof v === 'number' ? new Date(v).toUTCString() : v.toUTCString()),
+    expires: (v) => 'Expires=' +
+        (typeof v === 'string' || typeof v === 'number'
+            ? new Date(v).toUTCString()
+            : v.toUTCString()),
     maxAge: (v) => 'Max-Age=' + convertTime(v, 's').toString(),
     domain: (v) => 'Domain=' + v,
     path: (v) => 'Path=' + v,
-    secure: (v) => v ? 'Secure' : '',
-    httpOnly: (v) => v ? 'HttpOnly' : '',
+    secure: (v) => (v ? 'Secure' : ''),
+    httpOnly: (v) => (v ? 'HttpOnly' : ''),
     sameSite: (v) => v ? 'SameSite=' + (typeof v === 'string' ? v : 'Strict') : '',
 };
 
@@ -317,7 +329,9 @@ function useCookies() {
     const getCookie = (name) => init(name, () => {
         if (cookie) {
             const result = new RegExp(`(?:^|; )${escapeRegex(name)}=(.*?)(?:;?$|; )`, 'i').exec(cookie);
-            return result && result[1] ? safeDecodeURIComponent(result[1]) : null;
+            return result && result[1]
+                ? safeDecodeURIComponent(result[1])
+                : null;
         }
         else {
             return null;
@@ -338,7 +352,10 @@ function useSetCookies() {
         });
     }
     function cookies() {
-        return cookiesStore.entries().filter(a => !!a[1]).map(([key, value]) => renderCookie(key, value));
+        return cookiesStore
+            .entries()
+            .filter((a) => !!a[1])
+            .map(([key, value]) => renderCookie(key, value));
     }
     return {
         setCookie,
@@ -368,7 +385,7 @@ class WooksURLSearchParams extends url.URLSearchParams {
         const json = {};
         for (const [key, value] of this.entries()) {
             if (isArrayParam(key)) {
-                const a = json[key] = (json[key] || []);
+                const a = (json[key] = (json[key] || []));
                 a.push(value);
             }
             else {
@@ -412,6 +429,8 @@ 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 */
+
 
 function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -445,7 +464,9 @@ function __asyncValues(o) {
 
 class BaseHttpResponseRenderer {
     render(response) {
-        if (typeof response.body === 'string' || typeof response.body === 'boolean' || typeof response.body === 'number') {
+        if (typeof response.body === 'string' ||
+            typeof response.body === 'boolean' ||
+            typeof response.body === 'number') {
             if (!response.getContentType())
                 response.setContentType('text/plain');
             return response.body.toString();
@@ -643,7 +664,7 @@ class BaseHttpResponse {
         return this;
     }
     setCookie(name, value, attrs) {
-        const cookies = this._headers['set-cookie'] = (this._headers['set-cookie'] || []);
+        const cookies = (this._headers['set-cookie'] = (this._headers['set-cookie'] || []));
         cookies.push(renderCookie(name, { value, attrs: attrs || {} }));
         return this;
     }
@@ -651,7 +672,7 @@ class BaseHttpResponse {
         this.setHeader('cache-control', renderCacheControl(data));
     }
     setCookieRaw(rawValue) {
-        const cookies = this._headers['set-cookie'] = (this._headers['set-cookie'] || []);
+        const cookies = (this._headers['set-cookie'] = (this._headers['set-cookie'] || []));
         cookies.push(rawValue);
         return this;
     }
@@ -668,7 +689,7 @@ class BaseHttpResponse {
     mergeHeaders() {
         const { headers } = useSetHeaders();
         const { cookies, removeCookie } = useSetCookies();
-        const newCookies = (this._headers['set-cookie'] || []);
+        const newCookies = this._headers['set-cookie'] || [];
         for (const cookie of newCookies) {
             removeCookie(cookie.slice(0, cookie.indexOf('=')));
         }
@@ -683,7 +704,9 @@ class BaseHttpResponse {
         this.status = this.status || useResponse().status();
         if (!this.status) {
             const { method } = useRequest();
-            this.status = renderedBody ? defaultStatus[method] || exports.EHttpStatusCode.OK : exports.EHttpStatusCode.NoContent;
+            this.status = renderedBody
+                ? defaultStatus[method] || exports.EHttpStatusCode.OK
+                : exports.EHttpStatusCode.NoContent;
         }
         return this;
     }
@@ -732,7 +755,8 @@ class BaseHttpResponse {
                     });
                 }
             }
-            else if (globalThis.Response && this.body instanceof Response /* Fetch Response */) {
+            else if (globalThis.Response &&
+                this.body instanceof Response /* Fetch Response */) {
                 this.mergeFetchStatus(this.body.status);
                 if (method === 'HEAD') {
                     res.end();
@@ -791,42 +815,51 @@ function respondWithFetch(fetchBody, res) {
     });
 }
 
-const preStyles = 'font-family: monospace;'
-    + 'width: 100%;'
-    + 'max-width: 900px;'
-    + 'padding: 10px;'
-    + 'margin: 20px auto;'
-    + 'border-radius: 8px;'
-    + 'background-color: #494949;'
-    + 'box-shadow: 0px 0px 3px 2px rgb(255 255 255 / 20%);';
+const preStyles = 'font-family: monospace;' +
+    'width: 100%;' +
+    'max-width: 900px;' +
+    'padding: 10px;' +
+    'margin: 20px auto;' +
+    'border-radius: 8px;' +
+    'background-color: #494949;' +
+    'box-shadow: 0px 0px 3px 2px rgb(255 255 255 / 20%);';
 class HttpErrorRenderer extends BaseHttpResponseRenderer {
     renderHtml(response) {
         const data = response.body || {};
         response.setContentType('text/html');
-        const keys = Object.keys(data).filter(key => !['statusCode', 'error', 'message'].includes(key));
-        return '<html style="background-color: #333; color: #bbb;">' +
+        const keys = Object.keys(data).filter((key) => !['statusCode', 'error', 'message'].includes(key));
+        return ('<html style="background-color: #333; color: #bbb;">' +
             `<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.2.18"} </center>` +
-            `${keys.length ? `<pre style="${preStyles}">${JSON.stringify(Object.assign(Object.assign({}, data), { statusCode: undefined, message: undefined, error: undefined }), null, '  ')}</pre>` : ''}` +
-            '</body></html>';
+            `<center style="color: #666;"> Wooks v${"0.2.20"} </center>` +
+            `${keys.length
+                ? `<pre style="${preStyles}">${JSON.stringify(Object.assign(Object.assign({}, data), { statusCode: undefined, message: undefined, error: undefined }), null, '  ')}</pre>`
+                : ''}` +
+            '</body></html>');
     }
     renderText(response) {
         const data = response.body || {};
         response.setContentType('text/plain');
-        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, '  ')}` : ''}`;
+        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, '  ')}`
+                : ''}`);
     }
     renderJson(response) {
         const data = response.body || {};
         response.setContentType('application/json');
-        const keys = Object.keys(data).filter(key => !['statusCode', 'error', 'message'].includes(key));
-        return `{"statusCode":${escapeQuotes(data.statusCode)},`
-            + `"error":"${escapeQuotes(data.error)}",`
-            + `"message":"${escapeQuotes(data.message)}"`
-            + `${keys.length ? (',' + keys.map(k => `"${escapeQuotes(k)}":${JSON.stringify(data[k])}`).join(',')) : ''}}`;
+        const keys = Object.keys(data).filter((key) => !['statusCode', 'error', 'message'].includes(key));
+        return (`{"statusCode":${escapeQuotes(data.statusCode)},` +
+            `"error":"${escapeQuotes(data.error)}",` +
+            `"message":"${escapeQuotes(data.message)}"` +
+            `${keys.length
+                ? ',' +
+                    keys
+                        .map((k) => `"${escapeQuotes(k)}":${JSON.stringify(data[k])}`)
+                        .join(',')
+                : ''}}`);
     }
     render(response) {
         var _a;
@@ -847,7 +880,9 @@ class HttpErrorRenderer extends BaseHttpResponseRenderer {
     }
 }
 function escapeQuotes(s) {
-    return (typeof s === 'number' ? s : (s || '')).toString().replace(/[\""]/g, '\\"');
+    return (typeof s === 'number' ? s : s || '')
+        .toString()
+        .replace(/[\""]/g, '\\"');
 }
 
 class HttpError extends Error {
@@ -857,11 +892,13 @@ class HttpError extends Error {
         this._body = _body;
     }
     get body() {
-        return typeof this._body === 'string' ? {
-            statusCode: this.code,
-            message: this.message,
-            error: httpStatusCodes[this.code],
-        } : Object.assign(Object.assign({}, this._body), { statusCode: this.code, message: this.message, error: httpStatusCodes[this.code] });
+        return typeof this._body === 'string'
+            ? {
+                statusCode: this.code,
+                message: this.message,
+                error: httpStatusCodes[this.code],
+            }
+            : Object.assign(Object.assign({}, this._body), { statusCode: this.code, message: this.message, error: httpStatusCodes[this.code] });
     }
     attachRenderer(renderer) {
         this.renderer = renderer;
@@ -938,7 +975,7 @@ class WooksHttp extends wooks.WooksAdapterBase {
     }
     listen(...args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const server = this.server = http.createServer(this.getServerCb());
+            const server = (this.server = http.createServer(this.getServerCb()));
             return new Promise((resolve, reject) => {
                 server.once('listening', resolve);
                 server.once('error', reject);
@@ -970,12 +1007,12 @@ class WooksHttp extends wooks.WooksAdapterBase {
     }
     getServerCb() {
         return (req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b, _c;
             const { restoreCtx, clearCtx } = createHttpContext({ req, res }, this.mergeEventOptions((_a = this.opts) === null || _a === void 0 ? void 0 : _a.eventOptions));
             const handlers = this.wooks.lookup(req.method, req.url);
-            if (handlers) {
+            if (handlers || ((_b = this.opts) === null || _b === void 0 ? void 0 : _b.onNotFound)) {
                 try {
-                    yield this.processHandlers(handlers);
+                    yield this.processHandlers(handlers || [(_c = this.opts) === null || _c === void 0 ? void 0 : _c.onNotFound]);
                 }
                 catch (e) {
                     this.logger.error('Internal error, please report', e);
@@ -1010,7 +1047,7 @@ class WooksHttp extends wooks.WooksAdapterBase {
                     break;
                 }
                 catch (e) {
-                    this.logger.error(`Uncought route handler exception: ${(store('event').get('req').url || '')}`, e);
+                    this.logger.error(`Uncought route handler exception: ${store('event').get('req').url || ''}`, e);
                     if (isLastHandler) {
                         restoreCtx();
                         this.respond(e);

package/dist/index.d.ts

@@ -9,7 +9,7 @@ import { TConsoleBase } from '@prostojs/logger';
 import { TEmpty } from '@wooksjs/event-core';
 import { TEventOptions } from '@wooksjs/event-core';
 import { TGenericContextStore } from '@wooksjs/event-core';
-import { TProstoRouterPathBuilder } from '@prostojs/router';
+import { TProstoRouterPathHandle } from '@prostojs/router';
 import { TWooksHandler } from 'wooks';
 import { URLSearchParams as URLSearchParams_2 } from 'url';
 import { Wooks } from 'wooks';
@@ -349,6 +349,7 @@ export declare interface TWooksErrorBodyExt extends TWooksErrorBody {
 export declare interface TWooksHttpOptions {
     logger?: TConsoleBase;
     eventOptions?: TEventOptions;
+    onNotFound?: TWooksHandler<unknown>;
 }
 
 export declare interface TWooksResponseRenderer<T = unknown> {
@@ -488,14 +489,14 @@ export declare class WooksHttp extends WooksAdapterBase {
     protected opts?: TWooksHttpOptions | undefined;
     protected logger: TConsoleBase;
     constructor(opts?: TWooksHttpOptions | undefined, wooks?: Wooks | WooksAdapterBase);
-    all<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathBuilder<ParamsType>;
-    get<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathBuilder<ParamsType>;
-    post<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathBuilder<ParamsType>;
-    put<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathBuilder<ParamsType>;
-    patch<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathBuilder<ParamsType>;
-    delete<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathBuilder<ParamsType>;
-    head<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathBuilder<ParamsType>;
-    options<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathBuilder<ParamsType>;
+    all<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathHandle<ParamsType>;
+    get<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathHandle<ParamsType>;
+    post<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathHandle<ParamsType>;
+    put<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathHandle<ParamsType>;
+    patch<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathHandle<ParamsType>;
+    delete<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathHandle<ParamsType>;
+    head<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathHandle<ParamsType>;
+    options<ResType = unknown, ParamsType = Record<string, string | string[]>>(path: string, handler: TWooksHandler<ResType>): TProstoRouterPathHandle<ParamsType>;
     protected server?: Server;
     listen(...args: Parameters<Server['listen']>): Promise<unknown>;
     close(server?: Server): Promise<unknown>;

package/dist/index.mjs

@@ -37,8 +37,11 @@ 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].split(',').shift()) === null || _a === void 0 ? void 0 : _a.trim();
+        if (typeof req.headers[xForwardedFor] === 'string' &&
+            req.headers[xForwardedFor]) {
+            return (_a = req.headers[xForwardedFor]
+                .split(',')
+                .shift()) === null || _a === void 0 ? void 0 : _a.trim();
         }
         else {
             return '';
@@ -56,8 +59,12 @@ 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) || '',
-            forwarded: (req.headers[xForwardedFor] || '').split(',').map(s => s.trim()),
+            remoteIp: ((_a = req.socket) === null || _a === void 0 ? void 0 : _a.remoteAddress) ||
+                ((_b = req.connection) === null || _b === void 0 ? void 0 : _b.remoteAddress) ||
+                '',
+            forwarded: (req.headers[xForwardedFor] || '')
+                .split(',')
+                .map((s) => s.trim()),
         };
     });
     return {
@@ -166,7 +173,7 @@ function convertTime(time, unit = 'ms') {
     const rg = /(\d+)(\w+)/g;
     let t = 0;
     let r;
-    while (r = rg.exec(time)) {
+    while ((r = rg.exec(time))) {
         t += Number(r[1]) * (units[r[2]] || 0);
     }
     return t / units[unit];
@@ -204,9 +211,9 @@ function renderCacheControl(data) {
 const cacheControlFunc = {
     mustRevalidate: (v) => v ? 'must-revalidate' : '',
     noCache: (v) => v ? (typeof v === 'string' ? `no-cache="${v}"` : 'no-cache') : '',
-    noStore: (v) => v ? 'no-store' : '',
-    noTransform: (v) => v ? 'no-transform' : '',
-    public: (v) => v ? 'public' : '',
+    noStore: (v) => (v ? 'no-store' : ''),
+    noTransform: (v) => (v ? 'no-transform' : ''),
+    public: (v) => (v ? 'public' : ''),
     private: (v) => v ? (typeof v === 'string' ? `private="${v}"` : 'private') : '',
     proxyRevalidate: (v) => v ? 'proxy-revalidate' : '',
     maxAge: (v) => 'max-age=' + convertTime(v, 's').toString(),
@@ -214,8 +221,10 @@ const cacheControlFunc = {
 };
 
 const renderAge = (v) => convertTime(v, 's').toString();
-const renderExpires = (v) => (typeof v === 'string' || typeof v === 'number' ? new Date(v).toUTCString() : v.toUTCString());
-const renderPragmaNoCache = (v) => v ? 'no-cache' : '';
+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();
@@ -246,7 +255,7 @@ function useResponse() {
     const responded = store('response').hook('responded');
     const statusCode = store('status').hook('code');
     function status(code) {
-        return statusCode.value = code ? code : statusCode.value;
+        return (statusCode.value = code ? code : statusCode.value);
     }
     const rawResponse = (options) => {
         if (!options || !options.passthrough)
@@ -258,7 +267,7 @@ function useResponse() {
         hasResponded: () => responded.value || !res.writable || res.writableEnded,
         status: attachHook(status, {
             get: () => statusCode.value,
-            set: (code) => statusCode.value = code,
+            set: (code) => (statusCode.value = code),
         }),
     };
 }
@@ -282,12 +291,15 @@ function renderCookie(key, data) {
     return `${key}=${encodeURIComponent(data.value)}${attrs}`;
 }
 const cookieAttrFunc = {
-    expires: (v) => 'Expires=' + (typeof v === 'string' || typeof v === 'number' ? new Date(v).toUTCString() : v.toUTCString()),
+    expires: (v) => 'Expires=' +
+        (typeof v === 'string' || typeof v === 'number'
+            ? new Date(v).toUTCString()
+            : v.toUTCString()),
     maxAge: (v) => 'Max-Age=' + convertTime(v, 's').toString(),
     domain: (v) => 'Domain=' + v,
     path: (v) => 'Path=' + v,
-    secure: (v) => v ? 'Secure' : '',
-    httpOnly: (v) => v ? 'HttpOnly' : '',
+    secure: (v) => (v ? 'Secure' : ''),
+    httpOnly: (v) => (v ? 'HttpOnly' : ''),
     sameSite: (v) => v ? 'SameSite=' + (typeof v === 'string' ? v : 'Strict') : '',
 };
 
@@ -315,7 +327,9 @@ function useCookies() {
     const getCookie = (name) => init(name, () => {
         if (cookie) {
             const result = new RegExp(`(?:^|; )${escapeRegex(name)}=(.*?)(?:;?$|; )`, 'i').exec(cookie);
-            return result && result[1] ? safeDecodeURIComponent(result[1]) : null;
+            return result && result[1]
+                ? safeDecodeURIComponent(result[1])
+                : null;
         }
         else {
             return null;
@@ -336,7 +350,10 @@ function useSetCookies() {
         });
     }
     function cookies() {
-        return cookiesStore.entries().filter(a => !!a[1]).map(([key, value]) => renderCookie(key, value));
+        return cookiesStore
+            .entries()
+            .filter((a) => !!a[1])
+            .map(([key, value]) => renderCookie(key, value));
     }
     return {
         setCookie,
@@ -366,7 +383,7 @@ class WooksURLSearchParams extends URLSearchParams {
         const json = {};
         for (const [key, value] of this.entries()) {
             if (isArrayParam(key)) {
-                const a = json[key] = (json[key] || []);
+                const a = (json[key] = (json[key] || []));
                 a.push(value);
             }
             else {
@@ -410,6 +427,8 @@ 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 */
+
 
 function __awaiter(thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
@@ -443,7 +462,9 @@ function __asyncValues(o) {
 
 class BaseHttpResponseRenderer {
     render(response) {
-        if (typeof response.body === 'string' || typeof response.body === 'boolean' || typeof response.body === 'number') {
+        if (typeof response.body === 'string' ||
+            typeof response.body === 'boolean' ||
+            typeof response.body === 'number') {
             if (!response.getContentType())
                 response.setContentType('text/plain');
             return response.body.toString();
@@ -641,7 +662,7 @@ class BaseHttpResponse {
         return this;
     }
     setCookie(name, value, attrs) {
-        const cookies = this._headers['set-cookie'] = (this._headers['set-cookie'] || []);
+        const cookies = (this._headers['set-cookie'] = (this._headers['set-cookie'] || []));
         cookies.push(renderCookie(name, { value, attrs: attrs || {} }));
         return this;
     }
@@ -649,7 +670,7 @@ class BaseHttpResponse {
         this.setHeader('cache-control', renderCacheControl(data));
     }
     setCookieRaw(rawValue) {
-        const cookies = this._headers['set-cookie'] = (this._headers['set-cookie'] || []);
+        const cookies = (this._headers['set-cookie'] = (this._headers['set-cookie'] || []));
         cookies.push(rawValue);
         return this;
     }
@@ -666,7 +687,7 @@ class BaseHttpResponse {
     mergeHeaders() {
         const { headers } = useSetHeaders();
         const { cookies, removeCookie } = useSetCookies();
-        const newCookies = (this._headers['set-cookie'] || []);
+        const newCookies = this._headers['set-cookie'] || [];
         for (const cookie of newCookies) {
             removeCookie(cookie.slice(0, cookie.indexOf('=')));
         }
@@ -681,7 +702,9 @@ class BaseHttpResponse {
         this.status = this.status || useResponse().status();
         if (!this.status) {
             const { method } = useRequest();
-            this.status = renderedBody ? defaultStatus[method] || EHttpStatusCode.OK : EHttpStatusCode.NoContent;
+            this.status = renderedBody
+                ? defaultStatus[method] || EHttpStatusCode.OK
+                : EHttpStatusCode.NoContent;
         }
         return this;
     }
@@ -730,7 +753,8 @@ class BaseHttpResponse {
                     });
                 }
             }
-            else if (globalThis.Response && this.body instanceof Response /* Fetch Response */) {
+            else if (globalThis.Response &&
+                this.body instanceof Response /* Fetch Response */) {
                 this.mergeFetchStatus(this.body.status);
                 if (method === 'HEAD') {
                     res.end();
@@ -789,42 +813,51 @@ function respondWithFetch(fetchBody, res) {
     });
 }
 
-const preStyles = 'font-family: monospace;'
-    + 'width: 100%;'
-    + 'max-width: 900px;'
-    + 'padding: 10px;'
-    + 'margin: 20px auto;'
-    + 'border-radius: 8px;'
-    + 'background-color: #494949;'
-    + 'box-shadow: 0px 0px 3px 2px rgb(255 255 255 / 20%);';
+const preStyles = 'font-family: monospace;' +
+    'width: 100%;' +
+    'max-width: 900px;' +
+    'padding: 10px;' +
+    'margin: 20px auto;' +
+    'border-radius: 8px;' +
+    'background-color: #494949;' +
+    'box-shadow: 0px 0px 3px 2px rgb(255 255 255 / 20%);';
 class HttpErrorRenderer extends BaseHttpResponseRenderer {
     renderHtml(response) {
         const data = response.body || {};
         response.setContentType('text/html');
-        const keys = Object.keys(data).filter(key => !['statusCode', 'error', 'message'].includes(key));
-        return '<html style="background-color: #333; color: #bbb;">' +
+        const keys = Object.keys(data).filter((key) => !['statusCode', 'error', 'message'].includes(key));
+        return ('<html style="background-color: #333; color: #bbb;">' +
             `<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.2.18"} </center>` +
-            `${keys.length ? `<pre style="${preStyles}">${JSON.stringify(Object.assign(Object.assign({}, data), { statusCode: undefined, message: undefined, error: undefined }), null, '  ')}</pre>` : ''}` +
-            '</body></html>';
+            `<center style="color: #666;"> Wooks v${"0.2.20"} </center>` +
+            `${keys.length
+                ? `<pre style="${preStyles}">${JSON.stringify(Object.assign(Object.assign({}, data), { statusCode: undefined, message: undefined, error: undefined }), null, '  ')}</pre>`
+                : ''}` +
+            '</body></html>');
     }
     renderText(response) {
         const data = response.body || {};
         response.setContentType('text/plain');
-        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, '  ')}` : ''}`;
+        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, '  ')}`
+                : ''}`);
     }
     renderJson(response) {
         const data = response.body || {};
         response.setContentType('application/json');
-        const keys = Object.keys(data).filter(key => !['statusCode', 'error', 'message'].includes(key));
-        return `{"statusCode":${escapeQuotes(data.statusCode)},`
-            + `"error":"${escapeQuotes(data.error)}",`
-            + `"message":"${escapeQuotes(data.message)}"`
-            + `${keys.length ? (',' + keys.map(k => `"${escapeQuotes(k)}":${JSON.stringify(data[k])}`).join(',')) : ''}}`;
+        const keys = Object.keys(data).filter((key) => !['statusCode', 'error', 'message'].includes(key));
+        return (`{"statusCode":${escapeQuotes(data.statusCode)},` +
+            `"error":"${escapeQuotes(data.error)}",` +
+            `"message":"${escapeQuotes(data.message)}"` +
+            `${keys.length
+                ? ',' +
+                    keys
+                        .map((k) => `"${escapeQuotes(k)}":${JSON.stringify(data[k])}`)
+                        .join(',')
+                : ''}}`);
     }
     render(response) {
         var _a;
@@ -845,7 +878,9 @@ class HttpErrorRenderer extends BaseHttpResponseRenderer {
     }
 }
 function escapeQuotes(s) {
-    return (typeof s === 'number' ? s : (s || '')).toString().replace(/[\""]/g, '\\"');
+    return (typeof s === 'number' ? s : s || '')
+        .toString()
+        .replace(/[\""]/g, '\\"');
 }
 
 class HttpError extends Error {
@@ -855,11 +890,13 @@ class HttpError extends Error {
         this._body = _body;
     }
     get body() {
-        return typeof this._body === 'string' ? {
-            statusCode: this.code,
-            message: this.message,
-            error: httpStatusCodes[this.code],
-        } : Object.assign(Object.assign({}, this._body), { statusCode: this.code, message: this.message, error: httpStatusCodes[this.code] });
+        return typeof this._body === 'string'
+            ? {
+                statusCode: this.code,
+                message: this.message,
+                error: httpStatusCodes[this.code],
+            }
+            : Object.assign(Object.assign({}, this._body), { statusCode: this.code, message: this.message, error: httpStatusCodes[this.code] });
     }
     attachRenderer(renderer) {
         this.renderer = renderer;
@@ -936,7 +973,7 @@ class WooksHttp extends WooksAdapterBase {
     }
     listen(...args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const server = this.server = http.createServer(this.getServerCb());
+            const server = (this.server = http.createServer(this.getServerCb()));
             return new Promise((resolve, reject) => {
                 server.once('listening', resolve);
                 server.once('error', reject);
@@ -968,12 +1005,12 @@ class WooksHttp extends WooksAdapterBase {
     }
     getServerCb() {
         return (req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b, _c;
             const { restoreCtx, clearCtx } = createHttpContext({ req, res }, this.mergeEventOptions((_a = this.opts) === null || _a === void 0 ? void 0 : _a.eventOptions));
             const handlers = this.wooks.lookup(req.method, req.url);
-            if (handlers) {
+            if (handlers || ((_b = this.opts) === null || _b === void 0 ? void 0 : _b.onNotFound)) {
                 try {
-                    yield this.processHandlers(handlers);
+                    yield this.processHandlers(handlers || [(_c = this.opts) === null || _c === void 0 ? void 0 : _c.onNotFound]);
                 }
                 catch (e) {
                     this.logger.error('Internal error, please report', e);
@@ -1008,7 +1045,7 @@ class WooksHttp extends WooksAdapterBase {
                     break;
                 }
                 catch (e) {
-                    this.logger.error(`Uncought route handler exception: ${(store('event').get('req').url || '')}`, e);
+                    this.logger.error(`Uncought route handler exception: ${store('event').get('req').url || ''}`, e);
                     if (isLastHandler) {
                         restoreCtx();
                         this.respond(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wooksjs/event-http",
-  "version": "0.2.18",
+  "version": "0.2.20",
   "description": "@wooksjs/event-http",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -31,12 +31,12 @@
     "url": "https://github.com/wooksjs/wooksjs/issues"
   },
   "peerDependencies": {
-    "wooks": "0.2.18",
-    "@prostojs/router": "^0.0.16",
-    "@wooksjs/event-core": "0.2.18"
+    "wooks": "0.2.20",
+    "@prostojs/router": "^0.1.0",
+    "@wooksjs/event-core": "0.2.20"
   },
   "dependencies": {
-    "@prostojs/logger": "^0.3.4"
+    "@prostojs/logger": "^0.3.6"
   },
   "homepage": "https://github.com/wooksjs/wooksjs/tree/main/packages/event-http#readme"
 }