core: 优化钩子逻辑

packages/hydrooj/src/entry/cli.ts

@@ -5,6 +5,7 @@ import {
     lib, service, model,
     builtinLib, builtinModel,
 } from './common';
+import * as bus from '../service/bus';
 
 const COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
 const ARR = /=>.*$/mg;
@@ -51,13 +52,8 @@ export async function load() {
     require('../utils');
     require('../error');
     require('../options');
-    const bus = require('../service/bus');
     await new Promise((resolve) => {
-        const h = () => {
-            bus.unsubscribe(['system_database_connected'], h);
-            resolve();
-        };
-        bus.subscribe(['system_database_connected'], h);
+        bus.once('database/connect', resolve);
         require('../service/db');
     });
     for (const i of builtinLib) require(`../lib/${i}`);
@@ -66,6 +62,6 @@ export async function load() {
     await service(pending, fail);
     for (const i of builtinModel) require(`../model/${i}`);
     await model(pending, fail);
-    for (const postInit of global.Hydro.postInit) await postInit();
+    await bus.parallel('app/started');
     await cli();
 }

packages/hydrooj/src/entry/master.ts

@@ -7,6 +7,7 @@ import pslist from 'ps-list';
 import { argv } from 'yargs';
 import { builtinModel } from './common';
 import { Entry } from '../loader';
+import * as bus from '../service/bus';
 
 const tmpdir = path.resolve(os.tmpdir(), 'hydro');
 const lockfile = path.resolve(tmpdir, 'lock.json');
@@ -31,9 +32,6 @@ export async function load(call: Entry) {
         ppid: process.ppid,
     };
     await fs.writeFile(lockfile, JSON.stringify(context));
-    global.onDestory.push(() => {
-        fs.removeSync(lockfile);
-    });
     require('../lib/i18n');
     require('../utils');
     require('../error');
@@ -45,14 +43,15 @@ export async function load(call: Entry) {
             process.exit(1);
         });
     }
-    const bus = require('../service/bus');
+    bus.once('app/exit', () => {
+        fs.removeSync(lockfile);
+    });
     await new Promise((resolve) => {
         const h = () => {
             console.log('Database connected');
-            bus.unsubscribe(['system_database_connected'], h);
             resolve();
         };
-        bus.subscribe(['system_database_connected'], h);
+        bus.once('database/connect', h);
         require('../service/db');
     });
     require('../service/monitor');
@@ -63,11 +62,6 @@ export async function load(call: Entry) {
         const ins = require('../script/upgrade0_1');
         await ins.run({ username: 'Root', password: 'rootroot' });
     }
-    for (const postInit of global.Hydro.postInit) {
-        await postInit().catch((e) => {
-            console.error('Error running postInit:', postInit.toString());
-            console.error(e);
-        });
-    }
+    bus.serial('app/started');
     return await modelSystem.get('server.worker');
 }

packages/hydrooj/src/entry/worker.ts

@@ -4,6 +4,7 @@ import {
     locale, template, lib, service, model, handler, script, setting, uistatic,
     builtinLib, builtinScript, builtinHandler, builtinModel,
 } from './common';
+import * as bus from '../service/bus';
 
 export async function load() {
     const pending = global.addons;
@@ -18,14 +19,12 @@ export async function load() {
         template(pending, fail),
         uistatic(pending, fail),
     ]);
-    const bus = require('../service/bus');
     await new Promise((resolve) => {
         const h = () => {
             console.log('Database connected');
-            bus.unsubscribe(['system_database_connected'], h);
             resolve();
         };
-        bus.subscribe(['system_database_connected'], h);
+        bus.once('database/connect', h);
         require('../service/db');
     });
     for (const i of builtinLib) require(`../lib/${i}`);
@@ -48,7 +47,7 @@ export async function load() {
     await notfound.apply();
     for (const i of builtinScript) require(`../script/${i}`);
     await script(pending, fail, active);
-    for (const postInit of global.Hydro.postInit) await postInit();
+    await bus.serial('app/started');
     await server.start();
     setInterval(() => {
         process.send({ event: 'stat', count: global.Hydro.stat.reqCount });