From e7b1f2c2239f3deef39fca456efb9e83dfc367e9 Mon Sep 17 00:00:00 2001 From: undefined Date: Thu, 7 Nov 2024 20:39:29 +0800 Subject: [PATCH] feat: add xcpcio --- .gitignore | 4 +- packages/hydrooj/src/handler/contest.ts | 54 ++++--- packages/hydrooj/src/interface.ts | 2 +- packages/scoreboard-xcpcio/index.ts | 138 ++++++++++++++++++ packages/scoreboard-xcpcio/install.ts | 12 ++ packages/scoreboard-xcpcio/package.json | 12 ++ .../templates/xcpcio_board.html | 33 +++++ .../templates/contest_scoreboard.html | 12 +- 8 files changed, 241 insertions(+), 26 deletions(-) create mode 100644 packages/scoreboard-xcpcio/index.ts create mode 100644 packages/scoreboard-xcpcio/install.ts create mode 100644 packages/scoreboard-xcpcio/package.json create mode 100644 packages/scoreboard-xcpcio/templates/xcpcio_board.html diff --git a/.gitignore b/.gitignore index 40ab8ec8e..69b50713b 100644 --- a/.gitignore +++ b/.gitignore @@ -59,4 +59,6 @@ __* *.local # Monokle -.monokle \ No newline at end of file +.monokle + +packages/*/public/assets diff --git a/packages/hydrooj/src/handler/contest.ts b/packages/hydrooj/src/handler/contest.ts index d755b6fb6..0bedadc45 100644 --- a/packages/hydrooj/src/handler/contest.ts +++ b/packages/hydrooj/src/handler/contest.ts @@ -27,7 +27,7 @@ import storage from '../model/storage'; import * as system from '../model/system'; import user from '../model/user'; import { - Handler, param, post, Types, + Handler, param, post, Type, Types, } from '../service/server'; export class ContestListHandler extends Handler { @@ -618,10 +618,10 @@ type BuiltinInput = { groups: any[]; }; type AnyFunction = (...args: any) => any; -type ParseArgs = { - [key in keyof T]: T[key] extends keyof BuiltinInput ? BuiltinInput[T[key]] : T[key] extends AnyFunction ? ReturnType : never +type ParseArgs }> = { + [key in keyof T]: T[key] extends keyof BuiltinInput ? BuiltinInput[T[key]] : T[key] extends AnyFunction ? ReturnType : any }; -export interface ScoreboardView { +export interface ScoreboardView }> { id: string; name: string; supportedRules: string[]; @@ -650,12 +650,16 @@ export class ContestScoreboardHandler extends ContestDetailBaseHandler { for (const key in view.args) { if (typeof view.args[key] === 'function') { try { - args[key] = view.args[key](this.args); + args[key] = view.args[key](this.args[key]); } catch (e) { throw new ValidationError(key); } - } else if (fetcher[key]) { - args[key] = await fetcher[key](); // eslint-disable-line no-await-in-loop + } else if (view.args[key] instanceof Array) { + if (this.args[key] === undefined && view.args[key].find((i) => i === true)) continue; + if (view.args[key][1] && !view.args[key][1](this.args[key])) throw new ValidationError(key); + args[key] = view.args[key][0](this.args[key]); + } else if (fetcher[view.args[key]]) { + args[key] = await fetcher[view.args[key]](); // eslint-disable-line no-await-in-loop } } await view.display.call(this, args); @@ -677,7 +681,7 @@ class ScoreboardService extends Service { ctx.set('scoreboard', this); } - addView( + addView }>( id: string, name: string, args: T, { display, supportedRules, cacheTime }: { display: (this: ContestScoreboardHandler, args: ParseArgs) => Promise, @@ -697,7 +701,8 @@ class ScoreboardService extends Service { } getAvailableViews(rule: string) { - return Object.values(this.views).filter((i) => i.supportedRules.includes(rule) || i.supportedRules.includes('*')); + return Object.fromEntries(Object.values(this.views).filter((i) => i.supportedRules.includes(rule) || i.supportedRules.includes('*')) + .map((i) => [i.id, i.name])); } getView(id: string) { @@ -765,8 +770,8 @@ export async function apply(ctx: Context) { ctx.plugin(ScoreboardService); ctx.inject(['scoreboard'], ({ Route, scoreboard }) => { Route('contest_scoreboard', '/contest/:tid/scoreboard', ContestScoreboardHandler, PERM.PERM_VIEW_CONTEST_SCOREBOARD); - Route('contest_scoreboard', '/contest/:tid/scoreboard/:viewId', ContestScoreboardHandler, PERM.PERM_VIEW_CONTEST_SCOREBOARD); - scoreboard.addView('default', 'Default', { tdoc: 'tdoc', groups: 'groups', realtime: Schema.boolean().default(false) }, { + Route('contest_scoreboard_view', '/contest/:tid/scoreboard/:view', ContestScoreboardHandler, PERM.PERM_VIEW_CONTEST_SCOREBOARD); + scoreboard.addView('default', 'Default', { tdoc: 'tdoc', groups: 'groups', realtime: Types.Boolean }, { async display({ realtime, tdoc, groups }) { if (realtime && !this.user.own(tdoc)) { this.checkPerm(PERM.PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD); @@ -780,8 +785,9 @@ export async function apply(ctx: Context) { const page_name = tdoc.rule === 'homework' ? 'homework_scoreboard' : 'contest_scoreboard'; + const availableViews = scoreboard.getAvailableViews(tdoc.rule); this.response.body = { - tdoc: this.tdoc, tsdoc: this.tsdocAsPublic(), rows, udict, pdict, page_name, groups, + tdoc: this.tdoc, tsdoc: this.tsdocAsPublic(), rows, udict, pdict, page_name, groups, availableViews, }; this.response.pjax = 'partials/scoreboard.html'; this.response.template = 'contest_scoreboard.html'; @@ -839,17 +845,27 @@ export async function apply(ctx: Context) { }, supportedRules: ['*'], }); - scoreboard.addView('export', 'Export', { tdoc: 'tdoc', ext: Schema.union(['csv', 'html']).required() }, { - async display({ tdoc, ext }) { + scoreboard.addView('html', 'HTML', { tdoc: 'tdoc' }, { + async display({ tdoc }) { await this.limitRate('scoreboard_download', 60, 3); - const getContent = { - csv: async (rows) => `\uFEFF${rows.map((c) => (c.map((i) => i.value?.toString().replace(/\n/g, ' ')).join(','))).join('\n')}`, - html: (rows) => this.renderHTML('contest_scoreboard_download_html.html', { rows, tdoc }), - }; const [, rows] = await contest.getScoreboard.call(this, tdoc.domainId, tdoc._id, { isExport: true, lockAt: this.tdoc.lockAt, showDisplayName: this.user.hasPerm(PERM.PERM_VIEW_DISPLAYNAME), }); - this.binary(await getContent[ext](rows), `${this.tdoc.title}.${ext}`); + this.binary(await this.renderHTML('contest_scoreboard_download_html.html', { rows, tdoc }), `${this.tdoc.title}.html`); + }, + supportedRules: ['*'], + }); + scoreboard.addView('csv', 'CSV', { tdoc: 'tdoc' }, { + async display({ tdoc }) { + await this.limitRate('scoreboard_download', 60, 3); + const [, rows] = await contest.getScoreboard.call(this, tdoc.domainId, tdoc._id, { + isExport: true, lockAt: this.tdoc.lockAt, showDisplayName: this.user.hasPerm(PERM.PERM_VIEW_DISPLAYNAME), + }); + const escapeValue = (i: string) => `"${i.toString().replace(/\n/g, ' ').replace(/"/g, '\\"')}"`; + this.binary( + `\uFEFF${rows.map((c) => (c.map((i) => escapeValue(i.value)).join(','))).join('\n')}`, + `${this.tdoc.title}.csv`, + ); }, supportedRules: ['*'], }); diff --git a/packages/hydrooj/src/interface.ts b/packages/hydrooj/src/interface.ts index de0ecc5ce..9be64681e 100644 --- a/packages/hydrooj/src/interface.ts +++ b/packages/hydrooj/src/interface.ts @@ -390,7 +390,7 @@ export interface Tdoc extends Document { lockAt?: Date; unlocked?: boolean; autoHide?: boolean; - balloon?: Record; + balloon?: Record; score?: Record; /** diff --git a/packages/scoreboard-xcpcio/index.ts b/packages/scoreboard-xcpcio/index.ts new file mode 100644 index 000000000..5fe3d6974 --- /dev/null +++ b/packages/scoreboard-xcpcio/index.ts @@ -0,0 +1,138 @@ +import path from 'path'; +import { + ContestModel, Context, fs, Handler, ObjectId, Schema, STATUS, Types, UserModel, +} from 'hydrooj'; + +const file = fs.readFileSync(path.join(__dirname, 'public/assets/board.html'), 'utf8'); +const indexJs = file.match(/index-([A-Za-z0-9_-]+)\.js"/)?.[1]; +const indexCss = file.match(/index-([A-Za-z0-9_-]+)\.css"/)?.[1]; + +class XcpcioHandler extends Handler { + async get() { + this.response.body = { + js: indexJs, + css: indexCss, + }; + this.response.template = 'xcpcio_board.html'; + } +} + +const status = { + [STATUS.STATUS_WRONG_ANSWER]: 'WRONG_ANSWER', + [STATUS.STATUS_ACCEPTED]: 'CORRECT', + [STATUS.STATUS_COMPILING]: 'PENDING', + [STATUS.STATUS_WAITING]: 'PENDING', + [STATUS.STATUS_JUDGING]: 'PENDING', + [STATUS.STATUS_TIME_LIMIT_EXCEEDED]: 'TIME_LIMIT_EXCEEDED', + [STATUS.STATUS_MEMORY_LIMIT_EXCEEDED]: 'MEMORY_LIMIT_EXCEEDED', + [STATUS.STATUS_RUNTIME_ERROR]: 'RUNTIME_ERROR', + [STATUS.STATUS_SYSTEM_ERROR]: 'SYSTEM_ERROR', + [STATUS.STATUS_COMPILE_ERROR]: 'COMPILATION_ERROR', + [STATUS.STATUS_FETCHED]: 'PENDING', + [STATUS.STATUS_OUTPUT_LIMIT_EXCEEDED]: 'OUTPUT_LIMIT_EXCEEDED', + [STATUS.STATUS_ETC]: 'SYSTEM_ERROR', + [STATUS.STATUS_CANCELED]: 'CANCELED', +}; + +export async function apply(ctx: Context) { + ctx.Route('board_xcpcio', '/board', XcpcioHandler); + ctx.inject(['scoreboard'], ({ scoreboard }) => { + scoreboard.addView('xcpcio', 'XCPCIO', { + tdoc: 'tdoc', + groups: 'groups', + json: Types.Boolean, + gold: Schema.transform(Schema.union([Schema.string(), Schema.number().step(1).min(0)]), (v) => +v).default(0), + silver: Schema.transform(Schema.union([Schema.string(), Schema.number().step(1).min(0)]), (v) => +v).default(0), + bronze: Schema.transform(Schema.union([Schema.string(), Schema.number().step(1).min(0)]), (v) => +v).default(0), + }, { + async display({ + tdoc, groups, json, gold, silver, bronze, + }) { + if (json || this.request.json) { + const tsdocs = await ContestModel.getMultiStatus(tdoc.domainId, { docId: tdoc.docId }).toArray(); + const udict = await UserModel.getList(tdoc.domainId, tsdocs.map((i) => i.uid)); + const teams = tsdocs.map((i) => { + const udoc = udict[i.uid]; + return { + team_id: `${udoc._id}`, + name: udoc.uname, + organization: udoc.school, + members: [], + coach: '', + group: [ + ...(udoc.group || []), + i.unrank ? 'unofficial' : 'official', + ], + }; + }); + const relatedGroups = teams.flatMap((i) => i.group); + this.response.body = { + contest: { + contest_name: tdoc.title, + start_time: Math.floor(tdoc.beginAt.getTime() / 1000), + end_time: Math.floor(tdoc.endAt.getTime() / 1000), + frozen_time: tdoc.lockAt ? Math.floor((tdoc.endAt.getTime() - tdoc.lockAt.getTime()) / 1000) : 0, + penalty: 1200, + problem_quantity: tdoc.pids.length, + problem_id: tdoc.pids.map((i, idx) => String.fromCharCode(65 + idx)), + group: { + official: '正式队伍', + unofficial: '打星队伍', + ...Object.fromEntries(groups.filter((i) => relatedGroups.includes(i.name)).map((i) => [i.name, i.name])), + }, + organization: 'School', + status_time_display: { + 'correct': true, + 'incorrect': true, + 'pending': true, + }, + medal: { + official: { + gold, + silver, + bronze, + }, + }, + balloon_color: tdoc.balloon + ? tdoc.pids.map((i) => ({ + color: '#000', + background_color: typeof tdoc.balloon[i] === 'string' ? tdoc.balloon[i] : tdoc.balloon[i].color, + })) + : [], + logo: { + preset: 'ICPC', + }, + // banner: { + // url: 'assets/banner.png', + // }, + options: { + submission_timestamp_unit: 'millisecond', + }, + }, + submissions: tsdocs.flatMap((i) => (i.journal || []).map((j) => ({ + problem_id: tdoc.pids.indexOf(j.pid), + team_id: `${i.uid}`, + timestamp: Math.floor(new ObjectId(j.rid).getTimestamp().getTime() - tdoc.beginAt.getTime()), + status: status[j.status] || 'SYSTEM_ERROR', + language: j.lang || '', + submission_id: j.rid, + }))), + teams, + }; + } else { + this.response.template = 'xcpcio_board.html'; + let query = ''; + if (gold || silver || bronze) { + query = `&gold=${gold}&silver=${silver}&bronze=${bronze}`; + } + this.response.body = { + dataSource: `/d/${tdoc.domainId}/contest/${tdoc.docId}/scoreboard/xcpcio?json=true${query}#allInOne=true`, + js: indexJs, + css: indexCss, + }; + } + }, + supportedRules: ['acm'], + }); + }); +} diff --git a/packages/scoreboard-xcpcio/install.ts b/packages/scoreboard-xcpcio/install.ts new file mode 100644 index 000000000..a909d645a --- /dev/null +++ b/packages/scoreboard-xcpcio/install.ts @@ -0,0 +1,12 @@ +import fs from 'fs'; +import path from 'path'; + +const dist = path.join(path.dirname(require.resolve('@xcpcio/board-app/package.json')), 'dist'); +const target = path.join(__dirname, 'public'); +if (fs.existsSync(target)) { + fs.rmSync(target, { recursive: true }); +} +fs.mkdirSync(target, { recursive: true }); +fs.cpSync(path.join(dist, 'assets'), path.join(target, 'assets'), { recursive: true }); +fs.cpSync(path.join(dist, 'index.html'), path.join(target, 'assets/board.html')); +console.log('Copied board app to', target); diff --git a/packages/scoreboard-xcpcio/package.json b/packages/scoreboard-xcpcio/package.json new file mode 100644 index 000000000..fb75e80b5 --- /dev/null +++ b/packages/scoreboard-xcpcio/package.json @@ -0,0 +1,12 @@ +{ + "name": "@hydrooj/scoreboard-xcpcio", + "license": "AGPL-3.0-or-later", + "version": "0.0.1", + "main": "index.ts", + "scripts": { + "install": "node -r @hydrooj/register install.ts" + }, + "dependencies": { + "@xcpcio/board-app": "^0.53.2" + } +} diff --git a/packages/scoreboard-xcpcio/templates/xcpcio_board.html b/packages/scoreboard-xcpcio/templates/xcpcio_board.html new file mode 100644 index 000000000..77c9fa1a3 --- /dev/null +++ b/packages/scoreboard-xcpcio/templates/xcpcio_board.html @@ -0,0 +1,33 @@ +{% set page_name = 'contest_scoreboard_xcpcio' %} +{% extends "layout/basic.html" %} +{% block content %} + + + + +
+ +{% endblock %} \ No newline at end of file diff --git a/packages/ui-default/templates/contest_scoreboard.html b/packages/ui-default/templates/contest_scoreboard.html index f4e776436..f75321be0 100644 --- a/packages/ui-default/templates/contest_scoreboard.html +++ b/packages/ui-default/templates/contest_scoreboard.html @@ -8,14 +8,16 @@
- {%- for ext in ['HTML','CSV'] -%} - + {%- for ext in ['HTML', 'CSV', 'Ghost'] -%} + {{ _('Export as {0}').format(ext) }} {%- endfor -%} - - {{ _('Export as Ghost') }} - + {% for id, name in availableViews %}{% if not ['html', 'csv', 'default', 'ghost'].includes(id) %} + + {{ _(name) }} + + {% endif %}{% endfor %} {% if model.contest.isDone(tdoc) and tdoc.lockAt and handler.user.own(tdoc) and not tdoc.unlocked %}