save

Author: pandadtdyy

.gitignore

@@ -14,7 +14,7 @@ config.yaml
 config.json
 config.*.yaml
 config.*.json
-data/
+data*
 yarn.lock
 pnpm-lock.yaml
 

.yarn/patches/@myteril-node-win-printer-npm-1.1.5-c62910fcfd.patch

@@ -0,0 +1,60 @@
+diff --git a/lib/index.js b/lib/index.js
+index 2cfbc38128a6387e03e30df13422584cf51636fb..97d08d3459b6e06128955fbdd1ac56ab676c5427 100644
+--- a/lib/index.js
++++ b/lib/index.js
+@@ -68,53 +68,14 @@ var getPrinters = function () { return __awaiter(void 0, void 0, void 0, functio
+             case 0: return [4 /*yield*/, getTerminalCodepage()];
+             case 1:
+                 codepage = _b.sent();
+-                return [4 /*yield*/, execAsync('wmic printer list /format:list', { encoding: 'binary' })];
++                return [4 /*yield*/, execAsync('powershell "Get-WmiObject -Class Win32_Printer | ConvertTo-Json"', { encoding: 'binary' })];
+             case 2:
+                 _a = _b.sent(), stdout = _a.stdout, stderr = _a.stderr;
+                 if (stderr.length > 0) {
+                     return [2 /*return*/, null];
+                 }
+                 result = iconv_lite_1.default.decode(Buffer.from(stdout, 'binary'), "cp".concat(codepage));
+-                blocks = result.replace(/\r/ig, '').split('\n\n\n');
+-                printerInfos = blocks.map(function (block) {
+-                    var obj = {};
+-                    // Split the block into lines that contain an attribute and its value.
+-                    var lines = block.trim().split('\n');
+-                    lines.forEach(function (line) {
+-                        // If the line is empty, ignore it.
+-                        if (line.trim().length < 1)
+-                            return;
+-                        // Get the index of the first equals sign.
+-                        var equalsSignIndex = line.indexOf('=');
+-                        // Extract the name and the value of the attribute.
+-                        var attributeName = line.substring(0, equalsSignIndex);
+-                        var attributeValue = line.substring(equalsSignIndex + 1);
+-                        // Ignore attributes that have blank values for compact output.
+-                        if (attributeValue.length < 1)
+-                            return;
+-                        // Array
+-                        if (attributeValue.startsWith('{') && attributeValue.endsWith('}'))
+-                            attributeValue = JSON.parse("[".concat(attributeValue.substring(1, attributeValue.length - 1), "]"));
+-                        // Boolean
+-                        if (typeof attributeValue === 'string') {
+-                            switch (attributeValue) {
+-                                case 'TRUE':
+-                                    attributeValue = true;
+-                                    break;
+-                                case 'FALSE':
+-                                    attributeValue = false;
+-                                    break;
+-                            }
+-                        }
+-                        // Numbers
+-                        if (typeof attributeValue === 'string' && !isNaN(parseFloat(attributeValue))) {
+-                            attributeValue = Number(attributeValue).valueOf();
+-                        }
+-                        // Assign the attribute value by its name into the object.
+-                        obj[attributeName] = attributeValue;
+-                    });
+-                    return obj;
+-                });
++                printerInfos = JSON.parse(result)
+                 // Ignore the empty printer info objects.
+                 printerInfos = printerInfos.filter(function (printerInfo) { return Object.keys(printerInfo).length > 0; });
+                 return [2 /*return*/, printerInfos];

.yarn/patches/http-proxy-npm-1.18.1-a313c479c5.patch

@@ -0,0 +1,27 @@
+diff --git a/lib/http-proxy/passes/web-incoming.js b/lib/http-proxy/passes/web-incoming.js
+index 7ae735514190eea569c605fff7d27c045fe8d601..88953ebc549d4e56dc26e46aa32211b82e6546a1 100644
+--- a/lib/http-proxy/passes/web-incoming.js
++++ b/lib/http-proxy/passes/web-incoming.js
+@@ -143,8 +143,11 @@ module.exports = {
+     }
+ 
+     // Ensure we abort proxy if request is aborted
+-    req.on('aborted', function () {
+-      proxyReq.abort();
++    res.on('close', function () {
++      var aborted = !res.writableFinished;
++      if (aborted) {
++        proxyReq.abort();
++      }
+     });
+ 
+     // handle errors in proxy and incoming request, just like for forward proxy
+@@ -154,7 +157,7 @@ module.exports = {
+ 
+     function createErrorHandler(proxyReq, url) {
+       return function proxyError(err) {
+-        if (req.socket.destroyed && err.code === 'ECONNRESET') {
++        if ((req.aborted || req.destroyed || req.socket?.destroyed) && err.code === 'ECONNRESET') {
+           server.emit('econnreset', err, req, res, url);
+           return proxyReq.abort();
+         }

package.json

@@ -29,6 +29,7 @@
     "typescript": "5.4.5"
   },
   "resolutions": {
-    "formidable": "patch:formidable@npm%3A2.1.2#~/.yarn/patches/formidable-npm-2.1.2-40ba18d67f.patch"
+    "formidable": "patch:formidable@npm%3A2.1.2#~/.yarn/patches/formidable-npm-2.1.2-40ba18d67f.patch",
+    "http-proxy@npm:^1.18.1": "patch:http-proxy@npm%3A1.18.1#~/.yarn/patches/http-proxy-npm-1.18.1-a313c479c5.patch"
   }
 }

packages/machine-setup/frontend/package.json

@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@neutralinojs/lib": "^5.4.0",
+    "@neutralinojs/lib": "^5.5.0",
     "vue": "^3.5.12"
   },
   "devDependencies": {

packages/machine-setup/neutralino.config.json

@@ -43,7 +43,7 @@
     "binaryName": "hydro-xcpctools-machine-setup",
     "resourcesPath": "/frontend/",
     "extensionsPath": "/extensions/",
-    "binaryVersion": "5.4.0",
+    "binaryVersion": "5.5.0",
     "clientVersion": "5.4.0",
     "frontendLibrary": {
       "projectPath": "/frontend/",

packages/server/client/balloon.ts

@@ -3,7 +3,7 @@ import EscPosEncoder from '@freedom_sky/esc-pos-encoder';
 import superagent from 'superagent';
 import { config } from '../config';
 import {
-    checkReceiptStatus, convertToChinese, Logger, receiptPrint, sleep,
+    checkReceiptStatus, getBalloonName, Logger, receiptPrint, sleep,
 } from '../utils';
 
 const post = (url: string) => superagent.post(new URL(url, config.server).toString()).set('Accept', 'application/json');
@@ -30,7 +30,7 @@ const i18n = {
     },
 };
 
-export const receiptText = (
+export const receiptBalloonText = (
     id: number, location: string, problem: string, color: string, comment: string, teamname: string, status: string, lang: 'zh' | 'en' = 'zh',
 ) => encoder
     .initialize()
@@ -66,6 +66,18 @@ export const receiptText = (
     .cut()
     .encode();
 
+export const plainBalloonText = (
+    id: number, location: string, problem: string, color: string, comment: string, teamname: string, status: string, lang: 'zh' | 'en' = 'zh',
+) => `
+${i18n[lang].receipt}
+ID: ${id}
+${i18n[lang].location}: ${location}
+${i18n[lang].team}: ${teamname}
+${i18n[lang].problem}: ${problem}
+${i18n[lang].color}: ${color}
+${i18n[lang].comment}: ${comment}
+`;
+
 const logger = new Logger('balloon');
 
 let timer = null;
@@ -74,20 +86,21 @@ let printer = null;
 async function printBalloon(doc, lang) {
     let status = '';
     for (const i in doc.total) {
-        status += `- ${i}: ${lang === 'zh' ? await convertToChinese(doc.total[i].color) : doc.total[i].color}\n`;
+        status += `- ${i}: ${getBalloonName(doc.total[i].color, lang)}\n`;
     }
-    const bReceipt = receiptText(
+    const genText = config.balloonType === 'plain' ? plainBalloonText : receiptBalloonText;
+    const bReceipt = await genText(
         doc.balloonid,
         doc.location ? doc.location : 'N/A',
         doc.problem,
-        lang === 'zh' ? await convertToChinese(doc.contestproblem.color) : doc.contestproblem.color,
+        getBalloonName(doc.contestproblem.rgb, lang),
         doc.awards ? doc.awards : 'N/A',
         doc.team,
         status,
         lang,
     );
     printer = await checkReceiptStatus(printer);
-    await receiptPrint(printer, bReceipt);
+    await receiptPrint(printer, bReceipt, config.balloonCommand);
 }
 
 async function fetchTask(c) {

packages/server/client/printer.ts

@@ -1,5 +1,6 @@
 /* eslint-disable no-await-in-loop */
 import path from 'path';
+import { PDFDocument } from 'pdf-lib';
 import superagent from 'superagent';
 import { config, saveConfig } from '../config';
 import {
@@ -14,42 +15,75 @@ const logger = new Logger('printer');
 
 let timer = null;
 
+const mergePDFs = async (files: string[], output: string) => {
+    const pdf = await PDFDocument.create();
+    pdf.setProducer('pdf-merger-js');
+    pdf.setCreationDate(new Date());
+    for (const file of files) {
+        const srcDoc = await PDFDocument.load(fs.readFileSync(file));
+        const srcPageCount = srcDoc.getPageCount();
+        logger.info(`${file} has ${srcPageCount} pages`);
+        const copiedPages = await pdf.copyPages(
+            srcDoc,
+            Array.from({ length: config.printPageMax > srcPageCount ? srcPageCount : config.printPageMax }, (_, i) => i),
+        );
+        for (const page of copiedPages) {
+            pdf.addPage(page);
+        }
+    }
+    logger.info(`Merged ${files.length} files into ${output}`);
+    return fs.writeFileSync(output, await pdf.save());
+};
+
 export async function ConvertCodeToPDF(code, lang, filename, team, location, codeColor = false) {
     compiler ||= await createTypstCompiler();
-    const typst = generateTypst(team, location, filename, lang, codeColor);
+    const fakeFilename = String.random(8); // cubercsl: do not trust filename from user
+    const typst = generateTypst(team, location, fakeFilename, filename, lang, codeColor);
     compiler.addSource('/main.typst', typst);
-    compiler.addSource(`/${filename}`, code);
+    compiler.addSource(`/${fakeFilename}`, code);
     const docs = await compiler.compile({
         format: 'pdf',
         mainFilePath: '/main.typst',
     });
+    compiler.addSource(`/${fakeFilename}`, '');
     logger.info(`Convert ${filename} to PDF`);
     return docs;
 }
 
-export async function printFile(doc) {
-    const {
-        _id, tid, code, lang, filename, team, location,
-    } = doc;
+export async function printFile(docs) {
     try {
-        const docs = await ConvertCodeToPDF(code || 'empty file', lang, filename, team, location, config.printColor);
-        fs.writeFileSync(path.resolve(process.cwd(), `data${path.sep}${tid}#${_id}.pdf`), docs);
+        let finalFile = null;
+        const files = [];
+        for (const doc of docs) {
+            const {
+                _id, tid, code, lang, filename, team, location,
+            } = doc;
+            const pdf = await ConvertCodeToPDF(code || 'empty file', lang, filename, team, location, config.printColor);
+            fs.writeFileSync(path.resolve(process.cwd(), `data${path.sep}${tid}#${_id}.pdf`), pdf);
+            files.push(path.resolve(process.cwd(), `data${path.sep}${tid}#${_id}.pdf`));
+        }
+        if (files.length === 1) {
+            finalFile = files[0];
+        } else {
+            finalFile = path.resolve(process.cwd(), `data${path.sep}${new Date().getTime()}-merged.pdf`);
+            await mergePDFs(files, finalFile);
+        }
         if (config.printers.length) {
             // eslint-disable-next-line no-constant-condition
             while (true) {
                 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') {
-                    logger.info(`Printing ${_id} on ${randomP.printer}`);
-                    await print(path.resolve(process.cwd(), `data/${tid}#${_id}.pdf`), randomP.printer, 1, 5);
+                    logger.info(`Printing ${finalFile} on ${randomP.printer}`);
+                    await print(finalFile, randomP.printer, 1, files.length > 1 ? undefined : 5);
                     return randomP.printer;
                 }
                 for (const printer of printers.filter((p) => p.printer !== randomP.printer)) {
                     logger.info(`Checking ${printer.printer} ${printer.status}`);
                     if (printer.status === 'idle') {
-                        logger.info(`Printing ${_id} on ${printer.printer}`);
-                        await print(path.resolve(process.cwd(), `data/${tid}#${_id}.pdf`), printer.printer, 1, 5);
+                        logger.info(`Printing ${finalFile} on ${printer.printer}`);
+                        await print(finalFile, printer.printer, 1, files.length > 1 ? undefined : 5);
                         return printer.printer;
                     }
                 }
@@ -70,26 +104,42 @@ async function fetchTask(c) {
     logger.info('Fetching Task from tools server...');
     try {
         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) => ({
-                    printer: p.printer,
-                    status: p.status,
-                    description: p.description,
-                }))),
-            });
-        if (body.setPrinter) {
-            config.printers = body.setPrinter;
-            saveConfig();
-            logger.info(`Printer set to ${config.printers}`);
+        const tasks = [];
+        for (let i = 0; i < config.printMergeQueue; i++) {
+            const { body } = await post(`${c.server}/client/${c.token}/print`)
+                .send({
+                    printers: config.printers,
+                    printersInfo: JSON.stringify(printersInfo.map((p) => ({
+                        printer: p.printer,
+                        status: p.status,
+                        description: p.description,
+                    }))),
+                });
+            if (body.setPrinter) {
+                config.printers = body.setPrinter;
+                saveConfig();
+                logger.info(`Printer set to ${config.printers}`);
+            }
+            if (body.doc) {
+                tasks.push(body.doc);
+                // FIXME: so ugly, give server merge task number
+                if (config.printMergeQueue !== 1) await post(`${c.server}/client/${c.token}/doneprint/${body.doc._id}`);
+            }
         }
-        if (body.doc) {
-            logger.info(`Print task ${body.doc.tid}#${body.doc._id}...`);
-            const printer = await printFile(body.doc);
-            if (!printer) throw new Error('No Printer Configured');
-            await post(`${c.server}/client/${c.token}/doneprint/${body.doc._id}?printer=${JSON.stringify(printer)}`);
-            logger.info(`Print task ${body.doc.tid}#${body.doc._id} completed.`);
+        if (tasks.length) {
+            logger.info(`Print task ${tasks.map((t) => `${t.tid}#${t._id}`).join(', ')}...`);
+            let printer = null;
+            try {
+                printer = await printFile(tasks);
+                if (!printer) throw new Error('No Printer Configured');
+            } catch (e) {
+                logger.error(e);
+                throw e;
+            }
+            for (const doc of tasks) {
+                await post(`${c.server}/client/${c.token}/doneprint/${doc._id}?printer=${JSON.stringify(printer)}`);
+                logger.info(`Print task ${doc.tid}#${doc._id} completed.`);
+            }
         } else {
             logger.info('No print task, sleeping...');
             await sleep(5000);

packages/server/client/typst.ts

@@ -59,7 +59,7 @@ class TypstCompilerDriver {
     }
 }
 
-export function generateTypst(team: string, location: string, filename: string, lang: string, codeColor: boolean) {
+export function generateTypst(team: string, location: string, filename: string, originalFilename: string, lang: string, codeColor: boolean) {
     return `
 #let fit(name: "", width: 147mm) = {
   context {
@@ -82,6 +82,7 @@ export function generateTypst(team: string, location: string, filename: string,
   team: "",
   location: "",
   filename: "",
+  original: "",
   lang: "",
 ) = {
   set document(author: (team), title: filename)
@@ -94,7 +95,7 @@ export function generateTypst(team: string, location: string, filename: string,
       }
       #fit(name: team)
       #linebreak()
-      filename: #filename
+      filename: #original
       #h(1fr)
       By Hydro/XCPC-TOOLS | Page #counter(page).display("1 of 1", both: true)
     ],
@@ -112,13 +113,14 @@ export function generateTypst(team: string, location: string, filename: string,
     }
     code
   }
-  raw(read(filename), lang: lang, block: true${codeColor ? '' : ', theme: "BW.tmtheme"'})
+  raw(read(filename), lang: lang, block: true${codeColor ? '' : ', theme: "/XCPCTOOLS/BW.tmtheme"'})
 }
 
 #print(
     team: ${JSON.stringify(team || '')},
     location: ${JSON.stringify(location || '')},
     filename: ${JSON.stringify(filename || '')},
+    original: ${JSON.stringify(originalFilename || filename || '')},
     lang: ${JSON.stringify(lang || '')}
 )`;
 }
@@ -129,6 +131,6 @@ export const BWTmTheme = '<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist
 export async function createTypstCompiler() {
     const compiler = new TypstCompilerDriver();
     await compiler.init();
-    compiler.addSource('/BW.tmtheme', BWTmTheme);
+    compiler.addSource('/XCPCTOOLS/BW.tmtheme', BWTmTheme);
     return compiler;
 }