bump dep version

This commit is contained in:
undefined committed 2021-08-06 00:58:39 +08:00
1 parent 7b34eaebb2
commit 54a97b51d5
13 files changed
+34 -35

No files matched your search

+2 -2
View File
@@ -28,7 +28,7 @@
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"devDependencies": { "devDependencies": {
"@types/cross-spawn": "^6.0.2", "@types/cross-spawn": "^6.0.2",
"@types/node": "^15.14.5", "@types/node": "^15.14.7",
"@types/semver": "^7.3.8", "@types/semver": "^7.3.8",
"@typescript-eslint/eslint-plugin": "^4.29.0", "@typescript-eslint/eslint-plugin": "^4.29.0",
"@typescript-eslint/parser": "^4.29.0", "@typescript-eslint/parser": "^4.29.0",
@@ -42,7 +42,7 @@
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
"globby": "^11.0.4", "globby": "^11.0.4",
"latest-version": "^5.1.0", "latest-version": "^5.1.0",
"mongodb": "^3.6.10", "mongodb": "^3.6.11",
"nmls": "^3.0.1", "nmls": "^3.0.1",
"ora": "^5.4.1", "ora": "^5.4.1",
"semver": "^7.3.5", "semver": "^7.3.5",
+1 -2
View File
@@ -11,8 +11,7 @@
"superagent": "^6.1.0" "superagent": "^6.1.0"
}, },
"devDependencies": { "devDependencies": {
"@types/js-yaml": "^4.0.2", "@types/js-yaml": "^4.0.2"
"@types/node": "^15.14.5"
}, },
"peerDependencies": { "peerDependencies": {
"hydrooj": "*" "hydrooj": "*"
+1 -1
View File
@@ -11,7 +11,7 @@
"adm-zip": "^0.5.5", "adm-zip": "^0.5.5",
"decode-html": "^2.0.0", "decode-html": "^2.0.0",
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
"mongodb": "^3.6.10", "mongodb": "^3.6.11",
"xml2js": "^0.4.23" "xml2js": "^0.4.23"
}, },
"devDependencies": { "devDependencies": {
+5 -5
View File
@@ -1,7 +1,7 @@
{ {
"name": "@hydrooj/hydrojudge", "name": "@hydrooj/hydrojudge",
"bin": "bin/hydrojudge.js", "bin": "bin/hydrojudge.js",
"version": "2.9.6", "version": "2.10.0",
"main": "package.json", "main": "package.json",
"author": "undefined <i@undefined.moe>", "author": "undefined <i@undefined.moe>",
"repository": "https://github.com/hydro-dev/Hydro.git", "repository": "https://github.com/hydro-dev/Hydro.git",
@@ -9,14 +9,14 @@
"@hydrooj/utils": "workspace:*", "@hydrooj/utils": "workspace:*",
"axios": "^0.21.1", "axios": "^0.21.1",
"cac": "^6.7.3", "cac": "^6.7.3",
"esbuild": "^0.12.17", "esbuild": "^0.12.18",
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"mongodb": "^3.6.10", "mongodb": "^3.6.11",
"p-queue": "^6.6.2", "p-queue": "^7.1.0",
"shell-quote": "^1.7.2", "shell-quote": "^1.7.2",
"ws": "^7.5.3" "ws": "^8.0.0"
}, },
"preferUnplugged": true, "preferUnplugged": true,
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
+3 -3
View File
@@ -261,13 +261,13 @@ export default class Hydro {
: '{"key":"ping"}'; : '{"key":"ping"}';
setInterval(() => this.ws.send(content), 30000); setInterval(() => this.ws.send(content), 30000);
}); });
this.ws.on('message', (data) => { this.ws.on('message', (data, isBinary) => {
const request = JSON.parse(data.toString()); const request = JSON.parse(isBinary ? data : data.toString());
if (request.language) this.language = request.language; if (request.language) this.language = request.language;
if (request.task) queue.push(new JudgeTask(this, request.task, this.ws)); if (request.task) queue.push(new JudgeTask(this, request.task, this.ws));
}); });
this.ws.on('close', (data, reason) => { this.ws.on('close', (data, reason) => {
log.warn(`[${this.config.host}] Websocket 断开:`, data, reason); log.warn(`[${this.config.host}] Websocket 断开:`, data, reason.toString());
setTimeout(() => this.retry(queue), 30000); setTimeout(() => this.retry(queue), 30000);
}); });
this.ws.on('error', (e) => { this.ws.on('error', (e) => {
-1
View File
@@ -177,7 +177,6 @@ export const judge = async (ctx) => {
if (ctx.failed[required.toString()]) effective = false; if (ctx.failed[required.toString()]) effective = false;
} }
if (effective) ctx.total_score += scores[sid]; if (effective) ctx.total_score += scores[sid];
console.log(effective, ctx.total_score, scores[sid], sid);
} }
ctx.stat.done = new Date(); ctx.stat.done = new Date();
if (process.env.DEV) ctx.next({ message: JSON.stringify(ctx.stat) }); if (process.env.DEV) ctx.next({ message: JSON.stringify(ctx.stat) });
+2
View File
@@ -46,7 +46,9 @@ function proc({
cpuLimit: time * 1000 * 1000 * rate, cpuLimit: time * 1000 * 1000 * rate,
realCpuLimit: time * 3000 * 1000 * rate, realCpuLimit: time * 3000 * 1000 * rate,
memoryLimit: memory * 1024 * 1024, memoryLimit: memory * 1024 * 1024,
stackLimit: memory * 1024 * 1024,
procLimit: process_limit, procLimit: process_limit,
strictMemoryLimit: true,
copyIn, copyIn,
copyOut, copyOut,
copyOutCached, copyOutCached,
+5 -5
View File
@@ -1,6 +1,6 @@
{ {
"name": "hydrooj", "name": "hydrooj",
"version": "2.30.14", "version": "2.31.0",
"bin": "bin/hydrooj.js", "bin": "bin/hydrooj.js",
"main": "src/loader", "main": "src/loader",
"module": "src/loader", "module": "src/loader",
@@ -8,7 +8,7 @@
"author": "undefined <i@undefined.moe>", "author": "undefined <i@undefined.moe>",
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"engines": { "engines": {
"node": ">=14" "node": ">=10.4"
}, },
"preferUnplugged": true, "preferUnplugged": true,
"dependencies": { "dependencies": {
@@ -30,11 +30,11 @@
"lru-cache": "^6.0.0", "lru-cache": "^6.0.0",
"minio": "7.0.17", "minio": "7.0.17",
"moment-timezone": "^0.5.33", "moment-timezone": "^0.5.33",
"mongodb": "^3.6.10", "mongodb": "^3.6.11",
"nodemailer": "^6.6.3", "nodemailer": "^6.6.3",
"p-queue": "^6.6.2", "p-queue": "^7.1.0",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
"serialize-javascript": "^5.0.1", "serialize-javascript": "^6.0.0",
"sockjs": "^0.3.21", "sockjs": "^0.3.21",
"superagent": "^6.1.0" "superagent": "^6.1.0"
}, },
+1 -1
View File
@@ -7,7 +7,7 @@
"license": "AGPL-3.0-or-later", "license": "AGPL-3.0-or-later",
"preferUnplugged": true, "preferUnplugged": true,
"dependencies": { "dependencies": {
"ws": "^7.5.3" "ws": "^8.0.0"
}, },
"devDependencies": { "devDependencies": {
"@types/ws": "^7.4.7" "@types/ws": "^7.4.7"
+2 -2
View File
@@ -18,8 +18,8 @@ export async function postInit() {
if (accessToken) headers.Authorization = `Bearer ${accessToken}`; if (accessToken) headers.Authorization = `Bearer ${accessToken}`;
const socket = new WebSocket(url, { headers }); const socket = new WebSocket(url, { headers });
socket.on('error', console.error); socket.on('error', console.error);
socket.on('message', async (message) => { socket.on('message', async (message, isBinary) => {
const payload = JSON.parse(message.toString()); const payload = JSON.parse(isBinary ? message : message.toString());
if (payload.post_type !== 'message') return; if (payload.post_type !== 'message') return;
if (payload.message.startsWith('login ')) { if (payload.message.startsWith('login ')) {
const secret = payload.message.split(' ')[1]; const secret = payload.message.split(' ')[1];
+1 -1
View File
@@ -10,6 +10,6 @@
"@types/mongodb": "^3.6.20" "@types/mongodb": "^3.6.20"
}, },
"dependencies": { "dependencies": {
"mongodb": "^3.6.10" "mongodb": "^3.6.11"
} }
} }
+10 -10
View File
@@ -8,8 +8,8 @@
"preferUnplugged": true, "preferUnplugged": true,
"devDependencies": { "devDependencies": {
"@babel/cli": "^7.14.8", "@babel/cli": "^7.14.8",
"@babel/core": "^7.14.8", "@babel/core": "^7.15.0",
"@babel/eslint-parser": "7.14.9", "@babel/eslint-parser": "7.15.0",
"@babel/plugin-proposal-class-properties": "^7.14.5", "@babel/plugin-proposal-class-properties": "^7.14.5",
"@babel/plugin-proposal-export-namespace-from": "^7.14.5", "@babel/plugin-proposal-export-namespace-from": "^7.14.5",
"@babel/plugin-proposal-function-sent": "^7.14.5", "@babel/plugin-proposal-function-sent": "^7.14.5",
@@ -18,8 +18,8 @@
"@babel/plugin-proposal-throw-expressions": "^7.14.5", "@babel/plugin-proposal-throw-expressions": "^7.14.5",
"@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-import-meta": "^7.10.4", "@babel/plugin-syntax-import-meta": "^7.10.4",
"@babel/plugin-transform-runtime": "^7.14.5", "@babel/plugin-transform-runtime": "^7.15.0",
"@babel/preset-env": "^7.14.9", "@babel/preset-env": "^7.15.0",
"@babel/preset-react": "^7.14.5", "@babel/preset-react": "^7.14.5",
"@babel/register": "^7.14.5", "@babel/register": "^7.14.5",
"@babel/runtime-corejs3": "^7.14.9", "@babel/runtime-corejs3": "^7.14.9",
@@ -28,7 +28,7 @@
"@blueprintjs/icons": "^3.27.0", "@blueprintjs/icons": "^3.27.0",
"@blueprintjs/select": "^3.16.6", "@blueprintjs/select": "^3.16.6",
"@hydrooj/utils": "workspace:*", "@hydrooj/utils": "workspace:*",
"@types/json-schema": "^7.0.8", "@types/json-schema": "^7.0.9",
"@types/katex": "^0.11.1", "@types/katex": "^0.11.1",
"@undefined-moe/monaco-yaml": "^2.5.0", "@undefined-moe/monaco-yaml": "^2.5.0",
"ansi_up": "^5.0.1", "ansi_up": "^5.0.1",
@@ -86,7 +86,7 @@
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-redux": "^7.2.4", "react-redux": "^7.2.4",
"react-split-pane": "^0.1.92", "react-split-pane": "^0.1.92",
"redux": "^4.1.0", "redux": "^4.1.1",
"redux-logger": "^3.0.6", "redux-logger": "^3.0.6",
"redux-promise-middleware": "^6.1.2", "redux-promise-middleware": "^6.1.2",
"redux-thunk": "^2.3.0", "redux-thunk": "^2.3.0",
@@ -113,20 +113,20 @@
"webpackbar": "^5.0.0-3" "webpackbar": "^5.0.0-3"
}, },
"dependencies": { "dependencies": {
"esbuild": "^0.12.17", "esbuild": "^0.12.18",
"esbuild-loader": "^2.13.1", "esbuild-loader": "^2.14.0",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"jsesc": "^3.0.2", "jsesc": "^3.0.2",
"katex": "^0.13.13", "katex": "^0.13.13",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"markdown-it": "^12.2.0", "markdown-it": "^12.2.0",
"markdown-it-anchor": "^7.1.0", "markdown-it-anchor": "^8.1.2",
"markdown-it-footnote": "^3.0.3", "markdown-it-footnote": "^3.0.3",
"markdown-it-imsize": "^2.0.1", "markdown-it-imsize": "^2.0.1",
"markdown-it-mark": "^3.0.1", "markdown-it-mark": "^3.0.1",
"markdown-it-merge-cells": "^1.0.1", "markdown-it-merge-cells": "^1.0.1",
"markdown-it-table-of-contents": "^0.5.2", "markdown-it-table-of-contents": "^0.5.2",
"mongodb": "^3.6.10", "mongodb": "^3.6.11",
"nunjucks": "^3.2.3", "nunjucks": "^3.2.3",
"streamsaver": "^2.0.5", "streamsaver": "^2.0.5",
"xss": "^1.0.9" "xss": "^1.0.9"
+1 -2
View File
@@ -11,12 +11,11 @@
"fs-extra": "^10.0.0", "fs-extra": "^10.0.0",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"moment": "^2.29.1", "moment": "^2.29.1",
"mongodb": "^3.6.10", "mongodb": "^3.6.11",
"systeminformation": "^5.7.9" "systeminformation": "^5.7.9"
}, },
"devDependencies": { "devDependencies": {
"@types/fs-extra": "^9.0.12", "@types/fs-extra": "^9.0.12",
"@types/node": "^15.14.5",
"moment-timezone": "^0.5.33" "moment-timezone": "^0.5.33"
} }
} }