diff --git a/install/install.js b/install/install.js index cd05118dc..32e23e64c 100644 --- a/install/install.js +++ b/install/install.js @@ -66,7 +66,6 @@ const mirrors = { official: 'https://repo.mongodb.org/apt/ubuntu', }, minio: { - china: 'http://dl.minio.org.cn/server/minio/release/linux-amd64/minio', undefined: 'https://s3.undefined.moe/public/minio', official: 'https://dl.min.io/server/minio/release/linux-amd64/minio', }, @@ -245,7 +244,7 @@ apt-get -qq update && apt-get -q install -y mongodb-org`, { retry: true }], }, { init: 'install.minio', - skip: () => fs.exist('/root/.hydro/env'), + skip: () => __env.SKIP_MINIO || fs.exist('/root/.hydro/env'), operations: [ [`curl -fSL ${getMirror('minio')} -o /usr/bin/minio`, { retry: true }], 'chmod +x /usr/bin/minio', diff --git a/packages/fps-importer/handler.ts b/packages/fps-importer/handler.ts index cfddf1ce6..3278192de 100644 --- a/packages/fps-importer/handler.ts +++ b/packages/fps-importer/handler.ts @@ -123,7 +123,7 @@ class FpsProblemImportHandler extends Handler { } catch { } } } - if (!tasks.length) throw new ValidationError('file'); + if (!tasks.length) throw new ValidationError('file', null, 'No valid fps format file found'); for (const task of tasks) await this.run(domainId, task); this.response.redirect = this.url('problem_main'); } diff --git a/packages/fps-importer/package.json b/packages/fps-importer/package.json index 5adc3f64a..8192714c0 100644 --- a/packages/fps-importer/package.json +++ b/packages/fps-importer/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/fps-importer", - "version": "1.3.2", + "version": "1.3.3", "description": "Import FPS problems", "main": "package.json", "repository": "https://github.com/hydro-dev/Hydro.git", @@ -8,7 +8,7 @@ "license": "SEE LICENSE IN LICENSE", "preferUnplugged": true, "dependencies": { - "adm-zip": "0.5.9", + "adm-zip": "0.5.5", "decode-html": "^2.0.0", "fs-extra": "^10.0.0", "mongodb": "^3.7.3", diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 5163ae2a8..e8c169889 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "3.2.25", + "version": "3.2.26", "bin": "bin/hydrooj.js", "main": "src/loader", "module": "src/loader", @@ -14,7 +14,7 @@ "dependencies": { "@graphql-tools/schema": "^8.3.1", "@hydrooj/utils": "workspace:*", - "adm-zip": "0.5.9", + "adm-zip": "0.5.5", "ansi_up": "^5.1.0", "cac": "^6.7.12", "cookies": "^0.8.0", diff --git a/packages/hydrooj/src/service/bus.ts b/packages/hydrooj/src/service/bus.ts index fbe31290b..7f20779c5 100644 --- a/packages/hydrooj/src/service/bus.ts +++ b/packages/hydrooj/src/service/bus.ts @@ -71,7 +71,7 @@ export interface EventMap extends Record { 'handler/after': (thisArg: Handler) => VoidReturn 'handler/finish/UserRegister': (thisArg: UserRegisterHandler) => VoidReturn 'handler/finish': (thisArg: Handler) => VoidReturn - 'handler/error': (thisArg: Handler) => VoidReturn + 'handler/error': (thisArg: Handler, e: Error) => VoidReturn 'handler/solution/get': (thisArg: ProblemSolutionHandler) => VoidReturn 'discussion/before-add': (payload: Partial) => VoidReturn diff --git a/packages/import-qduoj/package.json b/packages/import-qduoj/package.json index 6b9891b67..f98f2c140 100644 --- a/packages/import-qduoj/package.json +++ b/packages/import-qduoj/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/import-qduoj", - "version": "1.3.1", + "version": "1.3.2", "description": "Import QDUOJ problem export", "main": "package.json", "repository": "https://github.com/hydro-dev/Hydro.git", @@ -8,7 +8,7 @@ "license": "AGPL-3.0-or-later", "preferUnplugged": true, "dependencies": { - "adm-zip": "0.5.9", + "adm-zip": "0.5.5", "decode-html": "^2.0.0", "fs-extra": "^10.0.0" }