bug fixes

Author: undefined-moe

build.ts

@@ -33,20 +33,21 @@ const nopMap = '//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIj
         entryPoints: [path.resolve(process.cwd(), 'packages/server/index.ts')],
         charset: 'utf8',
         sourcemap: process.argv.includes('--debug') ? 'inline' : false,
+        metafile: true,
         plugins: [{
             name: 'base16384',
             setup(b) {
                 b.onLoad({ filter: /\.(frontend|ttf|wasm)$/, namespace: 'file' }, (t) => {
                     const file = fs.readFileSync(path.join(t.path));
-                    const contents = `module.exports = "${encodeBinary(file)}";\n${nopMap}`;
+                    const contents = `module.exports = "${process.argv.includes('--no-binary') ? '' : encodeBinary(file)}";\n${nopMap}`;
                     console.log(t.path, size(contents));
                     return {
                         contents,
                         loader: 'tsx',
                     };
                 });
-                b.onLoad({ filter: /node_modules\/.+\.js$/ }, (t) => ({
-                    contents: `${fs.readFileSync(t.path, 'utf8')}\n${nopMap}`,
+                b.onLoad({ filter: /node_modules.*\.[jt]sx?$/ }, async (t) => ({
+                    contents: `${await fs.readFile(t.path, 'utf-8')}\n${nopMap}`,
                     loader: 'default',
                 }));
             },
@@ -60,6 +61,7 @@ const nopMap = '//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIj
     if (res.warnings.length) console.warn(res.warnings);
     logger.info(`Resource Size: ${size(res.outputFiles[0].text)}`);
     fs.writeFileSync(path.resolve(process.cwd(), 'dist/xcpc-tools.js'), res.outputFiles[0].text);
+    fs.writeFileSync(path.resolve(process.cwd(), 'dist/metafile.json'), JSON.stringify(res.metafile));
     logger.info('Saved to dist/xcpc-tools.js');
     if (!process.env.SEA) return;
     fs.writeFileSync(path.resolve(process.cwd(), 'dist/sea-config.json'), JSON.stringify({

packages/server/service/fetcher.ts

@@ -44,7 +44,7 @@ class BasicFetcher extends Service implements IBasicFetcher {
     }
 
     [Service.init]() {
-        this.ctx.interval(() => this.cron().catch(this.logger.error), 20000);
+        this.ctx.interval(() => this.cron().catch(this.logger.error), 10000);
     }
 
     async cron() {
@@ -204,22 +204,21 @@ class HydroFetcher extends BasicFetcher {
     async balloonInfo(all) {
         if (all) this.logger.info('Sync all balloons...');
         const { body } = await fetch(`/d/${this.contest.domainId}/contest/${this.contest.id}/balloon?todo=${all ? 'false' : 'true'}`);
-        if (!body || !body.length) return;
-        const balloons = body;
-        for (const balloon of balloons) {
-            const teamTotal = await this.ctx.db.balloon.find({ teamid: balloon.teamid, time: { $lt: (balloon.time * 1000).toFixed(0) } });
+        if (!body?.bdocs?.length) return;
+        for (const balloon of body.bdocs) {
+            const teamTotal = await this.ctx.db.balloon.find({ teamid: balloon.uid, time: { $lt: (balloon.time * 1000).toFixed(0) } });
             const encourage = teamTotal.length < (config.freezeEncourage ?? 0);
             const totalDict = {};
             for (const t of teamTotal) {
                 totalDict[t.problem] = t.contestproblem;
             }
             const shouldPrint = this.contest.info.freeze_time ? (balloon.time * 1000) < this.contest.info.freeze_time || encourage : true;
-            if (!shouldPrint && !balloon.done) await this.setBalloonDone(balloon.balloonid);
+            if (!shouldPrint && !balloon.sent) await this.setBalloonDone(balloon.balloonid);
             const contestproblem = {
-                id: String.fromCharCode(this.contest.pids.indexOf(balloon.pid) + 65),
+                id: String.fromCharCode(this.contest.info.pids.indexOf(balloon.pid) + 65),
                 name: body.pdict[balloon.pid].title,
-                rgb: this.contest.balloon[balloon.pid].color,
-                color: this.contest.balloon[balloon.pid].name,
+                rgb: this.contest.info.balloon[balloon.pid].color,
+                color: this.contest.info.balloon[balloon.pid].name,
             };
             await this.ctx.db.balloon.update({ balloonid: balloon.balloonid }, {
                 $set: {
@@ -237,13 +236,13 @@ class HydroFetcher extends BasicFetcher {
                     ),
                     done: balloon.sent,
                     total: totalDict,
-                    printDone: balloon.done ? 1 : 0,
+                    printDone: balloon.sent ? 1 : 0,
                     shouldPrint,
                 },
             }, { upsert: true });
         }
-        await this.ctx.parallel('balloon/newTask', balloons.length);
-        this.logger.debug(`Found ${balloons.length} balloons`);
+        await this.ctx.parallel('balloon/newTask', body.bdocs.length);
+        this.logger.debug(`Found ${body.bdocs.length} balloons`);
     }
 
     async setBalloonDone(bid) {

packages/server/service/server.ts

@@ -2,12 +2,14 @@ import { Context } from 'cordis';
 import proxy from 'koa-proxies';
 import { ForbiddenError, WebService } from '@hydrooj/framework';
 import { config } from '../config';
+import { randomstring } from '../utils';
 export * from '@hydrooj/framework/decorators';
 
 export async function apply(pluginContext: Context) {
     pluginContext.plugin(WebService, {
         host: '0.0.0.0',
         port: config.port,
+        keys: [randomstring(16)],
     } as any);
     pluginContext.inject(['server'], ({ server }) => {
         server.addServerLayer('stream', async (ctx, next) => {