@tsed/common 7.0.0-beta.9 → 7.0.0-rc.1

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

@@ -1 +1 @@
-{"version":3,"file":"PlatformAdapter.js","sourceRoot":"","sources":["../../../src/services/PlatformAdapter.ts"],"names":[],"mappings":";;;AACA,iCAAyE;AAIzE,+CAA0C;AAE1C,MAAsB,eAAe;CAoCpC;AApCD,0CAoCC;AAMD,IAAA,qBAAgB,EAAC;IACf,OAAO,EAAE,eAAe;IACxB,IAAI,EAAE,CAAC,oBAAe,CAAC;IACvB,QAAQ,EAAE,yBAAW;CACtB,CAAC,CAAC","sourcesContent":["import {Type} from \"@tsed/core\";\nimport {InjectorService, ProviderOpts, registerProvider} from \"@tsed/di\";\nimport {PlatformMulter, PlatformMulterSettings} from \"../config/interfaces/PlatformMulterSettings\";\nimport {PlatformStaticsOptions} from \"../config/interfaces/PlatformStaticsSettings\";\nimport {RouterOptions} from \"express\";\nimport {FakeAdapter} from \"./FakeAdapter\";\n\nexport abstract class PlatformAdapter<App = TsED.Application, Router = TsED.Router> {\n  /**\n   * Load providers in top priority\n   */\n  providers: ProviderOpts[];\n  /**\n   * Called after the injector instantiation\n   */\n  onInit?: () => any;\n  beforeLoadRoutes?: () => Promise<any>;\n  afterLoadRoutes?: () => Promise<any>;\n  useRouter?: () => any;\n  useContext?: () => any;\n\n  abstract app(): {app: App; callback(): any};\n\n  abstract router(routerOptions?: Partial<RouterOptions>): {router: Router; callback(): any};\n  /**\n   * Return the statics middlewares\n   * @param endpoint\n   * @param options\n   */\n  abstract statics(endpoint: string, options: PlatformStaticsOptions): any;\n\n  /**\n   * Return the multipart middleware\n   * @param options\n   */\n  abstract multipart(options: PlatformMulterSettings): PlatformMulter;\n\n  /**\n   * Return the body parser for the given\n   * @param type\n   * @param opts\n   */\n  abstract bodyParser(type: string, opts?: Record<string, any>): any;\n}\n\nexport interface PlatformBuilderSettings<App = TsED.Application, Router = TsED.Router> extends Partial<TsED.Configuration> {\n  adapter?: Type<PlatformAdapter<App, Router>>;\n}\n\nregisterProvider({\n  provide: PlatformAdapter,\n  deps: [InjectorService],\n  useClass: FakeAdapter\n});\n"]}
+{"version":3,"file":"PlatformAdapter.js","sourceRoot":"","sources":["../../../src/services/PlatformAdapter.ts"],"names":[],"mappings":";;;AACA,iCAAyE;AAKzE,+CAA0C;AAE1C,MAAsB,eAAe;IACnC;;OAEG;IACH,SAAS,CAAiB;IAC1B;;OAEG;IACH,MAAM,CAAa;IACnB,gBAAgB,CAAsB;IACtC,eAAe,CAAsB;CAsCtC;AAhDD,0CAgDC;AAMD,IAAA,qBAAgB,EAAC;IACf,OAAO,EAAE,eAAe;IACxB,IAAI,EAAE,CAAC,oBAAe,CAAC;IACvB,QAAQ,EAAE,yBAAW;CACtB,CAAC,CAAC","sourcesContent":["import {Type} from \"@tsed/core\";\nimport {InjectorService, ProviderOpts, registerProvider} from \"@tsed/di\";\nimport {PlatformHandlerMetadata, PlatformLayer} from \"@tsed/platform-router\";\nimport {IncomingMessage, ServerResponse} from \"http\";\nimport {PlatformMulter, PlatformMulterSettings} from \"../config/interfaces/PlatformMulterSettings\";\nimport {PlatformStaticsOptions} from \"../config/interfaces/PlatformStaticsSettings\";\nimport {FakeAdapter} from \"./FakeAdapter\";\n\nexport abstract class PlatformAdapter<App = TsED.Application> {\n  /**\n   * Load providers in top priority\n   */\n  providers: ProviderOpts[];\n  /**\n   * Called after the injector instantiation\n   */\n  onInit?: () => any;\n  beforeLoadRoutes?: () => Promise<any>;\n  afterLoadRoutes?: () => Promise<any>;\n  /**\n   * create initial context\n   */\n  abstract useContext: () => any;\n  /**\n   * Map router layer to the targeted framework\n   */\n  abstract mapLayers: (layer: PlatformLayer[]) => void;\n  /**\n   * Map handler to the targeted framework\n   */\n  abstract mapHandler: (handler: Function, layer: PlatformHandlerMetadata) => Function;\n\n  /**\n   * Return the app instance\n   */\n  abstract app(): {app: App; callback(): (req: IncomingMessage, res: ServerResponse) => void};\n\n  /**\n   * Return the statics middlewares\n   * @param endpoint\n   * @param options\n   */\n  abstract statics(endpoint: string, options: PlatformStaticsOptions): any;\n\n  /**\n   * Return the multipart middleware\n   * @param options\n   */\n  abstract multipart(options: PlatformMulterSettings): PlatformMulter;\n\n  /**\n   * Return the body parser for the given\n   * @param type\n   * @param opts\n   */\n  abstract bodyParser(type: string, opts?: Record<string, any>): any;\n}\n\nexport interface PlatformBuilderSettings<App = TsED.Application> extends Partial<TsED.Configuration> {\n  adapter?: Type<PlatformAdapter<App>>;\n}\n\nregisterProvider({\n  provide: PlatformAdapter,\n  deps: [InjectorService],\n  useClass: FakeAdapter\n});\n"]}

