loupedeck-commander 1.2.0 → 1.2.2

package/interfaces/shellif.mjs

@@ -1,46 +1,47 @@
-import { exec } from 'child_process'
-import { BaseIf } from './baseif.mjs'
-
-/**
- * Our Special-Handler just used the Default - and adds Vibration after triggers through Button-Releases
- */
-export class SHELLif extends BaseIf {
-  async call (cmd, options = {}) {
-    cmd = super.call(cmd, options)
-    return await this.sh(cmd)
-  }
-
-  async stop(){
-    console.log("Stopping SHELLif")
-  }
-
-  Check(options) {
-    var res= super.Check(options)
-    if (res <0)
-        return res
-  }
-
-  /**
-   * Run a Shell command in ASYNC mode
-   * @param {*} cmd 
-   * @returns 
-   */
-  async sh (cmd) {
-    if (this.options.verbose)
-      console.log('ShellIf call', cmd)
-
-    return new Promise(function (resolve, reject) {
-      exec(cmd, (err, stdout, stderr) => {
-        if (stdout.length>0)
-          console.log(`SHELLif Out: ${stdout}`)
-        if (stderr.length>0)
-          console.log(`SHELLif Err: ${stderr}`)
-        if (err) {
-          reject(err)
-        } else {
-          resolve({ stdout, stderr })
-        }
-      })
-    })
-  }
-}
+import { exec } from 'child_process'
+//import { exec } from 'node:child_process'
+import { BaseIf } from './baseif.mjs'
+
+/**
+ * Our Special-Handler just used the Default - and adds Vibration after triggers through Button-Releases
+ */
+export class SHELLif extends BaseIf {
+  async call (cmd, options = {}) {
+    cmd = super.call(cmd, options)
+    return await this.sh(cmd)
+  }
+
+  async stop(){
+    this.LogInfo("SHELLif: Stopping")
+  }
+
+  Check(options) {
+    var res= super.Check(options)
+    if (res <0)
+        return res
+  }
+
+  /**
+   * Run a Shell command in ASYNC mode
+   * @param {*} cmd 
+   * @returns 
+   */
+  async sh (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)
+          self.LogInfo(`SHELLif Out: ${stdout}`)
+        if (stderr.length>0)
+          self.LogError(`SHELLif Err: ${stderr}`)
+        if (err) {
+          reject(err)
+        } else {
+          resolve({ stdout, stderr })
+        }
+      })
+    })
+  }
+}

package/package.json

@@ -1,29 +1,29 @@
-{
-  "name": "loupedeck-commander",
-  "version": "1.2.0",
-  "description": "A system to ease working with LoupeDeck devices using CMD-line interfaces",
-  "main": "index.mjs",
-  "scripts": {
-    "test": "node test.mjs",
-    "start": "node index.mjs"
-  },
-  "dependencies": {
-    "canvas": "^2.11.2",
-    "loupedeck": "^6.0.1",
-    "mkdirp": "^3.0.1",
-    "node-opcua": "^2.138.1",
-    "string-template": "^1.0.0"
-  },
-  "author": "Thomas Schneider",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git@gitlab.com:keckxde/loupedeck-commander.git"
-  },
-  "bugs": {
-    "url": "https://gitlab.com/keckxde/loupedeck-commander/-/issues"
-  },
-  "devDependencies": {
-    "eslint": "^9.8.0"
-  }
-}
+{
+  "name": "loupedeck-commander",
+  "version": "1.2.2",
+  "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",
+    "start": "node index.mjs"
+  },
+  "dependencies": {
+    "canvas": "^2.11.2",
+    "loupedeck": "^6.0.1",
+    "mkdirp": "^3.0.1",
+    "node-opcua": "^2.138.1",
+    "string-template": "^1.0.0"
+  },
+  "author": "Thomas Schneider",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git@gitlab.com:keckxde/loupedeck-commander.git"
+  },
+  "bugs": {
+    "url": "https://gitlab.com/keckxde/loupedeck-commander/-/issues"
+  },
+  "devDependencies": {
+    "eslint": "^9.8.0"
+  }
+}

package/profile-1.json

