@tsed/common 7.0.0-beta.18 → 7.0.0-beta.19

package/coverage.json

@@ -1,6 +1,6 @@
 {
-  "statements": 92.25,
-  "branches": 77.85,
-  "functions": 88.81,
-  "lines": 92.24
+  "statements": 96.82,
+  "branches": 81.85,
+  "functions": 95.54,
+  "lines": 97.09
 }

package/lib/cjs/interfaces/PlatformRouteOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformRouteOptions.js","sourceRoot":"","sources":["../../../src/interfaces/PlatformRouteOptions.ts"],"names":[],"mappings":"","sourcesContent":["import {Type} from \"@tsed/core\";\nimport {PathType} from \"@tsed/di\";\n\n/**\n * @ignore\n */\nexport interface PlatformRouteOptions {\n  token?: Type<any>;\n  path?: PathType | undefined;\n  method?: string;\n  isFinal?: boolean;\n  handlers: any[];\n}\n\n/**\n * @ignore\n */\nexport type PlatformRouteWithoutHandlers = Partial<Omit<PlatformRouteOptions, \"handlers\">>;\n"]}
+{"version":3,"file":"PlatformRouteOptions.js","sourceRoot":"","sources":["../../../src/interfaces/PlatformRouteOptions.ts"],"names":[],"mappings":"","sourcesContent":["import {Type} from \"@tsed/core\";\nimport {PathType} from \"@tsed/di\";\n\n/**\n * @ignore\n */\nexport interface PlatformRouteOptions {\n  token?: Type<any>;\n  path?: PathType | undefined;\n  method?: string;\n  handlers: any[];\n}\n\n/**\n * @ignore\n */\nexport type PlatformRouteWithoutHandlers = Partial<Omit<PlatformRouteOptions, \"handlers\">>;\n"]}

package/lib/cjs/services/Platform.js

@@ -6,7 +6,6 @@ const di_1 = require("@tsed/di");
 const platform_router_1 = require("@tsed/platform-router");
 const PlatformApplication_1 = require("./PlatformApplication");
 const PlatformHandler_1 = require("./PlatformHandler");