package/lib/cjs/services/PlatformApplication.js

@@ -3,30 +3,44 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlatformApplication = void 0;
 const tslib_1 = require("tslib");
 const di_1 = require("@tsed/di");
-const PlatformHandler_1 = require("./PlatformHandler");
-const PlatformRouter_1 = require("./PlatformRouter");
+const platform_router_1 = require("@tsed/platform-router");
 const PlatformAdapter_1 = require("./PlatformAdapter");
 /**
  * `PlatformApplication` is used to provide all routes collected by annotation `@Controller`.
  *
  * @platform
  */
-let PlatformApplication = class PlatformApplication extends PlatformRouter_1.PlatformRouter {
-    constructor(platformHandler, adapter) {
-        super(platformHandler, adapter);
+let PlatformApplication = class PlatformApplication extends platform_router_1.PlatformRouter {
+    adapter;
+    injector;
+    rawApp;
+    rawCallback;
+    constructor(adapter, injector) {
+        super(injector);
+        this.adapter = adapter;
+        this.injector = injector;
         const { app, callback } = adapter.app();
-        this.rawApp = this.raw = app;
-        this.callback = callback;
+        this.rawApp = app;
+        this.rawCallback = callback;
     }
     getApp() {
-        return this.raw;
+        return this.rawApp;
+    }
+    multer(options) {
+        return this.adapter.multipart(options);
+    }
+    callback(req, res) {
+        if (req && res) {
+            return this.callback()(req, res);
+        }
+        return this.rawCallback();
     }
 };
 PlatformApplication = tslib_1.__decorate([
     (0, di_1.Injectable)({
         scope: di_1.ProviderScope.SINGLETON
     }),
-    tslib_1.__metadata("design:paramtypes", [PlatformHandler_1.PlatformHandler, PlatformAdapter_1.PlatformAdapter])
+    tslib_1.__metadata("design:paramtypes", [PlatformAdapter_1.PlatformAdapter, di_1.InjectorService])
 ], PlatformApplication);
 exports.PlatformApplication = PlatformApplication;
 //# sourceMappingURL=PlatformApplication.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"PlatformApplication.js","sourceRoot":"","sources":["../../../src/services/PlatformApplication.ts"],"names":[],"mappings":";;;;AAAA,iCAAmD;AACnD,uDAAkD;AAClD,qDAAgD;AAChD,uDAAkD;AASlD;;;;GAIG;AAIH,IAAa,mBAAmB,GAAhC,MAAa,mBAAkE,SAAQ,+BAA2B;IAKhH,YAAY,eAAgC,EAAE,OAAqC;QACjF,KAAK,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;QAChC,MAAM,EAAC,GAAG,EAAE,QAAQ,EAAC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAEtC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;CACF,CAAA;AAhBY,mBAAmB;IAH/B,IAAA,eAAU,EAAC;QACV,KAAK,EAAE,kBAAa,CAAC,SAAS;KAC/B,CAAC;6CAM6B,iCAAe,EAAW,iCAAe;GAL3D,mBAAmB,CAgB/B;AAhBY,kDAAmB","sourcesContent":["import {Injectable, ProviderScope} from \"@tsed/di\";\nimport {PlatformHandler} from \"./PlatformHandler\";\nimport {PlatformRouter} from \"./PlatformRouter\";\nimport {PlatformAdapter} from \"./PlatformAdapter\";\n\ndeclare global {\n  namespace TsED {\n    // @ts-ignore\n    export interface Application {}\n  }\n}\n\n/**\n * `PlatformApplication` is used to provide all routes collected by annotation `@Controller`.\n *\n * @platform\n */\n@Injectable({\n  scope: ProviderScope.SINGLETON\n})\nexport class PlatformApplication<App = TsED.Application, Router = TsED.Router> extends PlatformRouter<App, Router> {\n  raw: App;\n  rawApp: App;\n  declare rawRouter: Router;\n\n  constructor(platformHandler: PlatformHandler, adapter: PlatformAdapter<App, Router>) {\n    super(platformHandler, adapter);\n    const {app, callback} = adapter.app();\n\n    this.rawApp = this.raw = app;\n    this.callback = callback;\n  }\n\n  getApp(): App {\n    return this.raw;\n  }\n}\n"]}
+{"version":3,"file":"PlatformApplication.js","sourceRoot":"","sources":["../../../src/services/PlatformApplication.ts"],"names":[],"mappings":";;;;AAAA,iCAAoE;AACpE,2DAAqD;AAGrD,uDAAkD;AASlD;;;;GAIG;AAIH,IAAa,mBAAmB,GAAhC,MAAa,mBAA4C,SAAQ,gCAAc;IAI1D;IAAsC;IAHzD,MAAM,CAAM;IACZ,WAAW,CAAY;IAEvB,YAAmB,OAA6B,EAAS,QAAyB;QAChF,KAAK,CAAC,QAAQ,CAAC,CAAC;QADC,YAAO,GAAP,OAAO,CAAsB;QAAS,aAAQ,GAAR,QAAQ,CAAiB;QAEhF,MAAM,EAAC,GAAG,EAAE,QAAQ,EAAC,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAEtC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QAClB,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC;IAC9B,CAAC;IAED,MAAM;QACJ,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,MAAM,CAAC,OAA+B;QACpC,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACzC,CAAC;IAID,QAAQ,CAAC,GAAqB,EAAE,GAAoB;QAClD,IAAI,GAAG,IAAI,GAAG,EAAE;YACd,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;SAClC;QAED,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;IAC5B,CAAC;CACF,CAAA;AA7BY,mBAAmB;IAH/B,IAAA,eAAU,EAAC;QACV,KAAK,EAAE,kBAAa,CAAC,SAAS;KAC/B,CAAC;6CAK4B,iCAAe,EAAwB,oBAAe;GAJvE,mBAAmB,CA6B/B;AA7BY,kDAAmB","sourcesContent":["import {Injectable, InjectorService, ProviderScope} from \"@tsed/di\";\nimport {PlatformRouter} from \"@tsed/platform-router\";\nimport {IncomingMessage, ServerResponse} from \"http\";\nimport {PlatformMulterSettings} from \"../config/interfaces/PlatformMulterSettings\";\nimport {PlatformAdapter} from \"./PlatformAdapter\";\n\ndeclare global {\n  namespace TsED {\n    // @ts-ignore\n    export interface Application {}\n  }\n}\n\n/**\n * `PlatformApplication` is used to provide all routes collected by annotation `@Controller`.\n *\n * @platform\n */\n@Injectable({\n  scope: ProviderScope.SINGLETON\n})\nexport class PlatformApplication<App = TsED.Application> extends PlatformRouter {\n  rawApp: App;\n  rawCallback: () => any;\n\n  constructor(public adapter: PlatformAdapter<App>, public injector: InjectorService) {\n    super(injector);\n    const {app, callback} = adapter.app();\n\n    this.rawApp = app;\n    this.rawCallback = callback;\n  }\n\n  getApp(): App {\n    return this.rawApp;\n  }\n\n  multer(options: PlatformMulterSettings) {\n    return this.adapter.multipart(options);\n  }\n\n  callback(): (req: IncomingMessage, res: ServerResponse) => any;\n  callback(req: IncomingMessage, res: ServerResponse): any;\n  callback(req?: IncomingMessage, res?: ServerResponse) {\n    if (req && res) {\n      return this.callback()(req, res);\n    }\n\n    return this.rawCallback();\n  }\n}\n"]}

package/lib/cjs/services/PlatformHandler.js

@@ -5,231 +5,172 @@ 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 HandlerMetadata_1 = require("../domain/HandlerMetadata");
-const HandlerType_1 = require("../interfaces/HandlerType");
-const createHandlerMetadata_1 = require("../utils/createHandlerMetadata");
 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 {
-    constructor(injector, params) {
-        this.injector = injector;
-        this.params = params;
+    platformRouters;
+    responseFilter;
+    platformParams;
+    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);
+        });
     }
