update status badge

Teo230 · Jul 3, 2024 · 65ee76d · 65ee76d
1 parent 1bc56b3
commit 65ee76d
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 49 deletions.
diff --git a/core.js b/core.js
@@ -8,9 +8,9 @@
  */
 var core = core || { opcClient: {} }
 core.opcua = core.opcua || require('node-opcua')
-core.storage = core.storage || require('node-persist')
 core.opcClient = core.opcClient || new core.opcua.OPCUAClient();
 core.opcSession = core.opcSession || null
+core.opcClientStatus = core.opcClientStatus || "disconnected"
 
 core.createOpcUaClient = function(name){
     // caused the connect method to fail after one single unsuccessful retry
@@ -35,11 +35,13 @@ core.createOpcUaClient = function(name){
 
 core.connect = async function(host){
     await core.opcClient.connect(host);
+    core.opcClientStatus = "connected";
     core.opcSession = await core.opcClient.createSession();
 }
 
 core.close = async function(){
     await core.opcSession.close();
+    core.opcClientStatus = "disconnected";
     core.opcSession = null;
 }
 

diff --git a/opcua-client.js b/opcua-client.js
@@ -8,9 +8,6 @@ module.exports = function (RED) {
 
         let node = this;
 
-        //Initialize persist storage
-        core.storage.init({dir: `${RED.settings.userDir}/cache/node-red-opcua-x`});
-
         node.name = args.name; //unique name identifier
         node.host = args.host; //opc.tcp
 
@@ -29,17 +26,16 @@ module.exports = function (RED) {
         async function connect() {
             try {
 
-                opcClient.on("abort", () => node.debug("client has aborted"));
-                opcClient.on("close", () => node.debug("client has closed"));
-                opcClient.on("connection_reestablished", () => sendClientConnectionStatus(true));
-                opcClient.on("connection_lost", () => sendClientConnectionStatus(false));
-                opcClient.on("start_reconnection", () => node.debug("client is trying to reconnect"));
-                opcClient.on("after_reconnection", () => node.debug("client start reconnection"));
+                opcClient.on("abort", () => sendClientConnectionStatus("disconnected"));
+                opcClient.on("close", () => sendClientConnectionStatus("disconnected"));
+                opcClient.on("connection_reestablished", () => sendClientConnectionStatus("connected"));
+                opcClient.on("connection_lost", () => sendClientConnectionStatus("disconnected"));
+                opcClient.on("start_reconnection", () => sendClientConnectionStatus("reconnecting"));
+                opcClient.on("after_reconnection", () => sendClientConnectionStatus("reconnecting"));
 
                 await core.connect(node.host);
-                sendClientConnectionStatus(true);
 
-                core.opcSession.on("session_closed", () => node.debug("session has closed"));
+                core.opcSession.on("session_closed", () => sendClientConnectionStatus("disconnected"));
                 // core.opcSession.on("keepalive", () => node.debug("session keepalive"));
                 // core.opcSession.on("keepalive_failure", () => node.debug("session keepalive failure"));
 
@@ -48,10 +44,20 @@ module.exports = function (RED) {
             }
         }
 
-        function sendClientConnectionStatus(connected) {
-            if (connected) node.debug("client has reconnected");
-            else node.debug("client has lost connection");
-            core.storage.setItem("client-connected", connected);
+        function sendClientConnectionStatus(status) {
+            switch(status){
+                case "connected":
+                    node.debug("client has reconnected");
+                    break;
+                case "reconnecting":
+                    node.debug("client is trying to reconnect");
+                    break
+                case "disconnected":
+                    node.debug("client has lost connection");
+                    break;
+            }
+
+            core.opcClientStatus = status;
         }
 
         async function onNodeClosed(done){

diff --git a/opcua-read.js b/opcua-read.js
@@ -15,6 +15,11 @@ module.exports = function (RED) {
         // Read Input Arg node
         node.on('input', function (msg) {
 
+            if(!core.opcSession){
+                node.error("Session not defined");
+                return;
+            }
+
             // Override nodeId from incoming node if not defined on read node
             if (!args.nodeId && msg.nodeId) node.nodeId = msg.nodeId;
 

diff --git a/opcua-status.js b/opcua-status.js
@@ -6,29 +6,30 @@ module.exports = function (RED) {
 
         RED.nodes.createNode(this, config);
 
-        const storage = core.storage;
         let node = this;
         let state = false;
 
         setInterval(checkServerConnection, 5000);
 
         function checkServerConnection() {
-            if (storage === null || storage === undefined) return;
-
-            storage.getItem("client-connected").then((value) => {
-                if (state === value) return;
-                state = value;
-
-                if(state){
-                    node.status({fill:"green",shape:"dot",text:"connected"});
-                }else{
-                    node.status({fill:"red",shape:"ring",text:"disconnected"});
-                }
-
-                var msg = { payload: state ? 'connected' : 'disconnected' };
-
-                node.send(msg);
-            });
+            if (state === core.opcClientStatus) return;
+            state = core.opcClientStatus;
+
+            switch(state){
+                case "connected":
+                    node.status({ fill: "green", shape: "dot", text: "connected" });
+                    break;
+                case "reconnecting":
+                    node.status({ fill: "yellow", shape: "ring", text: "reconnecting" });
+                    break;
+                case "disconnected":
+                default:
+                    node.status({ fill: "red", shape: "ring", text: "disconnected" });
+            }
+
+            var msg = { payload: state };
+
+            node.send(msg);
         }
 
     }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red-opcua-x",
-    "version": "0.1.0",
+    "version": "0.2.0",
     "node-red": {
         "nodes": {
             "opcua-client": "opcua-client.js",
@@ -10,7 +10,6 @@
         }
     },
     "dependencies": {
-        "node-opcua": "^2.127.1",
-        "node-persist": "^4.0.1"
+        "node-opcua": "^2.127.1"
     }
 }