encoding detect

Author: undefined-moe

package.json

@@ -22,9 +22,11 @@
     "@neutralinojs/neu": "^11.3.0",
     "@types/node": "^20.17.1",
     "@yao-pkg/pkg": "^5.16.1",
+    "chardet": "^2.1.0",
     "dejavu-fonts-ttf": "^2.37.3",
     "eslint": "^8.57.1",
     "eslint-import-resolver-typescript": "^3.6.3",
+    "iconv-lite": "^0.6.3",
     "typescript": "5.4.5"
   },
   "resolutions": {

packages/server/client/balloon.ts

@@ -107,12 +107,12 @@ async function fetchTask(c) {
     if (timer) clearTimeout(timer);
     logger.info('Fetching balloon task from tools server...');
     try {
-        const { body } = await 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.balloonLang);
-                await 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 {

packages/server/client/printer.ts

@@ -1,5 +1,7 @@
 /* eslint-disable no-await-in-loop */
 import path from 'path';
+import chardet from 'chardet';
+import * as iconv from 'iconv-lite';
 import { PDFDocument } from 'pdf-lib';
 import superagent from 'superagent';
 import { config, saveConfig } from '../config';
@@ -35,12 +37,19 @@ const mergePDFs = async (files: string[], output: string) => {
     return fs.writeFileSync(output, await pdf.save());
 };
 
-export async function ConvertCodeToPDF(code, lang, filename, team, location, codeColor = false) {
+function toUtf8(code: Buffer) {
+    const info = chardet.detect(code);
+    logger.debug(`detected as ${info}`);
+    if (!info) return code.toString('utf8');
+    return iconv.decode(code, info).toString();
+}
+
+export async function ConvertCodeToPDF(code: Buffer, lang, filename, team, location, codeColor = false) {
     compiler ||= await createTypstCompiler();
     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(`/${fakeFilename}`, code);
+    compiler.addSource(`/${fakeFilename}`, toUtf8(code));
     const docs = await compiler.compile({
         format: 'pdf',
         mainFilePath: '/main.typst',
@@ -58,7 +67,14 @@ export async function printFile(docs) {
             const {
                 _id, tid, code, lang, filename, team, location,
             } = doc;
-            const pdf = await ConvertCodeToPDF(code || 'empty file', lang, filename, team, location, config.printColor);
+            const pdf = await ConvertCodeToPDF(
+                code ? Buffer.from(code, 'base64') : Buffer.from('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`));
         }

packages/server/handler/client.ts

@@ -61,7 +61,7 @@ class ClientPrintConnectHandler extends Handler {
             return;
         }
         try {
-            code.code = fs.readFileSync(path.resolve(process.cwd(), 'data/codes', `${code.tid}#${code._id}`)).toString();
+            code.code = fs.readFileSync(path.resolve(process.cwd(), 'data/codes', `${code.tid}#${code._id}`)).toString('base64');
         } catch (e) {
             logger.error(e);
         }

packages/server/handler/printer.ts

@@ -23,8 +23,15 @@ class PrintAdminHandler extends AuthHandler {
             throw new ValidationError('Code', null, 'Code not found');
         }
         fs.ensureDirSync(path.resolve(process.cwd(), 'data/.pdf'));
-        code.code = fs.readFileSync(path.resolve(process.cwd(), 'data/codes', `${code.tid}#${code._id}`)).toString();
-        const doc = await ConvertCodeToPDF(code.code || 'empty file', code.lang, code.filename, code.team, code.location, params.color ?? true);
+        const content = fs.readFileSync(path.resolve(process.cwd(), 'data/codes', `${code.tid}#${code._id}`));
+        const doc = await ConvertCodeToPDF(
+            content,
+            code.lang,
+            code.filename,
+            code.team,
+            code.location,
+            params.color ?? true,
+        );
         this.response.type = 'application/pdf';
         this.response.disposition = 'attachment; filename="code.pdf"';
         this.response.body = Buffer.from(doc);
@@ -78,11 +85,11 @@ class CodeHandler extends Handler {
             printer: '',
             done: 0,
         });
-        const codeFile = code || fs.readFileSync(this.request.files.file.filepath).toString();
+        const codeFile = code || fs.readFileSync(this.request.files.file.filepath);
         if (!codeFile) throw new BadRequestError('Code', null, 'Code is empty');
         if (codeFile.length > 256 * 1024) throw new BadRequestError('Code', null, 'Code is larger than 256KB');
         fs.ensureDirSync(path.resolve(process.cwd(), 'data/codes'));
-        fs.writeFileSync(path.resolve(process.cwd(), 'data/codes', `${team}#${res._id}`), code || fs.readFileSync(this.request.files.file.filepath));
+        fs.writeFileSync(path.resolve(process.cwd(), 'data/codes', `${team}#${res._id}`), codeFile);
         this.response.body = `The code has been submitted. Code Print ID: ${team}#${res._id}`;
         logger.info(`Team(${team}): ${tname} submitted code. Code Print ID: ${team}#${res._id}`);
         await this.ctx.parallel('print/newTask');