@midwayjs/faas 3.0.0-alpha.9 → 3.0.0-beta.12

package/CHANGELOG.md

@@ -3,6 +3,123 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.12](https://github.com/midwayjs/midway/compare/v3.0.0-beta.11...v3.0.0-beta.12) (2021-12-28)
+
+
+### Features
+
+* support throw err status ([#1440](https://github.com/midwayjs/midway/issues/1440)) ([7b98110](https://github.com/midwayjs/midway/commit/7b98110d65c5287a8fcb3eb5356dea2d7a32cee9))
+
+
+
+
+
+# [3.0.0-beta.11](https://github.com/midwayjs/midway/compare/v3.0.0-beta.10...v3.0.0-beta.11) (2021-12-21)
+
+**Note:** Version bump only for package @midwayjs/faas
+
+
+
+
+
+# [3.0.0-beta.10](https://github.com/midwayjs/midway/compare/v3.0.0-beta.9...v3.0.0-beta.10) (2021-12-20)
+
+
+### Features
+
+* default add session  & bodyparser support for koa/express/faas ([#1420](https://github.com/midwayjs/midway/issues/1420)) ([cdaff31](https://github.com/midwayjs/midway/commit/cdaff317c3e862a95494a167995a28280af639bf))
+* implement i18n for validate ([#1426](https://github.com/midwayjs/midway/issues/1426)) ([4c7ed2f](https://github.com/midwayjs/midway/commit/4c7ed2ff2e7ccf10f88f62abad230f92f5e76b97))
+
+
+
+
+
+# [3.0.0-beta.9](https://github.com/midwayjs/midway/compare/v3.0.0-beta.8...v3.0.0-beta.9) (2021-12-09)
+
+
+### Bug Fixes
+
+* faas missing config in framework ([#1413](https://github.com/midwayjs/midway/issues/1413)) ([7ab16a2](https://github.com/midwayjs/midway/commit/7ab16a24b29d5254a762bfffcdf18385effdf639))
+
+
+
+
+
+# [3.0.0-beta.8](https://github.com/midwayjs/midway/compare/v3.0.0-beta.7...v3.0.0-beta.8) (2021-12-08)
+
+**Note:** Version bump only for package @midwayjs/faas
+
+
+
+
+
+# [3.0.0-beta.7](https://github.com/midwayjs/midway/compare/v3.0.0-beta.6...v3.0.0-beta.7) (2021-12-03)
+
+
+### Bug Fixes
+
+* middleware with ctx.body ([#1389](https://github.com/midwayjs/midway/issues/1389)) ([77af5c0](https://github.com/midwayjs/midway/commit/77af5c0b456f1843f4dcfd3dbfd2c0aa244c51bd))
+
+
+
+
+
+# [3.0.0-beta.6](https://github.com/midwayjs/midway/compare/v3.0.0-beta.5...v3.0.0-beta.6) (2021-11-26)
+
+**Note:** Version bump only for package @midwayjs/faas
+
+
+
+
+
+# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25)
+
+**Note:** Version bump only for package @midwayjs/faas
+
+
+
+
+
+# [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24)
+
+
+### Features
+
+* add i18n ([#1375](https://github.com/midwayjs/midway/issues/1375)) ([bffefe0](https://github.com/midwayjs/midway/commit/bffefe07afe45777d49b5a76b9ab17fc2b9d9a55))
+* auto transform args to type ([#1372](https://github.com/midwayjs/midway/issues/1372)) ([bb3f7d2](https://github.com/midwayjs/midway/commit/bb3f7d2028a034e1926d9df554849332354c3762))
+* support global prefix url ([#1371](https://github.com/midwayjs/midway/issues/1371)) ([cc5fe44](https://github.com/midwayjs/midway/commit/cc5fe44e1d221590562dc71e1f33ae96093e0da7))
+
+
+
+
+
+# [3.0.0-beta.3](https://github.com/midwayjs/midway/compare/v3.0.0-beta.2...v3.0.0-beta.3) (2021-11-18)
+
+**Note:** Version bump only for package @midwayjs/faas
+
+
+
+
+
+# [3.0.0-beta.2](https://github.com/midwayjs/midway/compare/v3.0.0-beta.1...v3.0.0-beta.2) (2021-11-16)
+
+**Note:** Version bump only for package @midwayjs/faas
+
+
+
+
+
+# [3.0.0-beta.1](https://github.com/midwayjs/midway/compare/v2.12.4...v3.0.0-beta.1) (2021-11-14)
+
+
+### Bug Fixes
+
+* static prefix ([#1321](https://github.com/midwayjs/midway/issues/1321)) ([31fe961](https://github.com/midwayjs/midway/commit/31fe961931fed7656a144b1682ee4c4bb25fdff5))
+
+
+
+
+
 ## [2.12.4](https://github.com/midwayjs/midway/compare/v2.12.3...v2.12.4) (2021-08-13)
 
 

package/dist/config.default.d.ts

@@ -0,0 +1,8 @@
+export declare const midwayLogger: {
+    default: {
+        disableFile: boolean;
+        disableError: boolean;
+        printFormat: (info: any) => string;
+    };
+};
+//# sourceMappingURL=config.default.d.ts.map

package/dist/config.default.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.midwayLogger = void 0;
+exports.midwayLogger = {
+    default: {
+        disableFile: true,
+        disableError: true,
+        printFormat: (info) => {
+            var _a, _b, _c, _d, _e, _f;
+            const requestId = (_f = (_c = (_b = (_a = info.ctx) === null || _a === void 0 ? void 0 : _a['originContext']) === null || _b === void 0 ? void 0 : _b['requestId']) !== null && _c !== void 0 ? _c : (_e = (_d = info.ctx) === null || _d === void 0 ? void 0 : _d['originContext']) === null || _e === void 0 ? void 0 : _e['request_id']) !== null && _f !== void 0 ? _f : '';
+            return `${new Date().toISOString()} ${requestId} [${info.level}] ${info.message}`;
+        },
+    },
+};
+//# sourceMappingURL=config.default.js.map

package/dist/configuration.d.ts

@@ -0,0 +1,11 @@
+import { MidwayFaaSFramework } from './framework';
+import { MidwayDecoratorService } from '@midwayjs/core';
+export declare class FaaSConfiguration {
+    framework: MidwayFaaSFramework;
+    decoratorService: MidwayDecoratorService;
+    applicationContext: any;
+    init(): Promise<void>;
+    onReady(container: any): Promise<void>;
+    onServerReady(): Promise<void>;
+}
+//# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -0,0 +1,69 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(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 DefaultConfig = require("./config.default");
+let FaaSConfiguration = class FaaSConfiguration {
+    async init() {
+        this.decoratorService.registerPropertyHandler(decorator_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) => {
+            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]);
+        });
+    }
+    async onReady(container) { }
+    async onServerReady() {
+        if (!this.framework.isEnable()) {
+            await this.framework.run();
+        }
+    }
+};
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", framework_1.MidwayFaaSFramework)
+], FaaSConfiguration.prototype, "framework", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", core_1.MidwayDecoratorService)
+], FaaSConfiguration.prototype, "decoratorService", void 0);
+__decorate([
+    (0, decorator_1.ApplicationContext)(),
+    __metadata("design:type", Object)
+], FaaSConfiguration.prototype, "applicationContext", void 0);
+__decorate([
+    (0, decorator_1.Init)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], FaaSConfiguration.prototype, "init", null);
+FaaSConfiguration = __decorate([
+    (0, decorator_1.Configuration)({
+        namespace: 'faas',
+        importConfigs: [
+            {
+                default: DefaultConfig,
+            },
+        ],
+    })
+], FaaSConfiguration);
+exports.FaaSConfiguration = FaaSConfiguration;
+//# sourceMappingURL=configuration.js.map

package/dist/framework.d.ts

@@ -1,27 +1,31 @@
-import { FaaSContext, FaaSMiddleware, IFaaSConfigurationOptions, IMidwayFaaSApplication } from './interface';
-import { BaseFramework, IMidwayBootstrapOptions, MidwayFrameworkType, RouterInfo } from '@midwayjs/core';
+import { FaaSContext, IFaaSConfigurationOptions, IMidwayFaaSApplication } from './interface';
+import { BaseFramework, FunctionMiddleware, IMidwayBootstrapOptions, MidwayEnvironmentService, MidwayFrameworkType, MidwayMiddlewareService, RouterInfo } from '@midwayjs/core';
 import { LoggerOptions } from '@midwayjs/logger';
 export declare class MidwayFaaSFramework extends BaseFramework<IMidwayFaaSApplication, FaaSContext, IFaaSConfigurationOptions> {
     protected defaultHandlerMethod: string;
-    private globalMiddleware;
     protected funMappingStore: Map<string, RouterInfo>;
     protected logger: any;
     private lock;
     app: IMidwayFaaSApplication;
     private isReplaceLogger;
+    private developmentRun;
+    environmentService: MidwayEnvironmentService;
+    middlewareService: MidwayMiddlewareService<FaaSContext, any>;
+    configure(options: IFaaSConfigurationOptions): any;
+    isEnable(): boolean;
     applicationInitialize(options: IMidwayBootstrapOptions): Promise<void>;
-    protected initializeLogger(options: IMidwayBootstrapOptions): Promise<void>;
-    protected afterContainerReady(options: Partial<IMidwayBootstrapOptions>): Promise<void>;
     run(): Promise<void>;
     getFrameworkType(): MidwayFrameworkType;
     handleInvokeWrapper(handlerMapping: string): (...args: any[]) => Promise<any>;
-    generateMiddleware(middlewareId: string): Promise<FaaSMiddleware>;
+    /**
+     * @deprecated
+     * @param middlewareId
+     */
+    generateMiddleware(middlewareId: string): Promise<FunctionMiddleware<FaaSContext, any>>;
     getContext(context: any): any;
     private invokeHandler;
     protected getFunctionHandler(ctx: any, args: any, target: any, method: any): string;
-    private registerDecorator;
-    private loadMiddleware;
-    createLogger(name: string, option?: LoggerOptions): import("@midwayjs/logger").ILogger;
+    createLogger(name: string, option?: LoggerOptions): import("@midwayjs/core").ILogger;
     getFrameworkName(): string;
 }
 //# sourceMappingURL=framework.d.ts.map

package/dist/framework.js

@@ -1,24 +1,46 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(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 compose = require("koa-compose");
-const hooks_1 = require("./hooks");
 const logger_1 = require("@midwayjs/logger");
 const LOCK_KEY = '_faas_starter_start_key';
-class MidwayFaaSFramework extends core_1.BaseFramework {
+let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework {
     constructor() {
         super(...arguments);
         this.defaultHandlerMethod = 'handler';
         this.funMappingStore = new Map();
         this.lock = new simple_lock_1.default();
         this.isReplaceLogger = process.env['MIDWAY_SERVERLESS_REPLACE_LOGGER'] === 'true';
+        this.developmentRun = false;
+    }
+    configure(options) {
+        if (options) {
+            this.developmentRun = true;
+            this.configurationOptions = options;
+        }
+        else {
+            return this.configService.getConfiguration('faas');
+        }
+    }
+    isEnable() {
+        return !this.developmentRun;
     }
     async applicationInitialize(options) {
         var _a;
-        this.globalMiddleware = this.configurationOptions.middleware || [];
+        if (!this.logger) {
+            this.logger = options.logger || logger_1.loggers.getLogger('appLogger');
+        }
         this.app =
             ((_a = this.configurationOptions.applicationAdapter) === null || _a === void 0 ? void 0 : _a.getApplication()) ||
                 {};
@@ -29,14 +51,10 @@ class MidwayFaaSFramework extends core_1.BaseFramework {
             getInitializeContext: () => {
                 return this.configurationOptions.initializeContext;
             },
-            useMiddleware: async (middlewares) => {
-                if (middlewares.length) {
-                    const newMiddlewares = await this.loadMiddleware(middlewares);
-                    for (const mw of newMiddlewares) {
-                        this.app.use(mw);
-                    }
-                }
-            },
+            /**
+             * @deprecated
+             * @param middlewareId
+             */
             generateMiddleware: async (middlewareId) => {
                 return this.generateMiddleware(middlewareId);
             },
@@ -49,38 +67,15 @@ class MidwayFaaSFramework extends core_1.BaseFramework {
                 return (_a = this.configurationOptions.applicationAdapter) === null || _a === void 0 ? void 0 : _a.getFunctionServiceName();
             },
         });
-    }
-    async initializeLogger(options) {
-        if (!this.logger) {
-            this.logger =
-                options.logger ||
-                    logger_1.createConsoleLogger('midwayServerlessLogger', {
-                        printFormat: info => {
-                            var _a, _b, _c, _d, _e, _f;
-                            const requestId = (_f = (_c = (_b = (_a = info.ctx) === null || _a === void 0 ? void 0 : _a['originContext']) === null || _b === void 0 ? void 0 : _b['requestId']) !== null && _c !== void 0 ? _c : (_e = (_d = info.ctx) === null || _d === void 0 ? void 0 : _d['originContext']) === null || _e === void 0 ? void 0 : _e['request_id']) !== null && _f !== void 0 ? _f : '';
-                            return `${new Date().toISOString()} ${requestId} [${info.level}] ${info.message}`;
-                        },
-                    });
-            this.appLogger = this.logger;
-            logger_1.loggers.addLogger('coreLogger', this.logger, false);
-            logger_1.loggers.addLogger('appLogger', this.logger, false);
-            logger_1.loggers.addLogger('logger', this.logger, false);
-        }
-    }
-    async afterContainerReady(options) {
-        this.registerDecorator();
+        // hack use method
+        this.app.originUse = this.app.use;
+        this.app.use = this.app.useMiddleware;
     }
     async run() {
         return this.lock.sureOnce(async () => {
             var _a;
-            // attach global middleware from user config
-            if ((_a = this.app) === null || _a === void 0 ? void 0 : _a.use) {
-                const middlewares = this.app.getConfig('middleware') || [];
-                await this.app.useMiddleware(middlewares);
-                this.globalMiddleware = this.globalMiddleware.concat(this.app['middleware']);
-            }
             // set app keys
-            this.app['keys'] = this.app.getConfig('keys') || '';
+            this.app['keys'] = (_a = this.configService.getConfiguration('keys')) !== null && _a !== void 0 ? _a : '';
             // store all http function entry
             const collector = new core_1.ServerlessTriggerCollector();
             const functionList = await collector.getFunctionList();
@@ -98,50 +93,47 @@ class MidwayFaaSFramework extends core_1.BaseFramework {
             if (args.length === 0) {
                 throw new Error('first parameter must be function context');
             }
+            if (!funOptions) {
+                throw new Error(`function handler = ${handlerMapping} not found`);
+            }
             const context = this.getContext(args.shift());
-            if (funOptions) {
-                let fnMiddlewere = [];
-                // invoke middleware, just for http
-                if (context.headers && context.get) {
-                    fnMiddlewere = fnMiddlewere
-                        .concat(this.globalMiddleware)
-                        .concat(funOptions.controllerMiddleware);
-                }
-                fnMiddlewere = fnMiddlewere.concat(funOptions.middleware);
-                if (fnMiddlewere.length) {
-                    const mw = await this.loadMiddleware(fnMiddlewere);
-                    mw.push(async (ctx, next) => {
+            const isHttpFunction = !!(context.headers && context.get);
+            const globalMiddlewareFn = await this.applyMiddleware();
+            const middlewareManager = new core_1.ContextMiddlewareManager();
+            middlewareManager.insertLast(globalMiddlewareFn);
+            middlewareManager.insertLast(async (ctx, next) => {
+                const fn = await this.middlewareService.compose([
+                    ...funOptions.controllerMiddleware,
+                    ...funOptions.middleware,
+                    async (ctx, next) => {
+                        if (isHttpFunction) {
+                            args = [ctx];
+                        }
                         // invoke handler
-                        const result = await this.invokeHandler(funOptions, ctx, next, args);
-                        if (result !== undefined) {
+                        const result = await this.invokeHandler(funOptions, ctx, args, isHttpFunction);
+                        if (isHttpFunction && result !== undefined) {
                             ctx.body = result;
                         }
-                        return next();
-                    });
-                    return compose(mw)(context).then(() => {
-                        return context.body;
-                    });
-                }
-                else {
-                    // invoke handler
-                    return this.invokeHandler(funOptions, context, null, args);
-                }
-            }
-            throw new Error(`function handler = ${handlerMapping} not found`);
+                        return result;
+                    },
+                ], this.app);
+                return await fn(ctx, next);
+            });
+            const composeMiddleware = await this.middlewareService.compose(middlewareManager, this.app);
+            return await composeMiddleware(context);
         };
     }
+    /**
+     * @deprecated
+     * @param middlewareId
+     */
     async generateMiddleware(middlewareId) {
         const mwIns = await this.getApplicationContext().getAsync(middlewareId);
         return mwIns.resolve();
     }
     getContext(context) {
         if (!context.env) {
-            context.env = this.getApplicationContext()
-                .getEnvironmentService()
-                .getCurrentEnvironment();
-        }
-        if (!context.hooks) {
-            context.hooks = new hooks_1.MidwayHooks(context, this.app);
+            context.env = this.environmentService.getCurrentEnvironment();
         }
         if (this.isReplaceLogger || !context.logger) {
             context._serverlessLogger = this.createContextLogger(context);
@@ -157,13 +149,7 @@ class MidwayFaaSFramework extends core_1.BaseFramework {
         this.app.createAnonymousContext(context);
         return context;
     }
-    async invokeHandler(routerInfo, context, next, args) {
-        if (Array.isArray(routerInfo.requestMetadata) &&
-            routerInfo.requestMetadata.length) {
-            await Promise.all(routerInfo.requestMetadata.map(async ({ index, type, propertyData }) => {
-                args[index] = await core_1.extractKoaLikeValue(type, propertyData)(context, next);
-            }));
-        }
+    async invokeHandler(routerInfo, context, args, isHttpFunction) {
         const funModule = await context.requestContext.getAsync(routerInfo.controllerId);
         const handlerName = this.getFunctionHandler(context, args, funModule, routerInfo.method) ||
             this.defaultHandlerMethod;
@@ -172,7 +158,7 @@ class MidwayFaaSFramework extends core_1.BaseFramework {
             const result = await funModule[handlerName](...args);
             // implement response decorator
             const routerResponseData = routerInfo.responseMetadata;
-            if (context.headers && routerResponseData.length) {
+            if (isHttpFunction) {
                 for (const routerRes of routerResponseData) {
                     switch (routerRes.type) {
                         case decorator_1.WEB_RESPONSE_HTTP_CODE:
@@ -206,38 +192,24 @@ class MidwayFaaSFramework extends core_1.BaseFramework {
         }
         throw new Error(`no handler setup on ${target.name}#${method || this.defaultHandlerMethod}`);
     }
-    registerDecorator() {
-        this.getApplicationContext().registerDataHandler(decorator_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.app[key];
-        });
-        this.getApplicationContext().registerDataHandler(decorator_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.app.getLogger());
-        });
-    }
-    async loadMiddleware(middlewares) {
-        const newMiddlewares = [];
-        for (const middleware of middlewares) {
-            if (typeof middleware === 'function') {
-                newMiddlewares.push(middleware);
-            }
-            else {
-                const middlewareImpl = await this.getApplicationContext().getAsync(middleware);
-                if (middlewareImpl && typeof middlewareImpl.resolve === 'function') {
-                    newMiddlewares.push(middlewareImpl.resolve());
-                }
-            }
-        }
-        return newMiddlewares;
-    }
     createLogger(name, option = {}) {
         // 覆盖基类的创建日志对象，函数场景下的日志，即使自定义，也只启用控制台输出
-        return logger_1.createConsoleLogger(name, option);
+        return (0, logger_1.createConsoleLogger)(name, option);
     }
     getFrameworkName() {
         return 'midway:faas';
     }
-}
+};
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", core_1.MidwayEnvironmentService)
+], MidwayFaaSFramework.prototype, "environmentService", void 0);
+__decorate([
+    (0, decorator_1.Inject)(),
+    __metadata("design:type", core_1.MidwayMiddlewareService)
+], MidwayFaaSFramework.prototype, "middlewareService", void 0);
+MidwayFaaSFramework = __decorate([
+    (0, decorator_1.Framework)()
+], MidwayFaaSFramework);
 exports.MidwayFaaSFramework = MidwayFaaSFramework;
 //# sourceMappingURL=framework.js.map

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export * from './interface';
 export { MidwayFaaSFramework as Framework } from './framework';
-export { Func as func, Provide as provide, Inject as inject, Config as config, Plugin as plugin, Logger as logger, Init as init, } from '@midwayjs/decorator';
+export { FaaSConfiguration as Configuration } from './configuration';
 export * from './util';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -10,17 +10,11 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = exports.logger = exports.plugin = exports.config = exports.inject = exports.provide = exports.func = exports.Framework = void 0;
+exports.Configuration = exports.Framework = void 0;
 __exportStar(require("./interface"), exports);
 var framework_1 = require("./framework");
 Object.defineProperty(exports, "Framework", { enumerable: true, get: function () { return framework_1.MidwayFaaSFramework; } });
-var decorator_1 = require("@midwayjs/decorator");
-Object.defineProperty(exports, "func", { enumerable: true, get: function () { return decorator_1.Func; } });
-Object.defineProperty(exports, "provide", { enumerable: true, get: function () { return decorator_1.Provide; } });
-Object.defineProperty(exports, "inject", { enumerable: true, get: function () { return decorator_1.Inject; } });
-Object.defineProperty(exports, "config", { enumerable: true, get: function () { return decorator_1.Config; } });
-Object.defineProperty(exports, "plugin", { enumerable: true, get: function () { return decorator_1.Plugin; } });
-Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return decorator_1.Logger; } });
-Object.defineProperty(exports, "init", { enumerable: true, get: function () { return decorator_1.Init; } });
+var configuration_1 = require("./configuration");
+Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.FaaSConfiguration; } });
 __exportStar(require("./util"), exports);
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -1,19 +1,20 @@
-import { MidwayRequestContainer, IMidwayApplication, IConfigurationOptions, IMidwayContext } from '@midwayjs/core';
+import { MidwayRequestContainer, IMidwayApplication, IConfigurationOptions, IMidwayContext, NextFunction as BaseNextFunction } from '@midwayjs/core';
 import { FaaSHTTPContext } from '@midwayjs/faas-typings';
-import type { MidwayHooks } from './hooks';
 import { ILogger } from '@midwayjs/logger';
 export interface FaaSContext extends IMidwayContext<FaaSHTTPContext> {
     logger: ILogger;
     env: string;
     requestContext: MidwayRequestContainer;
     originContext: any;
-    hooks?: MidwayHooks;
 }
 export declare type FaaSMiddleware = ((context: FaaSContext, next: () => Promise<any>) => any) | string;
 export declare type IMidwayFaaSApplication = IMidwayApplication<FaaSContext, {
     getInitializeContext(): any;
     use(middleware: FaaSMiddleware): any;
-    useMiddleware(mw: string[]): any;
+    /**
+     * @deprecated
+     * @param middlewareId
+     */
     generateMiddleware(middlewareId: any): Promise<FaaSMiddleware>;
     /**
      * Get function name in serverless environment
@@ -28,9 +29,9 @@ export interface Application extends IMidwayFaaSApplication {
 }
 export interface Context extends FaaSContext {
 }
+export declare type NextFunction = BaseNextFunction;
 export interface IFaaSConfigurationOptions extends IConfigurationOptions {
     config?: object;
-    middleware?: string[];
     initializeContext?: object;
     applicationAdapter?: {
         getApplication(): IMidwayFaaSApplication;

package/dist/util.d.ts

@@ -1,11 +1,4 @@
-import { IMidwayContainer } from '@midwayjs/core';
+import { IMidwayBootstrapOptions } from '@midwayjs/core';
 import { Framework, IFaaSConfigurationOptions } from './index';
-export interface CreateOptions extends IFaaSConfigurationOptions {
-    container?: IMidwayContainer;
-    modules: any[];
-    entry: {
-        Configuration: any;
-    };
-}
-export declare const createModuleServerlessFramework: (options: CreateOptions) => Promise<Framework>;
+export declare const createModuleServerlessFramework: (globalOption: Omit<IMidwayBootstrapOptions, 'applicationContext'> & IFaaSConfigurationOptions) => Promise<Framework>;
 //# sourceMappingURL=util.d.ts.map

package/dist/util.js

@@ -3,17 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createModuleServerlessFramework = void 0;
 const core_1 = require("@midwayjs/core");
 const index_1 = require("./index");
-const createModuleServerlessFramework = async (options) => {
-    const container = core_1.createModuleContainer(options);
-    const framework = new index_1.Framework();
-    framework.configure(options);
-    await framework.initialize({
-        applicationContext: container,
+const createModuleServerlessFramework = async (globalOption) => {
+    const applicationContext = await (0, core_1.initializeGlobalApplicationContext)({
+        ...globalOption,
         baseDir: '',
         appDir: '',
     });
-    await framework.run();
-    return framework;
+    return applicationContext.get(index_1.Framework);
 };
 exports.createModuleServerlessFramework = createModuleServerlessFramework;
 //# sourceMappingURL=util.js.map

package/package.json

@@ -1,24 +1,23 @@
 {
   "name": "@midwayjs/faas",
-  "version": "3.0.0-alpha.9+d5acc750",
+  "version": "3.0.0-beta.12",
   "main": "dist/index",
   "typings": "index.d.ts",
   "dependencies": {
-    "@midwayjs/core": "^3.0.0-alpha.9+d5acc750",
-    "@midwayjs/decorator": "^3.0.0-alpha.2",
-    "@midwayjs/faas-typings": "^2.11.1",
-    "@midwayjs/logger": "^2.11.3",
-    "@midwayjs/simple-lock": "^1.1.4",
-    "koa-compose": "^4.1.0"
+    "@midwayjs/core": "^3.0.0-beta.12",
+    "@midwayjs/faas-typings": "^3.0.0-beta.12",
+    "@midwayjs/logger": "^3.0.0-beta.12",
+    "@midwayjs/simple-lock": "^1.1.4"
   },
   "devDependencies": {
-    "@midwayjs/mock": "^3.0.0-alpha.9+d5acc750",
-    "@midwayjs/serverless-fc-starter": "^3.0.0-alpha.9+d5acc750",
-    "@midwayjs/serverless-scf-starter": "^3.0.0-alpha.2",
+    "@midwayjs/decorator": "^3.0.0-beta.12",
+    "@midwayjs/mock": "^3.0.0-beta.12",
+    "@midwayjs/serverless-fc-starter": "^3.0.0-beta.12",
+    "@midwayjs/serverless-scf-starter": "^3.0.0-beta.12",
     "mm": "3"
   },
   "engines": {
-    "node": ">= 10"
+    "node": ">=12"
   },
   "files": [
     "dist/**/*.js",
@@ -46,5 +45,5 @@
     "url": "git@github.com:midwayjs/midway.git"
   },
   "license": "MIT",
-  "gitHead": "d5acc7505275ea9d566edd38e5e0377141e0abc1"
+  "gitHead": "1c46e53eb934248007eeb7fe3920f5ac24e272c6"
 }

package/dist/hooks.d.ts

@@ -1,16 +0,0 @@
-import { FaaSContext, IMidwayFaaSApplication } from './interface';
-/**
- * Stability: 1 - Experimental
- */
-export declare class MidwayHooks {
-    private readonly ctx;
-    private readonly app;
-    constructor(ctx: FaaSContext, app: IMidwayFaaSApplication);
-    useContext(): FaaSContext;
-    useInject<T>(identifier: any): Promise<T>;
-    useConfig(key?: string): any;
-    useLogger(): import("@midwayjs/logger").ILogger;
-    usePlugin(key: string): any;
-    useApp(): IMidwayFaaSApplication;
-}
-//# sourceMappingURL=hooks.d.ts.map

package/dist/hooks.js

@@ -1,32 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayHooks = void 0;
-/**
- * Stability: 1 - Experimental
- */
-class MidwayHooks {
-    constructor(ctx, app) {
-        this.ctx = ctx;
-        this.app = app;
-    }
-    useContext() {
-        return this.ctx;
-    }
-    useInject(identifier) {
-        return this.ctx.requestContext.getAsync(identifier);
-    }
-    useConfig(key) {
-        return this.ctx.requestContext.getConfigService().getConfiguration(key);
-    }
-    useLogger() {
-        return this.ctx.logger;
-    }
-    usePlugin(key) {
-        return this.ctx[key] || this.app[key];
-    }
-    useApp() {
-        return this.app;
-    }
-}
-exports.MidwayHooks = MidwayHooks;
-//# sourceMappingURL=hooks.js.map