loupedeck-commander 1.2.0 → 1.2.1

package/README.md

@@ -53,15 +53,26 @@ import { BaseLoupeDeckHandler } from 'loupedeck-commander'
 
 const handler = new BaseLoupeDeckHandler('config.json')
 
-const stopHandler = () => {
-  console.log('Receiving SIGINT => Stopping processes.')
-  handler.stop()
+/**
+ * Stop the handlers when a signal like SIGINT or SIGTERM arrive
+ * @param {*} signal 
+ */
+const stopHandler = async(signal) =>  {
+  console.log(`Receiving ${signal} => Stopping processes.`)
+  await handler.stop()
 }
 
-// Initiating a process
-process.on('SIGINT', stopHandler)
+// Initiating the signal handlers:
+// see https://www.tutorialspoint.com/unix/unix-signals-traps.htm
+process.on('SIGINT', async (signal) => { stopHandler(signal) })
+process.on('SIGTERM', async (signal) => { stopHandler(signal) })
 
+// Start it
 await handler.start()
+
+// Take care of running background processes and stop them accordingly:
+await new Promise((resolve) => process.once("SIGINT", resolve));
+
 ```
 
 Run the script using the following command:

package/common/BaseLoupeDeckHandler.mjs

@@ -12,13 +12,14 @@ export class BaseLoupeDeckHandler {
   screenUpdate = {}
   stopping = false
 
-  //touchButtons = undefined
-
   constructor (config) {
     console.log(`INIT with config ${config}`)
     this.loadConfig(config)
   }
 
+  /**
+   * event handler - start
+   */
   async start () {
     console.info('Start')
     while (!this.device && !this.stopping) {
@@ -61,11 +62,17 @@ export class BaseLoupeDeckHandler {
     console.info(`✅ Registered callbacks`)
   }
 
+  /**
+   * event handler - loupedeck device disconnected
+   */
   async disconnectDevice (event) {
-    console.info("Device Disconnected",event)
+    console.info("Device Disconnected")
     this.device=undefined
   }
 
+  /**
+   * stop handler - close the dipslay-connection and also stop all interface handlers
+   */
   async stop () {
     console.info('Stopping Handler')
 
@@ -74,39 +81,41 @@ export class BaseLoupeDeckHandler {
       this.stopping = true
       if (this.device){
         this.device.vibrate(HAPTIC.DESCEND_MED)
-        await new Promise(resolve => setTimeout(resolve, 500))
+        await new Promise(resolve => setTimeout(resolve, 250))
       }
       if (this.device){
         this.device.setBrightness(0)
-        await new Promise(resolve => setTimeout(resolve, 500))
+        await new Promise(resolve => setTimeout(resolve, 250))
       }
       if (this.device){
         this.device.reconnectInterval = 0
         await this.device.close()
-        await new Promise(resolve => setTimeout(resolve, 3000))
-        console.error(`Device Closed`)      
+        await new Promise(resolve => setTimeout(resolve, 2000))
+        console.info(`Device Closed`)      
       }
 
       console.info(`Stopping interfaces`)
-      
       await StopInterfaces()
-      await new Promise(resolve => setTimeout(resolve, 1000))
-      
-      this.device = null
-    } catch (e) {
-      console.error(`${e}. Catched error in 3 seconds...`)
-    }
+      await new Promise(resolve => setTimeout(resolve, 500))
+    } catch (e) {}
 
     process.exit()
 
   }
 
+  /**
+   * load Application config file from JSON
+   * @param filename
+   */
   loadConfig (fileName) {
     console.info(`Loading Config File ${fileName}`)
     this.appConfig = new ApplicationConfig()
     this.appConfig.loadFromFile(fileName)
   }
 
+  /**
+   * activate the profile with the givven ID
+   */
   async activateProfile (id) {
     // todo Profile-change implementation
     var oldProfile = this.currentProfile
@@ -151,11 +160,18 @@ export class BaseLoupeDeckHandler {
     await this.buttons.draw(this.device)
   }
 
+  /**
+   * get the dictionary iwth the current profile settings
+   */
   getCurrentProfile () {
     return this.appConfig.profiles[this.currentProfile]
   }
 
-  // Events:
+  /**
+   * Triggered, when LoupeDeck Device is connected
+   * - Initialize the profile from config-file and 
+   * - start the interface handlers accordingly
+   */
   async onConnected (address) {
     console.info(`✅ Connected to ${this.device.type}, ${address}`)
     
@@ -166,14 +182,18 @@ export class BaseLoupeDeckHandler {
 
     const self = this
 
+    // Register callback on monitored item change:
     opcuainterface.myEmitter.on("monitored item changed",(buttonID,nodeid,val) => { self.buttonStateChanged(buttonID,nodeid,val) })
 
     this.device.setBrightness(1)
     this.device.vibrate(HAPTIC.ASCEND_MED)
 
-    console.info('Done initializing')
+    console.info('✅ Done initializing')
   }
 
+  /**
+   * Fore an update of all screens
+   */
   async updateScreens () {
     const keys = Object.keys(this.screenUpdate)
     for (let i = 0; i < keys.length; i++) {
@@ -183,6 +203,9 @@ export class BaseLoupeDeckHandler {
     this.screenUpdate = {}
   }
 
+  /**
+   * Button Down Handler - triggered through Event Button Down - connected to LoupeDeck Event
+   */
   async onButtonDown (event) {
     let ok = false
     const id = event.id
@@ -191,6 +214,9 @@ export class BaseLoupeDeckHandler {
     return ok
   }
 
+  /**
+   * Button Up Handler - triggered through Event Button Up - connected to LoupeDeck Event
+   */
   async onButtonUp (event) {
     let ok = false
     const id = event.id
@@ -203,12 +229,18 @@ export class BaseLoupeDeckHandler {
     return ok
   }
 
+  /**
+   * Button Rotate Handler - triggered through Event Rotate available with knob-Buttons - connected to LoupeDeck Event
+   */
   async onRotate (event) {
     const id = event.id
     const delta = event.delta
     return await this.buttons.rotated(id, delta)
   }
 
+  /**
+   * TouchStart Handler - triggered through Event touch available on all touchbuttons on the loupedeck display - connected to LoupeDeck Event
+   */
   async onTouchStart (event) {
     let ok = false
     const changedTouches = event.changedTouches
@@ -225,6 +257,9 @@ export class BaseLoupeDeckHandler {
     return ok
   }
 
+  /**
+   * TouchMove Handler - triggered through Event touch available on all touchbuttons on the loupedeck display - connected to LoupeDeck Event
+   */
   async onTouchMove (event) {
     let ok = false
     const changedTouches = event.changedTouches
@@ -241,6 +276,9 @@ export class BaseLoupeDeckHandler {
     return ok
   }
 
+  /**
+   * TouchEnd Handler - triggered through Event touch available on all touchbuttons on the loupedeck display - connected to LoupeDeck Event
+   */
   async onTouchEnd (event) {
     let ok = false
     const changedTouches = event.changedTouches
@@ -258,6 +296,9 @@ export class BaseLoupeDeckHandler {
     return ok
   }
 
+  /**
+   * Handler for StateChanged through OPC/UA Interface - only connected with touch-buttons on center field (yet)
+   */
   async buttonStateChanged(buttonID,nodeid,val) {
     let ok = false
     this.screenUpdate["center"] = true

package/common/touchbuttons.mjs

@@ -1,4 +1,5 @@
 import { loadImage } from 'canvas'
+//import { loadImage } from "https://deno.land/x/canvas/mod.ts";
 
 import * as shellif from '../interfaces/shellif.mjs'
 import * as httpif from '../interfaces/httpif.mjs'
@@ -202,6 +203,7 @@ export class Button {
   #nodeid = ""
 
   #index = 0
+  #event
   #keys
   #states
 
@@ -346,7 +348,7 @@ export class Button {
     this.timeStampPressed = Date.now()
 
     this.#index++
-    this.updateState(this.#index)
+    this.updateState(this.#index,"pressed")
     return true
   }
 
@@ -375,13 +377,14 @@ export class Button {
         break
     }
 
-    this.updateState(this.#index)
+    this.updateState(this.#index,"released")
     
     return true // this.runCommand()
   }
 
-  updateState(index){
+  updateState(index,eventType){
     this.#index = index
+    this.#event = eventType
     // Update the State according to the correctly pressed state
     if (this.#index < 0) { this.#index = this.#keys.length - 1 }
     this.#index %= this.#keys.length
@@ -393,6 +396,7 @@ export class Button {
   async rotated (delta) {
     if (!this.getCurrentElement()) { return false }
 
+    this.#event = "rotated"
     this.#value = calcDelta(this.#value, delta, this.#max)
     return this.runCommand()
   }
@@ -458,21 +462,27 @@ export class Button {
 
   async runCommand () {
     const elem = this.getCurrentElement()
+    // Only continue, if we have an element, that contains some kind of command:
     if (!elem || (!elem.cmd && !elem.http && !elem.opcua)) {
       return
     }
+    // Filter for Event Type:
+    if (elem.filter && elem.filter != this.#event){
+      return
+    }
     // Call an action - include dynamic parameters
     // and also all attributes of elem + global config
     const params = {
+      text: this.getCurrentText(),
+      ...this.#config.parameters,
+      ...elem,
       id: this.id,
       key: this.key,
+      event: this.#event,
       state: this.#keys[this.#index],
       min: this.#min,
       max: this.#max,
-      value: this.#value,
-      text: this.getCurrentText(),
-      ...this.#config.parameters,
-      ...elem
+      value: this.#value
     }
 
     let res = ''

package/interfaces/baseif.mjs

@@ -22,7 +22,11 @@ export class BaseIf {
   }
 
   formatString (cmd, options = {}) {
-    return format(cmd, options)
+    let f =""
+    try{
+      f = format(cmd, options)
+    }catch(e){}
+    return f
   }
 
   Check(options) {
@@ -44,14 +48,21 @@ export class BaseIf {
   }
 
   LogError(...args){
-    console.error(args)
+    let str = new String(args)
+    process.stderr.write(str.toString())
+}
+
+  LogDebug(...args){
+    if (this.options && this.options.verbose){
+      let str = new String(args)
+      process.stdout.write(str.toString())
+    }
   }
 
   LogInfo(...args){
-    if (this.options && this.options.verbose)
-      console.log(args)
+    let str = new String(args)
+    process.stdout.write(str.toString())
   }
-
 }
 
 

package/interfaces/httpif.mjs

@@ -12,15 +12,15 @@ export class HTTPif extends BaseIf {
     try {
       myURL = new url.URL(url1)
       await this.get(myURL, options)
-    } catch (exception) {
-      console.error('error with URL', exception)
+    } catch (e) {
+      this.LogError(`HTTPif: error with URL: ${e.message}\n`)
       return false
     }
     return true
   }
 
   async stop(){
-    console.log("Stopping HTTPif")
+    this.LogInfo("HTTPif: Stopping\n")
     
   }
 
@@ -30,10 +30,6 @@ export class HTTPif extends BaseIf {
         return res
     if (!options.hostname)
         return -21
-    /*if (!options.port)
-        return -22
-    if (!options.pathname)
-        return -23*/
     return 0
   }
 
@@ -53,8 +49,7 @@ export class HTTPif extends BaseIf {
       }
     }
 
-    if (this.options.verbose)
-      console.log('HTTPIf call URL:', myURL, getOptions)
+    this.LogInfo(`HTTPIf: call URL ${myURL} ${getOptions}\n`)
     
 
     const prom = new Promise((resolve, reject) => {
@@ -76,7 +71,7 @@ export class HTTPif extends BaseIf {
       })
 
       req.on('error', (e) => {
-        console.warn(`ignore other errors like ERRNOTCONNECTED: ${e.message}`)
+        this.LogError(`HTTPif: ignore other errors like ERRNOTCONNECTED: ${e.message}\n`)
         return false
       });
     }).catch(function (error) { // (*)

package/interfaces/opcuaif.mjs

@@ -42,32 +42,32 @@ export class OPCUAIf extends BaseIf {
         super()
         this.myEmitter = new EventEmitter();
 
-        console.log("OPCUAIf Constructed");
+        this.LogInfo(`OPCUAIf Constructed`);
       }
 
     async stop(){
         if (!this.#client)
             return
         
-        console.log("Stopping OPC/UA")
+        this.LogInfo(`OPCUAIf Stopping`)
         await this.#client.closeSession(this.#session,true)
         await this.#client.disconnect()
         this.#connected = false
         this.#client = null
-        console.log("Stopped OPC/UA")
+        this.LogInfo(`OPCUAIf Stopped\n`)
     }
 
     async init( options = {},config = {},callbackFunction){
         var res = this.Check(options)
         if (res<0){
-            console.error("OpcuaIf init: Missing essential options in dictionary => Quitting\n",res,options)
+            this.LogError(`OPCUAIf: Missing essential options in dictionary => Quitting $res $options\n`)
         }
         try{
             this.#endpointurl = options.endpointurl
             this.#callback = callbackFunction
             this.monitoreditems = {}
             this.buttons = {}
-            console.log("OPCUAIf init",this.#endpointurl);
+            this.LogInfo(`OPCUAIf init ${this.#endpointurl}\n`);
         
             await this.Connect(this.#endpointurl);
 
@@ -84,21 +84,21 @@ export class OPCUAIf extends BaseIf {
 
             }
         } catch (error) {
-        console.log(' Error', error)
+            this.LogError(`OPCUAIf: Error $error\n`)
         }
     }
 
     async call (opcuaNode, options = {}) {
         var res = this.Check(options)
         if (res<0){
-            console.error("OpcuaIf call: Missing essential options in dictionary => Quitting\n",res,options)
+            this.LogError(`OPCUAIf call: Missing essential options in dictionary => Quitting $res\n`)
             return false
         }
 
         var nodeId = super.formatString(opcuaNode, options)
         var value = super.formatString(options.value, options)
 
-        console.log("OPCUAIf:write", nodeId, value)
+        this.LogInfo(`OPCUAIf: write ${nodeId} => ${value}\n`)
         await this.Write(nodeId,value)
 
         var NewState = "waiting"
@@ -120,9 +120,9 @@ export class OPCUAIf extends BaseIf {
 
     async Disconnect() {
         if (this.#client){
-            console.log("Disconnect !");
+            this.LogInfo(`OPCUAIf: Disconnect\n`);
             await this.#client.Disconnect()
-            console.log("Done !");
+            this.LogInfo(`OPCUAIf: Disconnected\n`);
         }
     }
     async Connect(url) {
@@ -137,8 +137,8 @@ export class OPCUAIf extends BaseIf {
             securityPolicy: SecurityPolicy.None,
             connectionStrategy: {
                 maxRetry: -1,
-                maxDelay: 2500,
-                initialDelay: 100
+                maxDelay: 5000,
+                initialDelay: 2500
             },
     
             defaultSecureTokenLifetime: 20000,
@@ -146,52 +146,49 @@ export class OPCUAIf extends BaseIf {
         });
     
         this.#client.on("backoff", (retry, delay) => {
-            console.log("Backoff ", retry, " next attempt in ", delay, "ms", self.#endpointurl);
+            if((retry%10) == 0)
+                this.LogInfo(`OPCUAIf Try Reconnection ${retry} next attempt in ${delay}ms ${self.#endpointurl}\n`);
         });
     
         this.#client.on("connection_lost", () => {
-            console.log("Connection lost");
+            this.LogInfo(`OPCUAIf: Connection lost\n`);
         });
     
         this.#client.on("connection_reestablished", () => {
-            console.log("Connection re-established");
+            this.LogInfo(`OPCUAIf: Connection re-established\n`);
         });
     
         this.#client.on("connection_failed", () => {
