fix: aggregation path (#567)

midwayjs · Jul 27, 2020 · 11a6d8a · 11a6d8a
1 parent c0efdd3
commit 11a6d8a
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 7 deletions.
diff --git a/packages/serverless-spec-builder/src/wrapper.ts b/packages/serverless-spec-builder/src/wrapper.ts
@@ -136,8 +136,11 @@ export function formetAggregationHandlers(handlers) {
       };
     })
     .sort((handlerA, handlerB) => {
-      if (handlerA.pureRouter === handlerB.pureRouter) {
-        return handlerA.router.length - handlerB.router.length;
+      if (handlerA.level === handlerB.level) {
+        if (handlerB.pureRouter === handlerA.pureRouter) {
+          return handlerA.router.length - handlerB.router.length;
+        }
+        return handlerB.pureRouter.length - handlerA.pureRouter.length;
       }
       return handlerB.level - handlerA.level;
     });

diff --git a/packages/serverless-spec-builder/test/fixtures/wrapper/aggre.js b/packages/serverless-spec-builder/test/fixtures/wrapper/aggre.js
@@ -8,24 +8,42 @@ let starter;
 let runtime;
 let inited = false;
 
+
 const initializeMethod = async (initializeContext = {}) => {
 
   runtime = await start({
     layers: [],
     getHandler: getHandler
   });
-  starter = new FaaSStarter({ baseDir: __dirname, initializeContext, applicationAdapter: runtime, middleware: ["test1","test2"] });
+  starter = new FaaSStarter({ baseDir: __dirname, initializeContext, applicationAdapter: runtime, middleware: [
+  "test1",
+  "test2"
+] });
 
 
   await starter.start();
    inited = true; 
+
 };
 
 const getHandler = (hanlderName) => {
 
     if (hanlderName === 'handler') {
       return  async (ctx) => {
-        const allHandlers = [{"handler":"index.handler","router":"/api/test","pureRouter":"/api/test","level":2},{"handler":"render.handler","router":"/**","pureRouter":"/","level":1}];
+        const allHandlers = [
+  {
+    "handler": "index.handler",
+    "router": "/api/test",
+    "pureRouter": "/api/test",
+    "level": 2
+  },
+  {
+    "handler": "render.handler",
+    "router": "/**",
+    "pureRouter": "/",
+    "level": 1
+  }
+];
         let handler = null;
         let ctxPath = ctx && ctx.path || '';
         if (ctxPath) {
@@ -46,6 +64,8 @@ const getHandler = (hanlderName) => {
 }
 
 
+
+
 exports.initializeUserDefine = asyncWrapper(async (...args) => {
   if (!inited) {
     await initializeMethod(...args);
@@ -57,7 +77,9 @@ exports.handler = asyncWrapper(async (...args) => {
   if (!inited) {
     await initializeMethod();
   }
+
 
   const handler = getHandler('handler');
   return runtime.asyncEvent(handler)(...args);
 });
+
diff --git a/packages/serverless-spec-builder/test/fixtures/wrapper/index.js b/packages/serverless-spec-builder/test/fixtures/wrapper/index.js
@@ -8,17 +8,22 @@ let starter;
 let runtime;
 let inited = false;
 
+
 const initializeMethod = async (initializeContext = {}) => {
 
   runtime = await start({
     layers: [],
     getHandler: getHandler
   });
-  starter = new FaaSStarter({ baseDir: __dirname, initializeContext, applicationAdapter: runtime, middleware: ["test1","test2"] });
+  starter = new FaaSStarter({ baseDir: __dirname, initializeContext, applicationAdapter: runtime, middleware: [
+  "test1",
+  "test2"
+] });
 
 
   await starter.start();
    inited = true; 
+
 };
 
 const getHandler = (hanlderName) => {
@@ -30,6 +35,8 @@ const getHandler = (hanlderName) => {
 }
 
 
+
+
 exports.initializeUserDefine = asyncWrapper(async (...args) => {
   if (!inited) {
     await initializeMethod(...args);
@@ -41,7 +48,9 @@ exports.handler = asyncWrapper(async (...args) => {
   if (!inited) {
     await initializeMethod();
   }
+
 
   const handler = getHandler('handler');
   return runtime.asyncEvent(handler)(...args);
 });
+
diff --git a/packages/serverless-spec-builder/test/fixtures/wrapper/render.js b/packages/serverless-spec-builder/test/fixtures/wrapper/render.js
@@ -8,17 +8,22 @@ let starter;
 let runtime;
 let inited = false;
 
+
 const initializeMethod = async (initializeContext = {}) => {
 
   runtime = await start({
     layers: [],
     getHandler: getHandler
   });
-  starter = new FaaSStarter({ baseDir: __dirname, initializeContext, applicationAdapter: runtime, middleware: ["test1","test2"] });
+  starter = new FaaSStarter({ baseDir: __dirname, initializeContext, applicationAdapter: runtime, middleware: [
+  "test1",
+  "test2"
+] });
 
 
   await starter.start();
    inited = true; 
+
 };
 
 const getHandler = (hanlderName) => {
@@ -30,6 +35,8 @@ const getHandler = (hanlderName) => {
 }
 
 
+
+
 exports.initializeUserDefine = asyncWrapper(async (...args) => {
   if (!inited) {
     await initializeMethod(...args);
@@ -41,7 +48,9 @@ exports.handler = asyncWrapper(async (...args) => {
   if (!inited) {
     await initializeMethod();
   }
+
 
   const handler = getHandler('handler');
   return runtime.asyncEvent(handler)(...args);
 });
+
diff --git a/packages/serverless-spec-builder/test/wrapper.test.ts b/packages/serverless-spec-builder/test/wrapper.test.ts
@@ -1,4 +1,4 @@
-import { writeWrapper } from '../src/wrapper';
+import { writeWrapper, formetAggregationHandlers } from '../src/wrapper';
 import { resolve } from 'path';
 import * as assert from 'assert';
 import { existsSync, readFileSync, remove } from 'fs-extra';
@@ -140,4 +140,22 @@ describe('/test/wrapper.test.ts', () => {
       );
     });
   });
+  it('formetAggregationHandlers', async () => {
+    const formatResult = formetAggregationHandlers([
+      { path: '/api/1' },
+      { path: '/api/' },
+      { path: '/' },
+      { path: '/api/*' },
+      { path: '/api2' },
+      { path: '/api/2' },
+      { path: '/api' },
+      { path: '/*' },
+    ]);
+    assert(formatResult[2].router === '/api/');
+    assert(formatResult[3].router === '/api/**');
+    assert(formatResult[4].router === '/api2');
+    assert(formatResult[5].router === '/api');
+    assert(formatResult[6].router === '/');
+    assert(formatResult[7].router === '/**');
+  });
 });