@midwayjs/faas 3.4.0-beta.5 → 3.4.0-beta.8

package/dist/framework.d.ts

@@ -11,7 +11,6 @@ export declare class MidwayFaaSFramework extends BaseFramework<Application, Cont
     app: Application;
     private isReplaceLogger;
     private developmentRun;
-    private serverlessRoutes;
     private server;
     private respond;
     private applicationAdapter;

package/dist/framework.js

@@ -26,7 +26,6 @@ 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;
@@ -128,13 +127,6 @@ let MidwayFaaSFramework = class MidwayFaaSFramework extends core_1.BaseFramework
                 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,
-                        });
-                    }
                 }
                 this.respond = this.app.callback();
             }, LOCK_KEY);
@@ -198,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) {

package/package.json

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