update deps

package.json

@@ -33,10 +33,10 @@
         "globby": "^11.0.1",
         "jest": "^26.6.3",
         "latest-version": "^5.1.0",
-        "ora": "^5.1.0",
+        "ora": "^5.2.0",
         "semver": "^7.3.4",
         "ts-jest": "^26.4.4",
-        "typescript": "4.0.3"
+        "typescript": "4.1.3"
     },
     "dependencies": {
         "fs-extra": "^9.0.1",

packages/hydrojudge/package.json

@@ -14,7 +14,7 @@
         "lodash": "^4.17.20",
         "p-queue": "^6.6.1",
         "shell-quote": "^1.7.2",
-        "systeminformation": "^4.33.1",
+        "systeminformation": "^4.33.4",
         "yargs": "^16.2.0"
     },
     "peerDependencies": {

packages/hydrojudge/src/compile.ts

@@ -33,7 +33,7 @@ export = async function compile(
     } if (info.type === 'interpreter') {
         f[target] = { content: code };
         return {
-            execute: info.execute, copyIn: f, clean: () => Promise.resolve(), time: info.time || 1,
+            execute: info.execute, copyIn: f, clean: () => Promise.resolve(null), time: info.time || 1,
         };
     }
     throw new SystemError('Unknown language type.');

packages/hydrojudge/src/hosts/hydro.ts

@@ -271,7 +271,7 @@ export default class Hydro {
             }, 30000);
         });
         await new Promise((resolve) => {
-            this.ws.once('open', () => { resolve(); });
+            this.ws.once('open', () => { resolve(null); });
         });
         log.info(`[${this.config.host}] 已连接`);
     }

packages/hydrojudge/src/hosts/vj4.ts

@@ -260,7 +260,7 @@ export default class VJ4 {
             await new Promise((resolve, reject) => {
                 zip.extractAllToAsync(savePath, true, (e) => {
                     if (e) reject(e);
-                    else resolve();
+                    else resolve(null);
                 });
             });
             await fs.unlink(tmpFilePath);
@@ -290,7 +290,7 @@ export default class VJ4 {
         await new Promise((resolve, reject) => {
             zip.extractAllToAsync(savePath, true, (e) => {
                 if (e) reject(e);
-                else resolve();
+                else resolve(null);
             });
         });
         await fs.unlink(tmpFilePath);
@@ -321,7 +321,7 @@ export default class VJ4 {
             }, 30000);
         });
         await new Promise((resolve) => {
-            this.ws.once('open', () => { resolve(); });
+            this.ws.once('open', () => { resolve(null); });
         });
         log.info(`[${this.config.host}] 已连接`);
     }

packages/hydrojudge/src/judge/default.ts

@@ -138,7 +138,7 @@ export const judge = async (ctx) => {
         })(),
         (async () => {
             if (!ctx.config.checker_type || ctx.config.checker_type === 'default') {
-                return { execute: '', copyIn: {}, clean: () => Promise.resolve() };
+                return { execute: '', copyIn: {}, clean: () => Promise.resolve(null) };
             }
             const copyIn = {};
             for (const file of ctx.config.judge_extra_files) {

packages/hydrojudge/src/utils.ts

@@ -30,7 +30,7 @@ export function parseMemoryMB(str: string) {
 export function sleep(timeout: number) {
     return new Promise((resolve) => {
         setTimeout(() => {
-            resolve();
+            resolve(null);
         }, timeout);
     });
 }

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.15.7",
+    "version": "2.15.8",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",
@@ -32,8 +32,8 @@
         "serialize-javascript": "^5.0.1",
         "sockjs": "^0.3.20",
         "superagent": "^6.1.0",
-        "systeminformation": "^4.33.1",
+        "systeminformation": "^4.33.4",
-        "terminal-kit": "^1.44.0",
+        "terminal-kit": "^1.44.3",
         "yargs": "^16.2.0"
     },
     "devDependencies": {

packages/hydrooj/src/loader.ts

@@ -66,7 +66,7 @@ async function entry(config: EntryConfig) {
             const p = await fork([`--entry=${config.entry}`]);
             await new Promise((resolve, reject) => {
                 p.on('exit', (code, signal) => {
-                    if (code === 0) resolve();
+                    if (code === 0) resolve(null);
                     else reject(signal);
                 });
                 p.on('error', (err: Error) => {

packages/hydrooj/src/upgrade.ts

@@ -145,6 +145,10 @@ const scripts: UpgradeScript[] = [
         }
         return true;
     },
+    async function _5_6() {
+        // Issue #58
+        await domain.edit('system', { owner: 1 });
+    },
 ];
 
 export = scripts;

packages/import-qduoj/handler.ts

@@ -19,7 +19,7 @@ class ImportQduojHandler extends Handler {
         const zip = new AdmZip(zipfile);
         const tmp = path.resolve(os.tmpdir(), 'hydro', 'import-qduoj', String.random(32));
         await new Promise((resolve, reject) => {
-            zip.extractAllToAsync(tmp, true, (err) => (err ? resolve() : reject(err)));
+            zip.extractAllToAsync(tmp, true, (err) => (err ? resolve(null) : reject(err)));
         });
         try {
             const folders = await fs.readdir(tmp);

packages/login-with-qq/service.ts

@@ -36,7 +36,7 @@ export async function postInit() {
     });
     await new Promise((resolve) => {
         socket.once('open', () => {
-            resolve();
+            resolve(null);
         });
     });
 }

packages/migrate-hustoj/package.json

@@ -10,7 +10,7 @@
         "build": "tsc"
     },
     "devDependencies": {
-        "@types/mysql": "^2.15.16"
+        "@types/mysql": "^2.15.17"
     },
     "peerDependencies": {
         "hydrooj": "^2.14.0"