Prevent running multiple OCL Validation at the same time.

Signed-off-by: Dennis Labordus <[email protected]>

Author: Dennis Labordus

src/compas-services/CompasValidatorService.ts

@@ -39,12 +39,15 @@ export function CompasSclValidatorService() {
         .then(parseXml);
     },
 
-    validateSCLUsingWebsockets(type: string, doc: Document, callback: (doc: Document) => void) {
+    validateSCLUsingWebsockets(type: string, doc: Document,
+                               callback: (doc: Document) => void,
+                               onCloseCallback: () => void) {
       Websockets('CompasValidatorService')
         .execute(
           getWebsocketUri(getSclValidatorServiceUrl()) + '/validate-ws/v1/' + type,
           createRequest(doc),
-          callback);
+          callback,
+          onCloseCallback);
     },
 
     listNsdocFiles(): Promise<Document> {

src/compas-services/Websockets.ts

@@ -16,7 +16,9 @@ export function Websockets(serviceName: string) {
   }
 
   return {
-    execute(url: string, request: string, callback: (doc: Document) => void) {
+    execute(url: string, request: string,
+            onMessageCallback: (doc: Document) => void,
+            onCloseCallback?: () => void) {
       websocket = new WebSocket(url);
 
       websocket.onopen = () => {
@@ -26,7 +28,7 @@ export function Websockets(serviceName: string) {
       websocket.onmessage = (evt) => {
         parseXml(evt.data)
           .then(doc => {
-            callback(doc);
+            onMessageCallback(doc);
             websocket?.close();
           })
           .catch(reason => {
@@ -44,6 +46,9 @@ export function Websockets(serviceName: string) {
 
       websocket.onclose = () => {
         websocket = undefined;
+        if (onCloseCallback) {
+          onCloseCallback();
+        }
       }
 
       dispatchEventOnOpenScd(newPendingStateEvent(waitUntilValidated()))

src/validators/CompasValidateSchema.ts

@@ -6,7 +6,10 @@ import { CompasSclValidatorService, SVS_NAMESPACE } from "../compas-services/Com
 import { createLogEvent } from "../compas-services/foundation.js";
 import { dispatchEventOnOpenScd, getTypeFromDocName } from "../compas/foundation.js";
 
-export default class ValidateTemplates extends LitElement {
+// Boolean to prevent running the validation multiple times at the same time.
+let compasValidationSchemaRunning = false;
+
+export default class CompasValidateSchema extends LitElement {
   @property({ attribute: false })
   doc!: XMLDocument;
 
@@ -18,21 +21,31 @@ export default class ValidateTemplates extends LitElement {
 
   async validate(manual: boolean): Promise<void> {
     // We don't want to externally validate every time a save is done. So only start the validation when manually triggered.
-    if (!manual) {
+    // And also if one is already running we don't want to start another one, wait until it's finished.
+    if (!manual || compasValidationSchemaRunning) {
       return;
     }
 
+    // Block running another validation until this one is finished.
+    compasValidationSchemaRunning = true;
+
     const docType = getTypeFromDocName(this.docName);
     const service = CompasSclValidatorService();
     if (service.useWebsocket()) {
-      service.validateSCLUsingWebsockets(docType, this.doc, (doc) => {
-        this.processValidationResponse(doc);
-      });
+      service.validateSCLUsingWebsockets(docType, this.doc,
+        (doc) => {
+          this.processValidationResponse(doc);
+        },
+        () => {
+          compasValidationSchemaRunning = false;
+        });
     } else {
       const response = await service.validateSCLUsingRest(docType, this.doc)
         .catch(createLogEvent);
       if (response instanceof Document) {
         this.processValidationResponse(response);
+      } else {
+        compasValidationSchemaRunning = false;
       }
     }
   }
@@ -51,5 +64,7 @@ export default class ValidateTemplates extends LitElement {
         );
       })
     }
+
+    compasValidationSchemaRunning = false;
   }
 }