-            console.log("Connection failed");
+            this.LogInfo(`OPCUAIf: Connection failed\n`);
         });
         this.#client.on("start_reconnection", () => {
-            console.log("Starting reconnection");
+            this.LogInfo(`OPCUAIf: Starting reconnection\n`);
         });
     
         this.#client.on("after_reconnection", (err) => {
-            console.log("After Reconnection event =>", err);
+            this.LogInfo(`OPCUAIf: After Reconnection event => ${err}\n`);
         });
         this.#client.on("security_token_renewed", () => {
-            //console.log("security_token_renewed =>");
-            //console.log(this.#client.toString());
-        })
-        this.#client.on("lifetime_75", (token) => {
-            //// /*ChannelSecurityToken*/
-            //console.log("lifetime_75 =>", token.toString());
+            this.LogInfo(`OPCUAIf: security_token_renewed\n`);
         })
+        this.#client.on("lifetime_75", (token) => {})
     
-        console.log("connecting client to url",url);//, this.#session.toString());
+        this.LogInfo(`OPCUAIf: connecting client to ${url}\n`);//, this.#session.toString());
         await this.#client.connect(url);
     
         this.#session = await this.#client.createSession();
     
         this.#session.on("session_closed", (statusCode) => {
-            console.log(" Session has been closed with statusCode = ", statusCode.toString());
+            this.LogInfo(`OPCUAIf: Session has been closed\n`);
         })
         this.#session.on("session_restored", () => {
