loupedeck-commander 1.2.9 → 1.2.11

package/common/ApplicationConfig.mjs

@@ -256,7 +256,7 @@ class ParametersConfig {
 
 class DefaultConfig {
   default = {
-    "filter": "released",
+//    "filter": "released",
     "color":  "#111111"
   }
 

package/common/BaseLoupeDeckHandler.mjs

@@ -83,10 +83,12 @@ export class BaseLoupeDeckHandler {
     try {
       console.info(`Closing Device`)
       this.stopping = true
-      if (this.device){
+
+/*      if (this.device){
         this.device.vibrate(HAPTIC.DESCEND_MED)
         await new Promise(resolve => setTimeout(resolve, 250))
       }
+*/
       if (this.device){
         this.device.setBrightness(0)
         await new Promise(resolve => setTimeout(resolve, 250))
@@ -97,11 +99,14 @@ export class BaseLoupeDeckHandler {
         await new Promise(resolve => setTimeout(resolve, 2000))
         console.info(`Device Closed`)      
       }
-
       console.info(`Stopping interfaces`)
       await StopInterfaces()
-      await new Promise(resolve => setTimeout(resolve, 500))
-    } catch (e) {}
+      await new Promise(resolve => setTimeout(resolve, 1000))
+
+    } catch (e) {
+      console.info(`e`,e)      
+
+    }
 
     process.exit()
 

package/common/touchbuttons.mjs

@@ -331,7 +331,8 @@ export class Button {
       ctx.font = '20px Verdana'
       ctx.textBaseline = 'top';
       ctx.textAlign = 'left';
-      ctx.fillText(this.text,x+6,y+6)  
+      let dynamicText = format(this.text, this.getParams(elem))
+      ctx.fillText(dynamicText,x+6,y+6)  
     }
   }
 
@@ -382,7 +383,8 @@ export class Button {
   }
 
   released () {
-    if (!this.getCurrentElement()) { return false }
+    let elem = this.getCurrentElement()
+    if (!elem) { return false }
     this.timeStampReleased = Date.now()
     this.timeHold = this.timeStampReleased - this.timeStampPressed
 
@@ -456,10 +458,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;
     }
@@ -490,26 +495,7 @@ export class Button {
     return false
   }
 
-  async runCommand () {
-    const elem = this.getCurrentElement()
-    // Only continue, if we have an element:    
-    if (!elem) {
-      return
-    }
-    // Filter for Event Type:
-    if (elem.filter && elem.filter != this.#event){
-      return
-    }
-
-    if (elem.profile !== undefined) {
-      profileEmitter.emit("profileChanged", elem.profile)
-    }
-
-    // Only continue, if we have an element, that contains some kind of command:    
-    if (!elem.cmd && !elem.http && !elem.opcua) {
-      return
-    }
-
+  getParams(elem){
     // Call an action - include dynamic parameters
     // and also all attributes of elem + global config
     const params = {
@@ -519,6 +505,9 @@ export class Button {
       id: this.id,
       key: this.key,
       event: this.#event,
+      pressed : this.#event == "pressed",
+      released : this.#event == "released",
+      rotated : this.#event == "rotated",
       state: this.#keys[this.#index],
       min: this.#min,
       max: this.#max,
@@ -529,7 +518,30 @@ export class Button {
     if (params.value === undefined)
       params.value = this.#value
 
+    return params
+  }
+
+  async runCommand () {
+    const elem = this.getCurrentElement()
+    // Only continue, if we have an element:    
+    if (!elem) {
+      return
+    }
+    // Filter for Event Type:
+    if (elem.filter && elem.filter != this.#event){
+      return
+    }
+
+    if (elem.profile !== undefined) {
+      profileEmitter.emit("profileChanged", elem.profile)
+    }
+
+    // Only continue, if we have an element, that contains some kind of command:    
+    if (!elem.cmd && !elem.http && !elem.opcua) {
+      return
+    }
 
+    let params = this.getParams(elem)
     let res = ''
     if ('cmd' in elem) {
       if (shellinterface){

package/config.json

@@ -4,6 +4,10 @@
         {
             "name": "profile-1",
             "file": "profile-1.json"
+        },
+        {
+            "name": "profile-2",
+            "file": "profile-2.json"
         }
     ]
 }

package/interfaces/opcuaif.mjs

@@ -39,19 +39,12 @@ export class OPCUAIf extends BaseIf {
     buttons
     constructor() {
         super()
-
-        this.LogInfo(`OPCUAIf Constructed`);
     }
 
     async stop() {
         if (!this.#client)
             return
-
-        this.LogInfo(`OPCUAIf Stopping\n`)
-        await this.#client.closeSession(this.#session, true)
-        await this.#client.disconnect()
-        this.#connected = false
-        this.#client = null
+        await this.Disconnect()
         this.LogInfo(`OPCUAIf Stopped\n`)
     }
 
@@ -91,8 +84,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
@@ -221,17 +216,22 @@ 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){
+            await this.Disconnect()
+        }
+        
         this.#client = OPCUAClient.create({
             applicationName: "NodeOPCUA-Client",
-
-            endpointMustExist: false,
+            endpointMustExist: true,
             // keepSessionAlive: true,
             requestedSessionTimeout: 60 * 1000,
             securityMode: MessageSecurityMode.None,
@@ -245,10 +245,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.11",
   "description": "A system to ease working with LoupeDeck devices using CMD-line, OPC/UA or HTTP-client interfaces",
   "main": "index.mjs",
   "scripts": {

package/profile-1.json

@@ -24,14 +24,16 @@
                     "off": {
                         "color": "#000099",
                         "image": "icons/home.png",
-                        "cmd": "echo \"{id} {state}\""
+                        "cmd": "echo \"{id} {state} {pressed}\""
                     },
                     "on": {
                         "color": "#00ff00",
                         "image": "icons/home.png",
-                        "cmd": "echo \"{id} {state}\""
+                        "cmd": "echo \"{id} {state} {pressed}\""
                     }
                 },
+                "minPressed" : 10000,
+                "text" : "{released}",
                 "group": ""
             },
             "2": {
@@ -265,6 +267,6 @@
         "endpointurl": "opc.tcp://{hostname}:4840",
         "publishingInterval" : 200,
         "nodeid" : "ns=0;s=nodeID",
-        "verbose": true    
+        "verbose": false 
     }
 }