优化中文搜索

packages/better-search/model.ts

@@ -0,0 +1,23 @@
+import nodejieba from 'nodejieba';
+import { Pdoc } from 'hydrooj';
+import * as document from 'hydrooj/dist/model/document';
+import * as bus from 'hydrooj/dist/service/bus';
+
+declare module 'hydrooj' {
+    interface Pdoc {
+        search?: string
+    }
+}
+
+bus.on('document/add', async (doc) => {
+    if (doc.type !== document.TYPE_PROBLEM) return;
+    const pdoc = doc as Pdoc;
+    const segments = nodejieba.cut(pdoc.title);
+    pdoc.search = segments.join(' ');
+});
+
+bus.on('document/set', async (domainId, docType, docId, $set) => {
+    if (docType !== document.TYPE_PROBLEM || !$set.title) return;
+    const segments = nodejieba.cut($set.title);
+    $set.search = segments.join(' ');
+});

packages/better-search/package.json

@@ -0,0 +1,20 @@
+{
+    "name": "@hydrooj/better-search",
+    "version": "1.0.1",
+    "description": "Enhance Problem Search",
+    "main": "package.json",
+    "repository": "https://github.com/hydro-dev/Hydro.git",
+    "author": "undefined <masnn0@outlook.com>",
+    "license": "AGPL-3.0-only",
+    "dependencies": {
+        "nodejieba": "^2.4.1"
+    },
+    "devDependencies": {},
+    "peerDependencies": {
+        "hydrooj": "^2.13.2"
+    },
+    "scripts": {
+        "build": "tsc",
+        "lint": "eslint . --ext ts --fix"
+    }
+}

packages/better-search/script.ts

@@ -0,0 +1,16 @@
+import nodejieba from 'nodejieba';
+import { Pdoc } from 'hydrooj';
+import * as document from 'hydrooj/dist/model/document';
+
+export const description = 'Ensure index for peoblem search';
+
+export async function run() {
+    await document.coll.find({ docType: document.TYPE_PROBLEM }).forEach(async (doc: Pdoc) => {
+        const segments = nodejieba.cut(doc.title);
+        await document.coll.updateOne({ _id: doc._id }, { $set: { search: segments.join(' ') } });
+    });
+}
+
+export const validate = {};
+
+global.Hydro.script.ensureSearch = { run, description, validate };

packages/better-search/tsconfig.json

@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "target": "es2019",
+        "module": "commonjs",
+        "esModuleInterop": true,
+        "moduleResolution": "node",
+        "declaration": true,
+        "sourceMap": true,
+        "composite": true,
+        "strictBindCallApply": true,
+        "experimentalDecorators": true,
+        "outDir": ".",
+        "rootDir": "."
+    },
+    "include": [
+        "*.ts"
+    ],
+    "exclude": []
+}

packages/hydrojudge/src/service.ts

@@ -252,4 +252,4 @@ async function postInit() {
     task.consume({ type: 'judge' }, (t) => (new JudgeTask(t)).handle().catch(console.error));
 }
 
-global.Hydro.postInit.push(postInit);
+global.Hydro.service.bus.once('app/started', postInit);

packages/hydrooj/package.json

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

packages/hydrooj/src/handler/manage.ts

@@ -1,3 +1,4 @@
+import { inspect } from 'util';
 import * as judge from './judge';
 import { ValidationError } from '../error';
 import * as check from '../check';
@@ -108,7 +109,7 @@ class SystemScriptHandler extends SystemHandler {
                     domainId,
                     rid,
                     status: STATUS.STATUS_ACCEPTED,
-                    message: ret.toString(),
+                    message: inspect(ret, false, 10, true),
                     judger: 1,
                     time,
                     memory: 0,

packages/hydrooj/src/model/document.ts

@@ -61,10 +61,11 @@ export function get(domainId: string, docType: number, docId: DocID) {
     return coll.findOne({ domainId, docType, docId });
 }
 
-export async function set(domainId: string, docType: number, docId: DocID, args: any) {
+export async function set(domainId: string, docType: number, docId: DocID, $set: any) {
+    await bus.parallel('document/set', domainId, docType, docId, $set);
     const res = await coll.findOneAndUpdate(
         { domainId, docType, docId },
-        { $set: args },
+        { $set },
         { returnOriginal: false, upsert: true },
     );
     return res.value;
@@ -339,7 +340,7 @@ async function ensureIndexes() {
     await ic({ domainId: 1, docType: 1, docId: 1 }, u);
     await ic({ domainId: 1, docType: 1, owner: 1, docId: -1 });
     // For problem
-    await ic({ domainId: 1, docType: 1, title: 'text' }, s);
+    await ic({ domainId: 1, docType: 1, search: 'text', title: 'text' }, s);
     await ic({ domainId: 1, docType: 1, category: 1, docId: 1 }, s);
     await ic({ domainId: 1, docType: 1, hidden: 1, category: 1, docId: 1 }, s);
     await ic({ domainId: 1, docType: 1, tag: 1, docId: 1 }, s);

packages/hydrooj/src/service/bus.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-await-in-loop */
 import cluster from 'cluster';
-import { Db } from 'mongodb';
+import { Db, ObjectID } from 'mongodb';
 import { Mdoc, Rdoc, User } from '../interface';
 
 const _hooks: Record<keyof any, Array<(...args: any[]) => any>> = {};
@@ -21,7 +21,8 @@ interface EventMap {
 
     'user/message': (uid: number, mdoc: Mdoc, udoc: User) => void
 
-    'document/add': (doc: any) => string | void
+    'document/add': (doc: any) => Promise<string | void> | string | void
+    'document/set': (domainId: string, docType: number, docId: ObjectID | string | number, args: any) => Promise<string | void> | string | void
 
     'record/change': (rdoc: Rdoc, $set?: any, $push?: any) => void
 }

packages/login-with-qq/service.ts

@@ -33,4 +33,4 @@ export async function postInit() {
     });
 }
 
-bus.subscribe(['app/started'], postInit);
+bus.once('app/started', postInit);

tsconfig.json

@@ -15,6 +15,7 @@
         { "path": "packages/hydrojudge" },
         { "path": "packages/geoip" },
         { "path": "packages/html2md" },
+        { "path": "packages/better-search" },
         { "path": "packages/fps-importer" },
         { "path": "packages/login-with-github" },
         { "path": "packages/login-with-google" },