update dep

hydro/handler/base.js

@@ -45,7 +45,6 @@ MIDDLEWARE(async (ctx, next) => {
             }
         };
         ctx.csrf_token = await token.add(token.TYPE_CSRF_TOKEN, 600, ctx.path);
-        console.log(ctx.session.uid);
         await next();
         if (ctx.session.sid)
             await token.update(ctx.session.sid, tokenType, expireSeconds, Object.assign({

hydro/handler/judge.js

@@ -27,7 +27,6 @@ GET('/judge/fetch', requirePerm(PERM_JUDGE), async ctx => {
     else ctx.body = {};
 });
 POST('/judge/next', requirePerm(PERM_JUDGE), async ctx => {
-    console.log(ctx.request.body);
     let body = ctx.request.body;
     let rdoc = await record.get(body.rid);
     let $set = {};
@@ -51,7 +50,6 @@ POST('/judge/next', requirePerm(PERM_JUDGE), async ctx => {
     ctx.body = {};
 });
 POST('/judge/end', requirePerm(PERM_JUDGE), async ctx => {
-    console.log(ctx.request.body);
     let body = ctx.request.body;
     let rdoc = await record.get(body.rid);
     let $set = {};

hydro/handler/ui.js

@@ -1,8 +1,8 @@
 const
     path = require('path'),
-    static = require('koa-static'),
+    send = require('koa-send'),
     nunjucks = require('nunjucks'),
-    hljs = require('hljs'),
+    hljs = require('highlight.js'),
     MarkdownIt = require('markdown-it'),
     katex = require('markdown-it-katex'),
     options = require('../options'),
@@ -75,15 +75,24 @@ class Nunjucks extends nunjucks.Environment {
         this.addGlobal('status', builtin.STATUS);
     }
 }
-const env = new Nunjucks();
-MIDDLEWARE(static(path.resolve(process.cwd(), '.uibuild')));
+let env = new Nunjucks();
+MIDDLEWARE(async (ctx, next) => {
+    let done = false;
+    if (ctx.method === 'HEAD' || ctx.method === 'GET')
+        try {
+            done = await send(ctx, ctx.path, { root: path.resolve(process.cwd(), '.uibuild'), index: 'index.html' });
+        } catch (err) {
+            if (err.status !== 404) throw err;
+        }
+    if (!done) await next();
+});
 MIDDLEWARE(async (ctx, next) => {
     ctx.render_title = str => str;
     ctx.UIContext = {
         cdn_prefix: '/',
         url_prefix: '/'
     };
-    ctx.preferJson = ctx.request.headers['accept'].includes('application/json');
+    ctx.preferJson = (ctx.request.headers['accept'] || '').includes('application/json');
     ctx.render = async (name, context) => {
         ctx.user = ctx.state.user;
         ctx.translate = str => {

hydro/service/server.js

@@ -3,15 +3,15 @@ const
     morgan = require('koa-morgan'),
     Body = require('koa-body'),
     Router = require('koa-router'),
-    SockJS = require('sockjs');
+    SocketIO = require('socket.io');
 
 const options = require('../options');
 
 let http = options.listen.https ? require('https') : require('http');
 let app = new Koa();
 let server = http.createServer(app.callback());
+let io = SocketIO(server);
 app.keys = options.session.keys;
-app.use(morgan(':method :url :status :res[content-length] - :response-time ms'));
 app.use(Body({
     multipart: true,
     formidable: {
@@ -41,23 +41,22 @@ function POST(route, ...handler) {
     router.post(route, ...handler);
 }
 /**
- * @callback SockJSHandler
- * @param {import('sockjs').Connection} conn
+ * @callback SocketIOHandler
+ * @param {import('socket.io').Socket} socket
  */
 /**
  * @param {string} prefix
- * @param {SockJSHandler} handler
+ * @param {SocketIOHandler} handler
  */
 function SOCKET(prefix, handler) {
-    const sock = SockJS.createServer({ prefix });
-    sock.on('connection', handler);
-    sock.installHandlers(server);
+    io.of(prefix).on('connection', handler);
 }
 exports.MIDDLEWARE = MIDDLEWARE;
 exports.GET = GET;
 exports.POST = POST;
 exports.SOCKET = SOCKET;
 exports.start = function start() {
+    app.use(morgan(':method :url :status :res[content-length] - :response-time ms'));
     app.use(router.routes()).use(router.allowedMethods());
     app.listen(options.listen.port);
     console.log('Server listening at: %s', options.listen.port);