fix print client on windows

Author: pandadtdyy

packages/server/client/printer.ts

@@ -16,11 +16,11 @@ let timer = null;
 export async function ConvertCodeToPDF(code, lang, filename, team, location) {
     compiler ||= await createTypstCompiler();
     const typst = generateTypst(team, location, filename, lang);
-    compiler.addSource(path.resolve(process.cwd(), 'main.typst'), typst);
-    compiler.addSource(path.resolve(process.cwd(), filename), code);
+    compiler.addSource('/main.typst', typst);
+    compiler.addSource(`/${filename}`, code);
     const docs = await compiler.compile({
         format: 'pdf',
-        mainFilePath: path.resolve(process.cwd(), 'main.typst'),
+        mainFilePath: '/main.typst',
     });
     logger.info(`Convert ${filename} to PDF`);
     return docs;
@@ -32,7 +32,7 @@ export async function printFile(doc) {
     } = doc;
     try {
         const docs = await ConvertCodeToPDF(code || 'empty file', lang, filename, team, location);
-        fs.writeFileSync(path.resolve(process.cwd(), `data/${tid}#${_id}.pdf`), docs);
+        fs.writeFileSync(path.resolve(process.cwd(), `data${path.sep}${tid}#${_id}.pdf`), docs);
         if (config.printers.length) {
             // eslint-disable-next-line no-constant-condition
             while (true) {

packages/server/package.json

@@ -17,7 +17,7 @@
   "dependencies": {
     "@freedom_sky/esc-pos-encoder": "^5.8.0",
     "@hydrooj/framework": "0.0.3",
-    "@myriaddreamin/typst-ts-web-compiler": "^0.4.1",
+    "@myriaddreamin/typst-ts-web-compiler": "^0.5.0-rc4",
     "@myteril/node-win-printer": "^1.1.5",
     "base16384": "^1.0.0",
     "cordis": "3.16.0",

packages/server/utils/printers.ts

@@ -1,9 +1,12 @@
 import fs from 'fs';
 import path from 'path';
-import winPrint from '@myteril/node-win-printer';
+import { getPrinters as wingetPrinters, PDFPrinter as WinPDFPrint } from '@myteril/node-win-printer';
 import { getPrinters as unixgetPrinters, print as unixPrint } from 'unix-print';
+import { Logger } from '.';
 
-let winPrinter: winPrint.PDFPrinter;
+const logger = new Logger('printer');
+
+let winPrinter: WinPDFPrint;
 
 export interface Printer {
     printer: string;
@@ -14,6 +17,7 @@ export interface Printer {
 }
 
 export function initWinPrinter() {
+    if (winPrinter) return;
     const execPath = [
         './SumatraPDF.exe',
         path.resolve(__dirname, 'SumatraPDF.exe'),
@@ -23,10 +27,11 @@ export function initWinPrinter() {
     ];
     const sumatraPdfPath = execPath.find((p) => fs.existsSync(p));
     if (!sumatraPdfPath) {
-        throw new Error(`SumatraPDF not found, please install it on https://www.sumatrapdfreader.org/download-free-pdf-viewer,
-or direct download from https://www.sumatrapdfreader.org/dl/rel/3.1.2/SumatraPDF-3.1.2.zip`);
+        // eslint-disable-next-line max-len
+        throw new Error('SumatraPDF not found, please install it on https://www.sumatrapdfreader.org/download-free-pdf-viewer, or direct download from https://www.sumatrapdfreader.org/dl/rel/3.1.2/SumatraPDF-3.1.2.zip');
     }
-    winPrinter = new winPrint.PDFPrinter({
+    logger.info(`SumatraPDF found at ${sumatraPdfPath}`);
+    winPrinter = new WinPDFPrint({
         sumatraPdfPath,
     });
 }
@@ -38,23 +43,23 @@ const windowsPrinterStatus = {
 
 export async function getPrinters(): Promise<Printer[]> {
     if (process.platform === 'win32') {
-        const winprinters = await winPrint.getPrinters();
-        return winprinters.map((p: any) => ({
-            printer: p.DriverName,
+        const winprinters = await wingetPrinters();
+        return winprinters.filter((p: any) => p.DeviceID).map((p: any) => ({
+            printer: p.DeviceID,
             description: p.Caption,
             status: windowsPrinterStatus[p.PrinterStatus] ? windowsPrinterStatus[p.PrinterStatus] : 'unknown',
         }));
     }
     return await unixgetPrinters();
 }
 
-export async function print(printer: string, file: string, startPage?: number, endPage?: number) {
+export async function print(file: string, printer: string, startPage?: number, endPage?: number) {
     if (process.platform === 'win32') {
         return winPrinter.print({
             file,
             printer,
             pages: startPage && endPage ? [{ start: startPage, end: endPage }] : undefined,
         });
     }
-    return unixPrint(printer, file, startPage && endPage ? ['-P', `${startPage}-${endPage}`] : []);
+    return unixPrint(file, printer, startPage && endPage ? ['-P', `${startPage}-${endPage}`] : []);
 }