loupedeck-commander 1.3.3 → 1.4.0

package/common/button.mjs

@@ -383,24 +383,27 @@ export class Button {
   async buttonStateChanged(buttonID, attribute, nodeid, val) {
 
     //
-    if (attribute == "nodeid" && nodeid == this.#params.nodeid) {
+    if ((attribute == "nodeid" && nodeid == this.#params.nodeid)) {
       this.#index = 0;
-      this.#enforcedIndex = -1;
+      this.#enforcedIndex = 0;
       for (let i = 0; i < this.#keys.length; i++) {
         let stateStr = this.#keys[i].toString()
         let valStr = val.toString()
         // check if the state-name is same as the value we get from outside:
         if (valStr == stateStr) {
-          if (i !== this.#index) {
-            console.info("Changed index", this.id, nodeid, val, i)
-            this.#index = i;
-            console.info("enforce State index", this.id, nodeid, val, i)
-            this.#enforcedIndex = this.#index;
-          }
+          //if (i !== this.#index) {
+            //console.info("enforce State index", this.id, nodeid, val, i)
+            this.#enforcedIndex = i;
+          //}
           break;
         }
       }
+      //console.info("Changed index", this.id, nodeid, val, this.#enforcedIndex)
+      this.#index = this.#enforcedIndex;
+      //console.info("enforce State index", this.id, nodeid, val, i)
+      //this.#enforcedIndex = this.#index;
     }
+    
 
     if (attribute == "blink") {
           console.info("Changed blink", buttonID, nodeid, val)

package/interfaces/opcuaif.mjs

@@ -56,6 +56,7 @@ export class OPCUAIf extends BaseIf {
                 this.#samplingInterval = 100;
                 this.LogInfo(`OPCUAIf init using default samplingInterval: ${this.#samplingInterval}ms\n`);
             }
+            this.options = options
             this.monitoreditems = {}
             this.types = {}
             this.buttons = {}
@@ -78,18 +79,22 @@ export class OPCUAIf extends BaseIf {
                         let attributes = ["nodeid", "blink"]
                         for (let j = 0; j < attributes.length; j++) {
                             const attribute = attributes[j]
+                            let nodeID = super.formatString(elem.params[attribute], options)
                             if (attribute in elem.params) {
-                                if (!this.IsNodeID(elem.params[attribute])) {
+                                if (!this.IsNodeID(nodeID)) {
                                     continue
                                 }
 
-                                let monitoredItemId = await this.Subscribe(elem.params[attribute], options,attribute)
+                                let monitoredItemId = await this.Subscribe(nodeID, options,attribute)
                                 if (monitoredItemId) {
-                                    this.buttons[monitoredItemId] = {
+                                    console.log("Register nodeid",nodeID, monitoredItemId, buttonID, attribute,)
+                                    if (this.buttons[monitoredItemId] == undefined)
+                                        this.buttons[monitoredItemId] = []
+                                    this.buttons[monitoredItemId].push({
                                         buttonID: i,
                                         buttonName: buttonID,
                                         attribute: attribute
-                                    }
+                                    })
                                 }
                             }
                         }
@@ -103,17 +108,21 @@ export class OPCUAIf extends BaseIf {
 
                             for (let k = 0; k < attributes.length; k++) {
                                 const attribute = attributes[k]
+                                let nodeID = super.formatString(state[attribute], options)
                                 if (attribute in state) {
-                                    if (!this.IsNodeID(state[attribute])) {
+                                    if (!this.IsNodeID(nodeID)) {
                                         continue
                                     }      
-                                    let monitoredItemId = await this.Subscribe(state[attribute], options,attribute)
+                                    let monitoredItemId = await this.Subscribe(nodeID, options,attribute)
                                     if (monitoredItemId) {
-                                        this.buttons[monitoredItemId] = {
+                                        console.log("Register state",monitoredItemId, buttonID, attribute,nodeID)
+                                        if (this.buttons[monitoredItemId] == undefined)
+                                            this.buttons[monitoredItemId] = []
+                                        this.buttons[monitoredItemId].push({
                                             buttonID: i,
                                             buttonName: buttonID,
                                             attribute: attribute
-                                        }
+                                        })
                                     }
                                 }
                             }
@@ -188,6 +197,12 @@ export class OPCUAIf extends BaseIf {
         var nodeId = super.call(opcuaNode, options)
 
         var type = this.types[nodeId]
+        
+        if (type === undefined){
+            let dataValue = await this.Read(nodeId)
+            this.types[nodeId]  = dataValue.value.dataType
+            type = this.types[nodeId]
+        }
         var value = options.value
         if (typeof value == "string")
             value = super.formatString(options.value, options)
@@ -311,10 +326,10 @@ export class OPCUAIf extends BaseIf {
         this.#session = await this.#client.createSession();
 
         this.#session.on("session_closed", (statusCode) => {
-            self.LogInfo(`OPCUAIf: Session has been closed\n`);
+            //self.LogInfo(`OPCUAIf: Session has been closed\n`);
         })
         this.#session.on("session_restored", () => {
-            self.LogInfo(`OPCUAIf: Session has been restored\n`);
+            //self.LogInfo(`OPCUAIf: Session has been restored\n`);
         });
         this.#session.on("keepalive", (lastKnownServerState) => {
             self.LogInfo(`OPCUAIf: KeepAlive lastKnownServerState ${lastKnownServerState}\n`);
@@ -367,11 +382,12 @@ export class OPCUAIf extends BaseIf {
         let nodeID = this.formatString(unformattedNodeID, options)
         
         // install monitored item
-        const monitoredNodeIdList = Object.values(this.monitoreditems)
+        const monitoredNodeIdList = Object.keys(this.monitoreditems)
+        let monitorItemId = -1
         for (let i = 0; i < monitoredNodeIdList.length; i++) {
-            if (monitoredNodeIdList[i] == nodeID) {
-                // already registered => return itemid
-                return this.monitoreditems[i]
+            let monitorItemId = monitoredNodeIdList[i]
+            if (this.monitoreditems[monitorItemId] == nodeID) {
+                return monitorItemId                  // already registered => return itemid
             }
         }
 
@@ -391,23 +407,27 @@ export class OPCUAIf extends BaseIf {
         }
         const monitoredItem = await this.#sub.monitor(itemToMonitor, monitoringParameters, TimestampsToReturn.Both);
         this.monitoreditems[monitoredItem.monitoredItemId] = nodeID
+        if (monitoredItem.monitoredItemId === undefined) {
+            this.LogError(`OPCUAIf: Error subscribing to node ${nodeID} (attribute ${attribute})\n`)
+        } else {
+            this.LogDebug(`OPCUAIf: Subscribe to ${monitoredItem.monitoredItemId},${nodeID},(attribute ${attribute})\n`);
+        }
+
         var self = this
         monitoredItem.on("changed", function (dataValue) {
             var nodeId = self.monitoreditems[this.monitoredItemId]
-            var buttonInfo = self.buttons[this.monitoredItemId]
+            
             // store the type of a nodeid in local dictionary
             self.types[nodeId] = dataValue.value.dataType
             // publish the value to subscribers:
-            self.LogInfo(`OPCUAIf: monitored item changed: ${buttonInfo.buttonID} ${buttonInfo.attribute} ${nodeId} => ${dataValue.value.value}\n`);
-            self.emit('monitored item changed', buttonInfo.buttonID, buttonInfo.attribute, nodeId, dataValue.value.value)
+            let buttons = self.buttons[this.monitoredItemId]
+            for (var i=0;i<buttons.length;i++){
+                var buttonInfo = buttons[i]
+                self.LogInfo(`OPCUAIf: monitored item changed: ${buttonInfo.buttonID} ${buttonInfo.attribute} ${nodeId} => ${dataValue.value.value}\n`);
+                self.emit('monitored item changed', buttonInfo.buttonID, buttonInfo.attribute, nodeId, dataValue.value.value)
+            }
         });
 
-        if (monitoredItem.monitoredItemId === undefined) {
-            this.LogError(`OPCUAIf: Error subscribing to node ${nodeID} (attribute ${attribute})\n`)
-        } else {
-            this.LogDebug(`OPCUAIf: Subscribe to ${monitoredItem.monitoredItemId},${nodeID},(attribute ${attribute})\n`);
-        }
-
         return monitoredItem.monitoredItemId;
     }
 
@@ -451,11 +471,11 @@ export class OPCUAIf extends BaseIf {
                         self.LogInfo(`OPCUAIf: wrote ${nodeID} => ${value}\n`);
                     }
                 } else {
-                    self.LogError("OPCUAIf: write NOT ok", nodeID, value, "\n");
+                    self.LogError(`OPCUAIf: writing not OK ${nodeID} => ${value}, ${err}\n`);
                 }
             });
         } catch (err) {
-            self.LogError("OPCUAIf: write NOT ok", nodeID, value, "\n");
+            self.LogError(`OPCUAIf: writing not OK ${nodeID} => ${value}, ${err}\n`);
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "loupedeck-commander",
-  "version": "1.3.3",
+  "version": "1.4.0",
   "description": "A system to ease working with LoupeDeck devices using CMD-line, OPC/UA or HTTP-client interfaces",
   "main": "index.mjs",
   "scripts": {
@@ -10,12 +10,12 @@
     "start": "node index.mjs"
   },
   "dependencies": {
-    "canvas": "^3.1.0",
+    "canvas": "^3.2.0",
     "loupedeck": "^7.0.0",
     "mkdirp": "^3.0.1",
-    "node-opcua": "^2.153.0",
+    "node-opcua": "^2.156.0",
     "string-template": "^1.0.0",
-    "yaml": "^2.8.0"
+    "yaml": "^2.8.1"
   },
   "author": "Thomas Schneider",
   "license": "Apache-2.0",