@midwayjs/faas 3.4.0-beta.4 → 3.4.0-beta.7

package/dist/configuration.js

@@ -33,8 +33,10 @@ let FaaSConfiguration = class FaaSConfiguration {
     async onReady(container) { }
     async onServerReady() {
         if (!this.framework.isEnable()) {
+            // just in legacy local dev and test
             await this.framework.run();
         }
+        await this.framework.loadFunction();
     }
 };
 __decorate([

package/dist/framework.d.ts

@@ -11,19 +11,21 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
     app: Application;
     private isReplaceLogger;
     private developmentRun;
-    private serverlessRoutes;
     private server;
     private respond;
     private applicationAdapter;
     private serverlessFunctionService;
     protected httpMiddlewareManager: ContextMiddlewareManager<Context, unknown, unknown>;
     protected eventMiddlewareManager: ContextMiddlewareManager<Context, unknown, unknown>;
+    private legacyVersion;
+    private loadedFunction;
     environmentService: MidwayEnvironmentService;
     middlewareService: MidwayMiddlewareService<Context, any>;
     configure(options: IFaaSConfigurationOptions): any;
     isEnable(): boolean;
     applicationInitialize(options: IMidwayBootstrapOptions): Promise<void>;
     run(): Promise<void>;
+    loadFunction(): Promise<void>;
     getFrameworkType(): MidwayFrameworkType;
     /**
      * @deprecated
@@ -49,5 +51,4 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
     getEventMiddleware(): ContextMiddlewareManager<Context, NextFunction, undefined>;
     getAllHandlerNames(): string[];
 }
-export declare const createModuleServerlessFramework: (globalOption: Omit<IMidwayBootstrapOptions, 'applicationContext'> & IFaaSConfigurationOptions) => Promise<MidwayFaaSFramework>;
 //# sourceMappingURL=framework.d.ts.map

package/dist/framework.js

@@ -9,7 +9,7 @@ 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.createModuleServerlessFramework = exports.MidwayFaaSFramework = void 0;
+exports.MidwayFaaSFramework = void 0;
 const core_1 = require("@midwayjs/core");
 const decorator_1 = require("@midwayjs/decorator");
 const simple_lock_1 = require("@midwayjs/simple-lock");
@@ -26,9 +26,10 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         this.lock = new simple_lock_1.default();
         this.isReplaceLogger = process.env['MIDWAY_SERVERLESS_REPLACE_LOGGER'] === 'true';
         this.developmentRun = false;
-        this.serverlessRoutes = [];
         this.httpMiddlewareManager = this.createMiddlewareManager();
         this.eventMiddlewareManager = this.createMiddlewareManager();
+        this.legacyVersion = false;
+        this.loadedFunction = false;
     }
     configure(options) {
         var _a;
@@ -51,6 +52,9 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         }
         this.applicationAdapter =
             this.configurationOptions.applicationAdapter || {};
+        if (this.applicationAdapter.getApplication) {
+            this.legacyVersion = true;
+        }
         this.app =
             ((_b = (_a = this.applicationAdapter).getApplication) === null || _b === void 0 ? void 0 : _b.call(_a)) ||
                 new serverless_http_parser_1.Application();
@@ -106,26 +110,27 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         }
     }
     async run() {
-        return this.lock.sureOnce(async () => {
-            var _a;
-            // set app keys
-            this.app['keys'] = (_a = this.configService.getConfiguration('keys')) !== null && _a !== void 0 ? _a : '';
-            // store all http function entry
-            this.serverlessFunctionService = await this.applicationContext.getAsync(core_1.MidwayServerlessFunctionService);
-            const functionList = await this.serverlessFunctionService.getFunctionList();
-            for (const funcInfo of functionList) {
-                // store handler
-                this.funMappingStore.set(funcInfo.funcHandlerName, funcInfo);
-                if (funcInfo.url) {
-                    // store router
-                    this.serverlessRoutes.push({
-                        matchPattern: (0, core_1.pathToRegexp)(funcInfo.url, [], { end: false }),
-                        funcInfo: funcInfo,
-                    });
+        if (this.legacyVersion) {
+            return this.loadFunction();
+        }
+    }
+    async loadFunction() {
+        if (!this.loadedFunction) {
+            this.loadedFunction = true;
+            return this.lock.sureOnce(async () => {
+                var _a;
+                // set app keys
+                this.app['keys'] = (_a = this.configService.getConfiguration('keys')) !== null && _a !== void 0 ? _a : '';
+                // store all http function entry
+                this.serverlessFunctionService = await this.applicationContext.getAsync(core_1.MidwayServerlessFunctionService);
+                const functionList = await this.serverlessFunctionService.getFunctionList();
+                for (const funcInfo of functionList) {
+                    // store handler
+                    this.funMappingStore.set(funcInfo.funcHandlerName, funcInfo);
                 }
-            }
-            this.respond = this.app.callback();
-        }, LOCK_KEY);
+                this.respond = this.app.callback();
+            }, LOCK_KEY);
+        }
     }
     getFrameworkType() {
         return core_1.MidwayFrameworkType.FAAS;
@@ -185,12 +190,10 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
             var _a;
             const isHttpFunction = options.isHttpFunction;
             if (!funOptions && isHttpFunction) {
-                for (const item of this.serverlessRoutes) {
-                    if (context.method === item.funcInfo['requestMethod'].toUpperCase() &&
-                        item.matchPattern.test(context.path)) {
-                        funOptions = item.funcInfo;
-                        break;
-                    }
+                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) {
@@ -320,36 +323,44 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
         return context;
     }
     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;
-        if (funModule[handlerName]) {
-            // invoke real method
-            const result = await funModule[handlerName](...args);
-            // implement response decorator
-            const routerResponseData = routerInfo.responseMetadata;
-            if (isHttpFunction) {
-                for (const routerRes of routerResponseData) {
-                    switch (routerRes.type) {
-                        case decorator_1.WEB_RESPONSE_HTTP_CODE:
-                            context.status = routerRes.code;
-                            break;
-                        case decorator_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:
-                            context.type = routerRes.contentType;
-                            break;
-                        case decorator_1.WEB_RESPONSE_REDIRECT:
-                            context.status = routerRes.code;
-                            context.redirect(routerRes.url);
-                            return;
+        if (typeof routerInfo.method !== 'string') {
+            if (!isHttpFunction) {
+                args.unshift(context);
+            }
+            return routerInfo.method(...args);
+        }
+        else {
+            const funModule = await context.requestContext.getAsync(routerInfo.controllerId);
+            const handlerName = this.getFunctionHandler(context, args, funModule, routerInfo.method) ||
+                this.defaultHandlerMethod;
+            if (funModule[handlerName]) {
+                // invoke real method
+                const result = await funModule[handlerName](...args);
+                // implement response decorator
+                const routerResponseData = routerInfo.responseMetadata;
+                if (isHttpFunction) {
+                    for (const routerRes of routerResponseData) {
+                        switch (routerRes.type) {
+                            case decorator_1.WEB_RESPONSE_HTTP_CODE:
+                                context.status = routerRes.code;
+                                break;
+                            case decorator_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:
+                                context.type = routerRes.contentType;
+                                break;
+                            case decorator_1.WEB_RESPONSE_REDIRECT:
+                                context.status = routerRes.code;
+                                context.redirect(routerRes.url);
+                                return;
+                        }
                     }
                 }
+                return result;
             }
-            return result;
         }
     }
     getFunctionHandler(ctx, args, target, method) {
@@ -402,13 +413,4 @@ MidwayFaaSFramework = __decorate([
     (0, decorator_1.Framework)()
 ], MidwayFaaSFramework);
 exports.MidwayFaaSFramework = MidwayFaaSFramework;
-const createModuleServerlessFramework = async (globalOption) => {
-    const applicationContext = await (0, core_1.initializeGlobalApplicationContext)({
-        ...globalOption,
-        baseDir: '',
-        appDir: '',
-    });
-    return applicationContext.get(MidwayFaaSFramework);
-};
-exports.createModuleServerlessFramework = createModuleServerlessFramework;
 //# sourceMappingURL=framework.js.map

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export * from './interface';
-export { MidwayFaaSFramework as Framework, createModuleServerlessFramework, } from './framework';
+export { MidwayFaaSFramework as Framework } from './framework';
 export { FaaSConfiguration as Configuration } from './configuration';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -14,11 +14,10 @@ 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.Configuration = exports.createModuleServerlessFramework = 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; } });
-Object.defineProperty(exports, "createModuleServerlessFramework", { enumerable: true, get: function () { return framework_1.createModuleServerlessFramework; } });
 var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.FaaSConfiguration; } });
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -47,6 +47,9 @@ export interface IFaaSConfigurationOptions extends IConfigurationOptions {
     config?: object;
     initializeContext?: object;
     applicationAdapter?: {
+        /**
+         * @deprecated
+         */
         getApplication(): Application;
         getFunctionName(): string;
         getFunctionServiceName(): string;

package/package.json

@@ -1,20 +1,20 @@
 {
   "name": "@midwayjs/faas",
-  "version": "3.4.0-beta.4",
+  "version": "3.4.0-beta.7",
   "main": "dist/index",
   "typings": "index.d.ts",
   "dependencies": {
-    "@midwayjs/core": "^3.4.0-beta.4",
+    "@midwayjs/core": "^3.4.0-beta.7",
     "@midwayjs/faas-typings": "^3.3.5",
     "@midwayjs/logger": "^2.15.0",
-    "@midwayjs/serverless-http-parser": "^3.4.0-beta.4",
+    "@midwayjs/serverless-http-parser": "^3.4.0-beta.7",
     "@midwayjs/simple-lock": "^1.1.4"
   },
   "devDependencies": {
-    "@midwayjs/decorator": "^3.4.0-beta.4",
-    "@midwayjs/mock": "^3.4.0-beta.4",
-    "@midwayjs/serverless-fc-starter": "^3.4.0-beta.4",
-    "@midwayjs/serverless-scf-starter": "^3.4.0-beta.4",
+    "@midwayjs/decorator": "^3.4.0-beta.7",
+    "@midwayjs/mock": "^3.4.0-beta.7",
+    "@midwayjs/serverless-fc-starter": "^3.4.0-beta.7",
+    "@midwayjs/serverless-scf-starter": "^3.4.0-beta.7",
     "mm": "3.2.0"
   },
   "engines": {
@@ -46,5 +46,5 @@
     "url": "git@github.com:midwayjs/midway.git"
   },
   "license": "MIT",
-  "gitHead": "3b686101f7802f87d47b8c9d25561339d556e573"
+  "gitHead": "4d5cc59a7a33e49beeaf20fcfaf766438649959c"
 }