fix

Author: pandadtdyy

packages/server/config.ts

@@ -18,8 +18,8 @@ if (!fs.existsSync(configPath)) {
     // eslint-disable-next-line no-promise-executor-return
     exit = new Promise((resolve) => (async () => {
         const serverConfigDefault = `\
-type: 
-viewPass: ${String.random(8)}
+type: server # server | domjudge | hydro
+viewPass: ${String.random(8)} # use admin / viewPass to login
 server: 
 token: 
 username: 
@@ -45,22 +45,29 @@ const serverSchema = Schema.intersect([
     Schema.object({
         type: Schema.union([
             Schema.const('server'),
-            Schema.const('client'),
+            Schema.const('domjudge'),
+            Schema.const('hydro'),
         ] as const).description('server type').required(),
+        port: Schema.number().default(5283),
         viewPass: Schema.string().default(String.random(8)),
         secretRoute: Schema.string().default(String.random(12)),
         seatFile: Schema.string().default('/home/icpc/Desktop/seat.txt'),
-    }).description('setting_file'),
+    }).description('Basic Config'),
     Schema.union([
         Schema.object({
-            type: Schema.const('server'),
-            token: Schema.string().required(),
-        }),
-        Schema.object({
-            type: Schema.const('client'),
+            type: Schema.const('domjudge').required(),
+            server: Schema.string().role('url').required(),
             username: Schema.string().required(),
             password: Schema.string().required(),
-        }),
+        }).description('DomJudge Fetcher Config'),
+        Schema.object({
+            type: Schema.const('hydro').required(),
+            server: Schema.string().role('url').required(),
+            token: Schema.string().required(),
+        }).description('Hydro Fetcher Config'),
+        Schema.object({
+            type: Schema.const('server').required(),
+        }).description('Server Mode Config'),
     ]),
 ]);
 const clientSchema = Schema.object({

packages/server/handler/monitor.ts

@@ -1,5 +1,4 @@
 /* eslint-disable no-await-in-loop */
-import http from 'http';
 import { Context } from 'cordis';
 import { BadRequestError, Handler } from '@hydrooj/framework';
 import { Logger } from '../utils';

packages/server/service/db.ts

@@ -26,23 +26,24 @@ export default class DBService extends Service {
         fs.ensureDirSync(path.resolve(process.cwd(), 'data/.db'));
         super(ctx, 'dbservice', true);
         ctx.mixin('dbservice', ['db']);
+        this.start();
     }
 
-    db: { [T in keyof Collections]: Datastore<Collections[T]> };
+    db: { [T in keyof Collections]: Datastore<Collections[T]> } = {} as any;
 
     async initDatabase(key: string, fields: string[]) {
         this.db[key] = Datastore.create(path.resolve(process.cwd(), `data/.db/${key}.db`));
-        await this[key].load();
+        await this.db[key].load();
         // eslint-disable-next-line no-await-in-loop
-        for (const field of fields) await this[key].ensureIndex({ fieldName: field });
+        for (const field of fields) await this.db[key].ensureIndex({ fieldName: field });
         this.ctx.logger('db').info(`${key} Database loaded`);
     }
 
     async start() {
-        await this.initDatabase('codeDB', ['_id', 'createAt', 'done', 'printer', 'deleted']);
-        await this.initDatabase('monitorDB', ['_id', 'mac', 'name', 'group']);
-        await this.initDatabase('clientDB', ['id', 'name', 'type', 'group']);
-        await this.initDatabase('balloonDB', ['id', 'time', 'problem', 'teamid', 'awards', 'done', 'printDone']);
-        await this.initDatabase('teamsDB', []);
+        await this.initDatabase('code', ['_id', 'createAt', 'done', 'printer', 'deleted']);
+        await this.initDatabase('monitor', ['_id', 'mac', 'name', 'group']);
+        await this.initDatabase('client', ['id', 'name', 'type', 'group']);
+        await this.initDatabase('balloon', ['id', 'time', 'problem', 'teamid', 'awards', 'done', 'printDone']);
+        await this.initDatabase('teams', []);
     }
 }

packages/server/service/server.ts

@@ -6,7 +6,7 @@ export * from '@hydrooj/framework/decorators';
 
 export async function apply(pluginContext: Context) {
     pluginContext.plugin(WebService, {
-        port: 5283,
+        port: config.port,
     });
     pluginContext.inject(['server'], ({ server }) => {
         server.addServerLayer('stream', async (ctx, next) => {