@midwayjs/faas 3.5.3 → 3.7.0

package/dist/configuration.d.ts

@@ -1,5 +1,5 @@
-import { MidwayFaaSFramework } from './framework';
 import { MidwayDecoratorService } from '@midwayjs/core';
+import { MidwayFaaSFramework } from './framework';
 export declare class FaaSConfiguration {
     framework: MidwayFaaSFramework;
     decoratorService: MidwayDecoratorService;

package/dist/configuration.js

@@ -10,24 +10,24 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FaaSConfiguration = void 0;
-const decorator_1 = require("@midwayjs/decorator");
-const framework_1 = require("./framework");
 const core_1 = require("@midwayjs/core");
+const framework_1 = require("./framework");
 const DefaultConfig = require("./config.default");
 let FaaSConfiguration = class FaaSConfiguration {
     async init() {
-        this.decoratorService.registerPropertyHandler(decorator_1.PLUGIN_KEY, (key, meta, target) => {
+        this.decoratorService.registerPropertyHandler(core_1.PLUGIN_KEY, (key, meta, target) => {
             var _a;
             return (((_a = target === null || target === void 0 ? void 0 : target[core_1.REQUEST_OBJ_CTX_KEY]) === null || _a === void 0 ? void 0 : _a[key]) ||
                 this.framework.getApplication()[key]);
         });
-        this.decoratorService.registerPropertyHandler(decorator_1.LOGGER_KEY, (key, meta, target) => {
+        this.decoratorService.registerPropertyHandler(core_1.LOGGER_KEY, (key, meta, target) => {
             var _a;
             return (((_a = target === null || target === void 0 ? void 0 : target[core_1.REQUEST_OBJ_CTX_KEY]) === null || _a === void 0 ? void 0 : _a['logger']) ||
                 this.framework.getLogger());
         });
-        this.decoratorService.registerParameterHandler(decorator_1.WEB_ROUTER_PARAM_KEY, options => {
-            return (0, core_1.extractKoaLikeValue)(options.metadata.type, options.metadata.propertyData, options.originParamType)(options.originArgs[0], options.originArgs[1]);
+        this.decoratorService.registerParameterHandler(core_1.WEB_ROUTER_PARAM_KEY, options => {
+            var _a;
+            return (0, core_1.extractKoaLikeValue)(options.metadata.type, options.metadata.propertyData, options.originParamType, (_a = options.metadata) === null || _a === void 0 ? void 0 : _a.pipes)(options.originArgs[0], options.originArgs[1]);
         });
     }
     async onReady(container) { }
@@ -40,25 +40,25 @@ let FaaSConfiguration = class FaaSConfiguration {
     }
 };
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", framework_1.MidwayFaaSFramework)
 ], FaaSConfiguration.prototype, "framework", void 0);
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayDecoratorService)
 ], FaaSConfiguration.prototype, "decoratorService", void 0);
 __decorate([
-    (0, decorator_1.ApplicationContext)(),
+    (0, core_1.ApplicationContext)(),
     __metadata("design:type", Object)
 ], FaaSConfiguration.prototype, "applicationContext", void 0);
 __decorate([
-    (0, decorator_1.Init)(),
+    (0, core_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], FaaSConfiguration.prototype, "init", null);
 FaaSConfiguration = __decorate([
-    (0, decorator_1.Configuration)({
+    (0, core_1.Configuration)({
         namespace: 'faas',
         importConfigs: [
             {

package/dist/framework.d.ts

@@ -32,7 +32,7 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
      * @param handlerMapping
      */
     handleInvokeWrapper(handlerMapping: string): (...args: any[]) => Promise<any>;
-    getTriggerFunction(handlerMapping: string): (context: any, options: HandlerOptions) => Promise<any>;
+    getTriggerFunction(context: any, handlerMapping: string, options: HandlerOptions): Promise<any>;
     wrapHttpRequest(req: http.IncomingMessage | Record<string, any>, res?: http.ServerResponse): Promise<unknown>;
     /**
      * @deprecated
@@ -44,7 +44,7 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
     protected getFunctionHandler(ctx: any, args: any, target: any, method: any): string;
     createLogger(name: string, option?: LoggerOptions): import("@midwayjs/core").ILogger;
     getFrameworkName(): string;
-    getServer(): http.Server;
+    getServer(): http.Server<typeof http.IncomingMessage, typeof http.ServerResponse>;
     beforeStop(): Promise<void>;
     protected createHttpContext(req: any, res: any): Promise<unknown>;
     useMiddleware(middleware: CommonMiddlewareUnion<Context, NextFunction, undefined>): void;

package/dist/framework.js

@@ -11,7 +11,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MidwayFaaSFramework = void 0;
 const core_1 = require("@midwayjs/core");
-const decorator_1 = require("@midwayjs/decorator");
 const simple_lock_1 = require("@midwayjs/simple-lock");
 const logger_1 = require("@midwayjs/logger");
 const serverless_http_parser_1 = require("@midwayjs/serverless-http-parser");
@@ -98,8 +97,8 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                     .createAnonymousContext()
                     .requestContext.getAsync(serviceClass);
             },
-            getTriggerFunction: (handlerMapping) => {
-                return this.getTriggerFunction(handlerMapping);
+            getTriggerFunction: (context, handlerMapping, options) => {
+                return this.getTriggerFunction(context, handlerMapping, options);
             },
         });
         // hack use method
@@ -161,6 +160,15 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                     ...funOptions.controllerMiddleware,
                     ...funOptions.middleware,
                     async (ctx, next) => {
+                        if (funOptions.controllerClz &&
+                            typeof funOptions.method === 'string') {
+                            const isPassed = await this.app
+                                .getFramework()
+                                .runGuard(ctx, funOptions.controllerClz, funOptions.method);
+                            if (!isPassed) {
+                                throw new core_1.httpError.ForbiddenError();
+                            }
+                        }
                         if (isHttpFunction) {
                             args = [ctx];
                         }
@@ -184,115 +192,113 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             return await composeMiddleware(context);
         };
     }
-    getTriggerFunction(handlerMapping) {
+    async getTriggerFunction(context, handlerMapping, options) {
+        var _a, _b;
         let funOptions = this.funMappingStore.get(handlerMapping);
-        return async (context, options) => {
-            var _a, _b;
-            const isHttpFunction = options.isHttpFunction;
-            if (!funOptions && isHttpFunction) {
-                funOptions = await this.serverlessFunctionService.getMatchedRouterInfo(context.path, context.method);
-                if (funOptions) {
-                    const matchRes = core_1.PathToRegexpUtil.match(funOptions.fullUrlFlattenString)(context.path);
-                    context.req.pathParameters = matchRes['params'] || {};
-                }
-            }
-            if (!funOptions) {
-                throw new Error(`function handler = ${handlerMapping} not found`);
-            }
-            context = this.getContext(context);
-            if ((_a = this.configurationOptions.applicationAdapter) === null || _a === void 0 ? void 0 : _a.runContextHook) {
-                this.configurationOptions.applicationAdapter.runContextHook(context);
+        const isHttpFunction = options.isHttpFunction;
+        if (!funOptions && isHttpFunction) {
+            funOptions = await this.serverlessFunctionService.getMatchedRouterInfo(context.path, context.method);
+            if (funOptions) {
+                const matchRes = core_1.PathToRegexpUtil.match(funOptions.fullUrlFlattenString)(context.path);
+                context.req.pathParameters = matchRes['params'] || {};
             }
-            const result = await (await this.applyMiddleware(async (ctx, next) => {
-                const fn = await this.middlewareService.compose([
-                    ...(isHttpFunction
-                        ? this.httpMiddlewareManager
-                        : this.eventMiddlewareManager),
-                    ...funOptions.controllerMiddleware,
-                    ...funOptions.middleware,
-                    async (ctx, next) => {
-                        let args;
-                        if (isHttpFunction) {
-                            args = [ctx];
+        }
+        if (!funOptions) {
+            throw new Error(`function handler = ${handlerMapping} not found`);
+        }
+        context = this.getContext(context);
+        if ((_a = this.configurationOptions.applicationAdapter) === null || _a === void 0 ? void 0 : _a.runContextHook) {
+            this.configurationOptions.applicationAdapter.runContextHook(context);
+        }
+        const result = await (await this.applyMiddleware(async (ctx, next) => {
+            const fn = await this.middlewareService.compose([
+                ...(isHttpFunction
+                    ? this.httpMiddlewareManager
+                    : this.eventMiddlewareManager),
+                ...funOptions.controllerMiddleware,
+                ...funOptions.middleware,
+                async (ctx, next) => {
+                    let args;
+                    if (isHttpFunction) {
+                        args = [ctx];
+                    }
+                    else {
+                        args = [options.originEvent, options.originContext];
+                    }
+                    // invoke handler
+                    const result = await this.invokeHandler(funOptions, ctx, args, isHttpFunction);
+                    if (isHttpFunction && result !== undefined) {
+                        if (result === null) {
+                            // 这样设置可以绕过 koa 的 _explicitStatus 赋值机制
+                            ctx.response._body = null;
                         }
                         else {
-                            args = [options.originEvent, options.originContext];
+                            ctx.body = result;
                         }
-                        // invoke handler
-                        const result = await this.invokeHandler(funOptions, ctx, args, isHttpFunction);
-                        if (isHttpFunction && result !== undefined) {
-                            if (result === null) {
-                                // 这样设置可以绕过 koa 的 _explicitStatus 赋值机制
-                                ctx.response._body = null;
-                            }
-                            else {
-                                ctx.body = result;
-                            }
-                        }
-                        // http 靠 ctx.body，否则会出现状态码不正确的问题
-                        if (!isHttpFunction) {
-                            return result;
-                        }
-                    },
-                ], this.app);
-                return await fn(ctx, next);
-            }))(context);
-            if (isHttpFunction) {
-                if (!((_b = context.response) === null || _b === void 0 ? void 0 : _b._explicitStatus)) {
-                    if (context.body === null || context.body === 'undefined') {
-                        context.body = '';
-                        context.type = 'text';
-                        context.status = 204;
-                    }
-                }
-                let encoded = false;
-                let data = context.body;
-                if (typeof data === 'string') {
-                    if (!context.type) {
-                        context.type = 'text/plain';
                     }
-                    context.body = data;
-                }
-                else if (isAnyArrayBuffer(data) || isUint8Array(data)) {
-                    encoded = true;
-                    if (!context.type) {
-                        context.type = 'application/octet-stream';
+                    // http 靠 ctx.body，否则会出现状态码不正确的问题
+                    if (!isHttpFunction) {
+                        return result;
                     }
-                    // data is reserved as buffer
-                    context.body = Buffer.from(data).toString('base64');
+                },
+            ], this.app);
+            return await fn(ctx, next);
+        }))(context);
+        if (isHttpFunction) {
+            if (!((_b = context.response) === null || _b === void 0 ? void 0 : _b._explicitStatus)) {
+                if (context.body === null || context.body === 'undefined') {
+                    context.body = '';
+                    context.type = 'text';
+                    context.status = 204;
                 }
-                else if (typeof data === 'object') {
-                    if (!context.type) {
-                        context.type = 'application/json';
-                    }
-                    // set data to string
-                    context.body = data = JSON.stringify(data);
+            }
+            let encoded = false;
+            const data = context.body;
+            if (typeof data === 'string') {
+                if (!context.type) {
+                    context.type = 'text/plain';
                 }
-                else {
-                    if (!context.type) {
-                        context.type = 'text/plain';
-                    }
-                    // set data to string
-                    context.body = data = data + '';
+                context.body = data;
+            }
+            else if (isAnyArrayBuffer(data) || isUint8Array(data)) {
+                encoded = true;
+                if (!context.type) {
+                    context.type = 'application/octet-stream';
                 }
-                // middleware return value and will be got 204 status
-                if (context.body === undefined &&
-                    !context.response._explicitStatus &&
-                    context._matchedRoute) {
-                    // 如果进了路由，重新赋值，防止 404
-                    context.body = undefined;
+                // data is reserved as buffer
+                context.body = Buffer.from(data).toString('base64');
+            }
+            else if (typeof data === 'object') {
+                if (!context.type) {
+                    context.type = 'application/json';
                 }
-                return {
-                    isBase64Encoded: encoded,
-                    statusCode: context.status,
-                    headers: context.res.headers,
-                    body: context.body,
-                };
+                // set data to string
+                context.body = JSON.stringify(data);
             }
             else {
-                return result;
+                if (!context.type) {
+                    context.type = 'text/plain';
+                }
+                // set data to string
+                context.body = data + '';
             }
-        };
+            // middleware return value and will be got 204 status
+            if (context.body === undefined &&
+                !context.response._explicitStatus &&
+                context._matchedRoute) {
+                // 如果进了路由，重新赋值，防止 404
+                context.body = undefined;
+            }
+            return {
+                isBase64Encoded: encoded,
+                statusCode: context.status,
+                headers: context.res.headers,
+                body: context.body,
+            };
+        }
+        else {
+            return result;
+        }
     }
     async wrapHttpRequest(req, res) {
         const newReq = res ? new serverless_http_parser_1.HTTPRequest(req, res) : req;
@@ -344,18 +350,18 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                 if (isHttpFunction) {
                     for (const routerRes of routerResponseData) {
                         switch (routerRes.type) {
-                            case decorator_1.WEB_RESPONSE_HTTP_CODE:
+                            case core_1.WEB_RESPONSE_HTTP_CODE:
                                 context.status = routerRes.code;
                                 break;
-                            case decorator_1.WEB_RESPONSE_HEADER:
+                            case core_1.WEB_RESPONSE_HEADER:
                                 for (const key in (routerRes === null || routerRes === void 0 ? void 0 : routerRes.setHeaders) || {}) {
                                     context.set(key, routerRes.setHeaders[key]);
                                 }
                                 break;
-                            case decorator_1.WEB_RESPONSE_CONTENT_TYPE:
+                            case core_1.WEB_RESPONSE_CONTENT_TYPE:
                                 context.type = routerRes.contentType;
                                 break;
-                            case decorator_1.WEB_RESPONSE_REDIRECT:
+                            case core_1.WEB_RESPONSE_REDIRECT:
                                 context.status = routerRes.code;
                                 context.redirect(routerRes.url);
                                 return;
@@ -412,15 +418,15 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
     }
 };
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayEnvironmentService)
 ], MidwayFaaSFramework.prototype, "environmentService", void 0);
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayMiddlewareService)
 ], MidwayFaaSFramework.prototype, "middlewareService", void 0);
 MidwayFaaSFramework = __decorate([
-    (0, decorator_1.Framework)()
+    (0, core_1.Framework)()
 ], MidwayFaaSFramework);
 exports.MidwayFaaSFramework = MidwayFaaSFramework;
 //# sourceMappingURL=framework.js.map

package/dist/interface.d.ts

@@ -34,8 +34,8 @@ export declare type IMidwayFaaSApplication = IMidwayApplication<Context, {
      */
     getFunctionServiceName(): string;
     useEventMiddleware(middleware: CommonMiddlewareUnion<Context, NextFunction, undefined>): void;
-    getEventMiddleware: ContextMiddlewareManager<Context, NextFunction, undefined>;
-    getTriggerFunction(handler: string): (context: any, options: HandlerOptions) => Promise<any>;
+    getEventMiddleware(): ContextMiddlewareManager<Context, NextFunction, undefined>;
+    getTriggerFunction(context: any, handler: string, options: HandlerOptions): Promise<any>;
     getServerlessInstance<T>(serviceClass: T): Promise<T>;
 }> & ServerlessHttpApplication;
 export interface Application extends IMidwayFaaSApplication {

package/package.json

@@ -1,20 +1,19 @@
 {
   "name": "@midwayjs/faas",
-  "version": "3.5.3",
+  "version": "3.7.0",
   "main": "dist/index",
   "typings": "index.d.ts",
   "dependencies": {
-    "@midwayjs/core": "^3.5.3",
-    "@midwayjs/faas-typings": "^3.5.0",
+    "@midwayjs/core": "^3.7.0",
+    "@midwayjs/faas-typings": "^3.6.0",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/serverless-http-parser": "^3.5.3",
+    "@midwayjs/serverless-http-parser": "^3.6.0",
     "@midwayjs/simple-lock": "^1.1.4"
   },
   "devDependencies": {
-    "@midwayjs/decorator": "^3.4.11",
-    "@midwayjs/mock": "^3.5.3",
-    "@midwayjs/serverless-fc-starter": "^3.5.3",
-    "@midwayjs/serverless-scf-starter": "^3.5.3",
+    "@midwayjs/mock": "^3.7.0",
+    "@midwayjs/serverless-fc-starter": "^3.7.0",
+    "@midwayjs/serverless-scf-starter": "^3.7.0",
     "mm": "3.2.0"
   },
   "engines": {
@@ -46,5 +45,5 @@
     "url": "git@github.com:midwayjs/midway.git"
   },
   "license": "MIT",
-  "gitHead": "32356484664846984f6d3d65a3a75dea015e8dcc"
+  "gitHead": "99386083ee26b386fd508b9c892091c914e77535"
 }