@@ -1,90 +1,281 @@
-{
-    "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",
-                        "cmd": "echo \"{id} {state}\""
-                    },
-                    "on": {
-                        "color": "#11ff11",
-                        "image": "icons/home.png",
-                        "cmd": "echo \"{id} {state}\""
-                    }
-                },
-                "group": "kvm1"
-            },
-            "1": {
-                "states": {
-                    "off": {
-                        "color": "#aaaaaa",
-                        "image": "icons/bulb.png",
-                        "http": "http://{user}:{password}@{hostname}:7778/control/connections"
-                    },
-                    "on": {
-                        "color": "#11ff11",
-                        "image": "icons/bulb.png",
-                        "http": "http://{hostname}:7778/control/connections",
-                        "opcua": "write",
-                        "nodeid": "ns=4;s=Is{simnbr}.Kvm.in.Source",
-                        "value": "{key}"
-                    }
-                },
-                "group": "kvm1"
-            },
-            "2": {
-                "states": {
-                    "off": {
-                        "color": "#aaaaaa",
-                        "image": "icons/mountain.png"
-                    },
-                    "on": {
-                        "color": "#11ff11",
-                        "image": "icons/mountain.png",
-                        "opcua": "write",
-                        "nodeid": "ns=4;s=Is{simnbr}.Kvm.in.Source",
-                        "value": "{key}"
-                    }
-                },
-                "group": "kvm1"
-            }
-        },
-        "knob": {}
-    },
-    "knobs": {
-        "left": {},
-        "right": {}
-    },
-    "buttons": {
-        "1": {
-            "states": {
-                "off": {
-                    "color": "#aaaaaa",
-                    "cmd": "echo \"{id} {state}\""
-                },
-                "on": {
-                    "color": "#11ff11",
-                    "cmd": "echo \"{id} {state}\""
-                }
-            },
-            "group": "kvm1"
-        }
-    }
+{
+    "profile": "sample",
+    "parameters": {
+        "hostname": "localhost",
+        "user": "httpuser",
+        "password": "httppasswd",
+        "verbose" : false,
+        "endpointurl": "opc.tcp://localhost:4840",
+        "nodeid" : "ns=0;s=OpcUaNode-{customarg}",
+        "value" : "value",
+        "customarg": "1"
+    },
+    "description": "",
+    "config": {},
+    "touch": {
+        "left": {},
+        "right": {},
+        "center": {
+            "0": {
+                "states": {
+                    "off": {
+                        "color": "#aaaaaa",
+                        "image": "icons/home.png",
+                        "cmd": "echo \"{id} {state}\""
+                    },
+                    "on": {
+                        "color": "#11ff11",
+                        "image": "icons/home.png",
+                        "cmd": "echo \"{id} {state}\""
+                    }
+                },
+                "text" : "A",
+                "group": "group1"
+            },
+            "1": {
+                "states": {
+                    "off": {
+                        "color": "#aaaaaa",
+                        "image": "icons/bulb.png"
+                    },
+                    "on": {
+                        "color": "#11ff11",
+                        "image": "icons/bulb.png",
+                        "http": "http://{user}:{password}@{hostname}:7778/control/connections",
+                        "value": "{key}"
+                    }
+                },
+                "text" : "B",
+                "group": "group1"
+            },
+            "2": {
+                "states": {
+                    "off": {
+                        "color": "#aaaaaa",
+                        "image": "icons/mountain.png"
+                    },
+                    "on": {
+                        "color": "#11ff11",
+                        "image": "icons/mountain.png",
+                        "opcua": "ns=0;s=Node{simnbr}",
+                        "value": "{key}"
+                    }
+                },
+                "text" : "C",
+                "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}"
+                    }
+                },
+                "text" : "HELLO",
+                "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}"
+                    }
+                },
+                "text" : "YOU",
+                "group": "group2"
+            }
+
+
+        }
+    },
+    "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} {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} {key} {state} {event}\"",
+                    "filter": "released"
+                }
+            },
+            "group": "group1"
+        }
+    }
 }

package/test.mjs

@@ -1,23 +1,23 @@
-import { BaseLoupeDeckHandler } from './common/BaseLoupeDeckHandler.mjs'
-//import { BaseLoupeDeckHandler } from 'loupedeck-commander'
-
-const handler = new BaseLoupeDeckHandler('config-test.json')
-
-/**
- * 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 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) })
-
-
-await handler.start()
-
+import { BaseLoupeDeckHandler } from './common/BaseLoupeDeckHandler.mjs'
+//import { BaseLoupeDeckHandler } from 'loupedeck-commander'
+
+const handler = new BaseLoupeDeckHandler('config.json')
+
+/**
+ * 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 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) })
+
+
+await handler.start()
+
 await new Promise((resolve) => process.once("SIGINT", resolve));

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)