From 5589b7dabee5953eda81d5b72d8f956c7b606bb3 Mon Sep 17 00:00:00 2001 From: undefined Date: Tue, 29 Dec 2020 18:23:05 +0800 Subject: [PATCH] update deps --- package.json | 4 ++-- packages/hydrojudge/package.json | 2 +- packages/hydrojudge/src/compile.ts | 2 +- packages/hydrojudge/src/hosts/hydro.ts | 2 +- packages/hydrojudge/src/hosts/vj4.ts | 6 +++--- packages/hydrojudge/src/judge/default.ts | 2 +- packages/hydrojudge/src/utils.ts | 2 +- packages/hydrooj/package.json | 6 +++--- packages/hydrooj/src/loader.ts | 2 +- packages/hydrooj/src/upgrade.ts | 4 ++++ packages/import-qduoj/handler.ts | 2 +- packages/login-with-qq/service.ts | 2 +- packages/migrate-hustoj/package.json | 2 +- 13 files changed, 21 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 96a051689..3ffe1521a 100644 --- a/package.json +++ b/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", diff --git a/packages/hydrojudge/package.json b/packages/hydrojudge/package.json index 4739acb81..8b199d384 100644 --- a/packages/hydrojudge/package.json +++ b/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": { diff --git a/packages/hydrojudge/src/compile.ts b/packages/hydrojudge/src/compile.ts index 725fcca53..9c07a019a 100644 --- a/packages/hydrojudge/src/compile.ts +++ b/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.'); diff --git a/packages/hydrojudge/src/hosts/hydro.ts b/packages/hydrojudge/src/hosts/hydro.ts index 33ca540fa..69c778337 100644 --- a/packages/hydrojudge/src/hosts/hydro.ts +++ b/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}] 已连接`); } diff --git a/packages/hydrojudge/src/hosts/vj4.ts b/packages/hydrojudge/src/hosts/vj4.ts index 7efc9bc08..9ddc2e61f 100644 --- a/packages/hydrojudge/src/hosts/vj4.ts +++ b/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}] 已连接`); } diff --git a/packages/hydrojudge/src/judge/default.ts b/packages/hydrojudge/src/judge/default.ts index 222a48d52..f4f72baea 100644 --- a/packages/hydrojudge/src/judge/default.ts +++ b/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) { diff --git a/packages/hydrojudge/src/utils.ts b/packages/hydrojudge/src/utils.ts index 8981f6877..301a08bd5 100644 --- a/packages/hydrojudge/src/utils.ts +++ b/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); }); } diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 049d55727..fc52262ff 100644 --- a/packages/hydrooj/package.json +++ b/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", - "terminal-kit": "^1.44.0", + "systeminformation": "^4.33.4", + "terminal-kit": "^1.44.3", "yargs": "^16.2.0" }, "devDependencies": { diff --git a/packages/hydrooj/src/loader.ts b/packages/hydrooj/src/loader.ts index 1296148b9..be9942d87 100644 --- a/packages/hydrooj/src/loader.ts +++ b/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) => { diff --git a/packages/hydrooj/src/upgrade.ts b/packages/hydrooj/src/upgrade.ts index a5e826300..1dc3fcc87 100644 --- a/packages/hydrooj/src/upgrade.ts +++ b/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; diff --git a/packages/import-qduoj/handler.ts b/packages/import-qduoj/handler.ts index 1624aa33b..634d0cbe6 100644 --- a/packages/import-qduoj/handler.ts +++ b/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); diff --git a/packages/login-with-qq/service.ts b/packages/login-with-qq/service.ts index c9b16eff2..05e035df3 100644 --- a/packages/login-with-qq/service.ts +++ b/packages/login-with-qq/service.ts @@ -36,7 +36,7 @@ export async function postInit() { }); await new Promise((resolve) => { socket.once('open', () => { - resolve(); + resolve(null); }); }); } diff --git a/packages/migrate-hustoj/package.json b/packages/migrate-hustoj/package.json index bae4124bd..e9e939280 100644 --- a/packages/migrate-hustoj/package.json +++ b/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"