bug fix

packages/hydrooj/package.json

@@ -1,6 +1,6 @@
 {
     "name": "hydrooj",
-    "version": "2.32.13",
+    "version": "2.32.14",
     "bin": "bin/hydrooj.js",
     "main": "src/loader",
     "module": "src/loader",

packages/hydrooj/src/model/discussion.ts

@@ -89,7 +89,7 @@ export async function add(
     };
     await bus.serial('discussion/before-add', payload);
     const res = await document.add(
-        payload.domainId, payload.content, payload.owner, document.TYPE_DISCUSSION,
+        payload.domainId!, payload.content!, payload.owner!, document.TYPE_DISCUSSION,
         null, payload.parentType, payload.parentId, omit(payload, ['domainId', 'content', 'owner', 'parentType', 'parentId']),
     );
     payload.docId = res;

packages/hydrooj/src/model/domain.ts

@@ -63,7 +63,7 @@ class DomainModel {
         const query: FilterQuery<DomainDoc> = { lower: domainId.toLowerCase() };
         await bus.serial('domain/before-get', query);
         const result = await coll.findOne(query);
-        await bus.serial('domain/get', result);
+        if (result) await bus.serial('domain/get', result);
         return result;
     }
 
@@ -72,7 +72,7 @@ class DomainModel {
         const query: FilterQuery<DomainDoc> = { host };
         await bus.serial('domain/before-get', query);
         const result = await coll.findOne(query);
-        await bus.serial('domain/get', result);
+        if (result) await bus.serial('domain/get', result);
         return result;
     }
 
@@ -83,7 +83,7 @@ class DomainModel {
     static async edit(domainId: string, $set: Partial<DomainDoc>) {
         await bus.serial('domain/before-update', domainId, $set);
         const result = await coll.findOneAndUpdate({ _id: domainId }, { $set }, { returnDocument: 'after' });
-        await bus.serial('domain/update', domainId, $set, result.value);
+        if (result.value) await bus.serial('domain/update', domainId, $set, result.value);
         return result.value;
     }
 
@@ -96,12 +96,12 @@ class DomainModel {
             { $inc: { [field]: n } },
             { returnDocument: 'after' },
         );
-        return res.value[field];
+        return res.value?.[field];
     }
 
     @ArgMethod
-    static async getList(domainIds: string[]): Promise<Dictionary<DomainDoc>> {
+    static async getList(domainIds: string[]) {
-        const r = {};
+        const r: Record<string, DomainDoc | null> = {};
         // eslint-disable-next-line no-await-in-loop
         for (const domainId of domainIds) r[domainId] = await DomainModel.get(domainId);
         return r;

packages/hydrooj/src/model/message.ts

@@ -48,7 +48,7 @@ class MessageModel {
             { $bit: { flag: { xor: flag } } },
             { returnDocument: 'after' },
         );
-        return result.value;
+        return result.value || null;
     }
 
     static async del(_id: ObjectID) {

packages/hydrooj/src/model/oauth.ts

@@ -21,7 +21,7 @@ class OauthModel {
             { $set: { value } },
             { upsert: true, returnDocument: 'after' },
         );
-        return res.value.uid;
+        return res.value?.uid;
     }
 }
 

packages/hydrooj/src/model/record.ts

@@ -3,14 +3,15 @@ import {
     PushOperator, MatchKeysAndValues, OnlyFieldsOfType,
     FilterQuery,
 } from 'mongodb';
-import { sum } from 'lodash';
+import { omit, sum } from 'lodash';
 import moment from 'moment';
 import { STATUS } from './builtin';
 import task from './task';
 import problem from './problem';
 import {
-    RecordDoc, ContestInfo, ProblemConfigFile, ExternalProblemId,
+    RecordDoc, ContestInfo, ProblemConfigFile, ExternalProblemId, FileInfo,
 } from '../interface';
+import { ProblemNotFoundError } from '../error';
 import { ArgMethod, buildProjection, Time } from '../utils';
 import { MaybeArray } from '../typeutils';
 import * as bus from '../service/bus';
@@ -34,7 +35,7 @@ class RecordModel {
 
     static async get(_id: ObjectID): Promise<RecordDoc | null>
     static async get(domainId: string, _id: ObjectID): Promise<RecordDoc | null>
-    static async get(arg0, arg1?) {
+    static async get(arg0: string | ObjectID, arg1?: any) {
         const _id = arg1 || arg0;
         const domainId = arg1 ? arg0 : null;
         const res = await RecordModel.coll.findOne({ _id });
@@ -61,15 +62,16 @@ class RecordModel {
 
     static async judge(domainId: string, rid: ObjectID, priority = 0, config: ProblemConfigFile = {}) {
         const rdoc = await RecordModel.get(domainId, rid);
-        let data = [];
+        if (!rdoc) return null;
-        delete rdoc._id;
+        let data: FileInfo[] = [];
         if (rdoc.pid) {
             const pdoc = await problem.get(rdoc.pdomain, rdoc.pid);
+            if (!pdoc) throw new ProblemNotFoundError(rdoc?.pdomain, rdoc.pid);
             data = pdoc.data;
-            if (typeof pdoc.config === 'string') throw new Error(); // Just for typings. This won't happen.
+            if (typeof pdoc.config === 'string') throw new Error(pdoc.config);
             if (pdoc.config.type === 'remote_judge') {
                 return await task.add({
-                    ...rdoc,
+                    ...omit(rdoc, ['_id']),
                     priority,
                     type: 'remotejudge',
                     subType: pdoc.config.subType,
@@ -82,7 +84,7 @@ class RecordModel {
             }
         }
         return await task.add({
-            ...rdoc,
+            ...omit(rdoc, ['_id']),
             priority,
             type: 'judge',
             rid,
@@ -162,7 +164,7 @@ class RecordModel {
                 $update,
                 { returnDocument: 'after' },
             );
-            return res.value;
+            return res.value || null;
         }
         return await RecordModel.get(domainId, _id);
     }
@@ -204,14 +206,13 @@ class RecordModel {
     static async getList(
         domainId: string, rids: ObjectID[], showHidden: boolean, fields?: (keyof RecordDoc)[],
     ): Promise<Record<string, Partial<RecordDoc>>> {
-        const r = {};
+        const r: Record<string, RecordDoc> = {};
         rids = Array.from(new Set(rids));
         let cursor = RecordModel.coll.find({ domainId, _id: { $in: rids } });
         if (fields) cursor = cursor.project(buildProjection(fields));
         const rdocs = await cursor.toArray();
         for (const rdoc of rdocs) {
-            if (rdoc.hidden && !showHidden) r[rdoc._id.toHexString()] = null;
+            if (!rdoc.hidden || showHidden) r[rdoc._id.toHexString()] = rdoc;
-            else r[rdoc._id.toHexString()] = rdoc;
         }
         return r;
     }

packages/hydrooj/src/service/server.ts

@@ -868,6 +868,7 @@ let started = false;
 export function start() {
     if (started) return;
     const port = system.get('server.port');
+    router.all('domain_main_redirect', '/d/:domain', (ctx) => ctx.redirect(`/d/${ctx.params.domain}/`));
     app.use(router.routes()).use(router.allowedMethods());
     server.listen(argv.options.port || port);
     logger.success('Server listening at: %d', argv.options.port || port);

packages/hydrooj/src/service/storage.ts

@@ -193,7 +193,7 @@ class StorageService {
     async signDownloadLink(target: string, filename?: string, noExpire = false, useAlternativeEndpointFor?: 'user' | 'judge'): Promise<string> {
         if (target.includes('..') || target.includes('//')) throw new Error('Invalid path');
         try {
-            const headers = {};
+            const headers: Record<string, string> = {};
             if (filename) headers['response-content-disposition'] = `attachment; filename="${encodeRFC5987ValueChars(filename)}"`;
             if (/\.(jpe?g|png|gif)$/i.test(target)) headers['cache-control'] = 'max-age=604800';
             const url = await this.client.presignedGetObject(
@@ -209,6 +209,19 @@ class StorageService {
             throw e;
         }
     }
+
+    async signUpload(target: string, size: number) {
+        const policy = this.client.newPostPolicy();
+        policy.setBucket(this.opts.bucket);
+        policy.setKey(target);
+        policy.setExpires(new Date(Date.now() + 30 * 60 * 1000));
+        if (size) policy.setContentLengthRange(size - 50, size + 50);
+        const policyResult = await this.client.presignedPostPolicy(policy);
+        return {
+            url: this.replaceWithAlternativeUrlFor.user(policyResult.postURL),
+            extraFormData: policyResult.formData,
+        };
+    }
 }
 
 const service = new StorageService();

packages/sonic/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hydrooj/sonic",
-    "version": "1.1.0",
+    "version": "1.1.1",
     "description": "Sonic search service",
     "main": "service.js",
     "typings": "service.d.ts",

packages/sonic/script.ts

@@ -3,12 +3,17 @@ import sonic from './service';
 
 export const description = 'Sonic problem search re-index';
 
-export async function run({ domainId }) {
+export async function run({ domainId }, report) {
     if (domainId) await sonic.flushb('problem', domainId);
     else await sonic.flushc('problem');
+    let i = 0;
     const cb = async (pdoc) => {
-        await sonic.push('problem', `${pdoc.domainId}@title`, pdoc.docId.toString(), pdoc.title);
+        i++;
-        await sonic.push('problem', `${pdoc.domainId}@content`, pdoc.docId.toString(), pdoc.content.toString());
+        if (!(i % 1000)) report({ message: `${i} problems indexed` });
+        await Promise.all([
+            sonic.push('problem', `${pdoc.domainId}@title`, pdoc.docId.toString(), pdoc.title),
+            sonic.push('problem', `${pdoc.domainId}@content`, pdoc.docId.toString(), pdoc.content.toString()),
+        ]).catch((e) => console.log(`${pdoc.domainId}/${pdoc.docId}`, e));
     };
     if (domainId) await iterateAllProblemInDomain(domainId, ['title', 'content'], cb);
     else await iterateAllProblem(['title', 'content'], cb);

packages/ui-default/.eslintrc.js

@@ -69,6 +69,7 @@ module.exports = {
     'consistent-return': 'warn',
     'func-names': 'off',
     'import/first': 'off',
+    'import/extensions': 'off',
     'import/no-extraneous-dependencies': 'off',
     'max-classes-per-file': 'off',
     'no-empty': ['warn', { allowEmptyCatch: true }],

packages/ui-default/build/config/webpack.js

@@ -147,7 +147,7 @@ export default function (env = {}) {
             name: `vditor-${require('vditor/package.json').version}`,
           },
           vendors: {
-            test: /[\\/]node_modules[\\/]/,
+            test: /[\\/]node_modules[\\/].+\.([jt]sx?|json|yaml)$/,
             priority: -10,
             name: 'vendors',
             reuseExistingChunk: true,

packages/ui-default/components/messagepad/MessagePadDialogueContentContainer.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import TimeAgo from 'timeago-react';
-import moment from 'dayjs';
+import moment from 'moment';
 import 'jquery-scroll-lock';
 import 'jquery.easing';
 import i18n from 'vj/utils/i18n';

packages/ui-default/components/scratchpad/ScratchpadRecordsRowContainer.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import classNames from 'classnames';
 import { connect } from 'react-redux';
 import TimeAgo from 'timeago-react';
-import moment from 'dayjs';
+import moment from 'moment';
 import _ from 'lodash';
 
 import substitute from 'vj/utils/substitute';

packages/ui-default/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/ui-default",
-  "version": "4.16.3",
+  "version": "4.16.4",
   "author": "undefined <i@undefined.moe>",
   "license": "AGPL-3.0",
   "main": "hydro.js",
@@ -42,7 +42,6 @@
     "clipboard": "^2.0.8",
     "copy-webpack-plugin": "^6.4.1",
     "css-loader": "^4.3.0",
-    "dayjs": "^1.10.6",
     "diff-dom": "^4.2.2",
     "echarts": "^5.1.2",
     "emojify.js": "^1.1.0",

packages/ui-default/templates/layout/html5.html

@@ -19,7 +19,7 @@
   <link rel="icon" type="image/png" href="{{ static_url('favicon-16x16.png') }}" sizes="16x16">
   <meta name="theme-color" content="#56758f">
   {% block ogp %}
-  <meta property="og:site_name" content="{{ handler.domain.ui.name|default(model.system.get('server.name')) }}" />
+  <meta property="og:site_name" content="{{ (handler.domain|default({ui:[]})).ui.name|default(model.system.get('server.name')) }}" />
   <meta property="og:title" content="{{ handler.renderTitle(page_name) }}" />
   <meta property="og:url" content="{{ model.system.get('server.url') }}{{ handler.ctx.request.path }}" />
   <meta property="og:image" content="{{ static_url('favicon-96x96.png') }}" />

packages/ui-default/templates/partials/login_dialog.html

@@ -3,7 +3,7 @@
     <div class="dialog--signin__bg">
       <div class="dialog--signin__side">
         <h1>{{ _("Don't have an account?") }}</h1>
-        <p>{{ _('By signing up a {0} universal account, you can submit code and join discussions in all online judging services provided by us.').format(handler.domain.ui.name|default(model.system.get('server.name'))) }}</p>
+        <p>{{ _('By signing up a {0} universal account, you can submit code and join discussions in all online judging services provided by us.').format((handler.domain|default({ui:[]})).ui.name|default(model.system.get('server.name'))) }}</p>
         <div><a href="{{ url('user_register') }}" class="inverse rounded button">{{ _('Sign Up Now') }}</a></div>
       </div>
     </div>