-            console.log(" Session has been restored");
+            this.LogInfo(`OPCUAIf: Session has been restored\n`);
         });
         this.#session.on("keepalive", (lastKnownServerState) => {
-            console.log("KeepAlive lastKnownServerState", lastKnownServerState);
+            this.LogInfo(`OPCUAIf: KeepAlive lastKnownServerState ${lastKnownServerState}\n`);
         });
         this.#session.on("keepalive_failure", () => {
-            console.log("KeepAlive failure");
+            this.LogInfo(`OPCUAIf: KeepAlive failure\n`);
         });
     
         this.#sub = await this.#session.createSubscription2({
@@ -202,9 +199,9 @@ export class OPCUAIf extends BaseIf {
             requestedPublishingInterval: 1000
         });
 
-        this.LogInfo("session created\n");//, this.#session.toString());
-        this.LogInfo("client\n", this.#client.toString());
-        this.LogInfo("subscription\n",this.#sub.toString());
+        this.LogInfo(`OPCUAIf: session created\n`);//, this.#session.toString());
+        this.LogInfo(`OPCUAIf: client\n`);
+        this.LogInfo(`OPCUAIf: subscription\n`);
         this.#connected = true
         this.#endpointurl = url
     }
@@ -222,17 +219,16 @@ export class OPCUAIf extends BaseIf {
         };
     
         if (!this.#sub){
-            this.LogError(" not register monitored items",itemToMonitor);
+            this.LogError(`OPCUAIf: not register monitored items $itemToMonitor\n`);
             return
         }
         const monitoredItem = await this.#sub.monitor(itemToMonitor, monitoringParameters, TimestampsToReturn.Both);
         this.monitoreditems[monitoredItem.monitoredItemId] = nodeID
         var self=this
-        //monitoredItem.on("changed", this.MonitoredItemUpdate)
         monitoredItem.on("changed", function (dataValue) {
             var nodeId = self.monitoreditems[this.monitoredItemId]
             var buttonID = self.buttons[this.monitoredItemId]
-            //console.log("monitored item changed:  ", this.monitoredItemId,nodeId, dataValue.value.value);
+            this.LogDebug("OPCUAIf: monitored item changed:  ", this.monitoredItemId,nodeId, dataValue.value.value,"\n");
             self.myEmitter.emit('monitored item changed',buttonID,nodeId, dataValue.value.value)
         });
 
@@ -245,18 +241,18 @@ export class OPCUAIf extends BaseIf {
             attributeId: AttributeIds.Value
         };
         if (!this.#connected){
-            this.LogError(" not connected, cannot read",nodeID);
+            this.LogError(`OPCUAIf: not connected, cannot read ${nodeID}\n`);
             return
         }
         const dataValue2 = await this.#session.read(nodeToRead, 0);
-        this.LogError("read: nodeID ",nodeID, dataValue2.toString());
+        this.LogError("OPCUAIf: read nodeID ",nodeID, dataValue2.toString(),"\n");
         return dataValue2
     }
 
     async Write(nodeID,value,datatype=DataType.String) {
         let self = this
         if (!this.#connected){
-            self.LogError(" not connected, cannot write",nodeID, value);
+            self.LogError("OPCUAIf: not connected, cannot write",nodeID, value,"\n");
             return
         }
         var nodesToWrite = [{
@@ -273,12 +269,12 @@ export class OPCUAIf extends BaseIf {
         await this.#session.write(nodesToWrite, function(err,statusCodes) {
             if (!err) {              
                 if (statusCodes && statusCodes[0].value != 0){
-                    self.LogInfo("status", statusCodes);
+                    self.LogInfo(`OPCUAIf: status $statusCodes\n`);
                 }else{
-                    self.LogInfo(" write ok",nodeID, value);
+                    self.LogInfo(`OPCUAIf: wrote $nodeID => $value\n`);
                 }
             }else{
-                self.LogError(" write NOT ok",nodeID, value);
+                self.LogError("OPCUAIf: write NOT ok",nodeID, value,"\n");
                 self.LogError(err)
             }
         });  

package/interfaces/shellif.mjs

@@ -1,4 +1,5 @@
 import { exec } from 'child_process'
+//import { exec } from 'node:child_process'
 import { BaseIf } from './baseif.mjs'
 
 /**
@@ -11,7 +12,7 @@ export class SHELLif extends BaseIf {
   }
 
   async stop(){
-    console.log("Stopping SHELLif")
+    this.LogInfo("SHELLif: Stopping")
   }
 
   Check(options) {
@@ -26,15 +27,15 @@ export class SHELLif extends BaseIf {
    * @returns 
    */
   async sh (cmd) {
-    if (this.options.verbose)
-      console.log('ShellIf call', cmd)
-
+    let self = this; 
+    this.LogDebug(`ShellIf: runCmd: ${cmd}\n`)
+    
     return new Promise(function (resolve, reject) {
       exec(cmd, (err, stdout, stderr) => {
         if (stdout.length>0)
-          console.log(`SHELLif Out: ${stdout}`)
+          self.LogInfo(`SHELLif Out: ${stdout}`)
         if (stderr.length>0)
-          console.log(`SHELLif Err: ${stderr}`)
+          self.LogError(`SHELLif Err: ${stderr}`)
         if (err) {
           reject(err)
         } else {

package/package.json

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

package/profile-1.json

@@ -6,9 +6,9 @@
         "password": "httppasswd",
         "verbose" : false,
         "endpointurl": "opc.tcp://localhost:4840",
-        "nodeid" : "ns=4;s=Is{simnbr}.Kvm.in.Source",
-        "value" : "kvm-transmitter-1",
-        "simnbr": "1"
+        "nodeid" : "ns=0;s=OpcUaNode-{customarg}",
+        "value" : "value",
+        "customarg": "1"
     },
     "description": "",
     "config": {},
@@ -29,25 +29,22 @@
                         "cmd": "echo \"{id} {state}\""
                     }
                 },
-                "group": "kvm1"
+                "group": "group1"
             },
             "1": {
                 "states": {
                     "off": {
                         "color": "#aaaaaa",
-                        "image": "icons/bulb.png",
-                        "http": "http://{user}:{password}@{hostname}:7778/control/connections"
+                        "image": "icons/bulb.png"
                     },
                     "on": {
                         "color": "#11ff11",
                         "image": "icons/bulb.png",
-                        "http": "http://{hostname}:7778/control/connections",
-                        "opcua": "write",
-                        "nodeid": "ns=4;s=Is{simnbr}.Kvm.in.Source",
+                        "http": "http://{user}:{password}@{hostname}:7778/control/connections",
                         "value": "{key}"
                     }
                 },
-                "group": "kvm1"
+                "group": "group1"
             },
             "2": {
                 "states": {
@@ -58,33 +55,222 @@
                     "on": {
                         "color": "#11ff11",
                         "image": "icons/mountain.png",
-                        "opcua": "write",
-                        "nodeid": "ns=4;s=Is{simnbr}.Kvm.in.Source",
+                        "opcua": "ns=0;s=Node{simnbr}",
                         "value": "{key}"
                     }
                 },
-                "group": "kvm1"
+                "group": "group1"
+            },
+            "8": {
+                "states": {
+                    "off": {
+                        "color": "#aaaaaa",
+                        "cmd": "echo \"{id} {state} {event} {value}\"",
+                        "value": "custom-value-{key}"                    },
+                    "on": {
+                        "color": "#11ff11",
+                        "cmd": "echo \"{id} {state} {event} {value}\"",
+                        "value": "custom-value-{key}"
+                    }
+                },
+                "group": "group2"
+            },
+            "9": {
+                "states": {
+                    "off": {
+                        "color": "#bbbbbb",
+                        "cmd": "echo \"{id} {state} {event} {value}\"",
+                        "value": "custom-value-{key}"                    },
+                    "on": {
+                        "color": "#33ff33",
+                        "cmd": "echo \"{id} {state} {event} {value}\"",
+                        "value": "custom-value-{key}"
+                    }
+                },
+                "group": "group2"
             }
-        },
-        "knob": {}
-    },
-    "knobs": {
-        "left": {},
-        "right": {}
+
+
+        }
     },
     "buttons": {
+        "knobTL": {
+            "states": {
+                "off": {
+                    "cmd": "echo \"{id} {state} Val: {value} Event: {event}\""
+                },
+                "on": {
+                    "cmd": "echo \"{id} {state} Val: {value} Event: {event}\""
+                }
+            }
+        },
+        "knobCL": {
+            "states": {
+                "off": {
+                    "cmd": "echo \"{id} {state} Val: {value} Event: {event}\""
+                },
+                "on": {
+                    "cmd": "echo \"{id} {state} Val: {value} Event: {event}\""
+                }
+            }
+        },
+        "knobBL": {
+            "states": {
+                "off": {
+                    "cmd": "echo \"{id} {state} Val: {value} Event: {event}\""
+                },
+                "on": {
+                    "cmd": "echo \"{id} {state} Val: {value} Event: {event}\""
+                }
+            }
+        },
+        "knobTR": {
+            "states": {
+                "off": {
+                    "cmd": "echo \"{id} {state} Val: {value} Event: {event}\""
+                },
+                "on": {
+                    "cmd": "echo \"{id} {state} Val: {value} Event: {event}\""
+                }
+            }
+        },
+        "knobCR": {
+            "states": {
+                "off": {
+                    "cmd": "echo \"{id} {state} Val: {value} Event: {event}\""
+                },
+                "on": {
+                    "cmd": "echo \"{id} {state} Val: {value} Event: {event}\""
+                }            
+            }
+        },
+        "knobBR": {
+            "states": {
+                "off": {
+                    "cmd": "echo \"{id} {state} Val: {value} Event: {event}\""
+                },
+                "on": {
+                    "cmd": "echo \"{id} {state} Val: {value} Event: {event}\""
+                }
+            }
+        },
+        "0": {
+            "states": {
+                "off": {
+                    "color": "#aaaaaa",
+                    "cmd": "echo \"{id} {state} {event}\""
+                },
+                "med": {
+                    "color": "ff11ff",
+                    "cmd": "echo \"{id} {state} {event}\""
+                },
+                "on": {
+                    "color": "#11ff11",
+                    "cmd": "echo \"{id} {state} {event}\""
+                }
+            },
+            "group": "group1"
+        },
         "1": {
             "states": {
                 "off": {
                     "color": "#aaaaaa",
-                    "cmd": "echo \"{id} {state}\""
+                    "cmd": "echo \"{id} {state} {event}\""
                 },
+                "med": {
+                    "color": "ff11ff",
+                    "cmd": "echo \"{id} {state} {event}\""
+                },
+                "on": {
+                    "color": "#11ff11",
+                    "cmd": "echo \"{id} {state} {event}\""
+                }
+            },
+            "group": "group1"
+        },
+        "2": {
+            "states": {
+                "off": {
+                    "color": "#aaaaaa",
+                    "cmd": "echo \"{id} {key} {state} {event}\"",
+                    "filter": "released"                },
+                "on": {
+                    "color": "#11ff11",
+                    "cmd": "echo \"{id} {key} {state} {event}\"",
+                    "filter": "released"
+                }
+            },
+            "group": "group1"
+        },
+        "3": {
+            "states": {
+                "off": {
+                    "color": "#aaaaaa",
+                    "cmd": "echo \"{id} {key} {state} {event}\"",
+                    "filter": "released"                },
+                "on": {
+                    "color": "#11ff11",
+                    "cmd": "echo \"{id} {key} {state} {event}\"",
+                    "filter": "released"
+                }
+            },
+            "group": "group1"
+        },
+        "4": {
+            "states": {
+                "off": {
+                    "color": "#aaaaaa",
+                    "cmd": "echo \"{id} {key} {state} {event}\"",
+                    "filter": "released"                },
+                "on": {
+                    "color": "#11ff11",
+                    "cmd": "echo \"{id} {key} {state} {event}\"",
+                    "filter": "released"
+                }
+            },
+            "group": "group1"
+        },
+        "5": {
+            "states": {
+                "off": {
+                    "color": "#aaaaaa",
+                    "cmd": "echo \"{id} {key} {state} {event}\"",
+                    "filter": "released"                },
+                "on": {
+                    "color": "#11ff11",
+                    "cmd": "echo \"{id} {key} {state} {event}\"",
+                    "filter": "released"
+                }
+            },
+            "group": "group1"
+        },
+        "6": {
+            "states": {
+                "off": {
+                    "color": "#aaaaaa",
+                    "cmd": "echo \"{id} {key} {state} {event}\"",
+                    "filter": "released"                },
+                "on": {
+                    "color": "#11ff11",
+                    "cmd": "echo \"{id} {key} {state} {event}\"",
+                    "filter": "released"
+                }
+            },
+            "group": "group1"
+        },
+        "7": {
+            "states": {
+                "off": {
+                    "color": "#aaaaaa",
+                    "cmd": "echo \"{id} {key} {state} {event}\"",
+                    "filter": "released"                },
                 "on": {
                     "color": "#11ff11",
-                    "cmd": "echo \"{id} {state}\""
+                    "cmd": "echo \"{id} {key} {state} {event}\"",
+                    "filter": "released"
                 }
             },
-            "group": "kvm1"
+            "group": "group1"
         }
     }
 }

