core: fix bugs (#435)

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "4.0.3",
+    "version": "4.0.4",
     "bin": "bin/hydrooj.js",
     "main": "src/plugin-api",
     "module": "src/plugin-api",

packages/hydrooj/src/entry/cli.ts

@@ -7,7 +7,7 @@ import { ObjectID } from 'mongodb';
 import { Context } from '../context';
 import db from '../service/db';
 import {
-    addon, lib, model, script, service, setting,
+    addon, builtinModel, lib, script, service, setting,
 } from './common';
 
 const argv = cac().parse();
@@ -96,11 +96,8 @@ export async function load(ctx: Context) {
         lib(pending, fail, ctx),
         service(pending, fail, ctx),
     ]);
-    require('../model/index');
+    await builtinModel(ctx);
-    await Promise.all([
+    await setting(pending, fail, require('../model/setting'));
-        model(pending, fail, ctx),
-        setting(pending, fail, require('../model/setting')),
-    ]);
     ctx.plugin(require('../service/server'));
     await addon(pending, fail, ctx);
     const scriptDir = path.resolve(__dirname, '..', 'script');

packages/hydrooj/src/handler/import.ts

@@ -51,8 +51,9 @@ class ProblemImportHydroHandler extends Handler {
         });
         try {
             const problems = await fs.readdir(tmpdir, { withFileTypes: true });
-            for (const { name: i, isDirectory } of problems) {
+            for (const p of problems) {
-                if (!isDirectory()) continue;
+                const i = p.name;
+                if (!p.isDirectory()) continue;
                 const files = await fs.readdir(path.join(tmpdir, i));
                 if (!files.includes('problem.yaml')) continue;
                 const content = fs.readFileSync(path.join(tmpdir, i, 'problem.yaml'), 'utf-8');