Added switch between using Websockets or Rest to make difference.

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

Author: Dennis Labordus

src/compas-services/CompasValidatorService.ts

@@ -25,6 +25,10 @@ export function CompasSclValidatorService() {
     if (sclValidatorServiceUrl.startsWith("ws://") || sclValidatorServiceUrl.startsWith("wss://")) {
       return sclValidatorServiceUrl + (sclValidatorServiceUrl.endsWith("/") ? "" : "/");
     }
+    if (sclValidatorServiceUrl.startsWith("http://") || sclValidatorServiceUrl.startsWith("https://")) {
+      return sclValidatorServiceUrl.replace("http://", "ws://").replace("https://", "wss://")
+        + (sclValidatorServiceUrl.endsWith("/") ? "" : "/");
+    }
 
     return (document.location.protocol == "http:" ? "ws://" : "wss://")
       + document.location.hostname  + ":" + getWebsocketPort()
@@ -40,8 +44,7 @@ export function CompasSclValidatorService() {
 
   return {
     useWebsocket(): boolean {
-      const sclValidatorServiceUrl = getCompasSettings().sclValidatorServiceUrl;
-      return !sclValidatorServiceUrl.startsWith("http");
+      return getCompasSettings().useWebsockets === 'on';
     },
 
     validateSCLUsingRest(type: string, doc: Document): Promise<Document> {

src/compas/CompasSettings.ts

@@ -7,12 +7,14 @@ import '@material/mwc-button';
 import {newWizardEvent} from '../foundation.js';
 import {TextFieldBase} from "@material/mwc-textfield/mwc-textfield-base";
 import {dispatchEventOnOpenScd} from "./foundation.js";
+import {Switch} from "@material/mwc-switch";
 
 export type CompasSettingsRecord = {
   sclDataServiceUrl: string;
   sclValidatorServiceUrl: string;
   cimMappingServiceUrl: string;
   sclAutoAlignmentServiceUrl: string;
+  useWebsockets: 'on' | 'off';
 };
 
 export function CompasSettings() {
@@ -23,7 +25,8 @@ export function CompasSettings() {
         sclDataServiceUrl: this.getCompasSetting('sclDataServiceUrl'),
         sclValidatorServiceUrl: this.getCompasSetting('sclValidatorServiceUrl'),
         cimMappingServiceUrl: this.getCompasSetting('cimMappingServiceUrl'),
-        sclAutoAlignmentServiceUrl: this.getCompasSetting('sclAutoAlignmentServiceUrl')
+        sclAutoAlignmentServiceUrl: this.getCompasSetting('sclAutoAlignmentServiceUrl'),
+        useWebsockets: this.getCompasSetting('useWebsockets')
       };
     },
 
@@ -32,7 +35,8 @@ export function CompasSettings() {
         sclDataServiceUrl: '/compas-scl-data-service',
         sclValidatorServiceUrl: '/compas-scl-validator',
         cimMappingServiceUrl: '/compas-cim-mapping',
-        sclAutoAlignmentServiceUrl: '/compas-scl-auto-alignment'
+        sclAutoAlignmentServiceUrl: '/compas-scl-auto-alignment',
+        useWebsockets: 'on'
       }
     },
 
@@ -72,6 +76,10 @@ export class CompasSettingsElement extends LitElement {
     return <TextFieldBase>this.shadowRoot!.querySelector('mwc-textfield[id="sclAutoAlignmentServiceUrl"]');
   }
 
+  getUseWebsockets(): Switch {
+    return <Switch>this.shadowRoot!.querySelector('mwc-switch[id="useWebsockets"]');
+  }
+
   valid(): boolean {
     return this.getSclDataServiceUrlField().checkValidity()
       && this.getSclValidatorServiceUrlField().checkValidity()
@@ -89,6 +97,7 @@ export class CompasSettingsElement extends LitElement {
     CompasSettings().setCompasSetting('sclValidatorServiceUrl', this.getSclValidatorServiceUrlField().value);
     CompasSettings().setCompasSetting('cimMappingServiceUrl', this.getCimMappingServiceUrlField().value);
     CompasSettings().setCompasSetting('sclAutoAlignmentServiceUrl', this.getSclAutoAlignmentServiceUrlField().value);
+    CompasSettings().setCompasSetting('useWebsockets', this.getUseWebsockets().checked ? 'on' : 'off');
     return true;
   }
 
@@ -122,6 +131,11 @@ export class CompasSettingsElement extends LitElement {
                      label="${translate('compas.settings.sclAutoAlignmentServiceUrl')}"
                      value="${this.compasSettings.sclAutoAlignmentServiceUrl}" required>
       </mwc-textfield>
+      <mwc-formfield label="${translate('compas.settings.useWebsockets')}">
+        <mwc-switch id="useWebsockets"
+                    ?checked=${this.compasSettings.useWebsockets === 'on'}>
+        </mwc-switch>
+      </mwc-formfield>
 
       <mwc-button @click=${() => {
                     if (this.reset()) {
@@ -137,7 +151,7 @@ export class CompasSettingsElement extends LitElement {
       width: 20vw;
     }
 
-    mwc-textfield {
+    mwc-textfield, mwc-formfield {
       margin: 10px;
       width: 100%;
     }

src/translations/de.ts

@@ -650,7 +650,8 @@ export const de: Translations = {
       sclDataServiceUrl: 'CoMPAS SCL Data Service URL',
       sclValidatorServiceUrl: 'CoMPAS SCL Validator Service URL',
       cimMappingServiceUrl: 'CoMPAS CIM Mapping Service URL',
-      sclAutoAlignmentServiceUrl: 'CoMPAS SCL Auto Alignment Service URL'
+      sclAutoAlignmentServiceUrl: 'CoMPAS SCL Auto Alignment Service URL',
+      useWebsockets: '???',
     },
     session: {
       headingExpiring: '???',

src/translations/en.ts

@@ -645,7 +645,8 @@ export const en = {
       sclDataServiceUrl: 'CoMPAS SCL Data Service URL',
       sclValidatorServiceUrl: 'CoMPAS SCL Validator Service URL',
       cimMappingServiceUrl: 'CoMPAS CIM Mapping Service URL',
-      sclAutoAlignmentServiceUrl: 'CoMPAS SCL Auto Alignment Service URL'
+      sclAutoAlignmentServiceUrl: 'CoMPAS SCL Auto Alignment Service URL',
+      useWebsockets: 'Use Websockets',
     },
     session: {
       headingExpiring: 'Your session is about to expire!',