core: return work printer for metric

Author: pandadtdyy

packages/server/client/printer.ts

@@ -43,22 +43,25 @@ export async function printFile(doc) {
                 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);
-                    return;
+                    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);
-                        return;
+                        return printer.printer;
                     }
                 }
                 logger.info('No Printer can found to print, sleeping...');
                 await sleep(3000);
             }
         }
+        logger.error('No Printer Configured');
+        return null;
     } catch (e) {
         logger.error(e);
+        return null;
     }
 }
 
@@ -83,8 +86,9 @@ async function fetchTask(c) {
         }
         if (body.doc) {
             logger.info(`Print task ${body.doc.tid}#${body.doc._id}...`);
-            await printFile(body.doc);
-            await post(`${c.server}/client/${c.token}/doneprint/${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=${printer}`);
             logger.info(`Print task ${body.doc.tid}#${body.doc._id} completed.`);
         } else {
             logger.info('No print task, sleeping...');

packages/server/handler/client.ts

@@ -81,7 +81,7 @@ class ClientPrintDoneHandler extends Handler {
         if (!code) throw new ValidationError('Code', null, 'Code not found');
         if (code.printer !== params.cid) throw new BadRequestError('Client', null, 'Client not match');
         await this.ctx.db.code.updateOne({ _id: params.tid }, { $set: { done: 1, doneAt: new Date().getTime() } });
-        await this.ctx.parallel('print/doneTask', client._id);
+        await this.ctx.parallel('print/doneTask', client._id, `${client._id}#${params.printer || 'unknown'}`);
         this.response.body = { code: 1 };
         logger.info(`Client ${client.name} connected, print task ${code.tid}#${code._id} completed.`);
     }

packages/server/utils/metrics.ts

@@ -10,7 +10,7 @@ declare module 'cordis' {
     interface Events {
         'print/newTask': () => void;
         'print/sendTask': (client: string) => void;
-        'print/doneTask': (client: string) => void;
+        'print/doneTask': (client: string, printer: string) => void;
     }
 }
 
@@ -42,7 +42,7 @@ export function createMetricsRegistry(ctx: Context) {
 
     ctx.on('print/sendTask', (client) => printTaskCounter.inc({ status: 'sent', client }));
 
-    ctx.on('print/doneTask', (client) => printTaskCounter.inc({ status: 'done', client }));
+    ctx.on('print/doneTask', (client, printer) => printTaskCounter.inc({ status: 'done', client, printer }));
 
     collectDefaultMetrics({ register: registry });