feat: support local single function to set multiple paths (#158)

midwayjs · May 6, 2020 · c21044d · c21044d
1 parent 53f40ef
commit c21044d
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 11 deletions.
diff --git a/packages/gateway-common-http/src/common.ts b/packages/gateway-common-http/src/common.ts
@@ -23,9 +23,6 @@ export async function parseInvokeOptionsByOriginUrl(
       }
     }
   }
-  if (currentUrl === '/favicon.ico') {
-    return {};
-  }
   const invokeOptions: Partial<InvokeOptions> = {};
   invokeOptions.functionDir = options.functionDir;
   invokeOptions.sourceDir = options.sourceDir;
@@ -46,16 +43,19 @@ export async function parseInvokeOptionsByOriginUrl(
   let urlMatchList = [];
   Object.keys(functions).forEach((functionName) => {
     const functionItem = functions[functionName] || {};
-    const event = (functionItem.events || []).find((eventItem: any) => {
+    const httpEvents = (functionItem.events || []).filter((eventItem: any) => {
       return eventItem.http || eventItem.apigw;
     });
-    const eventItem = event?.http || event?.apigw;
-    if (eventItem) {
-      urlMatchList.push({
-        functionName,
-        originRouter: eventItem.path || '/*',
-        router: eventItem.path?.replace(/\/\*$/, '/**') || '/**',
-      });
+
+    for( const event of httpEvents) {
+      const eventItem = event?.http || event?.apigw;
+      if (eventItem) {
+        urlMatchList.push({
+          functionName,
+          originRouter: eventItem.path || '/*',
+          router: eventItem.path?.replace(/\/\*$/, '/**') || '/**',
+        });
+      }
     }
   });
   // 1. 绝对路径规则优先级最高如 /ab/cb/e

diff --git a/packages/gateway-common-http/test/fixtures/ice-demo-repo/f.yml b/packages/gateway-common-http/test/fixtures/ice-demo-repo/f.yml
@@ -10,6 +10,8 @@ functions:
     events:
       - http:
           path: /server/user/info
+      - http:
+          path: /server/user/info2
   test2:
     handler: test2.handler
     events:

diff --git a/packages/gateway-common-http/test/index.test.ts b/packages/gateway-common-http/test/index.test.ts
@@ -73,6 +73,22 @@ describe('/test/index.test.ts', () => {
         .expect(200, done);
     });
 
+    it('test second url /server/user/info2', (done) => {
+      createExpressSuit({
+        functionDir: join(__dirname, './fixtures/ice-demo-repo'),
+        sourceDir: 'src/apis',
+      })
+        .post('/server/user/info2')
+        .query({
+          action: 'doTest',
+        })
+        .send({ name: 'zhangting' })
+        .expect('Content-type', 'text/html; charset=utf-8')
+        .expect(/zhangting,hello http world,doTest/)
+        .expect('x-schema', 'bbb')
+        .expect(200, done);
+    });
+
     it('test /* router', (done) => {
       createExpressSuit({
         functionDir: join(__dirname, './fixtures/ice-demo-repo'),
@@ -139,6 +155,22 @@ describe('/test/index.test.ts', () => {
       .expect(200, done);
   });
 
+  it('should invoke second url by http api and koa', (done) => {
+    createKoaSuit({
+      functionDir: join(__dirname, './fixtures/ice-demo-repo'),
+      sourceDir: 'src/apis',
+    })
+      .post('/server/user/info2')
+      .query({
+        action: 'doTest',
+      })
+      .send({ name: 'zhangting' })
+      .expect('Content-type', 'text/html; charset=utf-8')
+      .expect(/zhangting,hello http world,doTest/)
+      .expect('x-schema', 'bbb')
+      .expect(200, done);
+  });
+
   describe('test koa ignore pattern', () => {
     it('should test ignore pattern', (done) => {
       createKoaSuit({