core: add client label

Author: pandadtdyy

packages/server/handler/client.ts

@@ -67,7 +67,7 @@ class ClientPrintConnectHandler extends Handler {
         }
         this.response.body = { doc: code };
         if (params.printer && params.printer !== client.printer) this.response.body.setPrinter = client.printer;
-        await this.ctx.parallel('print/sendTask');
+        await this.ctx.parallel('print/sendTask', client._id);
         logger.info(`Client ${client.name} connected, print task ${code.tid}#${code._id} sent.`);
         await this.ctx.db.code.updateOne({ _id: code._id }, { $set: { printer: params.cid, receivedAt: new Date().getTime() } });
     }
@@ -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');
+        await this.ctx.parallel('print/doneTask', client._id);
         this.response.body = { code: 1 };
         logger.info(`Client ${client.name} connected, print task ${code.tid}#${code._id} completed.`);
     }

packages/server/utils/metrics.ts

@@ -9,8 +9,8 @@ declare module 'cordis' {
     }
     interface Events {
         'print/newTask': () => void;
-        'print/sendTask': () => void;
-        'print/doneTask': () => void;
+        'print/sendTask': (client: string) => void;
+        'print/doneTask': (client: string) => void;
     }
 }
 
@@ -36,13 +36,13 @@ export function createMetricsRegistry(ctx: Context) {
     });
 
     const printTaskCounter = createMetric(Counter, 'xcpc_printcount', 'printcount', {
-        labelNames: ['status'],
+        labelNames: ['status', 'client'],
     });
     ctx.on('print/newTask', () => printTaskCounter.inc({ status: 'new' }));
 
-    ctx.on('print/sendTask', () => printTaskCounter.inc({ status: 'sent' }));
+    ctx.on('print/sendTask', (client) => printTaskCounter.inc({ status: 'sent', client }));
 
-    ctx.on('print/doneTask', () => printTaskCounter.inc({ status: 'done' }));
+    ctx.on('print/doneTask', (client) => printTaskCounter.inc({ status: 'done', client }));
 
     collectDefaultMetrics({ register: registry });