fix: web refactor case error

midwayjs · czy88840616 · Oct 27, 2020 · Oct 20, 2020 · Oct 21, 2020 · Oct 21, 2020
commit 692c32c744b7230a1c4a2419b605c344fee7aa92
diff --git a/packages/core/src/loader.ts b/packages/core/src/loader.ts
@@ -10,9 +10,6 @@ import {
 } from '@midwayjs/decorator';
 import { IMidwayContainer } from './interface';
 
-import { debuglog } from 'util';
-const debugLogger = debuglog('midway:loader');
-
 function buildLoadDir(baseDir, dir) {
   if (!path.isAbsolute(dir)) {
     return path.join(baseDir, dir);
@@ -29,10 +26,10 @@ export class ContainerLoader {
   disableConflictCheck: boolean;
   duplicatedLoader: boolean;
 
-  static contextCache = new Map();
-  static clearContextCache = () => {
-    ContainerLoader.contextCache.clear();
-  }
+  /**
+   * 单个进程中上一次的 applicationContext
+   */
+  static parentApplicationContext: IMidwayContainer;
 
   constructor({
     baseDir,
@@ -44,22 +41,20 @@ export class ContainerLoader {
     this.isTsMode = isTsMode;
     this.preloadModules = preloadModules;
     this.disableConflictCheck = disableConflictCheck;
-    this.duplicatedLoader = false;
+    // this.duplicatedLoader = false;
   }
 
   initialize() {
     this.pluginContext = new Container(this.baseDir);
-    if (ContainerLoader.contextCache.has(this.baseDir)) {
-      // 标识为重复的加载器，只做简单的缓存读取，单进程同一目录只扫描一次
-      this.duplicatedLoader = true;
-      this.applicationContext = ContainerLoader.contextCache.get(this.baseDir);
-    } else {
-      this.applicationContext = new MidwayContainer(this.baseDir, undefined);
-      this.applicationContext.disableConflictCheck = this.disableConflictCheck;
-      this.applicationContext.registerObject('baseDir', this.baseDir);
-      this.applicationContext.registerObject('isTsMode', this.isTsMode);
-      ContainerLoader.contextCache.set(this.baseDir, this.applicationContext);
-    }
+    this.applicationContext = new MidwayContainer(
+      this.baseDir,
+      ContainerLoader.parentApplicationContext
+    );
+    this.applicationContext.disableConflictCheck = this.disableConflictCheck;
+    this.applicationContext.registerObject('baseDir', this.baseDir);
+    this.applicationContext.registerObject('isTsMode', this.isTsMode);
+    // 保存到最新的上下文中，供其他容器获取
+    ContainerLoader.parentApplicationContext = this.applicationContext;
   }
 
   getApplicationContext(): IMidwayContainer {
@@ -86,10 +81,12 @@ export class ContainerLoader {
       ignore?: string | string[];
     } = {}
   ) {
-    if (this.duplicatedLoader) {
-      debugLogger(`This is a duplicate loader and skip loadDirectory, baseDir=${this.baseDir}`);
-      return;
-    }
+    // if (this.duplicatedLoader) {
+    //   debugLogger(
+    //     `This is a duplicate loader and skip loadDirectory, baseDir=${this.baseDir}`
+    //   );
+    //   return;
+    // }
     if (!this.isTsMode && loadOpts.disableAutoLoad === undefined) {
       // disable auto load in js mode by default
       loadOpts.disableAutoLoad = true;
@@ -118,10 +115,6 @@ export class ContainerLoader {
 
   async refresh() {
     await this.pluginContext.ready();
-    if (this.duplicatedLoader) {
-      debugLogger(`This is a duplicate loader and skip refresh, baseDir=${this.baseDir}`);
-      return;
-    }
     await this.applicationContext.ready();
 
     // some common decorator implementation
@@ -160,11 +153,6 @@ export class ContainerLoader {
 
   async stop() {
     await this.pluginContext.stop();
-    if (this.duplicatedLoader) {
-      debugLogger(`This is a duplicate loader and skip stop, baseDir=${this.baseDir}`);
-      return;
-    }
     await this.applicationContext.stop();
   }
-
 }
diff --git a/packages/core/test/loader.test.ts b/packages/core/test/loader.test.ts
@@ -19,7 +19,7 @@ class TestModule {
 describe('/test/loader.test.ts', () => {
   beforeEach(() => {
     clearAllModule();
-    ContainerLoader.clearContextCache();
+    ContainerLoader.parentApplicationContext = null;
   });
   it('should create new loader', async () => {
     const loader = new ContainerLoader({

diff --git a/packages/mock/src/utils.ts b/packages/mock/src/utils.ts
@@ -1,5 +1,6 @@
 import { BootstrapStarter } from '@midwayjs/bootstrap';
 import {
+  ContainerLoader,
   IMidwayApplication,
   IMidwayFramework,
   MidwayFrameworkType,
@@ -32,6 +33,7 @@ export async function create<
 ): Promise<T> {
   process.env.MIDWAY_TS_MODE = 'true';
   clearAllModule();
+  ContainerLoader.parentApplicationContext = null;
   let framework: T = null;
   let DefaultFramework = null;
 

diff --git a/packages/web/agent.js b/packages/web/agent.js
@@ -1,7 +1,7 @@
 'use strict';
 
 const { BootstrapStarter } = require('@midwayjs/bootstrap');
-const { MidwayWebFramework } = require('./src/framework');
+const { MidwayWebFramework } = require('./dist/framework');
 
 class AgentBootHook {
   constructor(app) {

diff --git a/packages/web/app.js b/packages/web/app.js
@@ -1,7 +1,7 @@
 'use strict';
 
-const { Bootstrap } = require('@midwayjs/bootstrap');
-const { MidwayWebFramework } = require('./src/framework');
+const { BootstrapStarter } = require('@midwayjs/bootstrap');
+const { MidwayWebFramework } = require('./dist/framework');
 const pathMatching = require('egg-path-matching');
 const { safelyGet } = require('@midwayjs/core');
 
@@ -25,10 +25,13 @@ class AppBootHook {
       app: this.app,
       globalConfig: this.app.config,
     });
-    Bootstrap.configure({
-      baseDir: this.app.appDir,
-    }).load(this.framework);
-    await Bootstrap.run();
+    this.bootstrap = new BootstrapStarter();
+    this.bootstrap
+      .configure({
+        baseDir: this.app.appDir,
+      })
+      .load(this.framework);
+    await this.bootstrap.init();
     this.app.options['webFramework'] = this.framework;
 
     // register plugin

diff --git a/packages/web/app/extend/application.js b/packages/web/app/extend/application.js
@@ -0,0 +1,17 @@
+module.exports = {
+  get appOptions() {
+    return this.options;
+  },
+
+  get midwayWebFramework() {
+    return this.appOptions['webFramework'];
+  },
+
+  get applicationContext() {
+    return this.midwayWebFramework.getApplicationContext();
+  },
+
+  get baseDir() {
+    return this.loader.baseDir;
+  },
+};
diff --git a/packages/web/src/application.ts b/packages/web/src/application.ts
@@ -1,9 +1,8 @@
-import type { MidwayWebFramework } from './framework';
-import { RouterParamValue } from '@midwayjs/decorator';
+// import type { MidwayWebFramework } from './framework';
+// import { RouterParamValue } from '@midwayjs/decorator';
 import { parseNormalDir } from './utils';
 import * as extend from 'extend2';
 import { EggAppInfo } from 'egg';
-import { IMidwayWebApplication } from './interface';
 import { join } from 'path';
 
 const {
@@ -18,24 +17,17 @@ const EGG_PATH = Symbol.for('egg#eggPath');
 
 export const createAppWorkerLoader = AppWorkerLoader => {
   class EggAppWorkerLoader extends (AppWorkerLoader as any) {
-    app: IMidwayWebApplication & {
-      appOptions: {
-        typescript?: boolean;
-        isTsMode?: boolean;
-      };
-      appDir: string;
-      baseDir: string;
-    };
+    app: any;
 
     getEggPaths() {
       if (!this.appDir) {
         // 这里的逻辑是为了兼容老 cluster 模式
-        if (this.app.appOptions.typescript || this.app.appOptions.isTsMode) {
+        if (this.app.options.typescript || this.app.options.isTsMode) {
           process.env.EGG_TYPESCRIPT = 'true';
         }
         const result = parseNormalDir(
-          this.app.appOptions['baseDir'],
-          this.app.appOptions.isTsMode
+          this.app.options['baseDir'],
+          this.app.options.isTsMode
         );
         this.baseDir = result.baseDir;
         this.options.baseDir = this.baseDir;
@@ -72,12 +64,12 @@ export const createAgentWorkerLoader = AppWorkerLoader => {
   class EggAppWorkerLoader extends (AppWorkerLoader as any) {
     getEggPaths() {
       if (!this.appDir) {
-        if (this.app.appOptions.typescript || this.app.appOptions.isTsMode) {
+        if (this.app.options.typescript || this.app.options.isTsMode) {
           process.env.EGG_TYPESCRIPT = 'true';
         }
         const result = parseNormalDir(
-          this.app.appOptions['baseDir'],
-          this.app.appOptions.isTsMode
+          this.app.options['baseDir'],
+          this.app.options.isTsMode
         );
         this.baseDir = result.baseDir;
         this.options.baseDir = this.baseDir;
@@ -123,42 +115,42 @@ export const createEggApplication = Application => {
     get [EGG_PATH]() {
       return __dirname;
     }
-
-    get appOptions() {
-      return this.options;
-    }
-
-    get midwayWebFramework(): MidwayWebFramework {
-      return this.appOptions['webFramework'];
-    }
-
-    get applicationContext() {
-      return this.midwayWebFramework.getApplicationContext();
-    }
-
-    getApplicationContext() {
-      return this.applicationContext;
-    }
-
-    generateController(
-      controllerMapping: string,
-      routeArgsInfo?: RouterParamValue[],
-      routerResponseData?: any[]
-    ) {
-      return this.midwayWebFramework.generateController(
-        controllerMapping,
-        routeArgsInfo,
-        routerResponseData
-      );
-    }
-
-    async generateMiddleware(middlewareId: string) {
-      return this.midwayWebFramework.generateMiddleware(middlewareId);
-    }
-
-    get baseDir() {
-      return this.loader.baseDir;
-    }
+    //
+    // get appOptions() {
+    //   return this.options;
+    // }
+    //
+    // get midwayWebFramework(): MidwayWebFramework {
+    //   return this.appOptions['webFramework'];
+    // }
+    //
+    // get applicationContext() {
+    //   return this.midwayWebFramework.getApplicationContext();
+    // }
+    //
+    // getApplicationContext() {
+    //   return this.applicationContext;
+    // }
+    //
+    // generateController(
+    //   controllerMapping: string,
+    //   routeArgsInfo?: RouterParamValue[],
+    //   routerResponseData?: any[]
+    // ) {
+    //   return this.midwayWebFramework.generateController(
+    //     controllerMapping,
+    //     routeArgsInfo,
+    //     routerResponseData
+    //   );
+    // }
+    //
+    // async generateMiddleware(middlewareId: string) {
+    //   return this.midwayWebFramework.generateMiddleware(middlewareId);
+    // }
+    //
+    // get baseDir() {
+    //   return this.loader.baseDir;
+    // }
   }
 
   return EggApplication as any;
@@ -178,26 +170,6 @@ export const createEggAgent = Agent => {
     get [EGG_PATH]() {
       return __dirname;
     }
-
-    get appOptions() {
-      return this.options;
-    }
-
-    get midwayWebFramework(): MidwayWebFramework {
-      return this.appOptions['webFramework'];
-    }
-
-    get applicationContext() {
-      return this.midwayWebFramework.getApplicationContext();
-    }
-
-    getApplicationContext() {
-      return this.applicationContext;
-    }
-
-    get baseDir() {
-      return this.loader.baseDir;
-    }
   }
 
   return EggAgent as any;

diff --git a/packages/web/src/devFramework.ts b/packages/web/src/devFramework.ts
@@ -22,7 +22,15 @@ export class MidwayDevFramework
     return MidwayFrameworkType.WEB;
   }
 
-  public async run(): Promise<void> {}
+  public async run(): Promise<void> {
+    if (this.configurationOptions.port) {
+      new Promise(resolve => {
+        this.app.listen(this.configurationOptions.port, () => {
+          resolve();
+        });
+      });
+    }
+  }
 
   configure(options: IMidwayWebConfigurationOptions): MidwayDevFramework {
     this.configurationOptions = options;

diff --git a/packages/web/src/framework.ts b/packages/web/src/framework.ts
@@ -50,7 +50,7 @@ export class MidwayWebFramework extends MidwayKoaBaseFramework<
       this.getApplicationContext()
         .getConfigService()
         .addObject(this.configurationOptions.globalConfig);
-
+      console.log('4444444');
       Object.defineProperty(this.app, 'config', {
         get() {
           return self.getConfiguration();
@@ -83,8 +83,7 @@ export class MidwayWebFramework extends MidwayKoaBaseFramework<
 
   protected async afterInitialize(
     options: Partial<IMidwayBootstrapOptions>
-  ): Promise<void> {
-  }
+  ): Promise<void> {}
 
   public getApplication(): Application {
     return this.app;
@@ -97,15 +96,7 @@ export class MidwayWebFramework extends MidwayKoaBaseFramework<
   /**
    * 这个方法 egg-cluster 不走，只有单进程模式使用 @midwayjs/bootstrap 才会执行
    */
-  public async run(): Promise<void> {
-    if (this.configurationOptions.port) {
-      new Promise(resolve => {
-        this.app.listen(this.configurationOptions.port, () => {
-          resolve();
-        });
-      });
-    }
-  }
+  public async run(): Promise<void> {}
 
   /**
    * 这个方法 egg-cluster 不走，只有单进程模式使用 @midwayjs/bootstrap 才会执行