fix

Author: pandadtdyy

packages/server/client/balloon.ts

@@ -6,6 +6,7 @@ import {
     checkReceiptStatus, convertToChinese, Logger, receiptPrint, sleep,
 } from '../utils';
 
+const post = (url: string) => superagent.post(new URL(url, config.server).toString()).set('Accept', 'application/json');
 const encoder = new EscPosEncoder();
 
 const i18n = {
@@ -89,12 +90,12 @@ async function fetchTask(c) {
     if (timer) clearTimeout(timer);
     logger.info('Fetching balloon task from tools server...');
     try {
-        const { body } = await superagent.post(`${c.server}/client/${c.token}/balloon`).send();
+        const { body } = await post(`${c.server}/client/${c.token}/balloon`).send();
         if (body.balloons) {
             for (const doc of body.balloons) {
                 logger.info(`Print balloon task ${doc.teamid}#${doc.balloonid}...`);
                 await printBalloon(doc, config.receiptLang);
-                await superagent.post(`${c.server}/client/${c.token}/doneballoon/${doc.balloonid}`);
+                await post(`${c.server}/client/${c.token}/doneballoon/${doc.balloonid}`);
                 logger.info(`Print task ${doc.teamid}#${doc.balloonid} completed.`);
             }
         } else {
@@ -109,7 +110,7 @@ async function fetchTask(c) {
 }
 
 export async function apply() {
-    printer = config.balloon;
+    printer = { printer: config.balloon };
     if (config.token && config.server && config.balloon) await fetchTask(config);
     else logger.error('Config not found, please check the config.yaml');
 }

packages/server/client/printer.ts

@@ -9,6 +9,7 @@ import { createTypstCompiler, generateTypst } from './typst';
 
 let compiler;
 
+const post = (url: string) => superagent.post(new URL(url, config.server).toString()).set('Accept', 'application/json');
 const logger = new Logger('printer');
 
 let timer = null;
@@ -36,7 +37,7 @@ export async function printFile(doc) {
         if (config.printers.length) {
             // eslint-disable-next-line no-constant-condition
             while (true) {
-                const printersInfo = await getPrinters();
+                const printersInfo: any[] = await getPrinters();
                 const printers = printersInfo.filter((p) => config.printers.includes(p.printer));
                 const randomP = printers[Math.floor(Math.random() * printers.length)];
                 if (randomP.status === 'idle') {
@@ -65,8 +66,8 @@ async function fetchTask(c) {
     if (timer) clearTimeout(timer);
     logger.info('Fetching Task from tools server...');
     try {
-        const printersInfo = await getPrinters();
-        const { body } = await superagent.post(`${c.server}/client/${c.token}/print`)
+        const printersInfo: any[] = await getPrinters();
+        const { body } = await post(`${c.server}/client/${c.token}/print`)
             .send({
                 printers: config.printers,
                 printersInfo: JSON.stringify(printersInfo.map((p) => ({
@@ -83,7 +84,7 @@ async function fetchTask(c) {
         if (body.doc) {
             logger.info(`Print task ${body.doc.tid}#${body.doc._id}...`);
             await printFile(body.doc);
-            await superagent.post(`${c.server}/client/${c.token}/doneprint/${body.doc._id}`);
+            await post(`${c.server}/client/${c.token}/doneprint/${body.doc._id}`);
             logger.info(`Print task ${body.doc.tid}#${body.doc._id} completed.`);
         } else {
             logger.info('No print task, sleeping...');

packages/server/config.ts

@@ -32,15 +32,15 @@ password:
 `;
         let printers = [];
         if (isClient) {
-            printers = await getPrinters(true).catch(() => []);
-            logger.info(printers.length, 'printers found:', printers.join(', '));
-            await checkReceiptPrinter(printers);
+            printers = (await getPrinters().catch(() => [])).map((p: any) => p.printer);
+            logger.info(printers.length, 'printers found:', JSON.stringify(printers));
+            await checkReceiptPrinter(await getPrinters(true));
         }
         const clientConfigDefault = yaml.dump({
             server: '',
             balloon: '',
             balloonLang: 'zh',
-            printers: printers.map((p) => p.printer),
+            printers,
             token: '',
         });
         fs.writeFileSync(configPath, isClient ? clientConfigDefault : serverConfigDefault);

packages/server/handler/commands.ts

@@ -39,7 +39,7 @@ zenity --info --text "<span font='256'>$(cat ${config.seatFile})</span>"`);
     }
 
     async postSetHostname() {
-        this.response.body = await this.executeForAll(`hostnamectl hostname $(cat ${config.seatFile})`);
+        this.response.body = await this.executeForAll(`hostnamectl hostname $(cat -- ${config.seatFile})`);
     }
 
     async postAutologin({ }, autologin = false) {

packages/server/index.ts

@@ -47,11 +47,6 @@ async function apply(ctx) {
     } else {
         await applyServer(ctx);
     }
-    await require('./handler/misc').apply(ctx);
-    await require('./handler/printer').apply(ctx);
-    await require('./handler/monitor').apply(ctx);
-    await require('./handler/client').apply(ctx);
-    await require('./handler/balloon').apply(ctx);
     await ctx.lifecycle.flush();
     await ctx.parallel('app/listen');
     logger.success('Tools started');

packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hydrooj/xcpc-tools",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A tools for XCPC contests",
   "main": "index.ts",
   "repository": "https://github.com/Hydro-dev/xcpc-tools",

packages/server/service/fetcher.ts

@@ -239,4 +239,5 @@ export async function apply(ctx) {
     }
     ctx.provide('fetcher', undefined, true);
     ctx.fetcher = await new fetcherList[config.type](ctx);
+    ctx.fetcher.cron();
 }

packages/server/utils/receipt.ts

@@ -36,15 +36,15 @@ export async function checkReceiptPrinter(printers: object[]) {
 export async function checkReceiptStatus(printer) {
     if (process.platform !== 'linux') {
         printer = { printer: printer.printer };
-        return;
+        return printer;
     }
     const lp = printer.printer.split('/').pop();
     const oldPrinter = printer;
     printer = {
         printer: printer.printer,
         info: fs.readFileSync(`/sys/class/usbmisc/${lp}/device/ieee1284_id`, 'utf8').trim(),
     };
-    if (!oldPrinter || oldPrinter.info === printer.info) return;
+    if (!oldPrinter || oldPrinter.info === printer.info) return printer;
     logger.info('Printer changed:', printer.printer, printer.info);
     const usbDevices = fs.readdirSync('/dev/usb');
     for (const f of usbDevices) {
@@ -54,14 +54,15 @@ export async function checkReceiptStatus(printer) {
                 logger.info('Printer found:', f, ':', lpid);
                 oldPrinter.printer = `/dev/usb/${f}`;
                 printer = oldPrinter;
-                break;
+                return printer;
             }
         }
     }
     if (oldPrinter.info !== printer.info) throw Error('Printer not found, please check the printer connection.');
+    return printer;
 }
 
-export async function receiptPrint(text, printer) {
+export async function receiptPrint(printer, text) {
     fs.writeFileSync(path.resolve(process.cwd(), 'data', 'balloon.txt'), text);
     if (process.platform === 'win32') {
         exec(`COPY /B "${path.resolve(process.cwd(), 'data', 'balloon.txt')}" "${printer.printer}"`, (err, stdout, stderr) => {