core: add printTask metrics

Author: pandadtdyy

packages/server/handler/client.ts

@@ -66,7 +66,8 @@ class ClientPrintConnectHandler extends Handler {
             logger.error(e);
         }
         this.response.body = { doc: code };
-        if (params.printer && params.printer !== code.printer) this.response.body.setPrinter = code.printer;
+        if (params.printer && params.printer !== client.printer) this.response.body.setPrinter = client.printer;
+        await this.ctx.parallel('print/sendTask');
         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() } });
     }
@@ -80,6 +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');
         this.response.body = { code: 1 };
         logger.info(`Client ${client.name} connected, print task ${code.tid}#${code._id} completed.`);
     }

packages/server/handler/printer.ts

@@ -81,6 +81,7 @@ class CodeHandler extends Handler {
         fs.writeFileSync(path.resolve(process.cwd(), 'data/codes', `${team}#${res._id}`), code || fs.readFileSync(this.request.files.file.filepath));
         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');
         if (tname.length > 40) {
             logger.warn(`Team ${tname} name is too long, may cause overflow!`);
             this.response.body += ', your team name is too long, may cause print failed!';

packages/server/utils/metrics.ts

@@ -7,6 +7,11 @@ declare module 'cordis' {
     interface Context {
         metrics: Registry;
     }
+    interface Events {
+        'print/newTask': () => void;
+        'print/sendTask': () => void;
+        'print/doneTask': () => void;
+    }
 }
 
 export function createMetricsRegistry(ctx: Context) {
@@ -21,15 +26,24 @@ export function createMetricsRegistry(ctx: Context) {
     }
 
     createMetric(Gauge, 'xcpc_machinecount', 'machinecount', {
+        labelNames: ['status'],
         async collect() {
             const machines = await ctx.db.monitor.find({});
             const onlines = machines.filter((m) => m.updateAt > new Date().getTime() - 1000 * 60);
-            this.set({ type: 'total' }, machines.length);
-            this.set({ type: 'online' }, onlines.length);
-            this.set({ type: 'offline' }, machines.length - onlines.length);
+            this.set({ status: 'online' }, onlines.length);
+            this.set({ status: 'offline' }, machines.length - onlines.length);
         },
     });
 
+    const printTaskCounter = createMetric(Counter, 'xcpc_printcount', 'printcount', {
+        labelNames: ['status'],
+    });
+    ctx.on('print/newTask', () => printTaskCounter.inc({ status: 'new' }));
+
+    ctx.on('print/sendTask', () => printTaskCounter.inc({ status: 'sent' }));
+
+    ctx.on('print/doneTask', () => printTaskCounter.inc({ status: 'done' }));
+
     collectDefaultMetrics({ register: registry });
 
     ctx.set('metrics', registry);