Fix bug on jobId not being sent in transfer start/terminated messages.

ILLGrenoble · Jan 5, 2024 · 57e06ba · 57e06ba
1 parent 4742d01
commit 57e06ba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@illgrenoble/visa-print-server",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "A print server to transfer print jobs from a VISA instance to a print client via websocket",
   "repository": {
     "type": "git",

diff --git a/src/gateways/printer.gateway.ts b/src/gateways/printer.gateway.ts
@@ -39,14 +39,14 @@ export class PrinterGateway implements OnGatewayInit, OnGatewayConnection, OnGat
         client.broadcast.emit('print_job_handled', jobId);
     }
 
-    async sendChunkedPrinterJob(printJobs: PrintJob[]): Promise<void> {
-        await this.emit('print_job_start');
+    async sendChunkedPrinterJob(jobId: number, printJobs: PrintJob[]): Promise<void> {
+        await this.emit('print_job_start', jobId);
 
         for (const printJob of printJobs) {
             await this.sendPrinterJob(printJob);
         }
 
-        await this.emit('print_job_end');
+        await this.emit('print_job_end', jobId);
     }
 
     async sendPrinterJob(printJob: PrintJob): Promise<void> {

diff --git a/src/services/printer-job.service.ts b/src/services/printer-job.service.ts
@@ -20,7 +20,7 @@ export class PrinterJobService {
         try {
             this.logger.log(`Transferring ${chunks.length} chunks for print job ${jobId} (file '${fileData.fileName}' of length ${fileData.length} bytes)`);
 
-            await this.printerGateway.sendChunkedPrinterJob(chunks);
+            await this.printerGateway.sendChunkedPrinterJob(jobId, chunks);
 
             this.logger.log(`Print job ${jobId} transferred successfully`);
         } catch (error) {