-const PlatformMiddlewaresChain_1 = require("./PlatformMiddlewaresChain");
 /**
  * `Platform` is used to provide all routes collected by annotation `@Controller`.
  *
@@ -16,22 +15,11 @@ let Platform = class Platform {
     injector;
     platformApplication;
     platformRouters;
-    platformHandler;
-    platformMiddlewaresChain;
     #controllers = new Map();
-    constructor(injector, platformApplication, platformRouters, platformHandler, platformMiddlewaresChain) {
+    constructor(injector, platformApplication, platformRouters) {
         this.injector = injector;
         this.platformApplication = platformApplication;
         this.platformRouters = platformRouters;
-        this.platformHandler = platformHandler;
-        this.platformMiddlewaresChain = platformMiddlewaresChain;
-        // configure the router module
-        platformRouters.hooks
-            .on("alterEndpointHandlers", platformMiddlewaresChain.get.bind(platformMiddlewaresChain))
-            .on("alterHandler", (handler, handlerMetadata) => {
-            handler = handlerMetadata.isRawMiddleware() ? handler : this.platformHandler.createHandler(handler, handlerMetadata);
-            return platformApplication.adapter.mapHandler(handler, handlerMetadata);
-        });
         platformRouters.prebuild();
     }
     get app() {
@@ -74,13 +62,11 @@ let Platform = class Platform {
 Platform = tslib_1.__decorate([
     (0, di_1.Injectable)({
         scope: di_1.ProviderScope.SINGLETON,
-        imports: []
+        imports: [PlatformHandler_1.PlatformHandler]
     }),
     tslib_1.__metadata("design:paramtypes", [di_1.InjectorService,
         PlatformApplication_1.PlatformApplication,
-        platform_router_1.PlatformRouters,
-        PlatformHandler_1.PlatformHandler,
-        PlatformMiddlewaresChain_1.PlatformMiddlewaresChain])
+        platform_router_1.PlatformRouters])
 ], Platform);
 exports.Platform = Platform;
 //# sourceMappingURL=Platform.js.map

package/lib/cjs/services/Platform.js.map

@@ -1 +1 @@
-{"version":3,"file":"Platform.js","sourceRoot":"","sources":["../../../src/services/Platform.ts"],"names":[],"mappings":"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","sourcesContent":["import {Injectable, InjectorService, ProviderScope, TokenProvider} from \"@tsed/di\";\nimport {PlatformHandlerMetadata, PlatformRouters} from \"@tsed/platform-router\";\nimport {ControllerProvider} from \"@tsed/di\";\nimport {Route, RouteController} from \"../interfaces/Route\";\nimport {PlatformApplication} from \"./PlatformApplication\";\nimport {PlatformHandler} from \"./PlatformHandler\";\nimport {PlatformMiddlewaresChain} from \"./PlatformMiddlewaresChain\";\n\n/**\n * `Platform` is used to provide all routes collected by annotation `@Controller`.\n *\n * @platform\n */\n@Injectable({\n  scope: ProviderScope.SINGLETON,\n  imports: []\n})\nexport class Platform {\n  #controllers: Map<string, RouteController> = new Map();\n\n  constructor(\n    readonly injector: InjectorService,\n    readonly platformApplication: PlatformApplication,\n    readonly platformRouters: PlatformRouters,\n    readonly platformHandler: PlatformHandler,\n    readonly platformMiddlewaresChain: PlatformMiddlewaresChain\n  ) {\n    // configure the router module\n    platformRouters.hooks\n      .on(\"alterEndpointHandlers\", platformMiddlewaresChain.get.bind(platformMiddlewaresChain))\n      .on(\"alterHandler\", (handler: Function, handlerMetadata: PlatformHandlerMetadata) => {\n        handler = handlerMetadata.isRawMiddleware() ? handler : this.platformHandler.createHandler(handler as any, handlerMetadata);\n\n        return platformApplication.adapter.mapHandler(handler, handlerMetadata);\n      });\n\n    platformRouters.prebuild();\n  }\n\n  get app() {\n    return this.platformApplication;\n  }\n\n  public addRoutes(routes: Route[]) {\n    routes.forEach((routeSettings) => {\n      this.addRoute(routeSettings.route, routeSettings.token);\n    });\n  }\n\n  public addRoute(route: string, token: TokenProvider) {\n    const provider = this.injector.getProvider(token) as ControllerProvider;\n\n    if (!provider || provider.hasParent()) {\n      return this;\n    }\n\n    const router = this.platformRouters.from(provider.token);\n\n    this.app.use(route, router);\n\n    return this;\n  }\n\n  public getLayers() {\n    this.#controllers = new Map();\n\n    return this.platformRouters.getLayers(this.app).map((layer) => {\n      if (layer.isProvider()) {\n        this.#controllers.set(layer.provider.token, {\n          route: String(layer.path).split(layer.provider.path)[0],\n          provider: layer.provider\n        });\n      }\n\n      return layer;\n    });\n  }\n\n  /**\n   * Get all controllers mounted on the application.\n   * @returns  {RouteController[]}\n   */\n  public getMountedControllers(): RouteController[] {\n    return [...this.#controllers.values()];\n  }\n}\n"]}
+{"version":3,"file":"Platform.js","sourceRoot":"","sources":["../../../src/services/Platform.ts"],"names":[],"mappings":";;;;AAAA,iCAAuG;AACvG,2DAAsD;AAEtD,+DAA0D;AAC1D,uDAAkD;AAElD;;;;GAIG;AAKH,IAAa,QAAQ,GAArB,MAAa,QAAQ;IAIR;IACA;IACA;IALX,YAAY,GAAiC,IAAI,GAAG,EAAE,CAAC;IAEvD,YACW,QAAyB,EACzB,mBAAwC,EACxC,eAAgC;QAFhC,aAAQ,GAAR,QAAQ,CAAiB;QACzB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,oBAAe,GAAf,eAAe,CAAiB;QAEzC,eAAe,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAEM,SAAS,CAAC,MAAe;QAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YAC/B,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,QAAQ,CAAC,KAAa,EAAE,KAAoB;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAuB,CAAC;QAExE,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAE;YACrC,OAAO,IAAI,CAAC;SACb;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEzD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,SAAS;QACd,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;QAE9B,OAAO,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC5D,IAAI,KAAK,CAAC,UAAU,EAAE,EAAE;gBACtB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE;oBAC1C,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACvD,QAAQ,EAAE,KAAK,CAAC,QAAQ;iBACzB,CAAC,CAAC;aACJ;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,qBAAqB;QAC1B,OAAO,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;CACF,CAAA;AAzDY,QAAQ;IAJpB,IAAA,eAAU,EAAC;QACV,KAAK,EAAE,kBAAa,CAAC,SAAS;QAC9B,OAAO,EAAE,CAAC,iCAAe,CAAC;KAC3B,CAAC;6CAKqB,oBAAe;QACJ,yCAAmB;QACvB,iCAAe;GANhC,QAAQ,CAyDpB;AAzDY,4BAAQ","sourcesContent":["import {ControllerProvider, Injectable, InjectorService, ProviderScope, TokenProvider} from \"@tsed/di\";\nimport {PlatformRouters} from \"@tsed/platform-router\";\nimport {Route, RouteController} from \"../interfaces/Route\";\nimport {PlatformApplication} from \"./PlatformApplication\";\nimport {PlatformHandler} from \"./PlatformHandler\";\n\n/**\n * `Platform` is used to provide all routes collected by annotation `@Controller`.\n *\n * @platform\n */\n@Injectable({\n  scope: ProviderScope.SINGLETON,\n  imports: [PlatformHandler]\n})\nexport class Platform {\n  #controllers: Map<string, RouteController> = new Map();\n\n  constructor(\n    readonly injector: InjectorService,\n    readonly platformApplication: PlatformApplication,\n    readonly platformRouters: PlatformRouters\n  ) {\n    platformRouters.prebuild();\n  }\n\n  get app() {\n    return this.platformApplication;\n  }\n\n  public addRoutes(routes: Route[]) {\n    routes.forEach((routeSettings) => {\n      this.addRoute(routeSettings.route, routeSettings.token);\n    });\n  }\n\n  public addRoute(route: string, token: TokenProvider) {\n    const provider = this.injector.getProvider(token) as ControllerProvider;\n\n    if (!provider || provider.hasParent()) {\n      return this;\n    }\n\n    const router = this.platformRouters.from(provider.token);\n\n    this.app.use(route, router);\n\n    return this;\n  }\n\n  public getLayers() {\n    this.#controllers = new Map();\n\n    return this.platformRouters.getLayers(this.app).map((layer) => {\n      if (layer.isProvider()) {\n        this.#controllers.set(layer.provider.token, {\n          route: String(layer.path).split(layer.provider.path)[0],\n          provider: layer.provider\n        });\n      }\n\n      return layer;\n    });\n  }\n\n  /**\n   * Get all controllers mounted on the application.\n   * @returns  {RouteController[]}\n   */\n  public getMountedControllers(): RouteController[] {\n    return [...this.#controllers.values()];\n  }\n}\n"]}

package/lib/cjs/services/PlatformHandler.js

@@ -5,26 +5,48 @@ const tslib_1 = require("tslib");
 const core_1 = require("@tsed/core");
 const di_1 = require("@tsed/di");
 const logger_1 = require("@tsed/logger");
+const platform_exceptions_1 = require("@tsed/platform-exceptions");
 const platform_params_1 = require("@tsed/platform-params");
 const platform_response_filter_1 = require("@tsed/platform-response-filter");
 const platform_router_1 = require("@tsed/platform-router");
 const util_1 = require("util");
 const AnyToPromiseWithCtx_1 = require("../domain/AnyToPromiseWithCtx");
 const setResponseHeaders_1 = require("../utils/setResponseHeaders");
+const PlatformApplication_1 = require("./PlatformApplication");
+const PlatformMiddlewaresChain_1 = require("./PlatformMiddlewaresChain");
 /**
  * Platform Handler abstraction layer. Wrap original class method to a pure platform handler (Express, Koa, etc...).
  * @platform
  */
 let PlatformHandler = class PlatformHandler {
-    responseFilter;
     platformRouters;
+    responseFilter;
     platformParams;
-    createHandler(handler, handlerMetadata) {
-        return async ($ctx) => {
-            $ctx.handlerMetadata = handlerMetadata;
-            const error = await (0, core_1.catchAsyncError)(() => this.onRequest(handler, $ctx));
-            return this.next(error, $ctx.next, $ctx);
-        };
+    platformExceptions;
+    platformApplication;
+    platformMiddlewaresChain;
+    constructor(platformRouters) {
+        this.platformRouters = platformRouters;
+        // configure the router module
+        platformRouters.hooks
+            .on("alterEndpointHandlers", (allMiddlewares, operationRoute) => {
+            allMiddlewares = this.platformMiddlewaresChain.get(allMiddlewares, operationRoute);
+            return [...allMiddlewares, (0, platform_router_1.useResponseHandler)(this.onFinish.bind(this))];
+        })
+            .on("alterHandler", (handlerMetadata) => {
+            return this.platformApplication.adapter.mapHandler(this.createHandler(handlerMetadata), handlerMetadata);
+        });
+    }
+    createHandler(handlerMetadata) {
+        if (handlerMetadata.isInjectable()) {
+            const handler = this.platformParams.compileHandler(handlerMetadata);
+            return async ($ctx) => {
+                $ctx.handlerMetadata = handlerMetadata;
+                await (0, core_1.catchAsyncError)(() => this.onRequest(handler, $ctx));
+                return this.next($ctx);
+            };
+        }
+        return handlerMetadata.handler;
     }
     /**
      * @param provider
@@ -55,29 +77,20 @@ let PlatformHandler = class PlatformHandler {
             data = await this.responseFilter.transform(data, $ctx);
             response.body(data);
         }
-        return response;
-    }
-    setResponseHeaders($ctx) {
-        if (!$ctx.response.isDone()) {
-            return (0, setResponseHeaders_1.setResponseHeaders)($ctx);
-        }
     }
     /**
-     * @param error
-     * @param next
      * @param $ctx
      */
-    next(error, next, $ctx) {
+    next($ctx) {
         if ((0, core_1.isStream)($ctx.data) || $ctx.isDone()) {
             return;
         }
-        return error ? next(error) : next();
+        return $ctx.error ? $ctx.next($ctx.error) : $ctx.next();
     }
     /**
      * Call handler when a request his handle
      */
     async onRequest(handler, $ctx) {
-        // istanbul ignore next$
         if ($ctx.isDone()) {
             logger_1.$log.error({
                 name: "HEADERS_SENT",
@@ -85,13 +98,16 @@ let PlatformHandler = class PlatformHandler {
             });
             return;
         }
+        if (($ctx.error instanceof Error && !$ctx.handlerMetadata.hasErrorParam) || ($ctx.handlerMetadata.hasErrorParam && !$ctx.error)) {
+            return;
+        }
         try {
             const { handlerMetadata } = $ctx;
             if (handlerMetadata.type === platform_router_1.PlatformHandlerType.CTX_FN) {
                 return await handler({ $ctx });
             }
             const resolver = new AnyToPromiseWithCtx_1.AnyToPromiseWithCtx($ctx);
-            const { state, data, status, headers } = await resolver.call(handler);
+            const { state, type, data, status, headers } = await resolver.call(handler);
             // Note: restore previous handler metadata (for OIDC)
             $ctx.handlerMetadata = handlerMetadata;
             if (state === core_1.AnyToPromiseStatus.RESOLVED) {
@@ -104,59 +120,57 @@ let PlatformHandler = class PlatformHandler {
                 if (data !== undefined) {
                     $ctx.data = data;
                 }
-                // Can be canceled by the handler itself
-                return await this.onSuccess($ctx);
+                if (!$ctx.isDone()) {
+                    $ctx.error = null;
+                    // set headers each times that an endpoint is called
+                    if (handlerMetadata.isEndpoint()) {
+                        (0, setResponseHeaders_1.setResponseHeaders)($ctx);
+                    }
+                    // call returned middleware
+                    if ((0, core_1.isFunction)($ctx.data) && !(0, core_1.isStream)($ctx.data)) {
+                        return (0, util_1.promisify)($ctx.data)($ctx.getRequest(), $ctx.getResponse());
+                    }
+                    if (type === core_1.AnyToPromiseResponseTypes.STREAM) {
+                        return this.flush($ctx);
+                    }
+                }
             }
         }
         catch (error) {
-            return this.onError(error, $ctx);
+            $ctx.error = error;
+            throw error;
         }
     }
-    async onError(error, $ctx) {
-        $ctx.error = error;
-        throw error;
-    }
-    /**
-     * Manage success scenario
-     * @param $ctx
-     * @protected
-     */
-    async onSuccess($ctx) {
-        // istanbul ignore next
-        if ($ctx.isDone()) {
-            return;
-        }
-        $ctx.error = null;
-        const metadata = $ctx.handlerMetadata;
-        // set headers each times that an endpoint is called
-        if (metadata.isEndpoint()) {
-            this.setResponseHeaders($ctx);
-        }
-        // call returned middleware
-        if ((0, core_1.isFunction)($ctx.data) && !(0, core_1.isStream)($ctx.data)) {
-            return (0, util_1.promisify)($ctx.data)($ctx.getRequest(), $ctx.getResponse());
-        }
-        if (metadata.isFinal()) {
-            return this.flush($ctx);
-        }
+    async onFinish($ctx) {
+        $ctx.error = await (0, core_1.catchAsyncError)(() => this.flush($ctx));
+        return $ctx.error && this.platformExceptions.catch($ctx.error, $ctx);
     }
 };
 tslib_1.__decorate([
     (0, di_1.Inject)(),
     tslib_1.__metadata("design:type", platform_response_filter_1.PlatformResponseFilter)
 ], PlatformHandler.prototype, "responseFilter", void 0);
-tslib_1.__decorate([
-    (0, di_1.Inject)(),
-    tslib_1.__metadata("design:type", platform_router_1.PlatformRouters)
-], PlatformHandler.prototype, "platformRouters", void 0);
 tslib_1.__decorate([
     (0, di_1.Inject)(),
     tslib_1.__metadata("design:type", platform_params_1.PlatformParams)
 ], PlatformHandler.prototype, "platformParams", void 0);
+tslib_1.__decorate([
+    (0, di_1.Inject)(),
+    tslib_1.__metadata("design:type", platform_exceptions_1.PlatformExceptions)
+], PlatformHandler.prototype, "platformExceptions", void 0);
+tslib_1.__decorate([
+    (0, di_1.Inject)(),
+    tslib_1.__metadata("design:type", PlatformApplication_1.PlatformApplication)
+], PlatformHandler.prototype, "platformApplication", void 0);
+tslib_1.__decorate([
+    (0, di_1.Inject)(),
+    tslib_1.__metadata("design:type", PlatformMiddlewaresChain_1.PlatformMiddlewaresChain)
+], PlatformHandler.prototype, "platformMiddlewaresChain", void 0);
 PlatformHandler = tslib_1.__decorate([
     (0, di_1.Injectable)({
         scope: di_1.ProviderScope.SINGLETON
-    })
+    }),
+    tslib_1.__metadata("design:paramtypes", [platform_router_1.PlatformRouters])
 ], PlatformHandler);
 exports.PlatformHandler = PlatformHandler;
 //# sourceMappingURL=PlatformHandler.js.map

package/lib/cjs/services/PlatformHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformHandler.js","sourceRoot":"","sources":["../../../src/services/PlatformHandler.ts"],"names":[],"mappings":";;;;AAAA,qCAAqF;AACrF,iCAAqE;AACrE,yCAAkC;AAClC,2DAA6E;AAC7E,6EAAsE;AACtE,2DAA4H;AAC5H,+BAA+B;AAC/B,uEAAkE;AAElE,oEAA+D;AAE/D;;;GAGG;AAIH,IAAa,eAAe,GAA5B,MAAa,eAAe;IAEhB,cAAc,CAAyB;IAGvC,eAAe,CAAkB;IAGjC,cAAc,CAAiB;IAEzC,aAAa,CAAC,OAA+B,EAAE,eAAwC;QACrF,OAAO,KAAK,EAAE,IAAqB,EAAE,EAAE;YACrC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;YAEvC,MAAM,KAAK,GAAG,MAAM,IAAA,sBAAe,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;YAEzE,OAAO,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC3C,CAAC,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,mBAAmB,CAAC,QAAkB,EAAE,WAAmB;QACzD,MAAM,QAAQ,GAAG,IAAI,yCAAuB,CAAC;YAC3C,QAAQ;YACR,IAAI,EAAE,qCAAmB,CAAC,MAAM;YAChC,WAAW;SACZ,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEnE,OAAO,KAAK,EAAE,IAAqB,EAAE,EAAE;YACrC,IAAI,CAAC,eAAe,GAAG,QAAQ,CAAC;YAEhC,aAAa;YACb,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,KAAK,CAAC,IAAqB;QAC/B,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC;QAExB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE;YAClB,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAW,CAAC,CAAC;YACvE,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,EAAE,IAAW,CAAC,CAAC;YAC9D,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACrB;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,kBAAkB,CAAC,IAAqB;QAC7C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE;YAC3B,OAAO,IAAA,uCAAkB,EAAC,IAAI,CAAC,CAAC;SACjC;IACH,CAAC;IAED;;;;OAIG;IACH,IAAI,CAAC,KAAc,EAAE,IAAc,EAAE,IAAqB;QACxD,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;YACxC,OAAO;SACR;QAED,OAAO,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACtC,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,SAAS,CAAC,OAA+B,EAAE,IAAqB;QACpE,wBAAwB;QACxB,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;YACjB,aAAI,CAAC,KAAK,CAAC;gBACT,IAAI,EAAE,cAAc;gBACpB,OAAO,EAAE,0GAA0G,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE;aACrJ,CAAC,CAAC;YACH,OAAO;SACR;QAED,IAAI;YACF,MAAM,EAAC,eAAe,EAAC,GAAG,IAAI,CAAC;YAC/B,IAAI,eAAe,CAAC,IAAI,KAAK,qCAAmB,CAAC,MAAM,EAAE;gBACvD,OAAO,MAAM,OAAO,CAAC,EAAC,IAAI,EAAC,CAAC,CAAC;aAC9B;YAED,MAAM,QAAQ,GAAG,IAAI,yCAAmB,CAAC,IAAI,CAAC,CAAC;YAE/C,MAAM,EAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAC,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAEpE,qDAAqD;YACrD,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;YAEvC,IAAI,KAAK,KAAK,yBAAkB,CAAC,QAAQ,EAAE;gBACzC,IAAI,MAAM,EAAE;oBACV,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;iBAC9B;gBAED,IAAI,OAAO,EAAE;oBACX,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;iBACnC;gBAED,IAAI,IAAI,KAAK,SAAS,EAAE;oBACtB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;iBAClB;gBAED,wCAAwC;gBACxC,OAAO,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;aACnC;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;SAClC;IACH,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,KAAc,EAAE,IAAqB;QAC3D,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAEnB,MAAM,KAAK,CAAC;IACd,CAAC;IAED;;;;OAIG;IACO,KAAK,CAAC,SAAS,CAAC,IAAqB;QAC7C,uBAAuB;QACvB,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;YACjB,OAAO;SACR;QAED,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAElB,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC;QAEtC,oDAAoD;QAEpD,IAAI,QAAQ,CAAC,UAAU,EAAE,EAAE;YACzB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;SAC/B;QAED,2BAA2B;QAC3B,IAAI,IAAA,iBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACjD,OAAO,IAAA,gBAAS,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;SACpE;QAED,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;YACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CACF,CAAA;AA9JC;IADC,IAAA,WAAM,GAAE;sCACiB,iDAAsB;uDAAC;AAGjD;IADC,IAAA,WAAM,GAAE;sCACkB,iCAAe;wDAAC;AAG3C;IADC,IAAA,WAAM,GAAE;sCACiB,gCAAc;uDAAC;AAR9B,eAAe;IAH3B,IAAA,eAAU,EAAC;QACV,KAAK,EAAE,kBAAa,CAAC,SAAS;KAC/B,CAAC;GACW,eAAe,CAgK3B;AAhKY,0CAAe","sourcesContent":["import {AnyToPromiseStatus, catchAsyncError, isFunction, isStream} from \"@tsed/core\";\nimport {Inject, Injectable, Provider, ProviderScope} from \"@tsed/di\";\nimport {$log} from \"@tsed/logger\";\nimport {PlatformParams, PlatformParamsCallback} from \"@tsed/platform-params\";\nimport {PlatformResponseFilter} from \"@tsed/platform-response-filter\";\nimport {PlatformContextHandler, PlatformHandlerMetadata, PlatformHandlerType, PlatformRouters} from \"@tsed/platform-router\";\nimport {promisify} from \"util\";\nimport {AnyToPromiseWithCtx} from \"../domain/AnyToPromiseWithCtx\";\nimport {PlatformContext} from \"../domain/PlatformContext\";\nimport {setResponseHeaders} from \"../utils/setResponseHeaders\";\n\n/**\n * Platform Handler abstraction layer. Wrap original class method to a pure platform handler (Express, Koa, etc...).\n * @platform\n */\n@Injectable({\n  scope: ProviderScope.SINGLETON\n})\nexport class PlatformHandler {\n  @Inject()\n  protected responseFilter: PlatformResponseFilter;\n\n  @Inject()\n  protected platformRouters: PlatformRouters;\n\n  @Inject()\n  protected platformParams: PlatformParams;\n\n  createHandler(handler: PlatformParamsCallback, handlerMetadata: PlatformHandlerMetadata): PlatformContextHandler {\n    return async ($ctx: PlatformContext) => {\n      $ctx.handlerMetadata = handlerMetadata;\n\n      const error = await catchAsyncError(() => this.onRequest(handler, $ctx));\n\n      return this.next(error, $ctx.next, $ctx);\n    };\n  }\n\n  /**\n   * @param provider\n   * @param propertyKey\n   */\n  createCustomHandler(provider: Provider, propertyKey: string) {\n    const metadata = new PlatformHandlerMetadata({\n      provider,\n      type: PlatformHandlerType.CUSTOM,\n      propertyKey\n    });\n\n    const handler = this.platformParams.compileHandler(metadata.store);\n\n    return async ($ctx: PlatformContext) => {\n      $ctx.handlerMetadata = metadata;\n\n      // @ts-ignore\n      return this.onRequest(handler, $ctx);\n    };\n  }\n\n  /**\n   * Send the response to the consumer.\n   * @protected\n   * @param $ctx\n   */\n  async flush($ctx: PlatformContext) {\n    const {response} = $ctx;\n\n    if (!$ctx.isDone()) {\n      let data = await this.responseFilter.serialize($ctx.data, $ctx as any);\n      data = await this.responseFilter.transform(data, $ctx as any);\n      response.body(data);\n    }\n\n    return response;\n  }\n\n  public setResponseHeaders($ctx: PlatformContext) {\n    if (!$ctx.response.isDone()) {\n      return setResponseHeaders($ctx);\n    }\n  }\n\n  /**\n   * @param error\n   * @param next\n   * @param $ctx\n   */\n  next(error: unknown, next: Function, $ctx: PlatformContext) {\n    if (isStream($ctx.data) || $ctx.isDone()) {\n      return;\n    }\n\n    return error ? next(error) : next();\n  }\n\n  /**\n   * Call handler when a request his handle\n   */\n  async onRequest(handler: PlatformParamsCallback, $ctx: PlatformContext): Promise<any> {\n    // istanbul ignore next$\n    if ($ctx.isDone()) {\n      $log.error({\n        name: \"HEADERS_SENT\",\n        message: `An endpoint is called but the response is already send to the client. The call comes from the handler: ${$ctx.handlerMetadata.toString()}`\n      });\n      return;\n    }\n\n    try {\n      const {handlerMetadata} = $ctx;\n      if (handlerMetadata.type === PlatformHandlerType.CTX_FN) {\n        return await handler({$ctx});\n      }\n\n      const resolver = new AnyToPromiseWithCtx($ctx);\n\n      const {state, data, status, headers} = await resolver.call(handler);\n\n      // Note: restore previous handler metadata (for OIDC)\n      $ctx.handlerMetadata = handlerMetadata;\n\n      if (state === AnyToPromiseStatus.RESOLVED) {\n        if (status) {\n          $ctx.response.status(status);\n        }\n\n        if (headers) {\n          $ctx.response.setHeaders(headers);\n        }\n\n        if (data !== undefined) {\n          $ctx.data = data;\n        }\n\n        // Can be canceled by the handler itself\n        return await this.onSuccess($ctx);\n      }\n    } catch (error) {\n      return this.onError(error, $ctx);\n    }\n  }\n\n  protected async onError(error: unknown, $ctx: PlatformContext) {\n    $ctx.error = error;\n\n    throw error;\n  }\n\n  /**\n   * Manage success scenario\n   * @param $ctx\n   * @protected\n   */\n  protected async onSuccess($ctx: PlatformContext) {\n    // istanbul ignore next\n    if ($ctx.isDone()) {\n      return;\n    }\n\n    $ctx.error = null;\n\n    const metadata = $ctx.handlerMetadata;\n\n    // set headers each times that an endpoint is called\n\n    if (metadata.isEndpoint()) {\n      this.setResponseHeaders($ctx);\n    }\n\n    // call returned middleware\n    if (isFunction($ctx.data) && !isStream($ctx.data)) {\n      return promisify($ctx.data)($ctx.getRequest(), $ctx.getResponse());\n    }\n\n    if (metadata.isFinal()) {\n      return this.flush($ctx);\n    }\n  }\n}\n"]}
+{"version":3,"file":"PlatformHandler.js","sourceRoot":"","sources":["../../../src/services/PlatformHandler.ts"],"names":[],"mappings":"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","sourcesContent":["import {AnyToPromiseResponseTypes, AnyToPromiseStatus, catchAsyncError, isFunction, isStream} from \"@tsed/core\";\nimport {Inject, Injectable, Provider, ProviderScope} from \"@tsed/di\";\nimport {$log} from \"@tsed/logger\";\nimport {PlatformExceptions} from \"@tsed/platform-exceptions\";\nimport {PlatformParams, PlatformParamsCallback} from \"@tsed/platform-params\";\nimport {PlatformResponseFilter} from \"@tsed/platform-response-filter\";\nimport {PlatformHandlerMetadata, PlatformHandlerType, PlatformRouters, useResponseHandler} from \"@tsed/platform-router\";\nimport {JsonOperationRoute} from \"@tsed/schema\";\nimport {promisify} from \"util\";\nimport {AnyToPromiseWithCtx} from \"../domain/AnyToPromiseWithCtx\";\nimport {PlatformContext} from \"../domain/PlatformContext\";\nimport {setResponseHeaders} from \"../utils/setResponseHeaders\";\nimport {PlatformApplication} from \"./PlatformApplication\";\nimport {PlatformMiddlewaresChain} from \"./PlatformMiddlewaresChain\";\n\n/**\n * Platform Handler abstraction layer. Wrap original class method to a pure platform handler (Express, Koa, etc...).\n * @platform\n */\n@Injectable({\n  scope: ProviderScope.SINGLETON\n})\nexport class PlatformHandler {\n  @Inject()\n  protected responseFilter: PlatformResponseFilter;\n\n  @Inject()\n  protected platformParams: PlatformParams;\n\n  @Inject()\n  protected platformExceptions: PlatformExceptions;\n\n  @Inject()\n  protected platformApplication: PlatformApplication;\n\n  @Inject()\n  protected platformMiddlewaresChain: PlatformMiddlewaresChain;\n\n  constructor(protected platformRouters: PlatformRouters) {\n    // configure the router module\n    platformRouters.hooks\n      .on(\"alterEndpointHandlers\", (allMiddlewares: any[], operationRoute: JsonOperationRoute) => {\n        allMiddlewares = this.platformMiddlewaresChain.get(allMiddlewares, operationRoute);\n\n        return [...allMiddlewares, useResponseHandler(this.onFinish.bind(this))];\n      })\n      .on(\"alterHandler\", (handlerMetadata: PlatformHandlerMetadata) => {\n        return this.platformApplication.adapter.mapHandler(this.createHandler(handlerMetadata), handlerMetadata);\n      });\n  }\n\n  createHandler(handlerMetadata: PlatformHandlerMetadata): any {\n    if (handlerMetadata.isInjectable()) {\n      const handler = this.platformParams.compileHandler(handlerMetadata);\n\n      return async ($ctx: PlatformContext) => {\n        $ctx.handlerMetadata = handlerMetadata;\n\n        await catchAsyncError(() => this.onRequest(handler, $ctx));\n\n        return this.next($ctx);\n      };\n    }\n\n    return handlerMetadata.handler;\n  }\n\n  /**\n   * @param provider\n   * @param propertyKey\n   */\n  createCustomHandler(provider: Provider, propertyKey: string) {\n    const metadata = new PlatformHandlerMetadata({\n      provider,\n      type: PlatformHandlerType.CUSTOM,\n      propertyKey\n    });\n\n    const handler = this.platformParams.compileHandler(metadata.store);\n\n    return async ($ctx: PlatformContext) => {\n      $ctx.handlerMetadata = metadata;\n\n      // @ts-ignore\n      return this.onRequest(handler, $ctx);\n    };\n  }\n\n  /**\n   * Send the response to the consumer.\n   * @protected\n   * @param $ctx\n   */\n  async flush($ctx: PlatformContext) {\n    const {response} = $ctx;\n\n    if (!$ctx.isDone()) {\n      let data = await this.responseFilter.serialize($ctx.data, $ctx as any);\n      data = await this.responseFilter.transform(data, $ctx as any);\n      response.body(data);\n    }\n  }\n\n  /**\n   * @param $ctx\n   */\n  next($ctx: PlatformContext) {\n    if (isStream($ctx.data) || $ctx.isDone()) {\n      return;\n    }\n\n    return $ctx.error ? $ctx.next($ctx.error) : $ctx.next();\n  }\n\n  /**\n   * Call handler when a request his handle\n   */\n  async onRequest(handler: PlatformParamsCallback, $ctx: PlatformContext): Promise<any> {\n    if ($ctx.isDone()) {\n      $log.error({\n        name: \"HEADERS_SENT\",\n        message: `An endpoint is called but the response is already send to the client. The call comes from the handler: ${$ctx.handlerMetadata.toString()}`\n      });\n      return;\n    }\n\n    if (($ctx.error instanceof Error && !$ctx.handlerMetadata.hasErrorParam) || ($ctx.handlerMetadata.hasErrorParam && !$ctx.error)) {\n      return;\n    }\n\n    try {\n      const {handlerMetadata} = $ctx;\n\n      if (handlerMetadata.type === PlatformHandlerType.CTX_FN) {\n        return await handler({$ctx});\n      }\n\n      const resolver = new AnyToPromiseWithCtx($ctx);\n\n      const {state, type, data, status, headers} = await resolver.call(handler);\n\n      // Note: restore previous handler metadata (for OIDC)\n      $ctx.handlerMetadata = handlerMetadata;\n\n      if (state === AnyToPromiseStatus.RESOLVED) {\n        if (status) {\n          $ctx.response.status(status);\n        }\n\n        if (headers) {\n          $ctx.response.setHeaders(headers);\n        }\n\n        if (data !== undefined) {\n          $ctx.data = data;\n        }\n\n        if (!$ctx.isDone()) {\n          $ctx.error = null;\n\n          // set headers each times that an endpoint is called\n          if (handlerMetadata.isEndpoint()) {\n            setResponseHeaders($ctx);\n          }\n\n          // call returned middleware\n          if (isFunction($ctx.data) && !isStream($ctx.data)) {\n            return promisify($ctx.data)($ctx.getRequest(), $ctx.getResponse());\n          }\n\n          if (type === AnyToPromiseResponseTypes.STREAM) {\n            return this.flush($ctx);\n          }\n        }\n      }\n    } catch (error) {\n      $ctx.error = error;\n\n      throw error;\n    }\n  }\n\n  async onFinish($ctx: PlatformContext) {\n    $ctx.error = await catchAsyncError(() => this.flush($ctx));\n\n    return $ctx.error && this.platformExceptions.catch($ctx.error, $ctx);\n  }\n}\n"]}

package/lib/esm/interfaces/PlatformRouteOptions.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformRouteOptions.js","sourceRoot":"","sources":["../../../src/interfaces/PlatformRouteOptions.ts"],"names":[],"mappings":"","sourcesContent":["import {Type} from \"@tsed/core\";\nimport {PathType} from \"@tsed/di\";\n\n/**\n * @ignore\n */\nexport interface PlatformRouteOptions {\n  token?: Type<any>;\n  path?: PathType | undefined;\n  method?: string;\n  isFinal?: boolean;\n  handlers: any[];\n}\n\n/**\n * @ignore\n */\nexport type PlatformRouteWithoutHandlers = Partial<Omit<PlatformRouteOptions, \"handlers\">>;\n"]}
+{"version":3,"file":"PlatformRouteOptions.js","sourceRoot":"","sources":["../../../src/interfaces/PlatformRouteOptions.ts"],"names":[],"mappings":"","sourcesContent":["import {Type} from \"@tsed/core\";\nimport {PathType} from \"@tsed/di\";\n\n/**\n * @ignore\n */\nexport interface PlatformRouteOptions {\n  token?: Type<any>;\n  path?: PathType | undefined;\n  method?: string;\n  handlers: any[];\n}\n\n/**\n * @ignore\n */\nexport type PlatformRouteWithoutHandlers = Partial<Omit<PlatformRouteOptions, \"handlers\">>;\n"]}

