@wooksjs/event-http 0.2.12 → 0.2.14

package/dist/index.cjs

@@ -6,9 +6,10 @@ var stream = require('stream');
 var wooks = require('wooks');
 var http = require('http');
 
-function createHttpContext(data) {
+function createHttpContext(data, options) {
     return eventCore.createEventContext({
         event: Object.assign(Object.assign({}, data), { type: 'HTTP' }),
+        options,
     });
 }
 function useHttpContext() {
@@ -183,28 +184,6 @@ const units = {
     Y: 1000 * 60 * 60 * 24 * 365,
 };
 
-const banner = () => `[${"@wooksjs/event-http"}][${new Date().toISOString().replace('T', ' ').replace(/\.\d{3}z$/i, '')}] `;
-
-/* istanbul ignore file */
-function warn(text) {
-    console.warn('' + banner() + text + '');
-}
-function logError(error) {
-    console.error('' + '' + banner() + error + '');
-}
-function traceError(expl, e) {
-    logError(expl);
-    logError(e.message);
-    if (e.stack) {
-        warn(e.stack);
-    }
-}
-
-function panic(error) {
-    logError(error);
-    return new Error(error);
-}
-
 function renderCacheControl(data) {
     let attrs = '';
     for (const [a, v] of Object.entries(data)) {
@@ -218,7 +197,7 @@ function renderCacheControl(data) {
             }
         }
         else {
-            panic('Unknown Cache-Control attribute ' + a);
+            throw new Error('Unknown Cache-Control attribute ' + a);
         }
     }
     return attrs;
@@ -299,7 +278,7 @@ function renderCookie(key, data) {
             attrs += val ? '; ' + val : '';
         }
         else {
-            panic('Unknown Set-Cookie attribute ' + a);
+            throw new Error('Unknown Set-Cookie attribute ' + a);
         }
     }
     return `${key}=${encodeURIComponent(data.value)}${attrs}`;
@@ -482,7 +461,7 @@ class BaseHttpResponseRenderer {
                 response.setContentType('application/json');
             return JSON.stringify(response.body);
         }
-        throw panic('Unsupported body format "' + typeof response.body + '"');
+        throw new Error('Unsupported body format "' + typeof response.body + '"');
     }
 }
 
@@ -708,12 +687,21 @@ class BaseHttpResponse {
         }
         return this;
     }
+    mergeFetchStatus(fetchStatus) {
+        this.status = this.status || useResponse().status() || fetchStatus;
+    }
+    panic(text, logger) {
+        const error = new Error(text);
+        logger.error(error);
+        throw error;
+    }
     respond() {
         return __awaiter(this, void 0, void 0, function* () {
             const { rawResponse, hasResponded } = useResponse();
             const { method, rawRequest } = useRequest();
+            const logger = eventCore.useEventLogger('http-response');
             if (hasResponded()) {
-                throw panic('The response was already sent.');
+                this.panic('The response was already sent.', logger);
             }
             this.mergeHeaders();
             const res = rawResponse();
@@ -745,11 +733,19 @@ class BaseHttpResponse {
                 }
             }
             else if (globalThis.Response && this.body instanceof Response /* Fetch Response */) {
-                this.mergeStatus('ok');
+                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);
                 }
             }
@@ -812,7 +808,7 @@ 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.2.12"} </center>` +
+            `<center style="color: #666;"> Wooks v${"0.2.14"} </center>` +
             `${keys.length ? `<pre style="${preStyles}">${JSON.stringify(Object.assign(Object.assign({}, data), { statusCode: undefined, message: undefined, error: undefined }), null, '  ')}</pre>` : ''}` +
             '</body></html>';
     }
