reconnect, itemNames

Author: BoBiene

Dockerfile

@@ -3,7 +3,7 @@ ENV NODE_ENV=production
 
 # install openssl
 RUN apk update \
-	&& apk add --no-cache openssl\
+	&& apk add --no-cache openssl python3 make g++\
 	&& rm -rf /var/lib/apt/lists/* \
 	&& rm -rf /var/cache/apk/*
 

NetReconnect.js

@@ -0,0 +1,97 @@
+/**
+ * https://github.com/Cloud-Automation/node-net-reconnect
+ * Copyright (C) 2017 Stefan Poeter (Stefan.Poeter[at]cloud-automation.de)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ */
+let debug = require('debug')('net-reconnect')
+let NetKeepAlive = require('net-keepalive')
+
+class NetReconnect {
+
+  constructor (socket, options) {
+    this._socket = socket
+    this._options = options
+    this._retryTime = options.retryTime || 1000
+    this._retryAlways = options.retryAlways || false
+    this._keepAliveDelay = Math.max(options.keepAliveDelay, 1000) || 1000
+    this._keepAliveInterval = Math.max(options.keepAliveInterval, 1000) || 1000
+    this._keepAliveProbes = Math.max(Math.min(options.keepAliveProbes, 1), 20) || 1
+    this._closing = false
+
+    this._socket.on('connect', this._onConnect.bind(this))
+    this._socket.on('close', this._onClose.bind(this))
+    this._socket.on('error', this._onError.bind(this))
+  }
+
+  static apply (socket, options) {
+    return new NetReconnect(socket, options)
+  }
+
+  _reconnect () {
+    debug('reconnecting in %d', this._retryTime)
+    setTimeout(function () {
+      this._socket.connect(this._options)
+    }.bind(this), this._retryTime)
+  }
+
+  _onConnect () {
+    if (this._closing) {
+      return
+    }
+
+    this._socket.setKeepAlive(true, this._keepAliveDelay)
+    NetKeepAlive.setKeepAliveInterval(this._socket, this._keepAliveInterval)
+    NetKeepAlive.setKeepAliveProbes(this._socket, this._keepAliveProbes)
+
+    debug('online')
+  }
+
+  _onClose (hadError) {
+    if (this._closing) {
+      return
+    }
+    debug('offline')
+    this._state = 'offline'
+    if (!hadError) {
+      debug('connection closed on purpose')
+      if (this._retryAlways) {
+        debug('retryAlways flag active, reconnecting')
+        this._reconnect()
+        return
+      } else {
+        debug('not reconnecting')
+        return
+      }
+    }
+
+    debug('connection closed with errors, reconnecting')
+
+    this._reconnect()
+  }
+
+  _onError () {
+    if (this._closing) {
+      return
+    }
+
+    debug('error')
+  }
+
+  end () {
+    debug('closing socket permanently')
+    this._closing = true
+    this._socket.removeListener('connect', this._onConnect)
+    this._socket.removeListener('close', this._onClose)
+    this._socket.removeListener('error', this._onError)
+    return this._socket.end.apply(this._socket, arguments)
+  }
+
+}
+
+module.exports = NetReconnect

modbushandler.js

@@ -1,7 +1,8 @@
 `use strict`;
 
+var modbus = require('jsmodbus');
 const opcua = require("node-opcua");
-const Reconnect = require('node-net-reconnect')
+const Reconnect = require('./NetReconnect')
 const net = require('net');
 const { errorCodeToMessage } = require('jsmodbus/dist/codes');
 
@@ -79,16 +80,28 @@ var modbushandler = {
             'host': host,
             'port': port,
             'autoReconnect': true,
-            'retryAlways' : true,
+            'retryAlways': true,
             'retryTime': 1000,
             'timeout': 5000,
             'keepAlive': 5000
         };
-        let recon = new Reconnect( this.socket, options);
+        let recon = new Reconnect(this.socket, options);
         this.socket.connect(options);
 
-        console.log("Created a Modbus device on " + host + ":" + port + " " + unit);
+        console.log("Created a Modbus device on %s:%d %s",host,port,unit);
         this.modbusclient = mclient;
+        let connectionState = false;
+        this.socket.on('error', () => {
+            if (connectionState)
+                console.warn("Lost connection to Modbus device on %s:%d %s",host,port,unit);
+            connectionState = false;
+        });
+        this.socket.on('connect', () => {
+            if (!connectionState) {
+                console.info("Connection established to Modbus device on %s:%d %s",host,port,unit);
+            }
+            connectionState = true;
+        });
     }
 };
 

package-lock.json

@@ -14,7 +14,6 @@
     "jsmodbus": "~4.0",
     "lodash": "~4.17",
     "node-opcua": "~2.50",
-    "net-keepalive" : "~3.0",
-    "node-net-reconnect" :  "~0.2"
+    "net-keepalive": "~3.0"
   }
 }

package.json

@@ -1,20 +1,22 @@
-# opcua-server:
-#   container_name: opcua-server
-#   image: ghcr.io/bobiene/opcmodbusuaserver
-#   ports:
-#     - 8080:8080
-#   command: >
-#     --modbus-host modbus-server 
-#     --modbus-port 5020 
-#     --modbus-not-onebased 
-#     --modbus-holdingregister 0:100
-#     --modbus-inputregisters 0:2 3 5:5 426:6 456:6
-modbus-server:
-  container_name: modbus-server
-  image: oitc/modbus-server
-  restart: always
-  command: -f /server_config.json
-  ports:
-    - 5020:5020
-  volumes:
-    - ./modbus-server.json:/server_config.json:ro
+version: "2.4"
+services:
+  opcua-server:
+    container_name: opcua-server
+    image: ghcr.io/bobiene/opcmodbusuaserver
+    ports:
+      - 8080:8080
+    command: >
+      --modbus-host modbus-server 
+      --modbus-port 5020 
+      --modbus-not-onebased 
+      --modbus-holdingregister 0:100
+      --modbus-inputregisters 0:2 3 5:5 426:6 456:6
+  modbus-server:
+    container_name: modbus-server
+    image: oitc/modbus-server
+    restart: always
+    command: -f /server_config.json
+    ports:
+      - 5020:5020
+    volumes:
+      - ./modbus-server.json:/server_config.json:ro

sample/docker-compose.yaml

@@ -74,13 +74,13 @@ function create_modbus_variables(server, modbushandler, rootname, register, type
     modbushandler.StartPoll(rootname, type, StartAddress, count, device.pollrate);
     const addressSpace = server.engine.addressSpace;
     const namespace = addressSpace.getOwnNamespace();
-
+ 
     for (var i = 0; i < count; i++) {
         //console.log("creating variable: " + (address + count).toString());
         var node = function (register, type, address, i) {
             var servernode = {
                 componentOf: register,
-                browseName: (address + i).toString(),
+                browseName: (address + i).toString().padStart(5, 0),
                 minimumSamplingInterval: device.pollrate,
                 dataType: modbushandler.GetDataTypeString(type),
                 value: {