fix: faas middle http (#570)

midwayjs · Jul 27, 2020 · 27de83b · 27de83b
1 parent 9074d7c
commit 27de83b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/packages/faas-cli-plugin-package/src/index.ts b/packages/faas-cli-plugin-package/src/index.ts
@@ -606,8 +606,8 @@ export class PackagePlugin extends BasePlugin {
               delete this.core.service.functions[functionName];
             }
             return {
+              ...func,
               path: httpEvent.http.path,
-              handler: func.handler,
             };
           })
           .filter((func: any) => !!func);

diff --git a/packages/faas/src/starter.ts b/packages/faas/src/starter.ts
@@ -157,9 +157,11 @@ export class FaaSStarter implements IFaaSStarter {
       const context: FaaSContext = this.getContext(args.shift());
 
       if (funOptions && funOptions.mod) {
-        // invoke middleware, just for http
         let fnMiddlewere = [];
-        fnMiddlewere = fnMiddlewere.concat(this.globalMiddleware);
+        // invoke middleware, just for http
+        if (context.headers && context.get) {
+          fnMiddlewere = fnMiddlewere.concat(this.globalMiddleware);
+        }
         fnMiddlewere = fnMiddlewere.concat(funOptions.middleware);
         if (fnMiddlewere.length) {
           const mw: any[] = await this.loadMiddleware(fnMiddlewere);

diff --git a/packages/serverless-spec-builder/src/wrapper.ts b/packages/serverless-spec-builder/src/wrapper.ts
@@ -36,15 +36,13 @@ export function writeWrapper(options: {
   const functions = service.functions || {};
   for (const func in functions) {
     const handlerConf = functions[func];
+
     // for fp
-    if (handlerConf.isFunctional) {
-      if (!functionMap?.functionList) {
-        functionMap = { functionList: [] };
-      }
-      functionMap.functionList.push({
-        functionName: handlerConf.exportFunction,
-        functionHandler: handlerConf.handler,
-        functionFilePath: handlerConf.sourceFilePath,
+    functionMap = assignToFunctionMap(functionMap, handlerConf);
+    // for aggregation fp
+    if (handlerConf._handlers) {
+      handlerConf._handlers.forEach(innerHandlerConf => {
+        functionMap = assignToFunctionMap(functionMap, innerHandlerConf);
       });
     }
 
@@ -122,6 +120,20 @@ export function writeWrapper(options: {
   }
 }
 
+const assignToFunctionMap = (functionMap, handlerConf) => {
+  if (handlerConf.isFunctional) {
+    if (!functionMap?.functionList) {
+      functionMap = { functionList: [] };
+    }
+    functionMap.functionList.push({
+      functionName: handlerConf.exportFunction,
+      functionHandler: handlerConf.handler,
+      functionFilePath: handlerConf.sourceFilePath,
+    });
+  }
+  return functionMap;
+};
+
 export function formetAggregationHandlers(handlers) {
   if (!handlers || !handlers.length) {
     return [];