support receipt i18n

Author: pandadtdyy

.github/workflows/release.yml

@@ -34,6 +34,8 @@ jobs:
       - run: yarn
       - name: Build
         run: yarn build:pkg
+      - name: Copy Origin Bundle to Dist
+        run: cp dist/xcpc-tools.js /tmp/xcpc-tools-bundle.js
       - name: Create Zip for Windows
         run: zip -r /tmp/xcpc-tools-win.zip dist/pkg/xcpc-tools-win.exe
       - name: Create Tar for MacOS
@@ -50,6 +52,7 @@ jobs:
         with:
           tag_name: ${{ steps.tag.outputs.version }}-${{ steps.tag.outputs.sha_short }}
           files: |
+            /tmp/xcpc-tools-bundle.js
             /tmp/xcpc-tools-win.zip
             /tmp/xcpc-tools-macos.tar.gz
             /tmp/xcpc-tools-linux.tar.gz

package.json

@@ -6,23 +6,24 @@
     "packages/*"
   ],
   "scripts": {
-    "start:client": "node -r ./register.js packages/client/index.ts --debug",
+    "start:client": "node -r ./register.js packages/server/index.ts --client --debug",
     "start:server": "node -r ./register.js packages/server/index.ts --debug",
     "lint": "eslint packages --ext js,ts,tsx,jsx",
     "build": "yarn build:ui:prod && node -r ./register.js build.ts",
+    "build:server": "node -r ./register.js build.ts",
     "build:pkg": "yarn build:ui:prod && node -r ./register.js build.ts && pkg dist/xcpc-tools.js --targets linux,macos,win --out-path dist/pkg"
   },
   "devDependencies": {
     "@expo-google-fonts/noto-color-emoji": "^0.2.3",
     "@expo-google-fonts/noto-sans-sc": "^0.2.3",
     "@hydrooj/eslint-config": "^1.0.10",
     "@hydrooj/register": "^1.0.1",
-    "@hydrooj/utils": "^1.4.23",
-    "@types/node": "^20.12.13",
+    "@hydrooj/utils": "^1.4.24",
+    "@types/node": "^20.14.2",
+    "@yao-pkg/pkg": "^5.12.0",
     "dejavu-fonts-ttf": "^2.37.3",
     "eslint": "^8.57.0",
     "eslint-import-resolver-typescript": "^3.6.1",
-    "pkg": "^5.8.1",
     "typescript": "^5.3.3"
   },
   "resolutions": {

packages/server/client/balloon.ts

@@ -1,50 +1,73 @@
+/* eslint-disable no-await-in-loop */
 import path from 'path';
 import EscPosEncoder from '@freedom_sky/esc-pos-encoder';
 import superagent from 'superagent';
 import { config } from '../config';
 import {
+    convertToChinese,
     fs, Logger, sleep,
 } from '../utils';
 
 const encoder = new EscPosEncoder();
 
+const i18n = {
+    zh: {
+        receipt: '气球打印单',
+        location: '座位',
+        problem: '题目',
+        color: '颜色',
+        comment: '备注',
+        team: '队伍',
+        status: '队伍当前气球状态',
+    },
+    en: {
+        receipt: 'Balloon Receipt',
+        location: 'Location',
+        problem: 'Balloon',
+        color: 'Color',
+        comment: 'Comment',
+        team: 'Team',
+        status: 'Team Balloon Status',
+    },
+};
+
 export const receiptText = (
-    id: number, location: string, problem: string, color: string, comment: string, teamname: string, status: string,
+    id: number, location: string, problem: string, color: string, comment: string, teamname: string, status: string, lang: 'zh' | 'en' = 'zh',
 ) => encoder
     .initialize()
     .codepage('cp936')
     .setPinterType(80) // wrong typo in the library
     .align('center')
     .bold(true)
     .size(2)
-    .line('气球打印单')
+    .line(i18n[lang].receipt)
     .emptyLine(1)
     .line(`ID: ${id}`)
     .emptyLine(1)
     .bold(false)
     .size(1)
     .line('===========================================')
     .emptyLine(1)
-    .oneLine('座位', location)
-    .oneLine('气球', problem)
-    .oneLine('颜色', color)
-    .oneLine('备注', comment)
+    .oneLine(i18n[lang].location, location)
+    .oneLine(i18n[lang].problem, problem)
+    .oneLine(i18n[lang].color, color)
+    .oneLine(i18n[lang].comment, comment)
     .emptyLine(1)
     .align('center')
     .bold(true)
     .line('===========================================')
     .emptyLine(2)
     .size(0)
-    .line(`队伍: ${teamname}`)
-    .line('队伍当前气球状态:')
+    .line(`${i18n[lang].team}: ${teamname}`)
+    .line(`${i18n[lang].status}:`)
     .line(`${status}`)
     .emptyLine(2)
     .line('Powered by hydro-dev/xcpc-tools')
     .emptyLine(3)
     .cut()
     .encode();
 
-const logger = new Logger('fetcher');
+const logger = new Logger('balloon');
 
 let timer = null;
 let printer = null;
@@ -53,18 +76,18 @@ async function getReceiptStatus(receipt) {
     const lp = receipt.split('/').pop();
     const oldPrinter = printer;
     printer = {
-        printer: lp,
-        info: fs.readFileSync(`/sys/class/usb/${lp}/device/ieee1284_id`, 'utf8').trim(),
+        printer: receipt,
+        info: fs.readFileSync(`/sys/class/usbmisc/${lp}/device/ieee1284_id`, 'utf8').trim(),
     };
     if (!oldPrinter || oldPrinter.info === printer.info) return;
     logger.info('Printer changed:', printer.printer, printer.info);
     const usbDevices = fs.readdirSync('/dev/usb');
     for (const f of usbDevices) {
         if (f.startsWith('lp')) {
-            const lpid = fs.readFileSync(`/sys/class/usb/${f}/device/ieee1284_id`, 'utf8').trim();
+            const lpid = fs.readFileSync(`/sys/class/usbmisc/${f}/device/ieee1284_id`, 'utf8').trim();
             if (lpid === oldPrinter.info) {
                 logger.info('Printer found:', f, ':', lpid);
-                oldPrinter.printer = f;
+                oldPrinter.printer = `/dev/usb/${f}`;
                 printer = oldPrinter;
                 break;
             }
@@ -73,34 +96,37 @@ async function getReceiptStatus(receipt) {
     if (oldPrinter.info !== printer.info) throw Error('Printer not found, please check the printer connection.');
 }
 
-async function printBalloon(doc) {
+async function printBalloon(doc, lang) {
     const bReceipt = receiptText(
         doc.balloonid,
         doc.location ? doc.location : 'N/A',
         doc.problem,
-        doc.contestproblem.color,
+        lang === 'zh' ? convertToChinese(doc.contestproblem.color) : doc.contestproblem.color,
         doc.awards ? doc.awards : 'N/A',
         doc.team,
         doc.total ? Object.keys(doc.total).map((k) => `- ${k}: ${doc.total[k].color}`).join('\n') : 'N/A',
+        lang,
     );
     if (printer) {
         await getReceiptStatus(printer.printer);
-        fs.writeFileSync(path.resolve(printer), bReceipt);
+        fs.writeFileSync(path.resolve(printer.printer), bReceipt);
     }
 }
 
 async function fetchTask(c) {
     if (timer) clearTimeout(timer);
-    logger.info('Fetching Task from tools server...');
+    logger.info('Fetching balloon task from tools server...');
     try {
         const { body } = await superagent.post(`${c.server}/client/${c.token}/balloon`).send();
-        if (body.doc) {
-            logger.info(`Print task ${body.doc.tid}#${body.doc._id}...`);
-            await printBalloon(body.doc);
-            await superagent.post(`${c.server}/client/${c.token}/doneballoon/${body.doc._id}`);
-            logger.info(`Print task ${body.doc.tid}#${body.doc._id} completed.`);
+        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}`);
+                logger.info(`Print task ${doc.teamid}#${doc.balloonid} completed.`);
+            }
         } else {
-            logger.info('No print task, sleeping...');
+            logger.info('No balloon task, sleeping...');
             await sleep(5000);
         }
     } catch (e) {
@@ -113,4 +139,5 @@ async function fetchTask(c) {
 export async function apply() {
     await getReceiptStatus(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

@@ -107,4 +107,5 @@ export async function apply() {
         }
     }
     if (config.token && config.server && config.printers?.length) await fetchTask(config);
+    else logger.error('Config not found, please check the config.yaml');
 }

packages/server/config.ts

@@ -1,8 +1,9 @@
 import path from 'path';
 import Schema from 'schemastery';
-import { getPrinters } from 'unix-print';
 import { version } from './package.json';
-import { fs, Logger, yaml } from './utils';
+import {
+    fs, getPrinters, Logger, yaml,
+} from './utils';
 
 const logger = new Logger('init');
 
@@ -31,21 +32,22 @@ password:
         let printers = [];
         if (isClient) {
             printers = await getPrinters().then((r) => r.map((p) => p.printer)).catch(() => []);
-            logger.info(printers.length, 'printers found:', printers.map((p) => p.printer).join(', '));
+            logger.info(printers.length, 'printers found:', printers.join(', '));
             if (process.platform === 'linux') {
                 const usbDevices = fs.readdirSync('/dev/usb');
                 for (const f of usbDevices) {
                     if (f.startsWith('lp')) {
                         const lpid = fs.readFileSync(`/sys/class/usbmisc/${f}/device/ieee1284_id`, 'utf8').trim();
-                        logger.info('USB Printer found:', f, ':', lpid);
-                        logger.info('If you want to use this printer for balloon print, set balloon:', f, 'in config.yaml.');
+                        logger.info(`USB Printer ${f} found: ${lpid}`);
+                        logger.info(`If you want to use this printer for balloon print, please set balloon: /dev/usb/${f} in config.yaml.`);
                     }
                 }
             } else logger.info('If you want to use balloon client, please run this on linux.');
         }
         const clientConfigDefault = yaml.dump({
             server: '',
             balloon: '',
+            balloonLang: 'zh',
             printers,
             token: '',
         });
@@ -86,7 +88,8 @@ const serverSchema = Schema.intersect([
 ]);
 const clientSchema = Schema.object({
     server: Schema.string().role('url').required(),
-    balloon: Schema.string().required(),
+    balloon: Schema.string(),
+    balloonLang: Schema.union(['zh', 'en']).default('zh').required(),
     printers: Schema.array(Schema.string()).default([]).description('printer id list, will disable printing if unset'),
     token: Schema.string().required().description('Token generated on server'),
     fonts: Schema.array(Schema.string()).default([]),

packages/server/handler/client.ts

@@ -93,7 +93,7 @@ class ClientBallloonConnectHandler extends Handler {
         logger.info(`Client ${client.name}(${ip}) connected.`);
         const balloons = await this.ctx.db.balloon.find({ printDone: 0, shouldPrint: true }).sort({ time: 1 });
         this.response.body = { balloons };
-        logger.info(`Client ${client.name} connected, print ${balloons.length} tasks sent.`);
+        logger.info(`Client ${client.name} connected, balloon ${balloons.length} tasks sent.`);
         await this.ctx.db.client.updateOne({ id: params.cid }, { $set: { updateAt: new Date().getTime(), ip } });
         await this.ctx.db.balloon.update({ balloonid: { $in: balloons.map((b) => b.balloonid) } },
             { $set: { receivedAt: new Date().getTime() } }, { multi: true });
@@ -104,12 +104,12 @@ class ClientBalloonDoneHandler extends Handler {
     async post(params) {
         const client = await this.ctx.db.client.findOne({ id: params.cid });
         if (!client) throw new ForbiddenError('Client', null, 'Client not found');
-        const balloon = await this.ctx.db.balloon.findOne({ balloonid: +params.tid });
-        if (!balloon) throw new ValidationError('Balloon', params.tid, 'Balloon not found');
-        await this.ctx.db.balloon.updateOne({ balloonid: +params.tid }, { $set: { printDone: 1, printDoneAt: new Date().getTime() } });
+        const balloon = await this.ctx.db.balloon.findOne({ balloonid: +params.bid });
+        if (!balloon) throw new ValidationError('Balloon', params.bid, 'Balloon not found');
+        await this.ctx.db.balloon.updateOne({ balloonid: +params.bid }, { $set: { printDone: 1, printDoneAt: new Date().getTime() } });
         if (!balloon.done) await this.ctx.fetcher.setBalloonDone(balloon.balloonid);
         this.response.body = { code: 1 };
-        logger.info(`Client ${client.name} connected, print task ${balloon.teamid}#${balloon.balloonid} completed.`);
+        logger.info(`Client ${client.name} connected, balloon task ${balloon.teamid}#${balloon.balloonid} completed.`);
     }
 }
 
@@ -118,5 +118,5 @@ export async function apply(ctx: Context) {
     ctx.Route('client_print_fetch', '/client/:cid/print', ClientPrintConnectHandler);
     ctx.Route('client_print_done', '/client/:cid/doneprint/:tid', ClientPrintDoneHandler);
     ctx.Route('client_balloon_fetch', '/client/:cid/balloon', ClientBallloonConnectHandler);
-    ctx.Route('client_balloon_done', '/client/:cid/doneballoon/:tid', ClientBalloonDoneHandler);
+    ctx.Route('client_balloon_done', '/client/:cid/doneballoon/:bid', ClientBalloonDoneHandler);
 }

packages/server/index.ts

@@ -49,7 +49,7 @@ async function apply(ctx) {
     }
     await ctx.lifecycle.flush();
     await ctx.parallel('app/listen');
-    logger.success('Server started');
+    logger.success('Tools started');
     process.send?.('ready');
     await ctx.parallel('app/ready');
 }