Merge branch 'master' into develop

packages/hydrojudge/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@hydrooj/hydrojudge",
     "bin": "bin/hydrojudge.js",
-    "version": "2.5.16",
+    "version": "2.5.18",
     "main": "package.json",
     "author": "undefined <i@undefined.moe>",
     "repository": "https://github.com/hydro-dev/Hydro.git",
     "dependencies": {
-        "@hydrooj/utils": "^1.0.8",
+        "@hydrooj/utils": "^1.0.9",
         "adm-zip": "^0.5.5",
         "axios": "^0.21.1",
         "bson": "^4.3.0",

packages/hydrojudge/src/cases.ts

@@ -104,8 +104,9 @@ async function read0(folder: string, files: string[], checkFile, cfg) {
     return config;
 }
 
-async function read1(folder: string, files: string[], checkFile, cfg) {
+async function read1(folder: string, files: string[], checkFile, cfg, rst) {
     const subtask = {};
+    for (const s of rst.subtasks) if (s.id) subtask[s.id] = s;
     const subtasks = [];
     for (const file of files) {
         for (const REG of RE1) {
@@ -150,7 +151,7 @@ async function read1(folder: string, files: string[], checkFile, cfg) {
     return config;
 }
 
-async function readAutoCases(folder, { next }, cfg) {
+async function readAutoCases(folder, { next }, cfg, rst) {
     const config = {
         checker_type: 'default',
         count: 0,
@@ -170,7 +171,7 @@ async function readAutoCases(folder, { next }, cfg) {
             files.push(...outputs.map((i) => `output/${i}`));
         }
         let result = await read0(folder, files, checkFile, cfg);
-        if (!result.count) result = await read1(folder, files, checkFile, cfg);
+        if (!result.count) result = await read1(folder, files, checkFile, cfg, rst);
         Object.assign(config, result);
         next({ message: { message: 'Found {0} testcases.', params: [config.count] } });
     } catch (e) {
@@ -214,8 +215,12 @@ export default async function readCases(folder: string, cfg: Record<string, any>
     } catch (e) {
         throw changeErrorType(e, FormatError);
     }
-    if (!(result.outputs?.length || result.subtasks.length)) {
-        const c = await readAutoCases(folder, args, config);
+    let auto = !result.outputs?.length;
+    if (!result.subtasks.length) {
+        auto = !Math.sum(result.subtasks.map((subtask) => subtask.cases.length));
+    }
+    if (auto) {
+        const c = await readAutoCases(folder, args, config, result);
         result.subtasks = c.subtasks;
         result.count = c.count;
     }

packages/hydrojudge/src/hosts/hydro.ts

@@ -167,7 +167,7 @@ export default class Hydro {
 
     constructor(config) {
         this.config = config;
-        this.config.detail = this.config.detail || true;
+        this.config.detail = this.config.detail ?? true;
         this.config.cookie = this.config.cookie || '';
         this.config.last_update_at = this.config.last_update_at || 0;
         if (!this.config.server_url.startsWith('http')) this.config.server_url = `http://${this.config.server_url}`;

packages/hydrojudge/src/hosts/vj4.ts

@@ -173,7 +173,7 @@ export default class VJ4 {
 
     constructor(config) {
         this.config = config;
-        this.config.detail = this.config.detail || true;
+        this.config.detail = this.config.detail ?? true;
         this.config.cookie = this.config.cookie || '';
         this.config.last_update_at = this.config.last_update_at || 0;
         if (!this.config.server_url.startsWith('http')) this.config.server_url = `http://${this.config.server_url}`;

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.23.30",
+    "version": "2.23.31",
     "bin": "bin/hydrooj.js",
     "main": "dist/loader.js",
     "typings": "dist/loader.d.ts",

packages/hydrooj/src/handler/domain.ts

@@ -219,7 +219,7 @@ class DomainJoinApplicationsHandler extends ManageHandler {
         if (!this.response.body.joinSettings) {
             delete this.response.body.expirations[domain.JOIN_EXPIRATION_KEEP_CURRENT];
         }
-        this.response.body.url_prefix = system.get('server.url');
+        this.response.body.url_prefix = (this.domain.host || [])[0] || system.get('server.url');
         this.response.body.path = [
             ['Hydro', 'homepage'],
             ['domain', null],

packages/hydrooj/src/handler/home.ts

@@ -168,7 +168,7 @@ class HomeSecurityHandler extends Handler {
         const m = await this.renderHTML('user_changemail_mail.html', {
             path: `home/changeMail/${code}`,
             uname: this.user.uname,
-            url_prefix: system.get('server.url'),
+            url_prefix: (this.domain.host || [])[0] || system.get('server.url'),
         });
         await mail.sendMail(email, 'Change Email', 'user_changemail_mail', m);
         this.response.template = 'user_changemail_mail_sent.html';

packages/hydrooj/src/handler/user.ts

@@ -79,7 +79,7 @@ export class UserRegisterHandler extends Handler {
             if (system.get('smtp.user')) {
                 const m = await this.renderHTML('user_register_mail.html', {
                     path: `register/${t[0]}`,
-                    url_prefix: system.get('server.url'),
+                    url_prefix: (this.domain.host || [])[0] || system.get('server.url'),
                 });
                 await sendMail(mail, 'Sign Up', 'user_register_mail', m);
                 this.response.template = 'user_register_mail_sent.html';
@@ -146,7 +146,7 @@ class UserLostPassHandler extends Handler {
         );
         const m = await this.renderHTML('user_lostpass_mail.html', {
             url: `lostpass/${tid}`,
-            url_prefix: system.get('server.url'),
+            url_prefix: this.domain.host || system.get('server.url'),
             uname: udoc.uname,
         });
         await sendMail(mail, 'Lost Password', 'user_lostpass_mail', m);

packages/hydrooj/src/interface.ts

@@ -307,7 +307,7 @@ export interface DomainDoc extends Record<string, any> {
     avatar: string,
     bulletin: string,
     _join?: any,
-    host?: string,
+    host?: string[],
 }
 
 // Message

packages/hydrooj/src/pipelineUtils.ts

@@ -5,7 +5,7 @@ import user from './model/user';
 import problem, { Field, Pdoc } from './model/problem';
 
 export async function iterateAllDomain(cb: (ddoc: DomainDoc, current?: number, total?: number) => Promise<any>) {
-    const ddocs = await domain.getMulti().project({ _id: 1, owner: 1 }).toArray();
+    const ddocs = await domain.getMulti().toArray();
     for (const i in ddocs) await cb(ddocs[i], +i, ddocs.length);
 }
 

packages/hydrooj/src/upgrade.ts

@@ -311,6 +311,12 @@ const scripts: UpgradeScript[] = [
         await db.collection('oplog').updateMany({}, { $set: { type: 'delete', operateIp: '127.0.0.1' } });
         return true;
     },
+    async function _24_25() {
+        await iterateAllDomain(async (ddoc) => {
+            if (typeof ddoc.host === 'string') await domain.edit(ddoc._id, { host: [ddoc.host] });
+        });
+        return true;
+    },
 ];
 
 export default scripts;

packages/utils/lib/cases.ts

@@ -51,7 +51,7 @@ export default async function readYamlCases(cfg: Record<string, any> = {}, check
     } else if (cfg.subtasks) {
         for (const subtask of cfg.subtasks) {
             const cases = [];
-            for (const c of subtask.cases) {
+            for (const c of subtask.cases || []) {
                 config.count++;
                 cases.push({
                     input: c.input ? checkFile(c.input, 'Cannot find input file {0}.') : '/dev/null',

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hydrooj/utils",
-    "version": "1.0.8",
+    "version": "1.0.9",
     "description": "hydrooj utils",
     "main": "package.json",
     "repository": "https://github.com/hydro-dev/Hydro.git",