fix: regexp for root path match (#2105)

midwayjs · Jul 12, 2022 · 97ccc03 · 97ccc03
1 parent 25e8448
commit 97ccc03
Show file tree

Hide file tree

Showing 26 changed files with 3,879 additions and 318 deletions.
diff --git a/packages/bootstrap/src/bootstrap.ts b/packages/bootstrap/src/bootstrap.ts
@@ -40,12 +40,18 @@ export class BootstrapStarter {
     return this.applicationContext;
   }
 
-  public async run() {}
+  public async run() {
+    this.applicationContext = await this.init();
+  }
 
   public async stop() {
     await destroyGlobalApplicationContext(this.applicationContext);
   }
 
+  public getApplicationContext() {
+    return this.applicationContext;
+  }
+
   protected getBaseDir() {
     if (this.globalOptions.baseDir) {
       return this.globalOptions.baseDir;
@@ -62,7 +68,6 @@ export class Bootstrap {
   private static starter: BootstrapStarter;
   private static logger: IMidwayLogger;
   private static configured = false;
-  private static applicationContext: IMidwayContainer;
 
   /**
    * set global configuration for midway
@@ -120,11 +125,11 @@ export class Bootstrap {
     this.unhandledRejectionHandler = this.unhandledRejectionHandler.bind(this);
     process.on('unhandledRejection', this.unhandledRejectionHandler);
 
-    this.applicationContext = await this.getStarter().init();
     return this.getStarter()
       .run()
       .then(() => {
         this.logger.info('[midway:bootstrap] current app started');
+        global['MIDWAY_BOOTSTRAP_APP_READY'] = true;
       })
       .catch(err => {
         this.logger.error(err);
@@ -140,6 +145,7 @@ export class Bootstrap {
       this.unhandledRejectionHandler
     );
     this.reset();
+    global['MIDWAY_BOOTSTRAP_APP_READY'] = false;
   }
 
   static reset() {
@@ -200,6 +206,6 @@ export class Bootstrap {
   }
 
   static getApplicationContext(): IMidwayContainer {
-    return this.applicationContext;
+    return this.getStarter().getApplicationContext();
   }
 }
diff --git a/packages/core/src/common/webGenerator.ts b/packages/core/src/common/webGenerator.ts
@@ -139,6 +139,7 @@ export abstract class WebControllerGenerator<
         }
 
         if (this.app.getFrameworkType() === MidwayFrameworkType.WEB_KOA) {
+          // egg use path-to-regexp v1 but koa use v6
           if (typeof routeInfo.url === 'string' && /\*$/.test(routeInfo.url)) {
             routeInfo.url = routeInfo.url.replace('*', '(.*)');
           }

diff --git a/packages/core/src/service/slsFunctionService.ts b/packages/core/src/service/slsFunctionService.ts
@@ -198,7 +198,7 @@ export class MidwayServerlessFunctionService extends MidwayWebRouterService {
       this.routes.set(prefix, []);
       this.routesPriority.push({
         prefix,
-        priority: -999,
+        priority: 0,
         middleware: [],
         routerOptions: {},
         controllerId: undefined,

diff --git a/packages/core/src/service/webRouterService.ts b/packages/core/src/service/webRouterService.ts
@@ -25,7 +25,7 @@ import {
   MidwayDuplicateRouteError,
 } from '../error';
 import * as util from 'util';
-import { pathToRegexp } from '../util/pathToRegexp';
+import { PathToRegexpUtil } from '../util/pathToRegexp';
 
 const debug = util.debuglog('midway:debug');
 
@@ -58,6 +58,9 @@ export interface RouterInfo {
    * router description
    */
   description?: string;
+  /**
+   * @deprecated
+   */
   summary?: string;
   /**
    * router handler function key，for IoC container load
@@ -104,10 +107,20 @@ export interface RouterInfo {
    */
   functionMetadata?: any;
 
+  /**
+   * url with prefix
+   */
+  fullUrl?: string;
+
   /**
    * pattern after path-regexp compile
    */
-  urlCompiledPattern?: RegExp;
+  fullUrlCompiledRegexp?: RegExp;
+
+  /**
+   * url after wildcard and can be path-to-regexp by path-to-regexp v6
+   */
+  fullUrlFlattenString?: string;
 }
 
 export type DynamicRouterInfo = Omit<
@@ -331,12 +344,15 @@ export class MidwayWebRouterService {
     routerInfoOption: DynamicRouterInfo
   ) {
     const prefix = routerInfoOption.prefix || '';
+    routerInfoOption.requestMethod = (
+      routerInfoOption.requestMethod || 'GET'
+    ).toUpperCase();
 
     if (!this.routes.has(prefix)) {
       this.routes.set(prefix, []);
       this.routesPriority.push({
         prefix,
-        priority: -999,
+        priority: 0,
         middleware: [],
         routerOptions: {},
         controllerId: undefined,
@@ -448,10 +464,10 @@ export class MidwayWebRouterService {
         this.includeCompileUrlPattern = true;
         // attach match pattern function
         for (const item of this.cachedFlattenRouteList) {
-          if (item.url) {
-            item.urlCompiledPattern = pathToRegexp(item.url, [], {
-              end: false,
-            });
+          if (item.fullUrlFlattenString) {
+            item.fullUrlCompiledRegexp = PathToRegexpUtil.toRegexp(
+              item.fullUrlFlattenString
+            );
           }
         }
       }
@@ -469,9 +485,11 @@ export class MidwayWebRouterService {
       this.includeCompileUrlPattern = true;
       // attach match pattern function
       for (const item of routeArr) {
-        item.urlCompiledPattern = pathToRegexp(item.url, [], {
-          end: false,
-        });
+        if (item.fullUrlFlattenString) {
+          item.fullUrlCompiledRegexp = PathToRegexpUtil.toRegexp(
+            item.fullUrlFlattenString
+          );
+        }
       }
     }
     this.cachedFlattenRouteList = routeArr;
@@ -487,10 +505,10 @@ export class MidwayWebRouterService {
     });
     let matchedRouterInfo;
     for (const item of routes) {
-      if (item.urlCompiledPattern) {
+      if (item.fullUrlCompiledRegexp) {
         if (
           method.toUpperCase() === item['requestMethod'].toUpperCase() &&
-          item.urlCompiledPattern.test(routerUrl)
+          item.fullUrlCompiledRegexp.test(routerUrl)
         ) {
           matchedRouterInfo = item;
           break;
@@ -517,6 +535,22 @@ export class MidwayWebRouterService {
         `${routerInfo.handlerName}`
       );
     }
+    // format url
+    if (
+      !routerInfo.fullUrlFlattenString &&
+      routerInfo.url &&
+      typeof routerInfo.url === 'string'
+    ) {
+      routerInfo.fullUrl = joinURLPath(prefix, routerInfo.url);
+      if (/\*$/.test(routerInfo.fullUrl)) {
+        routerInfo.fullUrlFlattenString = routerInfo.fullUrl.replace(
+          '*',
+          '(.*)'
+        );
+      } else {
+        routerInfo.fullUrlFlattenString = routerInfo.fullUrl;
+      }
+    }
     prefixList.push(routerInfo);
   }
 }
diff --git a/packages/core/src/util/index.ts b/packages/core/src/util/index.ts
@@ -2,7 +2,7 @@ import { dirname, resolve, sep, posix } from 'path';
 import { readFileSync } from 'fs';
 import { debuglog } from 'util';
 import * as transformer from 'class-transformer';
-import { pathToRegexp } from './pathToRegexp';
+import { PathToRegexpUtil } from './pathToRegexp';
 import { MidwayCommonError } from '../error';
 import { FunctionMiddleware } from '../interface';
 
@@ -259,7 +259,7 @@ export function toPathMatch(pattern) {
     return ctx => pattern;
   }
   if (typeof pattern === 'string') {
-    const reg = pathToRegexp(pattern, [], { end: false });
+    const reg = PathToRegexpUtil.toRegexp(pattern.replace('*', '(.*)'));
     if (reg.global) reg.lastIndex = 0;
     return ctx => reg.test(ctx.path);
   }