升级queue为task

.github/workflows/build.yml

@@ -28,21 +28,6 @@ jobs:
       with:
         name: .uibuild
         path: .uibuild
-    - run: |
-        yarn add pkg -D
-        yarn run pack
-    - uses: actions/upload-artifact@v1
-      with:
-        name: Hydro_linux_amd64
-        path: hydro-linux
-    - uses: actions/upload-artifact@v1
-      with:
-        name: Hydro_macos_amd64
-        path: hydro-macos
-    - uses: actions/upload-artifact@v1
-      with:
-        name: Hydro_win_amd64.exe
-        path: hydro-win.exe
     - uses: elgohr/Publish-Docker-Github-Action@master
       with:
         name: hydrooj/hydro:alpine

build/buildModule.js

@@ -35,11 +35,14 @@ const build = async (type) => {
     };
     for (const i of modules) {
         if (!i.startsWith('.')) {
-            if (exist(`module/${i}/model.js`)) {
+            const prepare = ['model', 'lib', 'handler', 'service'];
-                config.entry[`${i}/model`] = root(`module/${i}/model.js`);
+            for (const j of prepare) {
+                if (exist(`module/${i}/${j}.js`)) {
+                    const file = fs.readFileSync(root(`module/${i}/${j}.js`));
+                    if (file.includes('require')) {
+                        config.entry[`${i}/${j}`] = root(`module/${i}/${j}.js`);
+                    }
                 }
-            if (exist(`module/${i}/handler.js`)) {
-                config.entry[`${i}/handler`] = root(`module/${i}/handler.js`);
             }
         }
     }
@@ -64,6 +67,17 @@ const build = async (type) => {
     for (const i of modules) {
         if (!i.startsWith('.')) {
             const current = {};
+            const prepare = ['model', 'lib', 'handler', 'service'];
+            for (const j of prepare) {
+                if (exist(`module/${i}/${j}.js`)) {
+                    const file = fs.readFileSync(root(`module/${i}/${j}.js`));
+                    if (file.includes('require')) {
+                        current[j] = fs.readFileSync(root(`.build/module/${i}/${j}.js`)).toString();
+                    } else {
+                        current[j] = fs.readFileSync(root(`module/${i}/${j}.js`)).toString();
+                    }
+                }
+            }
             if (exist(`module/${i}/locale`)) {
                 const locales = fs.readdirSync(root(`module/${i}/locale`));
                 const lang = {};
@@ -76,12 +90,6 @@ const build = async (type) => {
             if (exist(`module/${i}/template`)) {
                 current.template = template(`module/${i}/template`);
             }
-            if (exist(`module/${i}/model.js`)) {
-                current.model = fs.readFileSync(root(`.build/module/${i}/model.js`)).toString();
-            }
-            if (exist(`module/${i}/handler.js`)) {
-                current.handler = fs.readFileSync(root(`.build/module/${i}/handler.js`)).toString();
-            }
             const m = require(root(`module/${i}/hydro.json`));
             current.description = m.description || '';
             current.requirements = m.requirements || [];

build/index.js

@@ -8,6 +8,7 @@ const ignoreFailure = require('./ignoreFailure');
 async function build(type) {
     if (!['development', 'production'].includes(type)) throw new Error(`Unknown type: ${type}`);
     ignoreFailure(fs.mkdirSync, root('.build'));
+    ignoreFailure(fs.mkdirSync, root('.build/module'));
     const langs = fs.readdirSync(root('locales'));
     const lang = {};
     for (const i of langs) {

hydro/handler/judge.js

@@ -4,14 +4,12 @@ const problem = require('../model/problem');
 const builtin = require('../model/builtin');
 const contest = require('../model/contest');
 const user = require('../model/user');
+const task = require('../model/task');
 const bus = require('../service/bus');
-const queue = require('../service/queue');
 const {
     Route, Handler, Connection, ConnectionHandler,
 } = require('../service/server');
 
-queue.assert('judge');
-
 async function _postJudge(rdoc) {
     const accept = rdoc.status === builtin.STATUS_ACCEPTED;
     bus.publish('record_change', rdoc);
@@ -57,6 +55,7 @@ async function next(body) {
     rdoc = await record.update(body.rid, $set, $push);
     bus.publish('record_change', rdoc);
 }
+
 async function end(body) {
     let rdoc = await record.get(body.rid);
     const $set = {};
@@ -92,34 +91,10 @@ class JudgeHandler extends Handler {
     async get({ check = false }) {
         if (check) return;
         const tasks = [];
-        let rid = await queue.get('judge', false);
+        let t = await task.getFirst({ type: 'judge' });
-        while (rid) {
+        while (t) {
-            const rdoc = await record.get(rid); // eslint-disable-line no-await-in-loop
+            tasks.push(t);
-            let task;
+            t = await task.getFirst({ type: 'judge' }); // eslint-disable-line no-await-in-loop
-            if (!rdoc.input) {
-                // eslint-disable-next-line no-await-in-loop
-                const pdoc = await problem.getById(rdoc.pid);
-                task = {
-                    event: 'judge',
-                    rid,
-                    type: 0,
-                    pid: rdoc.pid,
-                    data: pdoc.data,
-                    lang: rdoc.lang,
-                    code: rdoc.code,
-                };
-            } else {
-                task = {
-                    event: 'pretest',
-                    rid,
-                    type: 0,
-                    input: rdoc.input,
-                    lang: rdoc.lang,
-                    code: rdoc.code,
-                };
-            }
-            tasks.push(task);
-            rid = await queue.get('judge', false); // eslint-disable-line no-await-in-loop
         }
         this.response.body = { tasks };
     }
@@ -133,6 +108,7 @@ class JudgeHandler extends Handler {
         await end(this.request.body);
     }
 }
+
 class JudgeConnectionHandler extends ConnectionHandler {
     async prepare() {
         this.checkPerm(PERM_JUDGE);
@@ -143,40 +119,16 @@ class JudgeConnectionHandler extends ConnectionHandler {
         else if (msg.key === 'end') {
             await end({ judger: this.user._id, ...msg });
             this.processing = null;
-            const rid = await queue.get('judge');
+            const t = await task.getFirst({ type: 'judge' });
-            const rdoc = await record.get(rid);
+            this.send({ task: t });
-            let task;
+            this.processing = t;
-            if (!rdoc.input) {
-                // eslint-disable-next-line no-await-in-loop
-                const pdoc = await problem.getById(rdoc.pid);
-                task = {
-                    event: 'judge',
-                    rid,
-                    type: 0,
-                    pid: rdoc.pid,
-                    data: pdoc.data,
-                    lang: rdoc.lang,
-                    code: rdoc.code,
-                };
-            } else {
-                task = {
-                    event: 'pretest',
-                    rid,
-                    type: 0,
-                    input: rdoc.input,
-                    lang: rdoc.lang,
-                    code: rdoc.code,
-                };
-            }
-            this.send({ task });
-            this.processing = task.rid;
         }
     }
 
     async cleanup() {
         if (this.processing) {
             await record.reset(this.processing);
-            queue.push('judge', this.processing);
+            task.add(this.processing);
         }
     }
 }
@@ -187,5 +139,5 @@ async function apply() {
 }
 
 global.Hydro.handler.judge = module.exports = {
-    JudgeHandler, JudgeConnectionHandler, apply,
+    JudgeHandler, JudgeConnectionHandler, apply, next, end,
 };

hydro/handler/problem.js

@@ -11,7 +11,6 @@ const {
     Route, Connection, Handler, ConnectionHandler,
 } = require('../service/server');
 const gridfs = require('../service/gridfs');
-const queue = require('../service/queue');
 const {
     NoProblemError, ProblemDataNotFoundError, BadRequestError,
     SolutionNotFoundError,
@@ -25,8 +24,6 @@ const {
     PERM_REPLY_PROBLEM_SOLUTION, PERM_LOGGEDIN,
 } = require('../permission');
 
-queue.assert('judge');
-
 class ProblemHandler extends Handler {
     async _prepare() {
         this.checkPerm(PERM_VIEW_PROBLEM);
@@ -122,7 +119,7 @@ class ProblemSubmitHandler extends ProblemDetailHandler {
         const rid = await record.add({
             uid: this.uid, lang, code, pid: this.pdoc._id,
         });
-        await queue.push('judge', rid);
+        await record.judge(rid);
         this.user.nSubmit++;
         this.response.body = { rid };
         this.response.redirect = `/r/${rid}`;
@@ -135,7 +132,7 @@ class ProblemPretestHandler extends ProblemDetailHandler {
         const rid = await record.add({
             uid: this.uid, lang, code, pid: this.pdoc._id, input,
         });
-        await queue.push('judge', rid);
+        await record.judge(rid);
         this.response.body = { rid };
     }
 }

hydro/handler/record.js

@@ -8,7 +8,6 @@ const record = require('../model/record');
 const contest = require('../model/contest');
 const user = require('../model/user');
 const bus = require('../service/bus');
-const queue = require('../service/queue');
 const {
     Route, Handler, Connection, ConnectionHandler,
 } = require('../service/server');
@@ -69,10 +68,7 @@ class RecordRejudgeHandler extends Handler {
     async post({ rid }) {
         this.checkPerm(PERM_REJUDGE);
         const rdoc = await record.get(rid);
-        if (rdoc) {
+        if (rdoc) await record.rejudge(rid);
-            await record.reset(rid);
-            await queue.push('judge', rid);
-        }
         this.back();
     }
 }

hydro/loader.js

@@ -26,8 +26,8 @@ async function handler() {
     for (const i of active) {
         if (i.handler) {
             console.time(`Handler init: ${i.id}`);
-            const module = {}; // eslint-disable-line no-unused-vars
+            const exports = {};
-            const exports = {}; // eslint-disable-line no-unused-vars
+            const module = { exports }; // eslint-disable-line no-unused-vars
             eval(i.handler);
             console.timeEnd(`Handler init: ${i.id}`);
         }
@@ -56,15 +56,28 @@ async function model() {
     for (const i of active) {
         if (i.model) {
             console.time(`Model init: ${i.id}`);
-            const module = {};
             const exports = {}; // eslint-disable-line no-unused-vars
-            eval(i.handler);
+            const module = { exports };
+            eval(i.model);
             if ((module.exports || {}).index) await module.exports.index();
             console.timeEnd(`Model init: ${i.id}`);
         }
     }
 }
 
+async function service() {
+    for (const i of active) {
+        if (i.service) {
+            console.time(`Service init: ${i.id}`);
+            const exports = {}; // eslint-disable-line no-unused-vars
+            const module = { exports };
+            eval(i.service);
+            if ((module.exports || {}).init) await module.exports.init();
+            console.timeEnd(`Service init: ${i.id}`);
+        }
+    }
+}
+
 async function load() {
     global.Hydro = {
         handler: {},
@@ -99,8 +112,8 @@ async function load() {
     for (const i of builtinLib) require(`./lib/${i}`);
     await locale();
     require('./service/gridfs');
-    require('./service/queue');
     const server = require('./service/server');
+    await service();
     const builtinModel = [
         'blacklist', 'builtin', 'contest', 'discussion', 'message',
         'opcount', 'problem', 'record', 'setting', 'solution',
@@ -122,6 +135,9 @@ async function load() {
     }
     const notfound = require('./handler/notfound');
     await notfound.apply();
+    for (const i in global.Hydro.service) {
+        if (global.Hydro.service[i].postInit) await global.Hydro.service[i].postInit();
+    }
     server.start();
 }
 

hydro/model/index.js

@@ -10,4 +10,7 @@ module.exports = {
     token: require('./token'),
     training: require('./training'),
     user: require('./user'),
+    task: require('./task'),
+    message: require('./message'),
+    setting: require('./setting'),
 };

hydro/model/record.js

@@ -1,7 +1,9 @@
 const _ = require('lodash');
 const { ObjectID } = require('bson');
-const { RecordNotFoundError } = require('../error');
 const { STATUS_WAITING } = require('./builtin').STATUS;
+const task = require('./task');
+const problem = require('./problem');
+const { RecordNotFoundError } = require('../error');
 const db = require('../service/db.js');
 
 const coll = db.collection('record');
@@ -75,6 +77,35 @@ function getUserInProblemMulti(uid, pid) {
     return coll.find({ owner: uid, pid });
 }
 
+async function judge(rid) {
+    const rdoc = await get(rid);
+    const pdoc = await problem.getById(rdoc.pid);
+    await task.add({
+        event: 'judge',
+        rid,
+        type: 0,
+        pid: rdoc.pid,
+        data: pdoc.data,
+        lang: rdoc.lang,
+        code: rdoc.code,
+    });
+}
+
+async function rejudge(rid) {
+    await reset(rid);
+    const rdoc = await get(rid);
+    const pdoc = await problem.getById(rdoc.pid);
+    await task.add({
+        event: 'judge',
+        rid,
+        type: 0,
+        pid: rdoc.pid,
+        data: pdoc.data,
+        lang: rdoc.lang,
+        code: rdoc.code,
+    });
+}
+
 module.exports = {
     add,
     get,
@@ -84,4 +115,6 @@ module.exports = {
     reset,
     getList,
     getUserInProblemMulti,
+    judge,
+    rejudge,
 };

hydro/model/task.js

@@ -0,0 +1,30 @@
+const db = require('../service/db.js');
+
+const coll = db.collection('task');
+
+async function add(task) {
+    const res = await coll.insertOne(task);
+    return res.insertedId;
+}
+
+function get(_id) {
+    return coll.findOne({ _id });
+}
+
+function count(query) {
+    return coll.find(query).count();
+}
+
+function del(_id) {
+    return coll.deleteOne({ _id });
+}
+
+async function getFirst(query) {
+    const res = await coll.find(query).sort('_id', 1).limit(1).toArray();
+    await coll.deleteOne({ _id: res[0]._id });
+    return res[0];
+}
+
+module.exports = {
+    add, get, del, count, getFirst,
+};

hydro/service/queue.js

@@ -1,27 +0,0 @@
-const q = {};
-module.exports = {
-    async connect() { }, // eslint-disable-line no-empty-function
-    async assert(queue) {
-        q[queue] = q[queue] || [];
-    },
-    async push(queue, data) {
-        q[queue].push(data);
-    },
-    async get(queue, wait = true) {
-        if (wait) {
-            while (!q[queue].length) {
-                await new Promise((resolve) => { // eslint-disable-line no-await-in-loop
-                    setTimeout(resolve, 100);
-                });
-            }
-            const data = q[queue][0];
-            q[queue].splice(0, 1);
-            return data;
-        }
-        if (!q[queue].length) return null;
-
-        const data = q[queue][0];
-        q[queue].splice(0, 1);
-        return data;
-    },
-};

module/html2md/hydro.json

@@ -0,0 +1,5 @@
+{
+    "name": "html2md",
+    "version": "0.0.1",
+    "description": "Convert html to markdown"
+}

module/html2md/lib.js

@@ -0,0 +1,16 @@
+global.Hydro.lib.html2md = module.exports = function html2md(str) {
+    return str.replace(/<p>/gmi, '').replace(/<\/p>/gmi, '  ')
+        .replace(/<h1>/gmi, '# ')
+        .replace(/<h2>/gmi, '## ')
+        .replace(/<h3>/gmi, '### ')
+        .replace(/<h4>/gmi, '#### ')
+        .replace(/<h5>/gmi, '##### ')
+        .replace(/<h6>/gmi, '###### ')
+        .replace(/<\/?code>/, '\n```\n')
+        .replace(/<img.*?src=".*?".*?>.*?<\/img>/gmi, (substr) => {
+            const RE_IMG = /<img.*?src="(.*?)".*?>(.*?)<\/img>/i;
+            const res = RE_IMG.exec(substr);
+            return `[${res[2]}](${res[1]})`;
+        })
+        .replace(/<\/h[0-6]>/, '\n');
+};

module/module-pastebin/handler.js

@@ -47,6 +47,6 @@ async function apply() {
     nav('/paste/create', 'pastebin', 'pastebin', PERM_LOGGEDIN);
 }
 
-global.Hydro.handler.paste = module.exports = {
+global.Hydro.handler.pastebin = module.exports = {
     PasteCreateHandler, PasteShowHandler, apply,
 };