From 71ffb24bb15c9fd1ee67eb3207cea419f4ff94e4 Mon Sep 17 00:00:00 2001 From: undefined Date: Fri, 10 Jan 2025 16:21:28 +0800 Subject: [PATCH] upgrade deps --- framework/eslint-config/package.json | 6 +++--- framework/framework/package.json | 2 +- packages/hydrooj/package.json | 12 ++++++------ packages/hydrooj/src/handler/problem.ts | 2 +- packages/migrate/scripts/hustoj.ts | 9 +++++++-- packages/ui-default/package.json | 12 ++++++------ packages/utils/package.json | 2 +- packages/vjudge/src/fetch.ts | 10 +++++++--- 8 files changed, 32 insertions(+), 23 deletions(-) diff --git a/framework/eslint-config/package.json b/framework/eslint-config/package.json index 738812eef..a3f1aa85f 100644 --- a/framework/eslint-config/package.json +++ b/framework/eslint-config/package.json @@ -5,10 +5,10 @@ "main": "react.yaml", "dependencies": { "@stylistic/eslint-plugin": "^2.12.1", - "@typescript-eslint/eslint-plugin": "^8.19.0", - "@typescript-eslint/parser": "^8.19.0", + "@typescript-eslint/eslint-plugin": "^8.19.1", + "@typescript-eslint/parser": "^8.19.1", "eslint-config-airbnb": "^19.0.4", - "eslint-plugin-github": "^5.1.4", + "eslint-plugin-github": "^5.1.5", "eslint-plugin-import": "2.31.0", "eslint-plugin-jsx-a11y": "^6.10.2", "eslint-plugin-react": "^7.37.3", diff --git a/framework/framework/package.json b/framework/framework/package.json index e8925d4b8..54a3c390e 100644 --- a/framework/framework/package.json +++ b/framework/framework/package.json @@ -27,7 +27,7 @@ "@types/koa": "^2.15.0", "@types/koa-compress": "^4.0.6", "@types/koa-router": "^7.4.8", - "@types/lodash": "^4.17.13", + "@types/lodash": "^4.17.14", "@types/saslprep": "^1.0.3", "@types/ws": "^8.5.13" } diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index 4677db957..69e147269 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -12,11 +12,11 @@ }, "preferUnplugged": true, "dependencies": { - "@aws-sdk/client-s3": "3.717.0", - "@aws-sdk/lib-storage": "3.717.0", - "@aws-sdk/s3-presigned-post": "3.717.0", - "@aws-sdk/s3-request-presigner": "3.717.0", - "@graphql-tools/schema": "^10.0.15", + "@aws-sdk/client-s3": "3.726.0", + "@aws-sdk/lib-storage": "3.726.0", + "@aws-sdk/s3-presigned-post": "3.726.0", + "@aws-sdk/s3-request-presigner": "3.726.0", + "@graphql-tools/schema": "^10.0.16", "@hydrooj/framework": "workspace:^", "@hydrooj/utils": "workspace:^", "@simplewebauthn/server": "9.0.3", @@ -59,7 +59,7 @@ "@types/fs-extra": "^11.0.4", "@types/js-yaml": "^4.0.9", "@types/koa-static-cache": "^5.1.4", - "@types/lodash": "^4.17.13", + "@types/lodash": "^4.17.14", "@types/mime-types": "^2.1.4", "@types/mongodb-uri": "^0.9.4", "@types/nodemailer": "^6.4.17", diff --git a/packages/hydrooj/src/handler/problem.ts b/packages/hydrooj/src/handler/problem.ts index 34922a893..19ec98af0 100644 --- a/packages/hydrooj/src/handler/problem.ts +++ b/packages/hydrooj/src/handler/problem.ts @@ -1,5 +1,5 @@ import AdmZip from 'adm-zip'; -import { readFile, statSync } from 'fs-extra'; +import { readFile } from 'fs-extra'; import { escapeRegExp, flattenDeep, intersection, pick, } from 'lodash'; diff --git a/packages/migrate/scripts/hustoj.ts b/packages/migrate/scripts/hustoj.ts index a2f0716a2..74fa3bd54 100644 --- a/packages/migrate/scripts/hustoj.ts +++ b/packages/migrate/scripts/hustoj.ts @@ -317,12 +317,17 @@ hydrooj install https://hydro.ac/hydroac-client.zip const source = await query(`SELECT \`source\` FROM \`source_code\` WHERE \`solution_id\` = ${rdoc.solution_id}`); if (source[0]?.source) data.code = source[0].source; if (rdoc.contest_id) { - data.contest = new ObjectId(tidMap[rdoc.contest_id]); - await ContestModel.attend(domainId, data.contest, uidMap[rdoc.user_id]).catch(noop); + if (!tidMap[rdoc.contest_id]) { + report({ message: `warning: contest_id ${rdoc.contest_id} for submission ${rdoc.solution_id} not found` }); + } else { + data.contest = new ObjectId(tidMap[rdoc.contest_id]); + await ContestModel.attend(domainId, data.contest, uidMap[rdoc.user_id]).catch(noop); + } } await RecordModel.coll.insertOne(data); await postJudge(data).catch((err) => report({ message: err.message })); } + if (pageId % 10 === 0) report({ message: `record finished ${pageId * step} / ${rcount} (${Math.round(((pageId * step) / rcount) * 100)}%)` }); } report({ message: 'record finished' }); diff --git a/packages/ui-default/package.json b/packages/ui-default/package.json index 3742e9443..f563c6033 100644 --- a/packages/ui-default/package.json +++ b/packages/ui-default/package.json @@ -25,7 +25,7 @@ "@fontsource/source-code-pro": "^5.1.1", "@fontsource/ubuntu-mono": "^5.1.1", "@hydrooj/utils": "workspace:^", - "@sentry/browser": "^8.47.0", + "@sentry/browser": "^8.48.0", "@sentry/webpack-plugin": "^2.22.7", "@simplewebauthn/browser": "9.0.1", "@svgr/webpack": "^8.1.0", @@ -52,8 +52,8 @@ "clean-webpack-plugin": "^4.0.0", "clipboard": "^2.0.11", "copy-webpack-plugin": "^12.0.2", - "core-js": "^3.39.0", - "core-js-compat": "^3.39.0", + "core-js": "^3.40.0", + "core-js-compat": "^3.40.0", "css-loader": "^6.11.0", "diff": "^7.0.0", "diff-dom": "^5.1.4", @@ -69,7 +69,7 @@ "jquery.easing": "^1.4.1", "jquery.transit": "^0.9.12", "matchmedia-polyfill": "^0.3.2", - "md-editor-rt": "^5.1.1", + "md-editor-rt": "^5.2.0", "mini-css-extract-plugin": "^2.9.2", "moment": "^2.30.1", "monaco-editor": "0.50.0", @@ -114,7 +114,7 @@ "timeago-react": "^3.0.6", "timeago.js": "^4.0.2", "ts-loader": "^9.5.1", - "web-streams-polyfill": "^4.0.0", + "web-streams-polyfill": "^4.1.0", "webpack": "^5.97.1", "webpack-bundle-analyzer": "^4.10.2", "webpack-dev-server": "^5.2.0", @@ -141,7 +141,7 @@ "nunjucks": "^3.2.4", "schemastery-jsonschema": "^1.1.0", "streamsaver": "^2.0.6", - "uuid": "^11.0.3", + "uuid": "^11.0.5", "xss": "^1.0.15" } } diff --git a/packages/utils/package.json b/packages/utils/package.json index 5a679b88b..32fc682ef 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -16,7 +16,7 @@ "mongodb": "^5.9.2", "reggol": "^1.7.1", "search-query-parser": "^1.6.0", - "systeminformation": "^5.24.6" + "systeminformation": "^5.25.9" }, "devDependencies": { "@types/fs-extra": "^11.0.4" diff --git a/packages/vjudge/src/fetch.ts b/packages/vjudge/src/fetch.ts index 5f99b0f19..63150302f 100644 --- a/packages/vjudge/src/fetch.ts +++ b/packages/vjudge/src/fetch.ts @@ -29,7 +29,7 @@ export class BasicFetcher { get(url: string) { this.logger.debug('get', url); - url = new URL(url, this.account.endpoint || this.defaultEndpoint).toString(); + url = new URL(url, this.endpoint).toString(); let req = superagent.get(url).set('Cookie', this.cookie).set('User-Agent', this.UA); if (this.fetchOptions.headers) req = req.set(this.fetchOptions.headers); if (this.fetchOptions.get?.headers) req = req.set(this.fetchOptions.get.headers); @@ -46,7 +46,7 @@ export class BasicFetcher { post(url: string) { this.logger.debug('post', url, this.cookie); - url = new URL(url, this.account.endpoint || this.defaultEndpoint).toString(); + url = new URL(url, this.endpoint).toString(); let req = superagent.post(url).set('Cookie', this.cookie).set('User-Agent', this.UA).type(this.formType); if (this.fetchOptions.headers) req = req.set(this.fetchOptions.headers); if (this.fetchOptions.post?.headers) req = req.set(this.fetchOptions.post.headers); @@ -60,7 +60,11 @@ export class BasicFetcher { return null; } - setEndpoint(endpoint: string) { + get endpoint() { + return this.account.endpoint || this.defaultEndpoint; + } + + set endpoint(endpoint: string) { this.defaultEndpoint = endpoint; } }