fix: Fix inner mw (#170)

midwayjs · May 18, 2020 · aa91d29 · aa91d29
1 parent 6d5a3d9
commit aa91d29
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/packages/faas/src/configuration.ts b/packages/faas/src/configuration.ts
@@ -14,7 +14,7 @@ export class FaaSContainerConfiguration implements ILifeCycle {
 
   async onReady() {
     // add middleware from user config
-    if (this.app?.use) {
+    if (this.app?.use && this.middleware?.length) {
       await this.app.useMiddleware(this.middleware);
     }
   }

diff --git a/packages/faas/src/starter.ts b/packages/faas/src/starter.ts
@@ -157,7 +157,9 @@ export class FaaSStarter implements IFaaSStarter {
 
       if (funOptions && funOptions.mod) {
         // invoke middleware, just for http
-        const fnMiddlewere = [].concat(funOptions.middleware);
+        let fnMiddlewere = [];
+        fnMiddlewere = fnMiddlewere.concat(this.globalMiddleware);
+        fnMiddlewere = fnMiddlewere.concat(funOptions.middleware);
         if (fnMiddlewere.length) {
           const mw: any[] = await this.loadMiddleware(fnMiddlewere);
           mw.push(async ctx => {
@@ -260,12 +262,6 @@ export class FaaSStarter implements IFaaSStarter {
         await this.getApplicationContext().getAsync(module);
       }
 
-      // load global web middleware
-      const globalMW = await this.loadMiddleware(this.globalMiddleware);
-      for (const mw of globalMW) {
-        this.webApplication.use(mw as any);
-      }
-
       // now only for test case
       if (typeof opts.cb === 'function') {
         await opts.cb();