loupedeck-commander 1.2.9 → 1.2.10

package/common/touchbuttons.mjs

@@ -456,10 +456,13 @@ export class Button {
           state : key,
           ...state
         }
-        let val1 = format(state.value,params)
-        if (val1 === val.toString()){
-          this.#index = i;
-          break;
+        if (state && state.value !== undefined){
+          let strVal = state.value.toString()
+          let val1 = format(strVal,params)
+          if (val1 === val?.toString()){
+            this.#index = i;
+            break;
+          }
         }
         //break;
     }

package/interfaces/opcuaif.mjs

@@ -91,8 +91,10 @@ export class OPCUAIf extends BaseIf {
                     const elem = field[key]
                     // groupnode
                     if (elem.nodeid) {
-                        let format = this.formatString(elem.nodeid, options)
-                        let monitoredItemId = await this.Subscribe(format)
+                        options["key"] = key
+                        let formattedNodeId = this.formatString(elem.nodeid, options)
+                        let monitoredItemId = await this.Subscribe(formattedNodeId)
+                        console.log("Subscribe to",formattedNodeId)
                         this.buttons[monitoredItemId] = i
                     }
                     // statenode
@@ -222,16 +224,23 @@ export class OPCUAIf extends BaseIf {
     async Disconnect() {
         if (this.#client) {
             this.LogInfo(`OPCUAIf: Disconnect\n`);
-            await this.#client.Disconnect()
+            if (this.#session)
+                await this.#client.closeSession(this.#session,true)
+            this.#session = undefined
+            this.#client = undefined
             this.LogInfo(`OPCUAIf: Disconnected\n`);
         }
     }
     async Connect(url) {
         let self = this
+        if (this.#client){
+            console.log("Closing session first")
+            await this.Disconnect()
+        }
+        
         this.#client = OPCUAClient.create({
             applicationName: "NodeOPCUA-Client",
-
-            endpointMustExist: false,
+            endpointMustExist: true,
             // keepSessionAlive: true,
             requestedSessionTimeout: 60 * 1000,
             securityMode: MessageSecurityMode.None,
@@ -245,10 +254,11 @@ export class OPCUAIf extends BaseIf {
             defaultSecureTokenLifetime: 20000,
             tokenRenewalInterval: 1000
         });
+    
 
         this.#client.on("backoff", (retry, delay) => {
-            if ((retry % 10) == 0)
-                self.LogInfo(`OPCUAIf Try Reconnection ${retry} next attempt in ${delay}ms ${self.#endpointurl}\n`);
+            //if ((retry % 10) == 0)
+            //    self.LogInfo(`OPCUAIf Try Reconnection ${retry} next attempt in ${delay}ms ${self.#endpointurl}\n`);
         });
 
         this.#client.on("connection_lost", () => {

package/package.json

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