@midwayjs/faas 3.5.2 → 3.6.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,23 +10,22 @@ 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 => {
+        this.decoratorService.registerParameterHandler(core_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]);
         });
     }
@@ -40,25 +39,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

@@ -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");
@@ -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];
                         }
@@ -344,18 +352,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 +420,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/package.json

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