@deepkit/http 1.0.15 → 1.0.19

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();
         }
     }
 }

package/src/router.ts

@@ -8,18 +8,7 @@
  * You should have received a copy of the MIT License along with this program.
  */
 import { ClassType, CompilerContext, getClassName, isArray, isClass, urlJoin } from '@deepkit/core';
-import {
-    entity,
-    ReflectionClass,
-    ReflectionFunction,
-    ReflectionKind,
-    ReflectionParameter,
-    SerializationOptions,
-    serializer,
-    Serializer,
-    Type,
-    ValidationError,
-} from '@deepkit/type';
+import { entity, ReflectionClass, ReflectionFunction, ReflectionKind, ReflectionParameter, SerializationOptions, serializer, Serializer, Type, ValidationError } from '@deepkit/type';
 import { getActions, HttpAction, httpClass, HttpController, HttpDecorator } from './decorator.js';
 import { HttpRequest, HttpRequestPositionedParameters, HttpRequestQuery, HttpRequestResolvedParameters } from './model.js';
 import { InjectorContext, InjectorModule } from '@deepkit/injector';
@@ -30,7 +19,7 @@ import { HttpMiddlewareConfig, HttpMiddlewareFn } from './middleware.js';
 
 //@ts-ignore
 import qs from 'qs';
-import { HtmlResponse, JSONResponse, Response } from './http.js';
+import { HtmlResponse, JSONResponse, Redirect, Response } from './http.js';
 import { getRequestParserCodeForParameters, ParameterForRequestParser, parseRoutePathToRegex } from './request-parser.js';
 import { HttpConfig } from './module.config.js';
 
@@ -444,6 +433,13 @@ export abstract class HttpRouterRegistryFunctionRegistrar {
         this.register(convertOptions(['HEAD'], pathOrOptions, this.defaultOptions), callback);
     }
 
+    public redirectCallback(pathOrOptions: string | HttpRouterFunctionOptions, callback: (request: HttpRequest) => string, redirectCode: number = 302) {
+        const options = convertOptions(['GET'], pathOrOptions, this.defaultOptions);
+        this.register(options, (request: HttpRequest) => {
+            return Redirect.toUrl(callback(request), redirectCode);
+        });
+    }
+
     private register(options: HttpRouterFunctionOptions, callback: (...args: any[]) => any, module?: InjectorModule<any>) {
         const fn = ReflectionFunction.from(callback);
 
@@ -536,7 +532,7 @@ export class HttpRouterRegistry extends HttpRouterRegistryFunctionRegistrar {
                 type: 'controller',
                 controller,
                 module,
-                methodName: action.methodName
+                methodName: action.methodName,
             };
             const routeConfig = createRouteConfigFromHttpAction(routeAction, action, module, controllerData);
 
@@ -578,7 +574,7 @@ export class HttpRouter {
         controllers: (ClassType | { module: InjectorModule<any>, controller: ClassType })[],
         middlewareRegistry: MiddlewareRegistry = new MiddlewareRegistry(),
         module: InjectorModule<any> = new InjectorModule(),
-        config: HttpConfig = new HttpConfig()
+        config: HttpConfig = new HttpConfig(),
     ): HttpRouter {
         return new this(new HttpControllers(controllers.map(v => {
             return isClass(v) ? { controller: v, module } : v;
@@ -636,7 +632,7 @@ export class HttpRouter {
             resolverForToken: routeConfig.resolverForToken,
             resolverForParameterName: routeConfig.resolverForParameterName,
             pathParameterNames: parsedRoute.pathParameterNames,
-            routeConfig
+            routeConfig,
         });
 
         let methodCheck = '';

package/src/static-serving.ts

@@ -49,13 +49,7 @@ export async function staticOnRoute(
     return new Promise(resolve => {
         stat(finalLocalPath, (err, stat) => {
             if (stat && stat.isFile()) {
-                event.routeFound(
-                    new RouteConfig('static', ['GET'], event.url, {
-                        type: 'function',
-                        fn: staticServe,
-                    }),
-                    () => ({ arguments: [localPath, relativePath, event.request, event.response], parameters: {} }),
-                );
+                event.routeFoundCallback(staticServe, [localPath, relativePath, event.request, event.response]);
             }
             resolve(undefined);
         });

package/tsconfig.json

@@ -7,6 +7,7 @@
     "sourceMap": true,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
+    "skipLibCheck": true,
     "moduleResolution": "node",
     "target": "es2020",
     "module": "CommonJS",