package/lib/esm/services/Platform.js

@@ -3,7 +3,6 @@ import { Injectable, InjectorService, ProviderScope } from "@tsed/di";
 import { PlatformRouters } from "@tsed/platform-router";
 import { PlatformApplication } from "./PlatformApplication.js";
 import { PlatformHandler } from "./PlatformHandler.js";
-import { PlatformMiddlewaresChain } from "./PlatformMiddlewaresChain.js";
 /**
  * `Platform` is used to provide all routes collected by annotation `@Controller`.
  *
@@ -13,22 +12,11 @@ let Platform = class Platform {
     injector;
     platformApplication;
     platformRouters;
-    platformHandler;
-    platformMiddlewaresChain;
     #controllers = new Map();
-    constructor(injector, platformApplication, platformRouters, platformHandler, platformMiddlewaresChain) {
+    constructor(injector, platformApplication, platformRouters) {
         this.injector = injector;
         this.platformApplication = platformApplication;
         this.platformRouters = platformRouters;
-        this.platformHandler = platformHandler;
-        this.platformMiddlewaresChain = platformMiddlewaresChain;
-        // configure the router module
-        platformRouters.hooks
-            .on("alterEndpointHandlers", platformMiddlewaresChain.get.bind(platformMiddlewaresChain))
-            .on("alterHandler", (handler, handlerMetadata) => {
-            handler = handlerMetadata.isRawMiddleware() ? handler : this.platformHandler.createHandler(handler, handlerMetadata);
-            return platformApplication.adapter.mapHandler(handler, handlerMetadata);
-        });
         platformRouters.prebuild();
     }
     get app() {
@@ -71,13 +59,11 @@ let Platform = class Platform {
 Platform = __decorate([
     Injectable({
         scope: ProviderScope.SINGLETON,
-        imports: []
+        imports: [PlatformHandler]
     }),
     __metadata("design:paramtypes", [InjectorService,
         PlatformApplication,
-        PlatformRouters,
-        PlatformHandler,
-        PlatformMiddlewaresChain])
+        PlatformRouters])
 ], Platform);
 export { Platform };
 //# sourceMappingURL=Platform.js.map

package/lib/esm/services/Platform.js.map

@@ -1 +1 @@
-{"version":3,"file":"Platform.js","sourceRoot":"","sources":["../../../src/services/Platform.ts"],"names":[],"mappings":"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","sourcesContent":["import {Injectable, InjectorService, ProviderScope, TokenProvider} from \"@tsed/di\";\nimport {PlatformHandlerMetadata, PlatformRouters} from \"@tsed/platform-router\";\nimport {ControllerProvider} from \"@tsed/di\";\nimport {Route, RouteController} from \"../interfaces/Route\";\nimport {PlatformApplication} from \"./PlatformApplication\";\nimport {PlatformHandler} from \"./PlatformHandler\";\nimport {PlatformMiddlewaresChain} from \"./PlatformMiddlewaresChain\";\n\n/**\n * `Platform` is used to provide all routes collected by annotation `@Controller`.\n *\n * @platform\n */\n@Injectable({\n  scope: ProviderScope.SINGLETON,\n  imports: []\n})\nexport class Platform {\n  #controllers: Map<string, RouteController> = new Map();\n\n  constructor(\n    readonly injector: InjectorService,\n    readonly platformApplication: PlatformApplication,\n    readonly platformRouters: PlatformRouters,\n    readonly platformHandler: PlatformHandler,\n    readonly platformMiddlewaresChain: PlatformMiddlewaresChain\n  ) {\n    // configure the router module\n    platformRouters.hooks\n      .on(\"alterEndpointHandlers\", platformMiddlewaresChain.get.bind(platformMiddlewaresChain))\n      .on(\"alterHandler\", (handler: Function, handlerMetadata: PlatformHandlerMetadata) => {\n        handler = handlerMetadata.isRawMiddleware() ? handler : this.platformHandler.createHandler(handler as any, handlerMetadata);\n\n        return platformApplication.adapter.mapHandler(handler, handlerMetadata);\n      });\n\n    platformRouters.prebuild();\n  }\n\n  get app() {\n    return this.platformApplication;\n  }\n\n  public addRoutes(routes: Route[]) {\n    routes.forEach((routeSettings) => {\n      this.addRoute(routeSettings.route, routeSettings.token);\n    });\n  }\n\n  public addRoute(route: string, token: TokenProvider) {\n    const provider = this.injector.getProvider(token) as ControllerProvider;\n\n    if (!provider || provider.hasParent()) {\n      return this;\n    }\n\n    const router = this.platformRouters.from(provider.token);\n\n    this.app.use(route, router);\n\n    return this;\n  }\n\n  public getLayers() {\n    this.#controllers = new Map();\n\n    return this.platformRouters.getLayers(this.app).map((layer) => {\n      if (layer.isProvider()) {\n        this.#controllers.set(layer.provider.token, {\n          route: String(layer.path).split(layer.provider.path)[0],\n          provider: layer.provider\n        });\n      }\n\n      return layer;\n    });\n  }\n\n  /**\n   * Get all controllers mounted on the application.\n   * @returns  {RouteController[]}\n   */\n  public getMountedControllers(): RouteController[] {\n    return [...this.#controllers.values()];\n  }\n}\n"]}
+{"version":3,"file":"Platform.js","sourceRoot":"","sources":["../../../src/services/Platform.ts"],"names":[],"mappings":";AAAA,OAAO,EAAqB,UAAU,EAAE,eAAe,EAAE,aAAa,EAAgB,MAAM,UAAU,CAAC;AACvG,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAEtD,OAAO,EAAC,mBAAmB,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAElD;;;;GAIG;AAKH,IAAa,QAAQ,GAArB,MAAa,QAAQ;IAIR;IACA;IACA;IALX,YAAY,GAAiC,IAAI,GAAG,EAAE,CAAC;IAEvD,YACW,QAAyB,EACzB,mBAAwC,EACxC,eAAgC;QAFhC,aAAQ,GAAR,QAAQ,CAAiB;QACzB,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,oBAAe,GAAf,eAAe,CAAiB;QAEzC,eAAe,CAAC,QAAQ,EAAE,CAAC;IAC7B,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,mBAAmB,CAAC;IAClC,CAAC;IAEM,SAAS,CAAC,MAAe;QAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;YAC/B,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,QAAQ,CAAC,KAAa,EAAE,KAAoB;QACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,KAAK,CAAuB,CAAC;QAExE,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,SAAS,EAAE,EAAE;YACrC,OAAO,IAAI,CAAC;SACb;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEzD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAE5B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,SAAS;QACd,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;QAE9B,OAAO,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC5D,IAAI,KAAK,CAAC,UAAU,EAAE,EAAE;gBACtB,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE;oBAC1C,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACvD,QAAQ,EAAE,KAAK,CAAC,QAAQ;iBACzB,CAAC,CAAC;aACJ;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,qBAAqB;QAC1B,OAAO,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;IACzC,CAAC;CACF,CAAA;AAzDY,QAAQ;IAJpB,UAAU,CAAC;QACV,KAAK,EAAE,aAAa,CAAC,SAAS;QAC9B,OAAO,EAAE,CAAC,eAAe,CAAC;KAC3B,CAAC;qCAKqB,eAAe;QACJ,mBAAmB;QACvB,eAAe;GANhC,QAAQ,CAyDpB;SAzDY,QAAQ","sourcesContent":["import {ControllerProvider, Injectable, InjectorService, ProviderScope, TokenProvider} from \"@tsed/di\";\nimport {PlatformRouters} from \"@tsed/platform-router\";\nimport {Route, RouteController} from \"../interfaces/Route\";\nimport {PlatformApplication} from \"./PlatformApplication\";\nimport {PlatformHandler} from \"./PlatformHandler\";\n\n/**\n * `Platform` is used to provide all routes collected by annotation `@Controller`.\n *\n * @platform\n */\n@Injectable({\n  scope: ProviderScope.SINGLETON,\n  imports: [PlatformHandler]\n})\nexport class Platform {\n  #controllers: Map<string, RouteController> = new Map();\n\n  constructor(\n    readonly injector: InjectorService,\n    readonly platformApplication: PlatformApplication,\n    readonly platformRouters: PlatformRouters\n  ) {\n    platformRouters.prebuild();\n  }\n\n  get app() {\n    return this.platformApplication;\n  }\n\n  public addRoutes(routes: Route[]) {\n    routes.forEach((routeSettings) => {\n      this.addRoute(routeSettings.route, routeSettings.token);\n    });\n  }\n\n  public addRoute(route: string, token: TokenProvider) {\n    const provider = this.injector.getProvider(token) as ControllerProvider;\n\n    if (!provider || provider.hasParent()) {\n      return this;\n    }\n\n    const router = this.platformRouters.from(provider.token);\n\n    this.app.use(route, router);\n\n    return this;\n  }\n\n  public getLayers() {\n    this.#controllers = new Map();\n\n    return this.platformRouters.getLayers(this.app).map((layer) => {\n      if (layer.isProvider()) {\n        this.#controllers.set(layer.provider.token, {\n          route: String(layer.path).split(layer.provider.path)[0],\n          provider: layer.provider\n        });\n      }\n\n      return layer;\n    });\n  }\n\n  /**\n   * Get all controllers mounted on the application.\n   * @returns  {RouteController[]}\n   */\n  public getMountedControllers(): RouteController[] {\n    return [...this.#controllers.values()];\n  }\n}\n"]}

package/lib/esm/services/PlatformHandler.js

@@ -1,27 +1,49 @@
 import { __decorate, __metadata } from "tslib";
-import { AnyToPromiseStatus, catchAsyncError, isFunction, isStream } from "@tsed/core";
+import { AnyToPromiseResponseTypes, AnyToPromiseStatus, catchAsyncError, isFunction, isStream } from "@tsed/core";
 import { Inject, Injectable, ProviderScope } from "@tsed/di";
 import { $log } from "@tsed/logger";
+import { PlatformExceptions } from "@tsed/platform-exceptions";
 import { PlatformParams } from "@tsed/platform-params";
 import { PlatformResponseFilter } from "@tsed/platform-response-filter";
-import { PlatformHandlerMetadata, PlatformHandlerType, PlatformRouters } from "@tsed/platform-router";
+import { PlatformHandlerMetadata, PlatformHandlerType, PlatformRouters, useResponseHandler } from "@tsed/platform-router";
 import { promisify } from "util";
 import { AnyToPromiseWithCtx } from "../domain/AnyToPromiseWithCtx.js";
 import { setResponseHeaders } from "../utils/setResponseHeaders.js";
+import { PlatformApplication } from "./PlatformApplication.js";
+import { PlatformMiddlewaresChain } from "./PlatformMiddlewaresChain.js";
 /**
  * Platform Handler abstraction layer. Wrap original class method to a pure platform handler (Express, Koa, etc...).
  * @platform
  */
 let PlatformHandler = class PlatformHandler {
-    responseFilter;
     platformRouters;
+    responseFilter;
     platformParams;
-    createHandler(handler, handlerMetadata) {
-        return async ($ctx) => {
-            $ctx.handlerMetadata = handlerMetadata;
-            const error = await catchAsyncError(() => this.onRequest(handler, $ctx));
-            return this.next(error, $ctx.next, $ctx);
-        };
+    platformExceptions;
+    platformApplication;
+    platformMiddlewaresChain;
+    constructor(platformRouters) {
+        this.platformRouters = platformRouters;
+        // configure the router module
+        platformRouters.hooks
+            .on("alterEndpointHandlers", (allMiddlewares, operationRoute) => {
+            allMiddlewares = this.platformMiddlewaresChain.get(allMiddlewares, operationRoute);
+            return [...allMiddlewares, useResponseHandler(this.onFinish.bind(this))];
+        })
+            .on("alterHandler", (handlerMetadata) => {
+            return this.platformApplication.adapter.mapHandler(this.createHandler(handlerMetadata), handlerMetadata);
+        });
+    }
+    createHandler(handlerMetadata) {
+        if (handlerMetadata.isInjectable()) {
+            const handler = this.platformParams.compileHandler(handlerMetadata);
+            return async ($ctx) => {
+                $ctx.handlerMetadata = handlerMetadata;
+                await catchAsyncError(() => this.onRequest(handler, $ctx));
+                return this.next($ctx);
+            };
+        }
+        return handlerMetadata.handler;
     }
     /**
      * @param provider
@@ -52,29 +74,20 @@ let PlatformHandler = class PlatformHandler {
             data = await this.responseFilter.transform(data, $ctx);
             response.body(data);
         }
-        return response;
-    }
-    setResponseHeaders($ctx) {
-        if (!$ctx.response.isDone()) {
-            return setResponseHeaders($ctx);
-        }
     }
     /**
-     * @param error
-     * @param next
      * @param $ctx
      */
-    next(error, next, $ctx) {
+    next($ctx) {
         if (isStream($ctx.data) || $ctx.isDone()) {
             return;
         }
-        return error ? next(error) : next();
+        return $ctx.error ? $ctx.next($ctx.error) : $ctx.next();
     }
     /**
      * Call handler when a request his handle
      */
     async onRequest(handler, $ctx) {
-        // istanbul ignore next$
         if ($ctx.isDone()) {
             $log.error({
                 name: "HEADERS_SENT",
@@ -82,13 +95,16 @@ let PlatformHandler = class PlatformHandler {
             });
             return;
         }
+        if (($ctx.error instanceof Error && !$ctx.handlerMetadata.hasErrorParam) || ($ctx.handlerMetadata.hasErrorParam && !$ctx.error)) {
+            return;
+        }
         try {
             const { handlerMetadata } = $ctx;
             if (handlerMetadata.type === PlatformHandlerType.CTX_FN) {
                 return await handler({ $ctx });
             }
             const resolver = new AnyToPromiseWithCtx($ctx);
-            const { state, data, status, headers } = await resolver.call(handler);
+            const { state, type, data, status, headers } = await resolver.call(handler);
             // Note: restore previous handler metadata (for OIDC)
             $ctx.handlerMetadata = handlerMetadata;
             if (state === AnyToPromiseStatus.RESOLVED) {
@@ -101,59 +117,57 @@ let PlatformHandler = class PlatformHandler {
                 if (data !== undefined) {
                     $ctx.data = data;
                 }
-                // Can be canceled by the handler itself
-                return await this.onSuccess($ctx);
+                if (!$ctx.isDone()) {
+                    $ctx.error = null;
+                    // set headers each times that an endpoint is called
+                    if (handlerMetadata.isEndpoint()) {
+                        setResponseHeaders($ctx);
+                    }
+                    // call returned middleware
+                    if (isFunction($ctx.data) && !isStream($ctx.data)) {
+                        return promisify($ctx.data)($ctx.getRequest(), $ctx.getResponse());
+                    }
+                    if (type === AnyToPromiseResponseTypes.STREAM) {
+                        return this.flush($ctx);
+                    }
+                }
             }
         }
         catch (error) {
-            return this.onError(error, $ctx);
+            $ctx.error = error;
+            throw error;
         }
     }
-    async onError(error, $ctx) {
-        $ctx.error = error;
-        throw error;
-    }
-    /**
-     * Manage success scenario
-     * @param $ctx
-     * @protected
-     */
-    async onSuccess($ctx) {
-        // istanbul ignore next
-        if ($ctx.isDone()) {
-            return;
-        }
-        $ctx.error = null;
-        const metadata = $ctx.handlerMetadata;
-        // set headers each times that an endpoint is called
-        if (metadata.isEndpoint()) {
-            this.setResponseHeaders($ctx);
-        }
-        // call returned middleware
-        if (isFunction($ctx.data) && !isStream($ctx.data)) {
-            return promisify($ctx.data)($ctx.getRequest(), $ctx.getResponse());
-        }
-        if (metadata.isFinal()) {
-            return this.flush($ctx);
-        }
+    async onFinish($ctx) {
+        $ctx.error = await catchAsyncError(() => this.flush($ctx));
+        return $ctx.error && this.platformExceptions.catch($ctx.error, $ctx);
     }
 };
 __decorate([
     Inject(),
     __metadata("design:type", PlatformResponseFilter)
 ], PlatformHandler.prototype, "responseFilter", void 0);
-__decorate([
-    Inject(),
-    __metadata("design:type", PlatformRouters)
-], PlatformHandler.prototype, "platformRouters", void 0);
 __decorate([
     Inject(),
     __metadata("design:type", PlatformParams)
 ], PlatformHandler.prototype, "platformParams", void 0);
+__decorate([
+    Inject(),
+    __metadata("design:type", PlatformExceptions)
+], PlatformHandler.prototype, "platformExceptions", void 0);
+__decorate([
+    Inject(),
+    __metadata("design:type", PlatformApplication)
+], PlatformHandler.prototype, "platformApplication", void 0);
+__decorate([
+    Inject(),
+    __metadata("design:type", PlatformMiddlewaresChain)
+], PlatformHandler.prototype, "platformMiddlewaresChain", void 0);
 PlatformHandler = __decorate([
     Injectable({
         scope: ProviderScope.SINGLETON
-    })
+    }),
+    __metadata("design:paramtypes", [PlatformRouters])
 ], PlatformHandler);
 export { PlatformHandler };
 //# sourceMappingURL=PlatformHandler.js.map

package/lib/esm/services/PlatformHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformHandler.js","sourceRoot":"","sources":["../../../src/services/PlatformHandler.ts"],"names":[],"mappings":"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","sourcesContent":["import {AnyToPromiseStatus, catchAsyncError, isFunction, isStream} from \"@tsed/core\";\nimport {Inject, Injectable, Provider, ProviderScope} from \"@tsed/di\";\nimport {$log} from \"@tsed/logger\";\nimport {PlatformParams, PlatformParamsCallback} from \"@tsed/platform-params\";\nimport {PlatformResponseFilter} from \"@tsed/platform-response-filter\";\nimport {PlatformContextHandler, PlatformHandlerMetadata, PlatformHandlerType, PlatformRouters} from \"@tsed/platform-router\";\nimport {promisify} from \"util\";\nimport {AnyToPromiseWithCtx} from \"../domain/AnyToPromiseWithCtx\";\nimport {PlatformContext} from \"../domain/PlatformContext\";\nimport {setResponseHeaders} from \"../utils/setResponseHeaders\";\n\n/**\n * Platform Handler abstraction layer. Wrap original class method to a pure platform handler (Express, Koa, etc...).\n * @platform\n */\n@Injectable({\n  scope: ProviderScope.SINGLETON\n})\nexport class PlatformHandler {\n  @Inject()\n  protected responseFilter: PlatformResponseFilter;\n\n  @Inject()\n  protected platformRouters: PlatformRouters;\n\n  @Inject()\n  protected platformParams: PlatformParams;\n\n  createHandler(handler: PlatformParamsCallback, handlerMetadata: PlatformHandlerMetadata): PlatformContextHandler {\n    return async ($ctx: PlatformContext) => {\n      $ctx.handlerMetadata = handlerMetadata;\n\n      const error = await catchAsyncError(() => this.onRequest(handler, $ctx));\n\n      return this.next(error, $ctx.next, $ctx);\n    };\n  }\n\n  /**\n   * @param provider\n   * @param propertyKey\n   */\n  createCustomHandler(provider: Provider, propertyKey: string) {\n    const metadata = new PlatformHandlerMetadata({\n      provider,\n      type: PlatformHandlerType.CUSTOM,\n      propertyKey\n    });\n\n    const handler = this.platformParams.compileHandler(metadata.store);\n\n    return async ($ctx: PlatformContext) => {\n      $ctx.handlerMetadata = metadata;\n\n      // @ts-ignore\n      return this.onRequest(handler, $ctx);\n    };\n  }\n\n  /**\n   * Send the response to the consumer.\n   * @protected\n   * @param $ctx\n   */\n  async flush($ctx: PlatformContext) {\n    const {response} = $ctx;\n\n    if (!$ctx.isDone()) {\n      let data = await this.responseFilter.serialize($ctx.data, $ctx as any);\n      data = await this.responseFilter.transform(data, $ctx as any);\n      response.body(data);\n    }\n\n    return response;\n  }\n\n  public setResponseHeaders($ctx: PlatformContext) {\n    if (!$ctx.response.isDone()) {\n      return setResponseHeaders($ctx);\n    }\n  }\n\n  /**\n   * @param error\n   * @param next\n   * @param $ctx\n   */\n  next(error: unknown, next: Function, $ctx: PlatformContext) {\n    if (isStream($ctx.data) || $ctx.isDone()) {\n      return;\n    }\n\n    return error ? next(error) : next();\n  }\n\n  /**\n   * Call handler when a request his handle\n   */\n  async onRequest(handler: PlatformParamsCallback, $ctx: PlatformContext): Promise<any> {\n    // istanbul ignore next$\n    if ($ctx.isDone()) {\n      $log.error({\n        name: \"HEADERS_SENT\",\n        message: `An endpoint is called but the response is already send to the client. The call comes from the handler: ${$ctx.handlerMetadata.toString()}`\n      });\n      return;\n    }\n\n    try {\n      const {handlerMetadata} = $ctx;\n      if (handlerMetadata.type === PlatformHandlerType.CTX_FN) {\n        return await handler({$ctx});\n      }\n\n      const resolver = new AnyToPromiseWithCtx($ctx);\n\n      const {state, data, status, headers} = await resolver.call(handler);\n\n      // Note: restore previous handler metadata (for OIDC)\n      $ctx.handlerMetadata = handlerMetadata;\n\n      if (state === AnyToPromiseStatus.RESOLVED) {\n        if (status) {\n          $ctx.response.status(status);\n        }\n\n        if (headers) {\n          $ctx.response.setHeaders(headers);\n        }\n\n        if (data !== undefined) {\n          $ctx.data = data;\n        }\n\n        // Can be canceled by the handler itself\n        return await this.onSuccess($ctx);\n      }\n    } catch (error) {\n      return this.onError(error, $ctx);\n    }\n  }\n\n  protected async onError(error: unknown, $ctx: PlatformContext) {\n    $ctx.error = error;\n\n    throw error;\n  }\n\n  /**\n   * Manage success scenario\n   * @param $ctx\n   * @protected\n   */\n  protected async onSuccess($ctx: PlatformContext) {\n    // istanbul ignore next\n    if ($ctx.isDone()) {\n      return;\n    }\n\n    $ctx.error = null;\n\n    const metadata = $ctx.handlerMetadata;\n\n    // set headers each times that an endpoint is called\n\n    if (metadata.isEndpoint()) {\n      this.setResponseHeaders($ctx);\n    }\n\n    // call returned middleware\n    if (isFunction($ctx.data) && !isStream($ctx.data)) {\n      return promisify($ctx.data)($ctx.getRequest(), $ctx.getResponse());\n    }\n\n    if (metadata.isFinal()) {\n      return this.flush($ctx);\n    }\n  }\n}\n"]}
+{"version":3,"file":"PlatformHandler.js","sourceRoot":"","sources":["../../../src/services/PlatformHandler.ts"],"names":[],"mappings":"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","sourcesContent":["import {AnyToPromiseResponseTypes, AnyToPromiseStatus, catchAsyncError, isFunction, isStream} from \"@tsed/core\";\nimport {Inject, Injectable, Provider, ProviderScope} from \"@tsed/di\";\nimport {$log} from \"@tsed/logger\";\nimport {PlatformExceptions} from \"@tsed/platform-exceptions\";\nimport {PlatformParams, PlatformParamsCallback} from \"@tsed/platform-params\";\nimport {PlatformResponseFilter} from \"@tsed/platform-response-filter\";\nimport {PlatformHandlerMetadata, PlatformHandlerType, PlatformRouters, useResponseHandler} from \"@tsed/platform-router\";\nimport {JsonOperationRoute} from \"@tsed/schema\";\nimport {promisify} from \"util\";\nimport {AnyToPromiseWithCtx} from \"../domain/AnyToPromiseWithCtx\";\nimport {PlatformContext} from \"../domain/PlatformContext\";\nimport {setResponseHeaders} from \"../utils/setResponseHeaders\";\nimport {PlatformApplication} from \"./PlatformApplication\";\nimport {PlatformMiddlewaresChain} from \"./PlatformMiddlewaresChain\";\n\n/**\n * Platform Handler abstraction layer. Wrap original class method to a pure platform handler (Express, Koa, etc...).\n * @platform\n */\n@Injectable({\n  scope: ProviderScope.SINGLETON\n})\nexport class PlatformHandler {\n  @Inject()\n  protected responseFilter: PlatformResponseFilter;\n\n  @Inject()\n  protected platformParams: PlatformParams;\n\n  @Inject()\n  protected platformExceptions: PlatformExceptions;\n\n  @Inject()\n  protected platformApplication: PlatformApplication;\n\n  @Inject()\n  protected platformMiddlewaresChain: PlatformMiddlewaresChain;\n\n  constructor(protected platformRouters: PlatformRouters) {\n    // configure the router module\n    platformRouters.hooks\n      .on(\"alterEndpointHandlers\", (allMiddlewares: any[], operationRoute: JsonOperationRoute) => {\n        allMiddlewares = this.platformMiddlewaresChain.get(allMiddlewares, operationRoute);\n\n        return [...allMiddlewares, useResponseHandler(this.onFinish.bind(this))];\n      })\n      .on(\"alterHandler\", (handlerMetadata: PlatformHandlerMetadata) => {\n        return this.platformApplication.adapter.mapHandler(this.createHandler(handlerMetadata), handlerMetadata);\n      });\n  }\n\n  createHandler(handlerMetadata: PlatformHandlerMetadata): any {\n    if (handlerMetadata.isInjectable()) {\n      const handler = this.platformParams.compileHandler(handlerMetadata);\n\n      return async ($ctx: PlatformContext) => {\n        $ctx.handlerMetadata = handlerMetadata;\n\n        await catchAsyncError(() => this.onRequest(handler, $ctx));\n\n        return this.next($ctx);\n      };\n    }\n\n    return handlerMetadata.handler;\n  }\n\n  /**\n   * @param provider\n   * @param propertyKey\n   */\n  createCustomHandler(provider: Provider, propertyKey: string) {\n    const metadata = new PlatformHandlerMetadata({\n      provider,\n      type: PlatformHandlerType.CUSTOM,\n      propertyKey\n    });\n\n    const handler = this.platformParams.compileHandler(metadata.store);\n\n    return async ($ctx: PlatformContext) => {\n      $ctx.handlerMetadata = metadata;\n\n      // @ts-ignore\n      return this.onRequest(handler, $ctx);\n    };\n  }\n\n  /**\n   * Send the response to the consumer.\n   * @protected\n   * @param $ctx\n   */\n  async flush($ctx: PlatformContext) {\n    const {response} = $ctx;\n\n    if (!$ctx.isDone()) {\n      let data = await this.responseFilter.serialize($ctx.data, $ctx as any);\n      data = await this.responseFilter.transform(data, $ctx as any);\n      response.body(data);\n    }\n  }\n\n  /**\n   * @param $ctx\n   */\n  next($ctx: PlatformContext) {\n    if (isStream($ctx.data) || $ctx.isDone()) {\n      return;\n    }\n\n    return $ctx.error ? $ctx.next($ctx.error) : $ctx.next();\n  }\n\n  /**\n   * Call handler when a request his handle\n   */\n  async onRequest(handler: PlatformParamsCallback, $ctx: PlatformContext): Promise<any> {\n    if ($ctx.isDone()) {\n      $log.error({\n        name: \"HEADERS_SENT\",\n        message: `An endpoint is called but the response is already send to the client. The call comes from the handler: ${$ctx.handlerMetadata.toString()}`\n      });\n      return;\n    }\n\n    if (($ctx.error instanceof Error && !$ctx.handlerMetadata.hasErrorParam) || ($ctx.handlerMetadata.hasErrorParam && !$ctx.error)) {\n      return;\n    }\n\n    try {\n      const {handlerMetadata} = $ctx;\n\n      if (handlerMetadata.type === PlatformHandlerType.CTX_FN) {\n        return await handler({$ctx});\n      }\n\n      const resolver = new AnyToPromiseWithCtx($ctx);\n\n      const {state, type, data, status, headers} = await resolver.call(handler);\n\n      // Note: restore previous handler metadata (for OIDC)\n      $ctx.handlerMetadata = handlerMetadata;\n\n      if (state === AnyToPromiseStatus.RESOLVED) {\n        if (status) {\n          $ctx.response.status(status);\n        }\n\n        if (headers) {\n          $ctx.response.setHeaders(headers);\n        }\n\n        if (data !== undefined) {\n          $ctx.data = data;\n        }\n\n        if (!$ctx.isDone()) {\n          $ctx.error = null;\n\n          // set headers each times that an endpoint is called\n          if (handlerMetadata.isEndpoint()) {\n            setResponseHeaders($ctx);\n          }\n\n          // call returned middleware\n          if (isFunction($ctx.data) && !isStream($ctx.data)) {\n            return promisify($ctx.data)($ctx.getRequest(), $ctx.getResponse());\n          }\n\n          if (type === AnyToPromiseResponseTypes.STREAM) {\n            return this.flush($ctx);\n          }\n        }\n      }\n    } catch (error) {\n      $ctx.error = error;\n\n      throw error;\n    }\n  }\n\n  async onFinish($ctx: PlatformContext) {\n    $ctx.error = await catchAsyncError(() => this.flush($ctx));\n\n    return $ctx.error && this.platformExceptions.catch($ctx.error, $ctx);\n  }\n}\n"]}

package/lib/types/interfaces/PlatformRouteOptions.d.ts

@@ -7,7 +7,6 @@ export interface PlatformRouteOptions {
     token?: Type<any>;
     path?: PathType | undefined;
     method?: string;
-    isFinal?: boolean;
     handlers: any[];
 }
 /**

package/lib/types/services/Platform.d.ts

@@ -2,8 +2,6 @@ import { InjectorService, TokenProvider } from "@tsed/di";
 import { PlatformRouters } from "@tsed/platform-router";
 import { Route, RouteController } from "../interfaces/Route";
 import { PlatformApplication } from "./PlatformApplication";
-import { PlatformHandler } from "./PlatformHandler";
-import { PlatformMiddlewaresChain } from "./PlatformMiddlewaresChain";
 /**
  * `Platform` is used to provide all routes collected by annotation `@Controller`.
  *
@@ -14,9 +12,7 @@ export declare class Platform {
     readonly injector: InjectorService;
     readonly platformApplication: PlatformApplication;
     readonly platformRouters: PlatformRouters;
-    readonly platformHandler: PlatformHandler;
-    readonly platformMiddlewaresChain: PlatformMiddlewaresChain;
-    constructor(injector: InjectorService, platformApplication: PlatformApplication, platformRouters: PlatformRouters, platformHandler: PlatformHandler, platformMiddlewaresChain: PlatformMiddlewaresChain);
+    constructor(injector: InjectorService, platformApplication: PlatformApplication, platformRouters: PlatformRouters);
     get app(): PlatformApplication<TsED.Application>;
     addRoutes(routes: Route[]): void;
     addRoute(route: string, token: TokenProvider): this;

package/lib/types/services/PlatformHandler.d.ts

@@ -1,17 +1,24 @@
 import { Provider } from "@tsed/di";
+import { PlatformExceptions } from "@tsed/platform-exceptions";
 import { PlatformParams, PlatformParamsCallback } from "@tsed/platform-params";
 import { PlatformResponseFilter } from "@tsed/platform-response-filter";
-import { PlatformContextHandler, PlatformHandlerMetadata, PlatformRouters } from "@tsed/platform-router";
+import { PlatformHandlerMetadata, PlatformRouters } from "@tsed/platform-router";
 import { PlatformContext } from "../domain/PlatformContext";
+import { PlatformApplication } from "./PlatformApplication";
+import { PlatformMiddlewaresChain } from "./PlatformMiddlewaresChain";
 /**
  * Platform Handler abstraction layer. Wrap original class method to a pure platform handler (Express, Koa, etc...).
  * @platform
  */
 export declare class PlatformHandler {
-    protected responseFilter: PlatformResponseFilter;
     protected platformRouters: PlatformRouters;
+    protected responseFilter: PlatformResponseFilter;
     protected platformParams: PlatformParams;
-    createHandler(handler: PlatformParamsCallback, handlerMetadata: PlatformHandlerMetadata): PlatformContextHandler;
+    protected platformExceptions: PlatformExceptions;
+    protected platformApplication: PlatformApplication;
+    protected platformMiddlewaresChain: PlatformMiddlewaresChain;
+    constructor(platformRouters: PlatformRouters);
+    createHandler(handlerMetadata: PlatformHandlerMetadata): any;
     /**
      * @param provider
      * @param propertyKey
@@ -22,23 +29,14 @@ export declare class PlatformHandler {
      * @protected
      * @param $ctx
      */
-    flush($ctx: PlatformContext): Promise<import("./PlatformResponse").PlatformResponse<any>>;
-    setResponseHeaders($ctx: PlatformContext): void;
+    flush($ctx: PlatformContext): Promise<void>;
     /**
-     * @param error
-     * @param next
      * @param $ctx
      */
-    next(error: unknown, next: Function, $ctx: PlatformContext): any;
+    next($ctx: PlatformContext): any;
     /**
      * Call handler when a request his handle
      */
     onRequest(handler: PlatformParamsCallback, $ctx: PlatformContext): Promise<any>;
-    protected onError(error: unknown, $ctx: PlatformContext): Promise<void>;
-    /**
-     * Manage success scenario
-     * @param $ctx
-     * @protected
-     */
-    protected onSuccess($ctx: PlatformContext): Promise<any>;
+    onFinish($ctx: PlatformContext): Promise<unknown>;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/common",
-  "version": "7.0.0-beta.18",
+  "version": "7.0.0-beta.19",
   "description": "A TypeScript Framework on top of Express",
   "private": false,
   "source": "./src/index.ts",
@@ -62,23 +62,23 @@
     }
   ],
   "dependencies": {
-    "@tsed/components-scan": "7.0.0-beta.18",
-    "@tsed/core": "7.0.0-beta.18",
-    "@tsed/di": "7.0.0-beta.18",
-    "@tsed/exceptions": "7.0.0-beta.18",
-    "@tsed/json-mapper": "7.0.0-beta.18",
+    "@tsed/components-scan": "7.0.0-beta.19",
+    "@tsed/core": "7.0.0-beta.19",
+    "@tsed/di": "7.0.0-beta.19",
+    "@tsed/exceptions": "7.0.0-beta.19",
+    "@tsed/json-mapper": "7.0.0-beta.19",
     "@tsed/logger": ">=6.2.0",
     "@tsed/logger-file": ">=6.2.0",
-    "@tsed/perf": "7.0.0-beta.18",
-    "@tsed/platform-cache": "7.0.0-beta.18",
-    "@tsed/platform-exceptions": "7.0.0-beta.18",
-    "@tsed/platform-log-middleware": "7.0.0-beta.18",
-    "@tsed/platform-middlewares": "7.0.0-beta.18",
-    "@tsed/platform-params": "7.0.0-beta.18",
-    "@tsed/platform-response-filter": "7.0.0-beta.18",
-    "@tsed/platform-router": "7.0.0-beta.18",
-    "@tsed/platform-views": "7.0.0-beta.18",
-    "@tsed/schema": "7.0.0-beta.18",
+    "@tsed/perf": "7.0.0-beta.19",
+    "@tsed/platform-cache": "7.0.0-beta.19",
+    "@tsed/platform-exceptions": "7.0.0-beta.19",
+    "@tsed/platform-log-middleware": "7.0.0-beta.19",
+    "@tsed/platform-middlewares": "7.0.0-beta.19",
+    "@tsed/platform-params": "7.0.0-beta.19",
+    "@tsed/platform-response-filter": "7.0.0-beta.19",
+    "@tsed/platform-router": "7.0.0-beta.19",
+    "@tsed/platform-views": "7.0.0-beta.19",
+    "@tsed/schema": "7.0.0-beta.19",
     "@types/json-schema": "7.0.11",
     "@types/on-finished": "2.3.1",
     "on-finished": "2.4.1",