fix: fix global middleware load order (#594)

midwayjs · Aug 11, 2020 · 137dd03 · 137dd03
1 parent 016e430
commit 137dd03
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 17 deletions.
diff --git a/packages/faas/src/configuration.ts b/packages/faas/src/configuration.ts
@@ -1,4 +1,4 @@
-import { Configuration, App, Config } from '@midwayjs/decorator';
+import { Configuration, App } from '@midwayjs/decorator';
 import { ILifeCycle } from '@midwayjs/core';
 import { IFaaSApplication } from './interface';
 
@@ -9,13 +9,5 @@ export class FaaSContainerConfiguration implements ILifeCycle {
   @App()
   app: IFaaSApplication;
 
-  @Config('middleware')
-  middleware: string[];
-
-  async onReady() {
-    // add middleware from user config
-    if (this.app?.use && this.middleware?.length) {
-      await this.app.useMiddleware(this.middleware);
-    }
-  }
+  async onReady() {}
 }
diff --git a/packages/faas/src/starter.ts b/packages/faas/src/starter.ts
@@ -234,12 +234,15 @@ export class FaaSStarter implements IFaaSStarter {
       this.registerDecorator();
       await this.loader.refresh();
 
-      // merge app middleware to global
-      if (this.webApplication?.['middleware']?.length) {
+      // attach global middleawre from user config
+      if (this.webApplication?.use) {
+        const middlewares = this.webApplication.getConfig('middleware') || [];
+        await this.webApplication.useMiddleware(middlewares);
         this.globalMiddleware = this.globalMiddleware.concat(
           this.webApplication['middleware']
         );
       }
+
       // set app keys
       this.webApplication['keys'] = this.webApplication.getConfig('keys') || '';
 
@@ -349,9 +352,11 @@ export class FaaSStarter implements IFaaSStarter {
       },
 
       useMiddleware: async middlewares => {
-        const newMiddlewares = await this.loadMiddleware(middlewares);
-        for (const mw of newMiddlewares) {
-          this.webApplication.use(mw);
+        if (middlewares.length) {
+          const newMiddlewares = await this.loadMiddleware(middlewares);
+          for (const mw of newMiddlewares) {
+            this.webApplication.use(mw);
+          }
         }
       },
     });

diff --git a/packages/faas/test/fixtures/base-app-middleware/src/configuration.ts b/packages/faas/test/fixtures/base-app-middleware/src/configuration.ts
@@ -3,4 +3,8 @@ import { Configuration } from '@midwayjs/decorator';
 @Configuration({
   importConfigs: ['./config.default'],
 })
-export class AutoConfiguraion {}
+export class AutoConfiguraion {
+  async onReady(container) {
+    container.registerObject('adb', { data: '123' });
+  }
+}
diff --git a/packages/faas/test/fixtures/base-app-middleware/src/mw/test.ts b/packages/faas/test/fixtures/base-app-middleware/src/mw/test.ts
@@ -1,10 +1,14 @@
-import { Provide } from '@midwayjs/decorator';
+import { Provide, Inject } from '@midwayjs/decorator';
 import * as assert from 'assert';
 
 @Provide()
 export class TestMiddleware {
+  @Inject()
+  adb: any;
+
   resolve() {
     return async (ctx, next) => {
+      assert(this.adb);
       assert(ctx.logger);
       ctx.requestId = 555;
       await next();