feat: minio storage support framework

packages/hydrooj/src/entry/cli.ts

@@ -5,7 +5,9 @@ import {
     lib, service, model,
     builtinLib, builtinModel,
 } from './common';
+import options from '../options';
 import * as bus from '../service/bus';
+import db from '../service/db';
 
 const COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
 const ARR = /=>.*$/mg;
@@ -52,10 +54,8 @@ export async function load() {
     require('../utils');
     require('../error');
     require('../options');
-    await new Promise((resolve) => {
-        bus.once('database/connect', resolve);
-        require('../service/db');
-    });
+    const opts = options();
+    await db.start(opts);
     for (const i of builtinLib) require(`../lib/${i}`);
     await lib(pending, fail);
     require('../service/gridfs');

packages/hydrooj/src/entry/master.ts

@@ -8,7 +8,9 @@ import { argv } from 'yargs';
 import { builtinModel } from './common';
 import { Entry } from '../loader';
 import { Logger } from '../logger';
+import options from '../options';
 import * as bus from '../service/bus';
+import db from '../service/db';
 
 const logger = new Logger('entry/master');
 const tmpdir = path.resolve(os.tmpdir(), 'hydro');
@@ -48,13 +50,9 @@ export async function load(call: Entry) {
     bus.once('app/exit', () => {
         fs.removeSync(lockfile);
     });
-    await new Promise((resolve) => {
-        bus.once('database/connect', () => {
-            bus.once('database/config', resolve);
-            require('../model/system');
-        });
-        require('../service/db');
-    });
+    const opts = options();
+    await db.start(opts);
+    await require('../model/system').runConfig();
     require('../service/monitor');
     for (const i of builtinModel) require(`../model/${i}`);
     const modelSystem = require('../model/system');

packages/hydrooj/src/entry/worker.ts

@@ -4,7 +4,9 @@ import {
     locale, template, lib, service, model, handler, script, setting, uistatic,
     builtinLib, builtinScript, builtinHandler, builtinModel,
 } from './common';
+import options from '../options';
 import * as bus from '../service/bus';
+import db from '../service/db';
 
 export async function load() {
     const pending = global.addons;
@@ -19,12 +21,11 @@ export async function load() {
         template(pending, fail),
         uistatic(pending, fail),
     ]);
+    const opts = options();
+    await db.start(opts);
     await new Promise((resolve) => {
-        bus.once('database/connect', () => {
-            bus.once('database/config', resolve);
-            require('../model/system');
-        });
-        require('../service/db');
+        bus.once('database/config', resolve);
+        require('../model/system');
     });
     for (const i of builtinLib) require(`../lib/${i}`);
     await lib(pending, fail);