@deepkit/http 1.0.18 → 1.0.19

package/src/http.ts

@@ -541,7 +541,7 @@ export class HttpListener {
         protected logger: LoggerInterface,
         protected resultFormatter: HttpResultFormatter,
         protected injector: Injector,
-        protected stopwatch?: Stopwatch,
+        protected stopwatch: Stopwatch,
     ) {
         this.setRouteConfig = injector.createSetter(RouteConfig, {name: 'http'});
     }
@@ -690,7 +690,7 @@ export class HttpListener {
             ? getClassName(event.route.action.controller) + '.' + event.route.action.methodName
             : event.route.action.fn.name;
 
-        const frame = this.stopwatch ? this.stopwatch.start(stopWatchLabel, FrameCategory.httpController) : undefined;
+        const frame = this.stopwatch.start(stopWatchLabel, FrameCategory.httpController);
         try {
             let result: any;
             if (event.route.action.type === 'controller') {
@@ -716,7 +716,6 @@ export class HttpListener {
             responseEvent.controllerActionTime = Date.now() - start;
             event.next('response', responseEvent);
         } catch (error: any) {
-            if (frame) frame.end();
             if (error instanceof HttpAccessDeniedError) {
                 event.next('accessDenied', new HttpAccessDeniedEvent(event.injectorContext, event.request, event.response, event.route, error));
             } else {
@@ -725,7 +724,7 @@ export class HttpListener {
                 event.next('controllerError', errorEvent);
             }
         } finally {
-            if (frame) frame.end();
+            frame.end();
         }
     }
 

package/src/kernel.ts

@@ -2,14 +2,7 @@ import { InjectorContext, Setter } from '@deepkit/injector';
 import { HttpRouter } from './router.js';
 import { EventDispatcher } from '@deepkit/event';
 import { LoggerInterface } from '@deepkit/logger';
-import {
-    HttpRequest,
-    HttpResponse,
-    incomingMessageToHttpRequest,
-    MemoryHttpResponse,
-    RequestBuilder,
-    serverResponseToHttpResponse,
-} from './model.js';
+import { HttpRequest, HttpResponse, incomingMessageToHttpRequest, MemoryHttpResponse, RequestBuilder, serverResponseToHttpResponse } from './model.js';
 import { HttpError, HttpRequestEvent, HttpResultFormatter, httpWorkflow, JSONResponse } from './http.js';
 import { FrameCategory, Stopwatch } from '@deepkit/stopwatch';
 import { unlink } from 'fs';
@@ -43,7 +36,7 @@ export class HttpKernel {
         protected eventDispatcher: EventDispatcher,
         protected injectorContext: InjectorContext,
         protected logger: LoggerInterface,
-        protected stopwatch?: Stopwatch,
+        protected stopwatch: Stopwatch,
     ) {
         this.setHttpRequest = injectorContext.setter(undefined, HttpRequest);
         this.setHttpResponse = injectorContext.setter(undefined, HttpResponse);
@@ -112,16 +105,12 @@ export class HttpKernel {
 
         req.throwErrorOnNotFound = options.throwOnNotFound || false;
 
-        const frame = this.stopwatch ? this.stopwatch.start(req.method + ' ' + req.getUrl(), FrameCategory.http, true) : undefined;
-        const workflow = httpWorkflow.create('start', this.eventDispatcher, httpInjectorContext, this.stopwatch);
+        const frame = this.stopwatch.start(req.method + ' ' + req.getUrl(), FrameCategory.http, true);
+        const workflow = httpWorkflow.create('start', this.eventDispatcher, this.stopwatch, httpInjectorContext);
 
         try {
-            if (frame) {
-                frame.data({ url: req.getUrl(), method: req.getMethod(), clientIp: req.getRemoteAddress() });
-                await frame.run(() => workflow.apply('request', new HttpRequestEvent(httpInjectorContext, req, res)));
-            } else {
-                await workflow.apply('request', new HttpRequestEvent(httpInjectorContext, req, res));
-            }
+            frame.data({ url: req.getUrl(), method: req.getMethod(), clientIp: req.getRemoteAddress() });
+            await frame.run(() => workflow.apply('request', new HttpRequestEvent(httpInjectorContext, req, res)));
         } catch (error: any) {
             if (!res.headersSent) {
                 const resultFormatter = httpInjectorContext.get(HttpResultFormatter);
@@ -151,10 +140,8 @@ export class HttpKernel {
                 });
             }
 
-            if (frame) {
-                frame.data({ responseStatus: res.statusCode });
-                frame.end();
-            }
+            frame.data({ responseStatus: res.statusCode });
+            frame.end();
         }
     }
 }