fix(opcua): Properly stop connector

OptimistikSAS · Jun 21, 2023 · a7eef11 · a7eef11
1 parent 2a2b6be
commit a7eef11
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 17 deletions.
diff --git a/backend/src/south/south-connector.ts b/backend/src/south/south-connector.ts
@@ -143,6 +143,9 @@ export default class SouthConnector {
   }
 
   addToQueue(scanMode: ScanModeDTO): void {
+    if (this.stopping) {
+      return;
+    }
     const foundJob = this.taskJobQueue.find(element => element.id === scanMode.id);
     if (foundJob) {
       // If a job is already scheduled in queue, it will not be added
@@ -325,6 +328,10 @@ export default class SouthConnector {
 
   async stop(): Promise<void> {
     this.stopping = true;
+    for (const cronJob of this.cronByScanModeIds.values()) {
+      cronJob.stop();
+    }
+    this.cronByScanModeIds.clear();
     this.logger.info(`Stopping South "${this.configuration.name}" (${this.configuration.id})...`);
 
     if (this.runProgress$) {

diff --git a/backend/src/south/south-opcua-da/manifest.ts b/backend/src/south/south-opcua-da/manifest.ts
@@ -34,7 +34,7 @@ const manifest: SouthConnectorManifest = {
       key: 'readTimeout',
       type: 'OibNumber',
       label: 'Read timeout (ms)',
-      defaultValue: 60_000,
+      defaultValue: 10_000,
       newRow: true,
       validators: [{ key: 'required' }, { key: 'min', params: { min: 1000 } }, { key: 'max', params: { max: 3_600_000 } }],
       readDisplay: false
@@ -43,7 +43,7 @@ const manifest: SouthConnectorManifest = {
       key: 'retryInterval',
       type: 'OibNumber',
       label: 'Retry interval (ms)',
-      defaultValue: 10_000,
+      defaultValue: 5_000,
       newRow: false,
       validators: [{ key: 'required' }, { key: 'min', params: { min: 100 } }, { key: 'max', params: { max: 3_600_000 } }],
       readDisplay: false

diff --git a/backend/src/south/south-opcua-da/south-opcua-da.ts b/backend/src/south/south-opcua-da/south-opcua-da.ts
@@ -78,13 +78,12 @@ export default class SouthOPCUADA extends SouthConnector {
    */
   async connectToOpcuaServer(): Promise<void> {
     try {
-      const connectionStrategy = {
-        initialDelay: 1000,
-        maxRetry: 1
-      };
       const options: OPCUAClientOptions = {
         applicationName: 'OIBus',
-        connectionStrategy,
+        connectionStrategy: {
+          initialDelay: 1000,
+          maxRetry: 1
+        },
         securityMode: MessageSecurityMode[this.configuration.settings.securityMode],
         securityPolicy: this.configuration.settings.securityPolicy,
         endpointMustExist: false,

diff --git a/backend/src/south/south-opcua-ha/manifest.ts b/backend/src/south/south-opcua-ha/manifest.ts
@@ -34,7 +34,7 @@ const manifest: SouthConnectorManifest = {
       key: 'readTimeout',
       type: 'OibNumber',
       label: 'Read timeout (ms)',
-      defaultValue: 60_000,
+      defaultValue: 10_000,
       newRow: true,
       validators: [{ key: 'required' }, { key: 'min', params: { min: 1000 } }, { key: 'max', params: { max: 3_600_000 } }],
       readDisplay: false
@@ -43,7 +43,7 @@ const manifest: SouthConnectorManifest = {
       key: 'retryInterval',
       type: 'OibNumber',
       label: 'Retry interval (ms)',
-      defaultValue: 10_000,
+      defaultValue: 5_000,
       newRow: false,
       validators: [{ key: 'required' }, { key: 'min', params: { min: 100 } }, { key: 'max', params: { max: 3_600_000 } }],
       readDisplay: false

diff --git a/backend/src/south/south-opcua-ha/south-opcua-ha.ts b/backend/src/south/south-opcua-ha/south-opcua-ha.ts
@@ -27,10 +27,10 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 
 const AGGREGATE_TYPES = ['raw', 'count', 'max', 'min', 'avg'];
-type AggregateType = typeof AGGREGATE_TYPES[number];
+type AggregateType = (typeof AGGREGATE_TYPES)[number];
 
 const RESAMPLINGS = ['none', '1s', '10s', '30s', '60s', '1h', '24h'];
-type Resampling = typeof RESAMPLINGS[number];
+type Resampling = (typeof RESAMPLINGS)[number];
 
 /**
  * Class SouthOPCUAHA - Connect to an OPCUA server in HA (Historian Access) mode
@@ -94,13 +94,12 @@ export default class SouthOPCUAHA extends SouthConnector {
    */
   async connectToOpcuaServer(): Promise<void> {
     try {
-      const connectionStrategy = {
-        initialDelay: 1000,
-        maxRetry: 1
-      };
       const options: OPCUAClientOptions = {
         applicationName: 'OIBus',
-        connectionStrategy,
+        connectionStrategy: {
+          initialDelay: 1000,
+          maxRetry: 1
+        },
         securityMode: MessageSecurityMode[this.configuration.settings.securityMode],
         securityPolicy: this.configuration.settings.securityPolicy,
         endpointMustExist: false,
@@ -323,6 +322,7 @@ export default class SouthOPCUAHA extends SouthConnector {
   }
 
   async internalDisconnect(): Promise<void> {
+    this.disconnecting = true;
     if (this.reconnectTimeout) {
       clearTimeout(this.reconnectTimeout);
     }
@@ -335,7 +335,6 @@ export default class SouthOPCUAHA extends SouthConnector {
   }
 
   override async disconnect(): Promise<void> {
-    this.disconnecting = true;
     await this.internalDisconnect();
   }
 }