Add transfer_started and transfer_terminated events. Update event nam…

…es from server. Fix bug on connection data being removed on disconnect event.
ILLGrenoble · Jan 5, 2024 · 28223d5 · 28223d5
1 parent b8666be
commit 28223d5
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 24 deletions.
diff --git a/lib/package-lock.json b/lib/package-lock.json
diff --git a/lib/package.json b/lib/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@illgrenoble/visa-print-client",
     "description": "",
-    "version": "1.0.2",
+    "version": "1.1.0",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/ILLGrenoble/visa-print-client.git"

diff --git a/lib/src/models/index.ts b/lib/src/models/index.ts
@@ -2,5 +2,4 @@ export * from './print-job.model';
 export * from './print-event.model';
 export * from './print-job-chunk-event.model';
 export * from './print-job-available-event.model';
-export * from './print-job-handled-event.model';
 export * from './error-event.model';
diff --git a/lib/src/models/print-event.model.ts b/lib/src/models/print-event.model.ts
@@ -1,12 +1,12 @@
 import {ErrorEvent} from "./error-event.model";
 import {PrintJobChunkEvent} from "./print-job-chunk-event.model";
 import {PrintJobAvailableEvent} from "./print-job-available-event.model";
-import {PrintJobHandledEvent} from "./print-job-handled-event.model";
 
 export class PrintEvent {
-    type: 'CONNECTING' | 'CONNECTED' | 'DISCONNECTED' | 'ERROR' | 'PRINT_JOB_CHUNK_RECEIVED' | 'PRINT_JOB_AVAILABLE' | 'PRINT_JOB_HANDLED' | 'PRINT_ENABLED' | 'PRINT_DISABLED';
+    type: 'CONNECTING' | 'CONNECTED' | 'DISCONNECTED' | 'ERROR' | 'PRINT_JOB_CHUNK_RECEIVED' | 'PRINT_JOB_TRANSFER_STARTED' | 'PRINT_JOB_TRANSFER_TERMINATED' | 'PRINT_JOB_AVAILABLE' | 'PRINT_JOB_HANDLED' | 'PRINT_ENABLED' | 'PRINT_DISABLED';
     connectionId: string;
-    data?: ErrorEvent | PrintJobChunkEvent | PrintJobAvailableEvent | PrintJobHandledEvent;
+    jobId?: number;
+    data?: ErrorEvent | PrintJobChunkEvent | PrintJobAvailableEvent;
 
     constructor(data?: Partial<PrintEvent>) {
         Object.assign(this, data);

diff --git a/lib/src/models/print-job-handled-event.model.ts b/lib/src/models/print-job-handled-event.model.ts
diff --git a/lib/src/services/visa-print.service.ts b/lib/src/services/visa-print.service.ts
@@ -1,10 +1,9 @@
 import {Injectable} from "@angular/core";
-import {BehaviorSubject, filter, Observable, Subject} from "rxjs";
+import {BehaviorSubject, Observable, Subject} from "rxjs";
 import {
     PrintEvent,
     PrintJob,
     ErrorEvent,
-    PrintJobHandledEvent,
     PrintJobChunkEvent,
     PrintJobAvailableEvent
 } from "../models";
@@ -82,15 +81,14 @@ export type Connection = {
 
         socket.on('print_job_handled', (jobId: number) => {
             connection.printables = connection.printables.filter(printable => printable.jobId !== jobId);
-            printEvents$.next(new PrintEvent({type: 'PRINT_JOB_HANDLED', connectionId, data: new PrintJobHandledEvent({jobId})}));
+            printEvents$.next(new PrintEvent({type: 'PRINT_JOB_HANDLED', connectionId, jobId}));
         });
 
         socket.on('connect_error', (error) => {
             printEvents$.next(new PrintEvent({type: 'ERROR', connectionId, data: new ErrorEvent({type: 'CONNECTION_ERROR', message: error.message})}));
         });
 
         socket.on('disconnect', () => {
-            this._connections = this._connections.filter(connection => connection.id !== connectionId);
             printEvents$.next(new PrintEvent({type: 'DISCONNECTED', connectionId}));
         });
 
@@ -102,7 +100,15 @@ export type Connection = {
             printEvents$.next(new PrintEvent({type: 'ERROR', connectionId, data: new ErrorEvent({type: 'EXCEPTION', message: e.message})}));
         });
 
-        socket.on('print', (printJob: PrintJob, ack) => {
+        socket.on('print_job_start', (jobId: number) => {
+            printEvents$.next(new PrintEvent({type: 'PRINT_JOB_TRANSFER_STARTED', connectionId, jobId}));
+        });
+
+        socket.on('print_job_end', (jobId: number) => {
+            printEvents$.next(new PrintEvent({type: 'PRINT_JOB_TRANSFER_TERMINATED', connectionId, jobId}));
+        });
+
+        socket.on('print_job_data', (printJob: PrintJob, ack) => {
             const {jobId, chunkId, chunkCount, chunkLength, data} = printJob;
             if (chunkLength !== data.length) {
                 console.error(`printer job data of chunk ${chunkId}/${chunkCount} for job ${jobId} ${printJob.fileName} has incorrect length`)
@@ -112,7 +118,7 @@ export type Connection = {
             }
 
             ack(true);
-            printEvents$.next(new PrintEvent({type: 'PRINT_JOB_CHUNK_RECEIVED', connectionId, data: new PrintJobChunkEvent({jobId, chunkId, chunkCount, chunkLength})}));
+            printEvents$.next(new PrintEvent({type: 'PRINT_JOB_CHUNK_RECEIVED', connectionId, jobId, data: new PrintJobChunkEvent({jobId, chunkId, chunkCount, chunkLength})}));
             this.handlePrintJob(connection, printJob);
         });
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@illgrenoble/visa-print-client",
     "description": "Receives print requests from a VISA instance via the VISA Print Server using a websocket",
-    "version": "1.0.2",
+    "version": "1.1.0",
     "scripts": {
         "ng": "ng",
         "start": "ng serve --proxy-config proxy.conf.json",