loupedeck-commander 1.2.5 → 1.2.6

package/common/touchbuttons.mjs

@@ -212,8 +212,8 @@ export class Button {
   text = ''
   font = '16px Arial'
 
-  #x
-  #y
+  #x = 0
+  #y = 0
   #moveLeft
   #moveRight
   #moveUp
@@ -500,6 +500,8 @@ export class Button {
       state: this.#keys[this.#index],
       min: this.#min,
       max: this.#max,
+      x: (this.#x %100),
+      y: (this.#y %100)
     }
 
     if (!params.value)

package/interfaces/opcuaif.mjs

@@ -23,7 +23,6 @@ const subscriptionParameters = {
     requestedPublishingInterval: 1000
 };
 
-
 /**
  * Our Special-Handler just used the Default - and adds Vibration after triggers through Button-Releases
  */
@@ -35,6 +34,7 @@ export class OPCUAIf extends BaseIf {
     #connected
     #endpointurl
     monitoreditems
+    types
     buttons
     #callback
     constructor() {
@@ -64,28 +64,68 @@ export class OPCUAIf extends BaseIf {
             this.#endpointurl = this.formatString(options.endpointurl,options)
             this.#callback = callbackFunction
             this.monitoreditems = {}
+            this.types = {}
             this.buttons = {}
             this.LogInfo(`OPCUAIf init ${this.#endpointurl}\n`);
         
             await this.Connect(this.#endpointurl);
 
-            let field=config.touch.center
-            const keys = Object.keys(field)
-            for (let i = 0; i < keys.length; i++) {
-                const key = keys[i]
-                const elem = config.touch.center[key]
-                if (elem.nodeid){
-                    let format = this.formatString(elem.nodeid,options)
-                    let monitoredItemId = await this.Subscribe(format)
-                    this.buttons[monitoredItemId] = i
+            let fields = [config.touch.center, config.knobs]
+            const fieldKeys = Object.keys(fields)
+            for (let f = 0; f < fieldKeys.length; f++) {
+                let field=fields[f]
+                const keys = Object.keys(field)
+                for (let i = 0; i < keys.length; i++) {
+                    const key = keys[i]
+                    const elem = field[key]
+                    if (elem.nodeid){
+                        let format = this.formatString(elem.nodeid,options)
+                        let monitoredItemId = await this.Subscribe(format)
+                        this.buttons[monitoredItemId] = i
+                    }
+                    await this.monitorStates(elem,options)
                 }
-
             }
         } catch (error) {
             this.LogError(`OPCUAIf: Error $error\n`)
         }
     }
 
+    async monitorStates(elem,options){
+        const stateKeys = Object.keys(elem.states)
+        for (let i = 0; i < stateKeys.length; i++) {
+            const key2 = stateKeys[i]
+            const state = elem.states[key2]
+            if (state.opcua){
+                let format = this.formatString(state.opcua,options)
+                let monitoredItemId = await this.Subscribe(format)
+                this.buttons[monitoredItemId] = i
+            }
+        }    
+    }
+
+    convert(value,type){
+        switch(type){
+            case DataType.Int16:
+            case DataType.Int32:
+                if (typeof value == "number"){
+                    if (Number.isInteger(value))
+                        return value
+                    else 
+                        return Math.trunc(value)
+                }
+                return parseInt(value,10)
+                break
+            case DataType.Float:
+                if (typeof value == "number")
+                    return value
+                return parseFloat(value)
+                break;
+            default:
+                return value
+        }
+    }
+
     async call (opcuaNode, options = {}) {
         var res = this.Check(options)
         if (res<0){
@@ -94,10 +134,15 @@ export class OPCUAIf extends BaseIf {
         }
 
         var nodeId = super.formatString(opcuaNode, options)
-        var value = super.formatString(options.value, options)
 
+        var type = this.types[opcuaNode]
+        var value = options.value
+        if (typeof value == "string")
+            value = super.formatString(options.value, options)
+
+        var convertedValue = this.convert(value,type)
         //this.LogInfo(`OPCUAIf: write ${nodeId} => ${value}\n`)
-        await this.Write(nodeId,value)
+        await this.Write(nodeId,convertedValue,type)
 
         var NewState = "waiting"
         return NewState
@@ -109,13 +154,13 @@ export class OPCUAIf extends BaseIf {
             this.LogError(`OPCUAIf: mandatory parameter missing\n`)    
             return res
         }
-        if (!options.endpointurl){
+        if (!"endpointurl" in options){
             this.LogError(`OPCUAIf: mandatory parameter endpointurl missing\n`)    
             return -11}
-        if (!options.nodeid){
+        if (!"nodeid" in options){
             this.LogError(`OPCUAIf: mandatory parameter nodeid missing\n`)    
             return -12}
-        if (!options.value){
+        if (!"value" in options){
             this.LogError(`OPCUAIf: mandatory parameter value missing\n`)    
             return -13}
         return 0
@@ -242,6 +287,9 @@ export class OPCUAIf extends BaseIf {
         monitoredItem.on("changed", function (dataValue) {
             var nodeId = self.monitoreditems[this.monitoredItemId]
             var buttonID = 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: ${nodeId} => ${dataValue.value.value}\n`);
             self.emit('monitored item changed',buttonID,nodeId, dataValue.value.value)
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "loupedeck-commander",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "A system to ease working with LoupeDeck devices using CMD-line, OPC/UA or HTTP-client interfaces",
   "main": "index.mjs",
   "scripts": {