package/test.mjs

@@ -1,7 +1,7 @@
 import { BaseLoupeDeckHandler } from './common/BaseLoupeDeckHandler.mjs'
 //import { BaseLoupeDeckHandler } from 'loupedeck-commander'
 
-const handler = new BaseLoupeDeckHandler('config-test.json')
+const handler = new BaseLoupeDeckHandler('config.json')
 
 /**
  * Stop the handlers when a signal like SIGINT or SIGTERM arrive

package/config-test.json

@@ -1,9 +0,0 @@
-{
-    "application": "TEST",
-    "profiles": [
-        {
-            "name": "profile1",
-            "file": "profile-2.json"
-        }
-    ]
-}

package/interfaces/opcuaif_test.mjs

@@ -1,31 +0,0 @@
-import * as opcuaif from '../interfaces/opcuaif.mjs'
-
-
-var opcuainterface = new opcuaif.OPCUAIf()
-import {
-    DataType
-} from "node-opcua";
-
-var call = {
-
-}
-
-var option = {
-    "id" : "touch-0",
-    "key" : "1",
-    "state" : "off",
-    "min":  "0",
-    "max":  "0",
-    "color":  "0",
-    "image":  "0",
-    "endpointurl": "opc.tcp://localhost:4840",
-    "nodeid": "ns=4;s=Is{key}.Kvm.in.Source",
-    "value": "{key}"
-}
-
-await opcuainterface.call(call,option)
-await opcuainterface.Subscribe("ns=4;s=Is1.Kvm.out.Source")
-await opcuainterface.Subscribe("ns=4;s=Is1.Kvm.out.Turret")
-await opcuainterface.Write("ns=4;s=Is1.Kvm.out.Turret",1,DataType.Int16)
-await opcuainterface.Write("ns=4;s=Is1.Kvm.out.Source","hello",DataType.String)
-//await opcuainterface.Write("ns=4;s=Is1.Kvm.state",2,DataType.Int32)

package/interfaces/pubel.js

@@ -1,95 +0,0 @@
-import {
-    OPCUAClient,
-    BrowseDirection,
-    AttributeIds,
-    NodeClassMask,
-    makeBrowsePath,
-    resolveNodeId,
-    TimestampsToReturn,
-    coerceInt32,
-    coerceByteString
-} from "node-opcua";
-import { BaseIf } from './baseif.mjs'
-
-var endpointUrl = "opc.tcp://localhost:4840";
-const subscriptionParameters = {
-    maxNotificationsPerPublish: 1000,
-    publishingEnabled: true,
-    requestedLifetimeCount: 100,
-    requestedMaxKeepAliveCount: 10,
-    requestedPublishingInterval: 1000
-};
-var client
-var GlobalSession
-var GlobalSub
-
-
-async function Connect() {
-    client = OPCUAClient.create({
-        endpointMustExist: false
-    });
-    client.on("backoff", (retry, delay) =>
-        console.log("still trying to connect to ", endpointUrl, ": retry =", retry, "next attempt in ", delay / 1000, "seconds")
-    );
-    
-
-    //await client.connect(endpointUrl)    
-    var self=this
-    await client.withSubscriptionAsync(endpointUrl, subscriptionParameters, async (session, subscription) => {
-        GlobalSession = session
-        GlobalSub = subscription
-        console.log("Session initialized")
-
-        // wait  until CTRL+C is pressed
-        console.log("CTRL+C to stop");
-        await new Promise((resolve) => process.once("SIGINT", resolve));
-    }    )
-}
-
-async function Subscribe(nodeID) {
-    // install monitored item
-
-    nodeID = "ns=4;s=Is1.Kvm.in.Source"
-    const itemToMonitor = {
-        nodeId: resolveNodeId(nodeID),
-        attributeId: AttributeIds.Value
-    };
-    const monitoringParameters = {
-        samplingInterval: 100,
-        discardOldest: true,
-        queueSize: 10
-    };
-
-    const monitoredItem = await GlobalSub.monitor(itemToMonitor, monitoringParameters, TimestampsToReturn.Both);
-    monitoredItem.on("changed", function (dataValue) {
-        //console.log("monitored item changed:  ", coerceInt32(dataValue.value.value), "bytes");
-        console.log("monitored item changed:  ", nodeID, dataValue.value.value);
-    });
-}
-
-async function Read(nodeID) {
-    if client
-    const maxAge = 0;
-    const nodeToRead = {
-        nodeId: "ns=4;s=Is1.Kvm.in.Receiver",
-        attributeId: AttributeIds.Value
-    };
-    
-    const dataValue2 = await GlobalSession.read(nodeToRead, maxAge);
-    console.log(" nodeID ",nodeID, dataValue2.toString());
-}
-
-Connect();
-//await Read("ns=4;s=Is1.Kvm.in.Receiver")
-await Subscribe("ns=4;s=Is1.Kvm.in.Receiver")
-await new Promise((resolve) => process.once("SIGINT", resolve));
-
-
-/**
- * Our Special-Handler just used the Default - and adds Vibration after triggers through Button-Releases
- */
-export class OPCUAIf extends BaseIf {
-    async call (callString, options = {}) {
-    }
-}
-  