-    /**
-     * Create a native middleware based on the given metadata and return an instance of AnyToPromiseWithCtx
-     * @param input
-     * @param options
-     */
-    createHandler(input, options = {}) {
-        return this.createRawHandler((0, createHandlerMetadata_1.createHandlerMetadata)(this.injector, input, options));
+    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;
     }
     /**
-     * Create injectable handler from the given provider
      * @param provider
      * @param propertyKey
      */
     createCustomHandler(provider, propertyKey) {
-        const handler = this.compileHandler(new HandlerMetadata_1.HandlerMetadata({
-            token: provider.provide,
-            target: provider.useClass,
-            type: HandlerType_1.HandlerType.CUSTOM,
-            scope: provider.scope,
+        const metadata = new platform_router_1.PlatformHandlerMetadata({
+            provider,
+            type: platform_router_1.PlatformHandlerType.CUSTOM,
             propertyKey
-        }));
-        return async ($ctx, next) => handler({
-            $ctx,
-            next
         });
+        const handler = this.platformParams.compileHandler(metadata.store);
+        return async ($ctx) => {
+            $ctx.handlerMetadata = metadata;
+            // @ts-ignore
+            return this.onRequest(handler, $ctx);
+        };
     }
     /**
      * Send the response to the consumer.
-     * @param data
-     * @param ctx
      * @protected
+     * @param $ctx
      */
-    async flush(data, ctx) {
-        const { response } = ctx;
-        if (!response.isDone()) {
-            data = await this.responseFilter.serialize(data, ctx);
-            data = await this.responseFilter.transform(data, ctx);
+    async flush($ctx) {
+        const { response } = $ctx;
+        if (!$ctx.isDone()) {
+            let data = await this.responseFilter.serialize($ctx.data, $ctx);
+            data = await this.responseFilter.transform(data, $ctx);
             response.body(data);
         }
     }
-    compileHandler(metadata) {
-        if (metadata.type === HandlerType_1.HandlerType.CTX_FN) {
-            return async (scope) => {
-                // @ts-ignore
-                return this.onCtxRequest({
-                    ...scope,
-                    handler: () => metadata.handler(scope.$ctx),
-                    metadata
-                });
-            };
+    /**
+     * @param $ctx
+     */
+    next($ctx) {
+        if ((0, core_1.isStream)($ctx.data) || $ctx.isDone()) {
+            return;
         }
-        const promise = this.params.compileHandler({
-            token: metadata.token,
-            propertyKey: metadata.propertyKey,
-            getCustomArgs: metadata.injectable ? undefined : this.getDefaultArgs(metadata)
-        });
-        return async (scope) => {
-            const handler = await promise;
-            // @ts-ignore
-            return this.onRequest({
-                ...scope,
-                handler,
-                metadata
-            });
-        };
-    }
-    async onCtxRequest(requestOptions) {
-        await requestOptions.handler(requestOptions);
-        return this.next(requestOptions);
+        return $ctx.error ? $ctx.next($ctx.error) : $ctx.next();
     }
     /**
      * Call handler when a request his handle
-     * @param requestOptions
      */
-    async onRequest(requestOptions) {
-        const { $ctx, metadata, err, handler } = requestOptions;
-        // istanbul ignore next
-        if (!$ctx || $ctx.isDone()) {
+    async onRequest(handler, $ctx) {
+        if ($ctx.isDone()) {
             logger_1.$log.error({
                 name: "HEADERS_SENT",
-                message: `An endpoint is called but the response is already send to the client. The call comes from the handler: ${metadata.toString()}`
+                message: `An endpoint is called but the response is already send to the client. The call comes from the handler: ${$ctx.handlerMetadata.toString()}`
             });
             return;
         }
-        const resolver = new AnyToPromiseWithCtx_1.AnyToPromiseWithCtx({ $ctx, err });
-        return (0, di_1.runInContext)($ctx, async () => {
-            try {
-                const { state, data, status, headers } = await resolver.call(handler);
-                if (state === core_1.AnyToPromiseStatus.RESOLVED) {
-                    if (status) {
-                        $ctx.response.status(status);
+        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, type, data, status, headers } = await resolver.call(handler);
+            // Note: restore previous handler metadata (for OIDC)
+            $ctx.handlerMetadata = handlerMetadata;
+            if (state === core_1.AnyToPromiseStatus.RESOLVED) {
+                if (status) {
+                    $ctx.response.status(status);
+                }
+                if (headers) {
+                    $ctx.response.setHeaders(headers);
+                }
+                if (data !== undefined) {
+                    $ctx.data = data;
+                }
+                if (!$ctx.isDone()) {
+                    $ctx.error = null;
+                    // set headers each times that an endpoint is called
+                    if (handlerMetadata.isEndpoint()) {
+                        (0, setResponseHeaders_1.setResponseHeaders)($ctx);
                     }
-                    if (headers) {
-                        $ctx.response.setHeaders(headers);
+                    // 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 (data !== undefined) {
-                        $ctx.data = data;
+                    if (type === core_1.AnyToPromiseResponseTypes.STREAM) {
+                        return this.flush($ctx);
                     }
-                    // Can be canceled by the handler itself
-                    return await this.onSuccess($ctx.data, requestOptions);
                 }
             }
-            catch (er) {
-                return this.onError(er, requestOptions);
-            }
-        });
-    }
-    async onError(er, requestOptions) {
-        const { next, $ctx, metadata } = requestOptions;
-        if ($ctx) {
-            $ctx.data = er;
         }
-        if (!next) {
-            throw er;
+        catch (error) {
+            $ctx.error = error;
+            throw error;
         }
-        // istanbul ignore next
-        if (!$ctx || $ctx.isDone()) {
-            logger_1.$log.warn({
-                name: "HEADERS_SENT",
-                message: `An error was caught after the headers were sent to the client. The error comes from the handler: ${metadata.toString()}`,
-                stack: er.stack,
-                origin: er,
-                request_id: $ctx === null || $ctx === void 0 ? void 0 : $ctx.id
-            });
-            return;
-        }
-        return next(er);
     }
-    /**
-     * Manage success scenario
-     * @param data
-     * @param requestOptions
-     * @protected
-     */
-    async onSuccess(data, requestOptions) {
-        const { metadata, $ctx, next } = requestOptions;
-        // istanbul ignore next
-        if ($ctx === null || $ctx === void 0 ? void 0 : $ctx.isDone()) {
-            return;
-        }
-        // set headers each times that an endpoint is called
-        if (metadata.type === HandlerType_1.HandlerType.ENDPOINT) {
-            this.setHeaders($ctx);
-        }
-        // call returned middleware
-        if ((0, core_1.isFunction)(data) && !(0, core_1.isStream)(data)) {
-            return this.callReturnedMiddleware(data, $ctx, next);
-        }
-        if (metadata.isFinal()) {
-            return this.flush(data, $ctx);
-        }
-        return this.next(requestOptions);
-    }
-    /**
-     * Call the returned middleware by the handler.
-     * @param middleware
-     * @param ctx
-     * @param next
-     * @protected
-     */
-    callReturnedMiddleware(middleware, ctx, next) {
-        return middleware(ctx.getRequest(), ctx.getResponse(), next);
-    }
-    /**
-     * create Raw handler
-     * @param metadata
-     */
-    createRawHandler(metadata) {
-        if ([HandlerType_1.HandlerType.RAW_ERR_FN, HandlerType_1.HandlerType.RAW_FN].includes(metadata.type)) {
-            return metadata.handler;
-        }
-        const handler = this.compileHandler(metadata);
-        return async (request, response, next) => {
-            return handler({
-                next,
-                $ctx: request.$ctx
-            });
-        };
-    }
-    /**
-     * Set response headers
-     * @param ctx
-     * @protected
-     */
-    setHeaders(ctx) {
-        return (0, setResponseHeaders_1.setResponseHeaders)(ctx);
-    }
-    next(requestOptions) {
-        const { $ctx, next } = requestOptions;
-        return !$ctx.response.isDone() && next && next();
-    }
-    getDefaultArgs(metadata) {
-        return async (scope) => [
-            metadata.hasErrorParam && scope.err,
-            scope.$ctx.request.request,
-            scope.$ctx.response.response,
-            metadata.hasNextFunction && scope.next
-        ].filter(Boolean);
+    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_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", [di_1.InjectorService, platform_params_1.PlatformParams])
+    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":"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","sourcesContent":["import {AnyToPromiseStatus, isFunction, isStream} from \"@tsed/core\";\nimport {Inject, Injectable, InjectorService, Provider, ProviderScope, runInContext} from \"@tsed/di\";\nimport {$log} from \"@tsed/logger\";\nimport {ArgScope, HandlerWithScope, PlatformParams} from \"@tsed/platform-params\";\nimport {PlatformResponseFilter} from \"@tsed/platform-response-filter\";\nimport {EndpointMetadata} from \"@tsed/schema\";\nimport {AnyToPromiseWithCtx} from \"../domain/AnyToPromiseWithCtx\";\nimport {HandlerMetadata} from \"../domain/HandlerMetadata\";\nimport {PlatformContext} from \"../domain/PlatformContext\";\nimport {HandlerType} from \"../interfaces/HandlerType\";\nimport {PlatformRouteWithoutHandlers} from \"../interfaces/PlatformRouteOptions\";\nimport {createHandlerMetadata} from \"../utils/createHandlerMetadata\";\nimport {setResponseHeaders} from \"../utils/setResponseHeaders\";\n\nexport interface OnRequestOptions {\n  $ctx: PlatformContext;\n  metadata: HandlerMetadata;\n  handler: HandlerWithScope;\n  next?: any;\n  err?: any;\n\n  [key: string]: any;\n}\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  constructor(protected injector: InjectorService, protected params: PlatformParams) {}\n\n  /**\n   * Create a native middleware based on the given metadata and return an instance of AnyToPromiseWithCtx\n   * @param input\n   * @param options\n   */\n  createHandler(input: EndpointMetadata | HandlerMetadata | any, options: PlatformRouteWithoutHandlers = {}) {\n    return this.createRawHandler(createHandlerMetadata(this.injector, input, options));\n  }\n\n  /**\n   * Create injectable handler from the given provider\n   * @param provider\n   * @param propertyKey\n   */\n  createCustomHandler(provider: Provider, propertyKey: string) {\n    const handler = this.compileHandler(\n      new HandlerMetadata({\n        token: provider.provide,\n        target: provider.useClass,\n        type: HandlerType.CUSTOM,\n        scope: provider.scope,\n        propertyKey\n      })\n    );\n\n    return async ($ctx: PlatformContext, next?: any) =>\n      handler({\n        $ctx,\n        next\n      });\n  }\n\n  /**\n   * Send the response to the consumer.\n   * @param data\n   * @param ctx\n   * @protected\n   */\n  async flush(data: any, ctx: PlatformContext) {\n    const {response} = ctx;\n\n    if (!response.isDone()) {\n      data = await this.responseFilter.serialize(data, ctx);\n      data = await this.responseFilter.transform(data, ctx);\n      response.body(data);\n    }\n  }\n\n  compileHandler(metadata: HandlerMetadata) {\n    if (metadata.type === HandlerType.CTX_FN) {\n      return async (scope: Record<string, any>) => {\n        // @ts-ignore\n        return this.onCtxRequest({\n          ...scope,\n          handler: () => metadata.handler(scope.$ctx),\n          metadata\n        });\n      };\n    }\n\n    const promise = this.params.compileHandler<PlatformContext>({\n      token: metadata.token,\n      propertyKey: metadata.propertyKey,\n      getCustomArgs: metadata.injectable ? undefined : this.getDefaultArgs(metadata)\n    });\n\n    return async (scope: Record<string, any>) => {\n      const handler = await promise;\n      // @ts-ignore\n      return this.onRequest({\n        ...scope,\n        handler,\n        metadata\n      });\n    };\n  }\n\n  protected async onCtxRequest(requestOptions: OnRequestOptions): Promise<any> {\n    await requestOptions.handler(requestOptions);\n\n    return this.next(requestOptions);\n  }\n\n  /**\n   * Call handler when a request his handle\n   * @param requestOptions\n   */\n  protected async onRequest(requestOptions: OnRequestOptions): Promise<any> {\n    const {$ctx, metadata, err, handler} = requestOptions;\n    // istanbul ignore next\n    if (!$ctx || $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: ${metadata.toString()}`\n      });\n      return;\n    }\n\n    const resolver = new AnyToPromiseWithCtx({$ctx, err});\n\n    return runInContext($ctx, async () => {\n      try {\n        const {state, data, status, headers} = await resolver.call(handler);\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.data, requestOptions);\n        }\n      } catch (er) {\n        return this.onError(er, requestOptions);\n      }\n    });\n  }\n\n  protected async onError(er: Error, requestOptions: OnRequestOptions) {\n    const {next, $ctx, metadata} = requestOptions;\n\n    if ($ctx) {\n      $ctx.data = er;\n    }\n\n    if (!next) {\n      throw er;\n    }\n\n    // istanbul ignore next\n    if (!$ctx || $ctx.isDone()) {\n      $log.warn({\n        name: \"HEADERS_SENT\",\n        message: `An error was caught after the headers were sent to the client. The error comes from the handler: ${metadata.toString()}`,\n        stack: er.stack,\n        origin: er,\n        request_id: $ctx?.id\n      });\n\n      return;\n    }\n\n    return next(er);\n  }\n\n  /**\n   * Manage success scenario\n   * @param data\n   * @param requestOptions\n   * @protected\n   */\n  protected async onSuccess(data: any, requestOptions: OnRequestOptions) {\n    const {metadata, $ctx, next} = requestOptions;\n\n    // istanbul ignore next\n    if ($ctx?.isDone()) {\n      return;\n    }\n\n    // set headers each times that an endpoint is called\n    if (metadata.type === HandlerType.ENDPOINT) {\n      this.setHeaders($ctx);\n    }\n\n    // call returned middleware\n    if (isFunction(data) && !isStream(data)) {\n      return this.callReturnedMiddleware(data, $ctx, next);\n    }\n\n    if (metadata.isFinal()) {\n      return this.flush(data, $ctx);\n    }\n\n    return this.next(requestOptions);\n  }\n\n  /**\n   * Call the returned middleware by the handler.\n   * @param middleware\n   * @param ctx\n   * @param next\n   * @protected\n   */\n  protected callReturnedMiddleware(middleware: any, ctx: PlatformContext, next: any) {\n    return middleware(ctx.getRequest(), ctx.getResponse(), next);\n  }\n\n  /**\n   * create Raw handler\n   * @param metadata\n   */\n  protected createRawHandler(metadata: HandlerMetadata) {\n    if ([HandlerType.RAW_ERR_FN, HandlerType.RAW_FN].includes(metadata.type)) {\n      return metadata.handler;\n    }\n\n    const handler = this.compileHandler(metadata);\n\n    return async (request: any, response: any, next: any) => {\n      return handler({\n        next,\n        $ctx: request.$ctx\n      });\n    };\n  }\n\n  /**\n   * Set response headers\n   * @param ctx\n   * @protected\n   */\n  protected setHeaders(ctx: PlatformContext) {\n    return setResponseHeaders(ctx);\n  }\n\n  protected next(requestOptions: OnRequestOptions) {\n    const {$ctx, next} = requestOptions;\n\n    return !$ctx.response.isDone() && next && next();\n  }\n\n  protected getDefaultArgs(metadata: HandlerMetadata) {\n    return async (scope: ArgScope<PlatformContext>) =>\n      [\n        metadata.hasErrorParam && scope.err,\n        scope.$ctx.request.request,\n        scope.$ctx.response.response,\n        metadata.hasNextFunction && scope.next\n      ].filter(Boolean);\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/cjs/services/PlatformMiddlewaresChain.js

@@ -2,33 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlatformMiddlewaresChain = void 0;
 const tslib_1 = require("tslib");
+const core_1 = require("@tsed/core");
 const di_1 = require("@tsed/di");
 const platform_params_1 = require("@tsed/platform-params");
 const schema_1 = require("@tsed/schema");
-const bindEndpointMiddleware_1 = require("../middlewares/bindEndpointMiddleware");
 const PlatformAcceptMimesMiddleware_1 = require("../middlewares/PlatformAcceptMimesMiddleware");
 const PlatformMulterMiddleware_1 = require("../middlewares/PlatformMulterMiddleware");
-const useCtxHandler_1 = require("../utils/useCtxHandler");
 const PlatformAdapter_1 = require("../services/PlatformAdapter");
-const core_1 = require("@tsed/core");
 let PlatformMiddlewaresChain = class PlatformMiddlewaresChain {
-    get(provider, operationRoute, parentMiddlewares = []) {
-        const { endpoint } = operationRoute;
-        const { beforeMiddlewares, middlewares: mldwrs, afterMiddlewares } = endpoint;
-        const { middlewares: { useBefore, use, useAfter } } = provider;
-        const allMiddlewares = [
-            ...parentMiddlewares,
-            ...useBefore,
-            ...beforeMiddlewares,
-            ...use,
-            ...mldwrs,
-            endpoint,
-            ...afterMiddlewares,
-            ...useAfter
-        ];
+    acceptMimes;
+    adapter;
+    get(allMiddlewares, operationRoute) {
         const { ACCEPT_MIMES, FILE, RAW_BODY, BODY } = this.getParamTypes(allMiddlewares, operationRoute);
         return [
-            (0, useCtxHandler_1.useCtxHandler)((0, bindEndpointMiddleware_1.bindEndpointMiddleware)(endpoint)),
             ACCEPT_MIMES && PlatformAcceptMimesMiddleware_1.PlatformAcceptMimesMiddleware,
             FILE && PlatformMulterMiddleware_1.PlatformMulterMiddleware,
             !FILE && RAW_BODY && this.adapter.bodyParser("raw"),
@@ -56,7 +42,7 @@ let PlatformMiddlewaresChain = class PlatformMiddlewaresChain {
             ACCEPT_MIMES: this.hasAcceptMimes(operationRoute),
             FILE: operationRoute.has(platform_params_1.ParamTypes.FILES),
             RAW_BODY: operationRoute.has(platform_params_1.ParamTypes.RAW_BODY),
-            BODY: operationRoute.has(platform_params_1.ParamTypes.BODY)
+            BODY: operationRoute.has(platform_params_1.ParamTypes.BODY) || operationRoute.method === "ALL"
         });
     }
 };

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

@@ -1 +1 @@
-{"version":3,"file":"PlatformMiddlewaresChain.js","sourceRoot":"","sources":["../../../src/services/PlatformMiddlewaresChain.ts"],"names":[],"mappings":"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","sourcesContent":["import {Constant, Inject, Injectable} from \"@tsed/di\";\nimport {ParamTypes} from \"@tsed/platform-params\";\nimport {JsonEntityStore, JsonOperationRoute} from \"@tsed/schema\";\nimport {ControllerProvider} from \"../domain/ControllerProvider\";\nimport {bindEndpointMiddleware} from \"../middlewares/bindEndpointMiddleware\";\nimport {PlatformAcceptMimesMiddleware} from \"../middlewares/PlatformAcceptMimesMiddleware\";\nimport {PlatformMulterMiddleware} from \"../middlewares/PlatformMulterMiddleware\";\nimport {useCtxHandler} from \"../utils/useCtxHandler\";\nimport {PlatformAdapter} from \"../services/PlatformAdapter\";\nimport {isClass} from \"@tsed/core\";\n\n@Injectable()\nexport class PlatformMiddlewaresChain {\n  @Constant(\"acceptMimes\", [])\n  protected acceptMimes: string[];\n\n  @Inject()\n  protected adapter: PlatformAdapter;\n\n  get(provider: ControllerProvider, operationRoute: JsonOperationRoute, parentMiddlewares: any[] = []) {\n    const {endpoint} = operationRoute;\n    const {beforeMiddlewares, middlewares: mldwrs, afterMiddlewares} = endpoint;\n\n    const {\n      middlewares: {useBefore, use, useAfter}\n    } = provider;\n\n    const allMiddlewares = [\n      ...parentMiddlewares,\n      ...useBefore,\n      ...beforeMiddlewares,\n      ...use,\n      ...mldwrs,\n      endpoint,\n      ...afterMiddlewares,\n      ...useAfter\n    ];\n\n    const {ACCEPT_MIMES, FILE, RAW_BODY, BODY} = this.getParamTypes(allMiddlewares, operationRoute);\n\n    return [\n      useCtxHandler(bindEndpointMiddleware(endpoint)),\n      ACCEPT_MIMES && PlatformAcceptMimesMiddleware,\n      FILE && PlatformMulterMiddleware,\n      !FILE && RAW_BODY && this.adapter.bodyParser(\"raw\"),\n      !FILE && !RAW_BODY && BODY && this.adapter.bodyParser(\"json\"),\n      !FILE && !RAW_BODY && BODY && this.adapter.bodyParser(\"urlencoded\"),\n      ...allMiddlewares\n    ].filter(Boolean);\n  }\n\n  protected hasAcceptMimes(operationRoute: JsonOperationRoute) {\n    return operationRoute.endpoint.acceptMimes.length || this.acceptMimes.length;\n  }\n\n  protected getParamTypes(middlewares: any[], operationRoute: JsonOperationRoute) {\n    return middlewares.filter(isClass).reduce(\n      (paramTypes, token) => {\n        if (token !== operationRoute.endpoint) {\n          const entity = JsonEntityStore.fromMethod(token, \"use\");\n\n          if (entity.decoratorType === \"method\") {\n            const {FILE, RAW_BODY, BODY} = entity.getParamTypes();\n            paramTypes.FILE = paramTypes.FILE || FILE;\n            paramTypes.RAW_BODY = paramTypes.RAW_BODY || RAW_BODY;\n            paramTypes.BODY = paramTypes.BODY || BODY;\n          }\n        }\n\n        return paramTypes;\n      },\n      {\n        ACCEPT_MIMES: this.hasAcceptMimes(operationRoute),\n        FILE: operationRoute.has(ParamTypes.FILES),\n        RAW_BODY: operationRoute.has(ParamTypes.RAW_BODY),\n        BODY: operationRoute.has(ParamTypes.BODY)\n      }\n    );\n  }\n}\n"]}
+{"version":3,"file":"PlatformMiddlewaresChain.js","sourceRoot":"","sources":["../../../src/services/PlatformMiddlewaresChain.ts"],"names":[],"mappings":";;;;AAAA,qCAAmC;AACnC,iCAAsD;AACtD,2DAAiD;AACjD,yCAAiE;AACjE,gGAA2F;AAC3F,sFAAiF;AACjF,iEAA4D;AAG5D,IAAa,wBAAwB,GAArC,MAAa,wBAAwB;IAEzB,WAAW,CAAW;IAGtB,OAAO,CAAkB;IAEnC,GAAG,CAAC,cAAqB,EAAE,cAAkC;QAC3D,MAAM,EAAC,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAC,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,EAAE,cAAc,CAAC,CAAC;QAEhG,OAAO;YACL,YAAY,IAAI,6DAA6B;YAC7C,IAAI,IAAI,mDAAwB;YAChC,CAAC,IAAI,IAAI,QAAQ,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC;YACnD,CAAC,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC;YAC7D,CAAC,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC;YACnE,GAAG,cAAc;SAClB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACpB,CAAC;IAES,cAAc,CAAC,cAAkC;QACzD,OAAO,cAAc,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;IAC/E,CAAC;IAES,aAAa,CAAC,WAAkB,EAAE,cAAkC;QAC5E,OAAO,WAAW,CAAC,MAAM,CAAC,cAAO,CAAC,CAAC,MAAM,CACvC,CAAC,UAAU,EAAE,KAAK,EAAE,EAAE;YACpB,IAAI,KAAK,KAAK,cAAc,CAAC,QAAQ,EAAE;gBACrC,MAAM,MAAM,GAAG,wBAAe,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;gBAExD,IAAI,MAAM,CAAC,aAAa,KAAK,QAAQ,EAAE;oBACrC,MAAM,EAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAC,GAAG,MAAM,CAAC,aAAa,EAAE,CAAC;oBACtD,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC;oBAC1C,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,IAAI,QAAQ,CAAC;oBACtD,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,IAAI,IAAI,CAAC;iBAC3C;aACF;YAED,OAAO,UAAU,CAAC;QACpB,CAAC,EACD;YACE,YAAY,EAAE,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC;YACjD,IAAI,EAAE,cAAc,CAAC,GAAG,CAAC,4BAAU,CAAC,KAAK,CAAC;YAC1C,QAAQ,EAAE,cAAc,CAAC,GAAG,CAAC,4BAAU,CAAC,QAAQ,CAAC;YACjD,IAAI,EAAE,cAAc,CAAC,GAAG,CAAC,4BAAU,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,MAAM,KAAK,KAAK;SAC7E,CACF,CAAC;IACJ,CAAC;CACF,CAAA;AA9CC;IADC,IAAA,aAAQ,EAAC,aAAa,EAAE,EAAE,CAAC;;6DACI;AAGhC;IADC,IAAA,WAAM,GAAE;sCACU,iCAAe;yDAAC;AALxB,wBAAwB;IADpC,IAAA,eAAU,GAAE;GACA,wBAAwB,CAgDpC;AAhDY,4DAAwB","sourcesContent":["import {isClass} from \"@tsed/core\";\nimport {Constant, Inject, Injectable} from \"@tsed/di\";\nimport {ParamTypes} from \"@tsed/platform-params\";\nimport {JsonEntityStore, JsonOperationRoute} from \"@tsed/schema\";\nimport {PlatformAcceptMimesMiddleware} from \"../middlewares/PlatformAcceptMimesMiddleware\";\nimport {PlatformMulterMiddleware} from \"../middlewares/PlatformMulterMiddleware\";\nimport {PlatformAdapter} from \"../services/PlatformAdapter\";\n\n@Injectable()\nexport class PlatformMiddlewaresChain {\n  @Constant(\"acceptMimes\", [])\n  protected acceptMimes: string[];\n\n  @Inject()\n  protected adapter: PlatformAdapter;\n\n  get(allMiddlewares: any[], operationRoute: JsonOperationRoute) {\n    const {ACCEPT_MIMES, FILE, RAW_BODY, BODY} = this.getParamTypes(allMiddlewares, operationRoute);\n\n    return [\n      ACCEPT_MIMES && PlatformAcceptMimesMiddleware,\n      FILE && PlatformMulterMiddleware,\n      !FILE && RAW_BODY && this.adapter.bodyParser(\"raw\"),\n      !FILE && !RAW_BODY && BODY && this.adapter.bodyParser(\"json\"),\n      !FILE && !RAW_BODY && BODY && this.adapter.bodyParser(\"urlencoded\"),\n      ...allMiddlewares\n    ].filter(Boolean);\n  }\n\n  protected hasAcceptMimes(operationRoute: JsonOperationRoute) {\n    return operationRoute.endpoint.acceptMimes.length || this.acceptMimes.length;\n  }\n\n  protected getParamTypes(middlewares: any[], operationRoute: JsonOperationRoute) {\n    return middlewares.filter(isClass).reduce(\n      (paramTypes, token) => {\n        if (token !== operationRoute.endpoint) {\n          const entity = JsonEntityStore.fromMethod(token, \"use\");\n\n          if (entity.decoratorType === \"method\") {\n            const {FILE, RAW_BODY, BODY} = entity.getParamTypes();\n            paramTypes.FILE = paramTypes.FILE || FILE;\n            paramTypes.RAW_BODY = paramTypes.RAW_BODY || RAW_BODY;\n            paramTypes.BODY = paramTypes.BODY || BODY;\n          }\n        }\n\n        return paramTypes;\n      },\n      {\n        ACCEPT_MIMES: this.hasAcceptMimes(operationRoute),\n        FILE: operationRoute.has(ParamTypes.FILES),\n        RAW_BODY: operationRoute.has(ParamTypes.RAW_BODY),\n        BODY: operationRoute.has(ParamTypes.BODY) || operationRoute.method === \"ALL\"\n      }\n    );\n  }\n}\n"]}

package/lib/cjs/services/PlatformRequest.js

@@ -8,9 +8,18 @@ const di_1 = require("@tsed/di");
  * @platform
  */
 let PlatformRequest = class PlatformRequest {
-    constructor({ request }, $ctx) {
+    $ctx;
+    constructor($ctx) {
         this.$ctx = $ctx;
-        this.raw = request;
+    }
+    /**
+     * The current @@PlatformResponse@@.
+     */
+    get response() {
+        return this.$ctx.response;
+    }
+    get raw() {
+        return this.$ctx.event.request;
     }
     get secure() {
         return this.raw.secure;
@@ -77,6 +86,9 @@ let PlatformRequest = class PlatformRequest {
     get files() {
         return this.raw.files;
     }
+    get route() {
+        return this.$ctx.handlerMetadata?.path;
+    }
     /**
      * Return the original request framework instance
      */
@@ -108,14 +120,6 @@ let PlatformRequest = class PlatformRequest {
     isAborted() {
         return this.raw.aborted;
     }
-    destroy() {
-        // @ts-ignore
-        delete this.raw;
-        // @ts-ignore
-        delete this.response;
-        // @ts-ignore
-        delete this.$ctx;
-    }
     /**
      * Return the Framework response object (express, koa, etc...)
      */
@@ -126,13 +130,13 @@ let PlatformRequest = class PlatformRequest {
      * Return the Node.js response object
      */
     getReq() {
-        return this.raw;
+        return this.$ctx.event.request;
     }
 };
 PlatformRequest = tslib_1.__decorate([
     (0, di_1.Injectable)(),
     (0, di_1.Scope)(di_1.ProviderScope.INSTANCE),
-    tslib_1.__metadata("design:paramtypes", [Object, Function])
+    tslib_1.__metadata("design:paramtypes", [Function])
 ], PlatformRequest);
 exports.PlatformRequest = PlatformRequest;
 //# sourceMappingURL=PlatformRequest.js.map