fix: delay load without layer and egg-cluster (#985)

* fix: delay load without layer and egg-cluster

* fix: listener after app close

* fix: lint

* chore: clean resource when stop app

* fix: lint

* chore: add output

* fix: clear set

packages/bootstrap/src/bootstrap.ts

@@ -120,6 +120,7 @@ export class BootstrapStarter {
 
   public async stop() {
     await Promise.all(this.getActions('stop', {}));
+    global['MIDWAY_BOOTSTRAP_APP_READY'] = false;
   }
 
   public getActions(action: string, args?): any[] {
@@ -256,6 +257,7 @@ export class Bootstrap {
 
   static async stop() {
     await this.getStarter().stop();
+    this.reset();
   }
 
   static reset() {

packages/midway-schedule/agent.ts

@@ -11,20 +11,47 @@ export = agent => {
     return;
   }
 
+  const STRATEGY = Object.getOwnPropertySymbols(agent.schedule)[0];
+  const STRATEGY_INSTANCE = Object.getOwnPropertySymbols(agent.schedule)[1];
+
   // ugly!! just support all and worker strategy
   class AllStrategy extends agent['TimerScheduleStrategy'] {
+    timer;
     handler() {
       this.sendAll();
     }
+
+    safeTimeout(...args) {
+      this.timer = super.safeTimeout(...args);
+      return this.timer;
+    }
+    close() {
+      clearTimeout(this.timer);
+    }
   }
 
   class WorkerStrategy extends agent['TimerScheduleStrategy'] {
+    timer;
     handler() {
       this.sendOne();
     }
+    safeTimeout(...args) {
+      this.timer = super.safeTimeout(...args);
+      return this.timer;
+    }
+    close() {
+      clearTimeout(this.timer);
+    }
   }
 
-  const strategyMap = new Map();
+  agent.schedule.close = () => {
+    agent.schedule.closed = true;
+    for (const instance of agent.schedule[STRATEGY_INSTANCE].values()) {
+      instance.close();
+    }
+  };
+
+  const strategyMap = agent.schedule[STRATEGY];
   strategyMap.set('worker', WorkerStrategy);
   strategyMap.set('all', AllStrategy);
 

packages/midway-schedule/test/schedule.test.ts

@@ -44,10 +44,11 @@ describe('test/schedule.test.ts', () => {
       await application.runSchedule('intervalCron#IntervalCron');
       await application.runSchedule(IntervalCron2 as any);
       await sleep(1000);
-      const log = getLogContent('worker-other');
+
       // console.log(log);
-      expect(contains(log, 'hello decorator')).toEqual(1);
-      expect(contains(log, 'hello decorator2')).toEqual(1);
+      const log = getLogContent('worker-other');
+      expect(contains(log, 'hello decorator')).toBeGreaterThanOrEqual(1);
+      expect(contains(log, 'hello decorator2')).toBeGreaterThanOrEqual(1);
       await closeApp(application);
     });
   });

packages/midway-schedule/test/utils.ts

@@ -1,9 +1,11 @@
 import { IMidwayWebConfigurationOptions, Framework } from '../../web/src';
 import { join } from 'path';
 import { createApp, close } from '@midwayjs/mock';
+import { remove } from 'fs-extra';
 
 export async function create(name, options: IMidwayWebConfigurationOptions = {}) {
   const baseDir = join(__dirname, 'fixtures', name);
+  await remove(join(baseDir, 'logs'));
   return createApp<Framework>(baseDir, options, Framework)
 }
 

packages/mock/src/utils.ts

@@ -88,6 +88,7 @@ export async function create<
     clearAllModule();
   }
   lastAppDir = appDir;
+  global['MIDWAY_BOOTSTRAP_APP_SET'].clear();
   clearContainerCache();
   clearAllLoggers();
 

packages/rabbitmq/src/framework.ts

@@ -45,6 +45,7 @@ export class MidwayRabbitMQFramework extends BaseFramework<
 
   public async run(): Promise<void> {
     await Promise.all(this.consumerList);
+    this.logger.info('Rabbitmq server start success');
   }
 
   protected async beforeStop(): Promise<void> {

packages/socketio/src/framework.ts

@@ -56,13 +56,19 @@ export class MidwaySocketIOFramework extends BaseFramework<
         this.applicationContext.get(HTTP_SERVER_KEY),
         this.configurationOptions
       );
+      this.logger.info(
+        'Socket.io server start success and attach to web server'
+      );
     } else {
       // listen port when http server not exist
       if (this.configurationOptions.port) {
         this.app.listen(
           this.configurationOptions.port,
           this.configurationOptions
         );
+        this.logger.info(
+          `Socket.io server port = ${this.configurationOptions.port} start success`
+        );
       }
     }
   }

packages/web/package.json

@@ -6,8 +6,8 @@
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "midway-bin build -c",
-    "test": "midway-bin test --ts --forceExit",
-    "cov": "midway-bin cov --ts --forceExit",
+    "test": "midway-bin test --ts",
+    "cov": "midway-bin cov --ts",
     "link": "npm link"
   },
   "keywords": [

packages/web/src/base.ts

@@ -131,7 +131,7 @@ export const createAppWorkerLoader = () => {
         })
         .load(this.framework);
 
-      if (this.app.options['mode'] !== 'single') {
+      if (this.app.options['midwaySingleton'] !== true) {
         // 这个代码只会在 egg-cluster 模式下执行
         this.app.beforeStart(async () => {
           await this.bootstrap.init();

packages/web/src/framework/singleProcess.ts

@@ -16,6 +16,7 @@ import { MidwayKoaContextLogger } from '@midwayjs/koa';
 export class MidwayWebSingleProcessFramework
   implements IMidwayFramework<Application, IMidwayWebConfigurationOptions> {
   public app: Application;
+  public agent;
   public configurationOptions: IMidwayWebConfigurationOptions;
   private isTsMode: boolean;
   private server: Server;
@@ -68,11 +69,12 @@ export class MidwayWebSingleProcessFramework
       mode: 'single',
       isTsMode: this.isTsMode || true,
       applicationContext: options.applicationContext,
+      midwaySingleton: true,
     };
 
     const Agent = require(opts.framework).Agent;
     const Application = require(opts.framework).Application;
-    const agent = new Agent(Object.assign({}, opts));
+    const agent = (this.agent = new Agent(Object.assign({}, opts)));
     await agent.ready();
     const application = (this.app = new Application(Object.assign({}, opts)));
     application.agent = agent;
@@ -118,7 +120,11 @@ export class MidwayWebSingleProcessFramework
   }
 
   async stop(): Promise<void> {
+    await new Promise(resolve => {
+      this.server.close(resolve);
+    });
     await this.app.close();
+    await this.agent.close();
   }
 
   getBaseDir(): string {

packages/web/test/logger.test.ts

@@ -17,6 +17,7 @@ describe('test/logger.test.js', () => {
     mm(process.env, 'EGG_SERVER_ENV', 'local');
     mm(process.env, 'EGG_LOG', 'WARN');
     const logsDir = join(__dirname, 'fixtures/apps/mock-dev-app-logger/logs/ali-demo');
+    await remove(logsDir);
     await ensureDir(logsDir);
     const app = await creatApp('apps/mock-dev-app-logger', { cleanLogsDir: false});
     app.coreLogger.warn('custom content');