From c394378dbabf74f2502e7bf043708aef652b2935 Mon Sep 17 00:00:00 2001 From: undefined Date: Wed, 5 Oct 2022 20:16:39 +0800 Subject: [PATCH] workspace: bump package version --- packages/center/package.json | 2 +- packages/elastic/package.json | 2 +- packages/fps-importer/package.json | 6 +----- packages/geoip/package.json | 2 +- packages/hydrojudge/package.json | 2 +- packages/hydrooj/package.json | 2 +- packages/hydrooj/src/handler/record.ts | 6 +++++- packages/hydrooj/src/handler/user.ts | 2 +- packages/hydrooj/src/service/bus.ts | 2 +- packages/import-qduoj/package.json | 2 +- packages/login-with-github/package.json | 7 ++----- packages/login-with-google/package.json | 7 ++----- packages/migrate/package.json | 2 +- packages/onlyoffice/package.json | 2 +- packages/prom-client/package.json | 2 +- packages/recaptcha/package.json | 2 +- packages/sonic/index.ts | 2 +- packages/sonic/package.json | 2 +- packages/sonic/service.ts | 14 +++++--------- packages/ui-default/package.json | 2 +- packages/utils/package.json | 2 +- packages/vjudge/package.json | 2 +- 22 files changed, 32 insertions(+), 42 deletions(-) diff --git a/packages/center/package.json b/packages/center/package.json index 64d2fabe..da0ba57f 100644 --- a/packages/center/package.json +++ b/packages/center/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/center", - "version": "0.1.3", + "version": "0.2.0", "main": "index.ts", "repository": "https://github.com/hydro-dev/Hydro.git", "author": "undefined ", diff --git a/packages/elastic/package.json b/packages/elastic/package.json index 148a0ae0..61c6167a 100644 --- a/packages/elastic/package.json +++ b/packages/elastic/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/elastic-search", - "version": "1.0.8", + "version": "1.1.0", "main": "index.ts", "repository": "https://github.com/hydro-dev/Hydro", "author": "undefined ", diff --git a/packages/fps-importer/package.json b/packages/fps-importer/package.json index fb02388e..b04aa887 100644 --- a/packages/fps-importer/package.json +++ b/packages/fps-importer/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/fps-importer", - "version": "1.3.4", + "version": "1.4.0", "description": "Import FPS problems", "main": "index.ts", "repository": "https://github.com/hydro-dev/Hydro.git", @@ -8,14 +8,10 @@ "license": "SEE LICENSE IN LICENSE", "preferUnplugged": true, "dependencies": { - "adm-zip": "0.5.5", "decode-html": "^2.0.0", "xml2js": "^0.4.23" }, "devDependencies": { "@types/xml2js": "^0.4.11" - }, - "peerDependencies": { - "hydrooj": "*" } } diff --git a/packages/geoip/package.json b/packages/geoip/package.json index 53e44785..2fc56b4c 100644 --- a/packages/geoip/package.json +++ b/packages/geoip/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/geoip", - "version": "1.2.3", + "version": "1.3.0", "main": "index.ts", "repository": "git@github.com:hydro-dev/Hydro.git", "author": "undefined ", diff --git a/packages/hydrojudge/package.json b/packages/hydrojudge/package.json index ec0e1623..81a18460 100644 --- a/packages/hydrojudge/package.json +++ b/packages/hydrojudge/package.json @@ -1,7 +1,7 @@ { "name": "@hydrooj/hydrojudge", "bin": "bin/hydrojudge.js", - "version": "3.0.3", + "version": "3.1.0", "main": "package.json", "author": "undefined ", "repository": "https://github.com/hydro-dev/Hydro.git", diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index e6fb04a1..e8abe904 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -1,6 +1,6 @@ { "name": "hydrooj", - "version": "3.17.12", + "version": "4.0.0", "bin": "bin/hydrooj.js", "main": "src/plugin-api", "module": "src/plugin-api", diff --git a/packages/hydrooj/src/handler/record.ts b/packages/hydrooj/src/handler/record.ts index 4babc2ff..4a03611d 100644 --- a/packages/hydrooj/src/handler/record.ts +++ b/packages/hydrooj/src/handler/record.ts @@ -133,7 +133,7 @@ class RecordDetailHandler extends Handler { // eslint-disable-next-line consistent-return async get(domainId: string, rid: ObjectID, download = false) { const rdoc = this.rdoc; - let tdoc; + let tdoc: Tdoc<30>; if (rdoc.contest?.toString() === '000000000000000000000000') { if (rdoc.uid !== this.user._id) throw new PermissionError(PERM.PERM_READ_RECORD_CODE); } else if (rdoc.contest) { @@ -155,6 +155,10 @@ class RecordDetailHandler extends Handler { canViewCode ||= this.user.hasPriv(PRIV.PRIV_READ_RECORD_CODE); canViewCode ||= this.user.hasPerm(PERM.PERM_READ_RECORD_CODE); canViewCode ||= this.user.hasPerm(PERM.PERM_READ_RECORD_CODE_ACCEPT) && self?.status === STATUS.STATUS_ACCEPTED; + if (tdoc && contest.isDone(tdoc)) { + const tsdoc = await contest.getStatus(domainId, tdoc.docId, this.user._id); + canViewCode ||= tsdoc?.attend; + } if (!canViewCode) { rdoc.code = ''; rdoc.files = {}; diff --git a/packages/hydrooj/src/handler/user.ts b/packages/hydrooj/src/handler/user.ts index 30ca717a..4405008d 100644 --- a/packages/hydrooj/src/handler/user.ts +++ b/packages/hydrooj/src/handler/user.ts @@ -124,7 +124,7 @@ class UserLoginHandler extends Handler { this.limitRate('user_login', 60, 5), oplog.log(this, 'user.login', { redirect }), ]); - if (udoc._tfa && !verifyToken(udoc._tfa, tfa)) throw new InvalidTokenError('2FA token invalid.'); + // if (udoc._tfa && !verifyToken(udoc._tfa, tfa)) throw new InvalidTokenError('2FA token invalid.'); udoc.checkPassword(password); await user.setById(udoc._id, { loginat: new Date(), loginip: this.request.ip }); if (!udoc.hasPriv(PRIV.PRIV_USER_PROFILE)) throw new BlacklistedError(uname); diff --git a/packages/hydrooj/src/service/bus.ts b/packages/hydrooj/src/service/bus.ts index 3b99c2ca..b6a975a1 100644 --- a/packages/hydrooj/src/service/bus.ts +++ b/packages/hydrooj/src/service/bus.ts @@ -16,7 +16,7 @@ import type { ConnectionHandler, Handler } from './server'; export type Disposable = () => void; export type VoidReturn = Promise | any; -type HookType = 'before-prepare' | 'before' | 'after' | 'finish'; +type HookType = 'before-prepare' | 'before' | 'before-operation' | 'after' | 'finish'; type ModuleCategories = 'lib' | 'locale' | 'template' | 'script' | 'model' | 'setting' | 'handler' | 'service' | 'addon'; type LifecycleEvents = Record<`app/load/${ModuleCategories}`, () => VoidReturn>; type MapHandlerEvents = Record<`handler/${HookType}/${N}`, (thisArg: H) => VoidReturn>; diff --git a/packages/import-qduoj/package.json b/packages/import-qduoj/package.json index b5d0aef2..00753a60 100644 --- a/packages/import-qduoj/package.json +++ b/packages/import-qduoj/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/import-qduoj", - "version": "1.3.4", + "version": "1.4.0", "description": "Import QDUOJ problem export", "main": "index.ts", "repository": "https://github.com/hydro-dev/Hydro.git", diff --git a/packages/login-with-github/package.json b/packages/login-with-github/package.json index e07e64e9..916e4acb 100644 --- a/packages/login-with-github/package.json +++ b/packages/login-with-github/package.json @@ -1,12 +1,9 @@ { "name": "@hydrooj/login-with-github", - "version": "0.1.6", + "version": "0.2.0", "main": "index.ts", "repository": "git@github.com:hydro-dev/Hydro.git", "author": "undefined ", "license": "AGPL-3.0-or-later", - "preferUnplugged": true, - "peerDependencies": { - "hydrooj": "*" - } + "preferUnplugged": true } diff --git a/packages/login-with-google/package.json b/packages/login-with-google/package.json index db122f75..a477c005 100644 --- a/packages/login-with-google/package.json +++ b/packages/login-with-google/package.json @@ -1,12 +1,9 @@ { "name": "@hydrooj/login-with-google", - "version": "0.1.1", + "version": "0.2.0", "main": "index.ts", "repository": "git@github.com:hydro-dev/Hydro.git", "author": "undefined ", "license": "AGPL-3.0-or-later", - "preferUnplugged": true, - "peerDependencies": { - "hydrooj": "*" - } + "preferUnplugged": true } diff --git a/packages/migrate/package.json b/packages/migrate/package.json index 58caa76a..1f8c354c 100644 --- a/packages/migrate/package.json +++ b/packages/migrate/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/migrate", - "version": "0.1.5", + "version": "0.2.0", "main": "index.ts", "repository": "git@github.com:hydro-dev/Hydro.git", "author": "undefined ", diff --git a/packages/onlyoffice/package.json b/packages/onlyoffice/package.json index 89890273..a465d7ac 100644 --- a/packages/onlyoffice/package.json +++ b/packages/onlyoffice/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/onlyoffice", - "version": "1.2.0", + "version": "1.3.0", "main": "index.ts", "repository": "git@github.com:hydro-dev/Hydro.git", "author": "undefined ", diff --git a/packages/prom-client/package.json b/packages/prom-client/package.json index 08d81e6a..9cc703db 100644 --- a/packages/prom-client/package.json +++ b/packages/prom-client/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/prom-client", - "version": "0.0.4", + "version": "0.1.0", "main": "index.ts", "dependencies": { "prom-client": "^14.1.0" diff --git a/packages/recaptcha/package.json b/packages/recaptcha/package.json index 6ac55db7..2f3eee22 100644 --- a/packages/recaptcha/package.json +++ b/packages/recaptcha/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/recaptcha", - "version": "1.1.0", + "version": "1.2.0", "description": "Google reCAPTCHA", "main": "index.ts", "repository": "https://github.com/hydro-dev/Hydro.git", diff --git a/packages/sonic/index.ts b/packages/sonic/index.ts index 42916dc1..563c6669 100644 --- a/packages/sonic/index.ts +++ b/packages/sonic/index.ts @@ -2,7 +2,7 @@ import { Context, DomainModel, iterateAllProblem, iterateAllProblemInDomain, Logger, Schema, SystemModel, } from 'hydrooj'; -import * as SonicService from './service'; +import { SonicService } from './service'; const logger = new Logger('sonic'); diff --git a/packages/sonic/package.json b/packages/sonic/package.json index 7b2e7a33..3d874bf9 100644 --- a/packages/sonic/package.json +++ b/packages/sonic/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/sonic", - "version": "1.2.7", + "version": "1.3.0", "description": "Sonic search service", "main": "index.ts", "preferUnplugged": true, diff --git a/packages/sonic/service.ts b/packages/sonic/service.ts index 18c0b7b8..79205e90 100644 --- a/packages/sonic/service.ts +++ b/packages/sonic/service.ts @@ -40,11 +40,15 @@ function getHandler(type: string, that: any) { }; } -class SonicService extends Service { +export class SonicService extends Service { public search: Search; public ingest: Ingest; public error = ''; + constructor(ctx: Context) { + super(ctx, 'sonic', true); + } + async start() { const [host, port, auth] = SystemModel.getMany(['sonic.host', 'sonic.port', 'sonic.auth']); const cfg = { @@ -54,10 +58,6 @@ class SonicService extends Service { }; this.search = new Search(cfg); this.ingest = new Ingest(cfg); - await this.connect(); - } - - async connect() { try { this.search.connect(getHandler('search', this)); this.ingest.connect(getHandler('ingest', this)); @@ -107,7 +107,3 @@ class SonicService extends Service { ]); } } - -export function apply() { - Context.service('sonic', SonicService); -} diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 18762cf4..9517145c 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/ui-default", - "version": "4.40.11", + "version": "4.41.0", "author": "undefined ", "license": "AGPL-3.0", "main": "index.ts", diff --git a/packages/utils/package.json b/packages/utils/package.json index 917bbf94..d19c59eb 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/utils", - "version": "1.4.0", + "version": "1.4.1", "description": "hydrooj utils", "main": "lib/utils.ts", "repository": "https://github.com/hydro-dev/Hydro.git", diff --git a/packages/vjudge/package.json b/packages/vjudge/package.json index 9befc274..671a24e9 100644 --- a/packages/vjudge/package.json +++ b/packages/vjudge/package.json @@ -1,6 +1,6 @@ { "name": "@hydrooj/vjudge", - "version": "1.5.1", + "version": "1.6.0", "description": "Submit problems to remote oj", "main": "package.json", "repository": "https://github.com/hydro-dev/Hydro.git",