package/profile-2.json

@@ -1,164 +0,0 @@
-{
-    "profile": "sample",
-    "parameters": {
-        "hostname": "localhost",
-        "user": "httpuser",
-        "password": "httppasswd",
-        "verbose" : false,
-        "endpointurl": "opc.tcp://localhost:4840",
-        "nodeid" : "ns=4;s=Is{simnbr}.Kvm.in.Source",
-        "value" : "kvm-transmitter-1",
-        "simnbr": "1"
-    },
-    "description": "",
-    "config": {},
-    "touch": {
-        "left": {},
-        "right": {},
-        "center": {
-            "0": {
-                "states": {
-                    "off": {
-                        "color": "#aaaaaa",
-                        "image": "icons/home.png"
-                    },
-                    "on": {
-                        "color": "#11ff11",
-                        "image": "icons/home.png",
-                        "opcua": "ns=4;s=Is{simnbr}.Kvm.in.Source",
-                        "value": "kvm-transmitter{key}-1"
-                    }
-                },
-                "nodeid": "ns=4;s=Is{simnbr}.Kvm.out.Source",
-                "group": "kvm1"
-            },
-            "1": {
-                "states": {
-                    "off": {
-                        "color": "#aaaaaa",
-                        "image": "icons/bulb.png"
-                    },
-                    "on": {
-                        "color": "#11ff11",
-                        "image": "icons/bulb.png",
-                        "opcua": "ns=4;s=Is{simnbr}.Kvm.in.Source",
-                        "value": "kvm-transmitter{key}-1"
-                    }
-                },
-                "nodeid": "ns=4;s=Is{simnbr}.Kvm.out.Source",
-                "group": "kvm1"
-            },
-            "2": {
-                "states": {
-                    "off": {
-                        "color": "#aaaaaa",
-                        "image": "icons/mountain.png"
-                    },
-                    "on": {
-                        "color": "#11ff11",
-                        "image": "icons/mountain.png",
-                        "opcua": "ns=4;s=Is{simnbr}.Kvm.in.Source",
-                        "value": "kvm-transmitter{key}-1"
-                    }
-                },
-                "nodeid": "ns=4;s=Is{simnbr}.Kvm.out.Source",
-                "group": "kvm1"
-            },
-            "3": {
-                "states": {
-                    "off": {
-                        "color": "#aaaaaa",
-                        "image": "icons/mountain.png"
-                    },
-                    "on": {
-                        "color": "#11ff11",
-                        "image": "icons/mountain.png",
-                        "opcua": "ns=4;s=Is{simnbr}.Kvm.in.Source",
-                        "value": "kvm-transmitter{key}-1"
-                    }
-                },
-                "nodeid": "ns=4;s=Is{simnbr}.Kvm.out.Source",
-                "group": "kvm1"
-            },
-            "4": {
-                "states": {
-                    "off": {
-                        "color": "#aaaaaa",
-                        "image": "icons/mountain.png"
-                    },
-                    "on": {
-                        "color": "#11ff11",
-                        "image": "icons/mountain.png",
-                        "opcua": "ns=4;s=Is{simnbr}.Kvm.in.Source",
-                        "value": "kvm-transmitter{key}-1"
-                    }
-                },
-                "nodeid": "ns=4;s=Is{simnbr}.Kvm.out.Source",
-                "group": "kvm1"
-            }
-        },
-        "knob": {}
-    },
-    "knobs": {
-        "left": {},
-        "right": {}
-    },
-    "buttons": {
-        "1": {
-            "states": {
-                "off": {
-                    "color": "#aaaaaa"
-                },
-                "on": {
-                    "color": "#11ff11",
-                    "http": "http://{hostname}:7778/control/connections",
-                    "opcua": "ns=4;s=Is{simnbr}.Kvm.out.Source",
-                    "value": "kvm-transmitter{key}-1"
-                }
-            },
-            "group": "kvm1"
-        },
-        "2": {
-            "states": {
-                "off": {
-                    "color": "#aaaaaa"
-                },
-                "on": {
-                    "color": "#11ff11",
-                    "http": "http://{hostname}:7778/control/connections",
-                    "opcua": "ns=4;s=Is{simnbr}.Kvm.out.Source",
-                    "value": "kvm-transmitter{key}-1"
-                }
-            },
-            "group": "kvm1"
-        },
-        "3": {
-            "states": {
-                "off": {
-                    "color": "#aaaaaa"
-                },
-                "on": {
-                    "color": "#11ff11",
-                    "http": "http://{hostname}:7778/control/connections",
-                    "opcua": "ns=4;s=Is{simnbr}.Kvm.out.Source",
-                    "value": "kvm-transmitter{key}-1"
-                }
-            },
-            "group": "kvm1"
-        },
-        "4": {
-            "states": {
-                "off": {
-                    "color": "#aaaaaa"
-                },
-                "on": {
-                    "color": "#11ff11",
-                    "http": "http://{hostname}:7778/control/connections",
-                    "opcua": "ns=4;s=Is{simnbr}.Kvm.out.Source",
-                    "value": "kvm-transmitter{key}-1"
-                }
-            },
-            "group": "kvm1"
-        }
-    }
-}