Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

upgrade deps

Browse Source
This commit is contained in:
undefined committed 2022-12-12 02:43:10 +08:00
1 parent 96fa6cc7b9
commit 80e3abf27b
12 files changed
+65 -70
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrojudge/package.json
+2 -6
View File
@@ -9,21 +9,17 @@
"@hydrooj/utils": "workspace:*",
"cac": "^6.7.14",
"fs-extra": "^10.1.0",
"js-yaml": "^4.1.0",
"lodash": "^4.17.21",
"mongodb": "^3.7.3",
"p-queue": "^7.3.0",
"schemastery": "^3.5.4",
"schemastery": "^3.6.1",
"shell-quote": "^1.7.4",
"superagent": "^8.0.4",
"superagent": "^8.0.6",
"ws": "^8.11.0"
},
"preferUnplugged": true,
"license": "AGPL-3.0-or-later",
"devDependencies": {
"@types/fs-extra": "^9.0.13",
"@types/js-yaml": "^4.0.5",
"@types/lodash": "^4.14.190",
"@types/shell-quote": "^1.7.1",
"@types/ws": "^8.5.3"
}
packages/hydrojudge/src/cases.ts
+3 -5
View File
@@ -1,11 +1,9 @@
/* eslint-disable no-await-in-loop */
import path from 'path';
import fs from 'fs-extra';
import yaml from 'js-yaml';
import { max, sum } from 'lodash';
import readYamlCases, { convertIniConfig } from '@hydrooj/utils/lib/cases';
import { normalizeSubtasks, readSubtasksFromFiles } from '@hydrooj/utils/lib/common';
import { changeErrorType } from '@hydrooj/utils/lib/utils';
import { changeErrorType, yaml } from '@hydrooj/utils/lib/utils';
import { ProblemConfigFile } from 'hydrooj';
import { getConfig } from './config';
import { FormatError, SystemError } from './error';
@@ -16,11 +14,11 @@ function isValidConfig(config) {
if (config.count > (getConfig('testcases_max') || 100)) {
throw new FormatError('Too many testcases. Cancelled.');
}
const time = sum(config.subtasks.map((subtask) => sum(subtask.cases.map((c) => c.time))));
const time = Math.sum(config.subtasks.map((subtask) => Math.sum(subtask.cases.map((c) => c.time))));
if (time > (getConfig('total_time_limit') || 60) * 1000) {
throw new FormatError('Total time limit longer than {0}s. Cancelled.', [+getConfig('total_time_limit') || 60]);
}
const memMax = max(config.subtasks.map((subtask) => max(subtask.cases.map((c) => c.memory))));
const memMax = Math.max(config.subtasks.map((subtask) => Math.max(subtask.cases.map((c) => c.memory))));
if (memMax > parseMemoryMB(getConfig('memoryMax'))) throw new FormatError('Memory limit larger than memory_max');
if (!['default', 'strict'].includes(config.checker_type || 'default') && !config.checker) {
throw new FormatError('You did not specify a checker.');
packages/hydrojudge/src/config.ts
+1 -1
View File
@@ -2,8 +2,8 @@ import os from 'os';
import path from 'path';
import cac from 'cac';
import fs from 'fs-extra';
import yaml from 'js-yaml';
import Schema from 'schemastery';
import { yaml } from '@hydrooj/utils';
const argv = cac().parse();
packages/hydrojudge/src/judge/objective.ts
+1 -1
View File
@@ -1,6 +1,6 @@
import assert from 'assert';
import { readFile } from 'fs-extra';
import yaml from 'js-yaml';
import { yaml } from '@hydrooj/utils';
import { STATUS } from '@hydrooj/utils/lib/status';
import { FormatError } from '../error';
import { Context } from './interface';
packages/hydrojudge/src/task.ts
+2 -3
View File
@@ -1,6 +1,5 @@
import path from 'path';
import fs from 'fs-extra';
import { noop } from 'lodash';
import { LangConfig } from '@hydrooj/utils/lib/lang';
import { STATUS } from '@hydrooj/utils/lib/status';
import type {
@@ -40,7 +39,7 @@ export class JudgeTask {
folder: string;
config: ParsedConfig;
meta: JudgeMeta;
files?:Record<string, string>;
files?: Record<string, string>;
next: (data: Partial<JudgeResultBody>) => void;
end: (data: Partial<JudgeResultBody>) => void;
env: Record<string, string>;
@@ -103,7 +102,7 @@ export class JudgeTask {
} finally {
Lock.release(`${host}/${this.source}/${this.rid}`);
// eslint-disable-next-line no-await-in-loop
for (const clean of this.clean) await clean()?.catch(noop);
for (const clean of this.clean) await clean()?.catch(() => null);
tmpfs.umount(this.tmpdir);
fs.removeSync(this.tmpdir);
}