@@ -914,6 +910,7 @@ class WooksHttp extends wooks.WooksAdapterBase {
         super(wooks);
         this.opts = opts;
         this.responder = createWooksResponder();
+        this.logger = (opts === null || opts === void 0 ? void 0 : opts.logger) || this.getLogger('wooks-http');
     }
     all(path, handler) {
         return this.on('*', path, handler);
@@ -968,19 +965,20 @@ class WooksHttp extends wooks.WooksAdapterBase {
     respond(data) {
         var _a;
         void ((_a = this.responder.respond(data)) === null || _a === void 0 ? void 0 : _a.catch((e) => {
-            traceError('Uncought response exception:\n', e);
+            this.logger.error('Uncought response exception', e);
         }));
     }
     getServerCb() {
         return (req, res) => __awaiter(this, void 0, void 0, function* () {
-            const { restoreCtx, clearCtx } = createHttpContext({ req, res });
+            var _a;
+            const { restoreCtx, clearCtx } = createHttpContext({ req, res }, ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.eventOptions) || {});
             const handlers = this.wooks.lookup(req.method, req.url);
             if (handlers) {
                 try {
                     yield this.processHandlers(handlers);
                 }
                 catch (e) {
-                    traceError('Internal error, please report: ', e);
+                    this.logger.error('Internal error, please report', e);
                     restoreCtx();
                     this.respond(e);
                     clearCtx();
@@ -1011,7 +1009,7 @@ class WooksHttp extends wooks.WooksAdapterBase {
                     break;
                 }
                 catch (e) {
-                    traceError(`Uncought route handler exception: ${(store('event').get('req').url || '')}\n`, 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

@@ -5,6 +5,8 @@ import { IncomingHttpHeaders } from 'http';
 import { IncomingMessage } from 'http';
 import { Server } from 'http';
 import { ServerResponse } from 'http';
+import { TConsoleBase } from '@prostojs/logger';
+import { TEventOptions } from '@wooksjs/event-core';
 import { TGenericContextStore } from '@wooksjs/event-core';
 import { TGenericEvent } from '@wooksjs/event-core';
 import { TProstoRouterPathBuilder } from '@prostojs/router';
@@ -36,6 +38,8 @@ export declare class BaseHttpResponse<BodyType = unknown> {
     getHeader(name: string): string | string[];
     protected mergeHeaders(): this;
     protected mergeStatus(renderedBody: string | Uint8Array): this;
+    protected mergeFetchStatus(fetchStatus: number): void;
+    protected panic(text: string, logger: TConsoleBase): void;
     respond(): Promise<unknown>;
 }
 
@@ -45,7 +49,7 @@ export declare class BaseHttpResponseRenderer<T = unknown> implements TWooksResp
 
 export declare function createHttpApp(opts?: TWooksHttpOptions, wooks?: Wooks | WooksAdapterBase): WooksHttp;
 
-export declare function createHttpContext(data: THttpEventData): {
+export declare function createHttpContext(data: THttpEventData, options: TEventOptions): {
     getCtx: () => THttpContextStore;
     restoreCtx: () => THttpContextStore;
     clearCtx: () => null;
@@ -343,6 +347,8 @@ export declare interface TWooksErrorBodyExt extends TWooksErrorBody {
 }
 
 export declare interface TWooksHttpOptions {
+    logger?: TConsoleBase;
+    eventOptions?: TEventOptions;
 }
 
 export declare interface TWooksResponseRenderer<T = unknown> {
@@ -480,6 +486,7 @@ export declare function useStatus(): {
 
 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>;

package/dist/index.mjs

@@ -1,12 +1,13 @@
-import { createEventContext, useEventContext, useEventId, attachHook } from '@wooksjs/event-core';
+import { createEventContext, useEventContext, useEventId, attachHook, useEventLogger } from '@wooksjs/event-core';
 import { URLSearchParams } from 'url';
 import { Readable } from 'stream';
 import { WooksAdapterBase } from 'wooks';
 import http from 'http';
 
-function createHttpContext(data) {
+function createHttpContext(data, options) {
     return createEventContext({
         event: Object.assign(Object.assign({}, data), { type: 'HTTP' }),
+        options,
     });
 }
 function useHttpContext() {
@@ -181,28 +182,6 @@ const units = {
     Y: 1000 * 60 * 60 * 24 * 365,
 };
 
-const banner = () => `[${"@wooksjs/event-http"}][${new Date().toISOString().replace('T', ' ').replace(/\.\d{3}z$/i, '')}] `;
-
-/* istanbul ignore file */
-function warn(text) {
-    console.warn('' + banner() + text + '');
-}
-function logError(error) {
-    console.error('' + '' + banner() + error + '');
-}
-function traceError(expl, e) {
-    logError(expl);
-    logError(e.message);
-    if (e.stack) {
-        warn(e.stack);
-    }
-}
-
-function panic(error) {
-    logError(error);
-    return new Error(error);
-}
-
 function renderCacheControl(data) {
     let attrs = '';
     for (const [a, v] of Object.entries(data)) {
@@ -216,7 +195,7 @@ function renderCacheControl(data) {
             }
         }
         else {
-            panic('Unknown Cache-Control attribute ' + a);
+            throw new Error('Unknown Cache-Control attribute ' + a);
         }
     }
     return attrs;
@@ -297,7 +276,7 @@ function renderCookie(key, data) {
             attrs += val ? '; ' + val : '';
         }
         else {
-            panic('Unknown Set-Cookie attribute ' + a);
+            throw new Error('Unknown Set-Cookie attribute ' + a);
         }
     }
     return `${key}=${encodeURIComponent(data.value)}${attrs}`;
@@ -480,7 +459,7 @@ class BaseHttpResponseRenderer {
                 response.setContentType('application/json');
             return JSON.stringify(response.body);
         }
-        throw panic('Unsupported body format "' + typeof response.body + '"');
+        throw new Error('Unsupported body format "' + typeof response.body + '"');
     }
 }
 
@@ -706,12 +685,21 @@ class BaseHttpResponse {
         }
         return this;
     }
+    mergeFetchStatus(fetchStatus) {
+        this.status = this.status || useResponse().status() || fetchStatus;
+    }
+    panic(text, logger) {
+        const error = new Error(text);
+        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()) {
-                throw panic('The response was already sent.');
+                this.panic('The response was already sent.', logger);
             }
             this.mergeHeaders();
             const res = rawResponse();
@@ -743,11 +731,19 @@ class BaseHttpResponse {
                 }
             }
             else if (globalThis.Response && this.body instanceof Response /* Fetch Response */) {
-                this.mergeStatus('ok');
+                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);
                 }
             }
@@ -810,7 +806,7 @@ 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.2.12"} </center>` +
+            `<center style="color: #666;"> Wooks v${"0.2.14"} </center>` +
             `${keys.length ? `<pre style="${preStyles}">${JSON.stringify(Object.assign(Object.assign({}, data), { statusCode: undefined, message: undefined, error: undefined }), null, '  ')}</pre>` : ''}` +
             '</body></html>';
     }
@@ -912,6 +908,7 @@ class WooksHttp extends WooksAdapterBase {
         super(wooks);
         this.opts = opts;
         this.responder = createWooksResponder();
+        this.logger = (opts === null || opts === void 0 ? void 0 : opts.logger) || this.getLogger('wooks-http');
     }
     all(path, handler) {
         return this.on('*', path, handler);
@@ -966,19 +963,20 @@ class WooksHttp extends WooksAdapterBase {
     respond(data) {
         var _a;
         void ((_a = this.responder.respond(data)) === null || _a === void 0 ? void 0 : _a.catch((e) => {
-            traceError('Uncought response exception:\n', e);
+            this.logger.error('Uncought response exception', e);
         }));
     }
     getServerCb() {
         return (req, res) => __awaiter(this, void 0, void 0, function* () {
-            const { restoreCtx, clearCtx } = createHttpContext({ req, res });
+            var _a;
+            const { restoreCtx, clearCtx } = createHttpContext({ req, res }, ((_a = this.opts) === null || _a === void 0 ? void 0 : _a.eventOptions) || {});
             const handlers = this.wooks.lookup(req.method, req.url);
             if (handlers) {
                 try {
                     yield this.processHandlers(handlers);
                 }
                 catch (e) {
-                    traceError('Internal error, please report: ', e);
+                    this.logger.error('Internal error, please report', e);
                     restoreCtx();
                     this.respond(e);
                     clearCtx();
@@ -1009,7 +1007,7 @@ class WooksHttp extends WooksAdapterBase {
                     break;
                 }
                 catch (e) {
-                    traceError(`Uncought route handler exception: ${(store('event').get('req').url || '')}\n`, 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.12",
+  "version": "0.2.14",
   "description": "@wooksjs/event-http",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -31,9 +31,12 @@
     "url": "https://github.com/wooksjs/wooksjs/issues"
   },
   "peerDependencies": {
-    "wooks": "0.2.12",
+    "wooks": "0.2.14",
     "@prostojs/router": "^0.0.16",
-    "@wooksjs/event-core": "0.2.12"
+    "@wooksjs/event-core": "0.2.14"
+  },
+  "dependencies": {
+    "@prostojs/logger": "^0.3.2"
   },
   "homepage": "https://github.com/wooksjs/wooksjs/tree/main/packages/event-http#readme"
 }