loupedeck-commander 1.2.2 → 1.2.3

package/common/BaseLoupeDeckHandler.mjs

@@ -1,6 +1,6 @@
 import {discover, HAPTIC,LoupedeckDevice } from 'loupedeck'
 import { ApplicationConfig } from './ApplicationConfig.mjs'
-import { ButtonField, StopInterfaces, InitializeInterfaces,opcuainterface} from './touchbuttons.mjs'
+import { ButtonField, StopInterfaces, InitializeInterfaces,opcuainterface,profileEmitter} from './touchbuttons.mjs'
 
 export class BaseLoupeDeckHandler {
   device = undefined
@@ -118,19 +118,20 @@ export class BaseLoupeDeckHandler {
    */
   async activateProfile (id) {
     // todo Profile-change implementation
+    id = Number(id)
     var oldProfile = this.currentProfile
-    if (this.appConfig.profiles.length >= id) {
+    if (this.appConfig.profiles.length > id) {
       this.currentProfile = id
     }else{
       return
     }
-
+    const profile = this.getCurrentProfile()
+    console.info("ACTIVATE PROFILE",id,profile.name)
     const dLeft = this.device.displays.left
     const dRight = this.device.displays.right
     const dCenter = this.device.displays.center
     const dKnob = this.device.displays.knob
     
-    const profile = this.getCurrentProfile()
     this.screens.center = new ButtonField('center', this.device.rows, this.device.columns, dCenter.width, dCenter.height, profile.touch.center,profile)
     this.screens.left = new ButtonField('left', 1, 1, dLeft.width, dLeft.height, profile.touch.left,profile)
     this.screens.right = new ButtonField('right', 1, 1, dRight.width, dRight.height, profile.touch.right,profile)
@@ -158,6 +159,7 @@ export class BaseLoupeDeckHandler {
     this.buttons.setState(oldProfile+1,1)
         
     await this.buttons.draw(this.device)
+    
   }
 
   /**
@@ -183,11 +185,20 @@ 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) })
+    opcuainterface.on("monitored item changed",(buttonID,nodeid,val) => { self.buttonStateChanged(buttonID,nodeid,val) })
+    profileEmitter.on("profileChanged",(profileID) => { self.activateProfile(profileID) })
+    
 
     this.device.setBrightness(1)
     this.device.vibrate(HAPTIC.ASCEND_MED)
 
+    // Fore update of all screens
+    console.info('✅ Force Screen update')
+    this.screenUpdate["center"] = true
+    this.screenUpdate["left"] = true
+    this.screenUpdate["right"] = true
+    await this.updateScreens()
+
     console.info('✅ Done initializing')
   }
 
@@ -302,6 +313,8 @@ export class BaseLoupeDeckHandler {
   async buttonStateChanged(buttonID,nodeid,val) {
     let ok = false
     this.screenUpdate["center"] = true
+    this.screenUpdate["left"] = true
+    this.screenUpdate["right"] = true
 
     ok = await this.screens.center.changed(buttonID,nodeid,val)
     

package/common/touchbuttons.mjs

@@ -6,11 +6,13 @@ import * as httpif from '../interfaces/httpif.mjs'
 import * as opcuaif from '../interfaces/opcuaif.mjs'
 import format from 'string-template'
 import { calcDelta } from './utils.mjs'
+import { EventEmitter } from 'node:events'
+
 
 export var opcuainterface = undefined
 var httpinterface = undefined
 var shellinterface = undefined
-
+export var profileEmitter = undefined
 export async function InitializeInterfaces(appConfig,callbackFunction){
   if (opcuainterface === undefined ){
     opcuainterface = new opcuaif.OPCUAIf()
@@ -21,6 +23,7 @@ export async function InitializeInterfaces(appConfig,callbackFunction){
   if (shellinterface === undefined)
     shellinterface = new shellif.SHELLif()
 
+  profileEmitter = new EventEmitter()
 }
 
 export async function StopInterfaces(){
@@ -85,10 +88,7 @@ export class ButtonField {
     this.#config = config
   }
 
-  //setProfileConfig (config) {
-//    this.#config = config
-//  }
-
+  
   async draw (device) {
     if (!this.#screen) {
       // physical buttons:
@@ -470,14 +470,24 @@ 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)) {
+    // 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){
+      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
+    }
+
     // Call an action - include dynamic parameters
     // and also all attributes of elem + global config
     const params = {
@@ -490,9 +500,12 @@ export class Button {
       state: this.#keys[this.#index],
       min: this.#min,
       max: this.#max,
-      value: this.#value
     }
 
+    if (!params.value)
+      params.value = this.#value
+
+
     let res = ''
     if ('cmd' in elem) {
       if (shellinterface){

package/interfaces/baseif.mjs

@@ -1,6 +1,7 @@
 import format from 'string-template'
+import { EventEmitter } from 'node:events'
 
-export class BaseIf {
+export class BaseIf extends EventEmitter {
   formattedCommand
   cmd
   options

package/interfaces/opcuaif.mjs

@@ -12,7 +12,7 @@ import {
     coerceByteString,
     DataType
 } from "node-opcua";
-import { EventEmitter } from 'node:events'
+
 import { BaseIf } from './baseif.mjs'
 
 const subscriptionParameters = {
@@ -37,10 +37,8 @@ export class OPCUAIf extends BaseIf {
     monitoreditems
     buttons
     #callback
-    myEmitter
     constructor() {
         super()
-        this.myEmitter = new EventEmitter();
 
         this.LogInfo(`OPCUAIf Constructed`);
       }
@@ -98,7 +96,7 @@ export class OPCUAIf extends BaseIf {
         var nodeId = super.formatString(opcuaNode, options)
         var value = super.formatString(options.value, options)
 
-        this.LogInfo(`OPCUAIf: write ${nodeId} => ${value}\n`)
+        //this.LogInfo(`OPCUAIf: write ${nodeId} => ${value}\n`)
         await this.Write(nodeId,value)
 
         var NewState = "waiting"
@@ -147,29 +145,29 @@ export class OPCUAIf extends BaseIf {
     
         this.#client.on("backoff", (retry, delay) => {
             if((retry%10) == 0)
-                this.LogInfo(`OPCUAIf Try Reconnection ${retry} next attempt in ${delay}ms ${self.#endpointurl}\n`);
+                self.LogInfo(`OPCUAIf Try Reconnection ${retry} next attempt in ${delay}ms ${self.#endpointurl}\n`);
         });
     
         this.#client.on("connection_lost", () => {
-            this.LogInfo(`OPCUAIf: Connection lost\n`);
+            self.LogInfo(`OPCUAIf: Connection lost\n`);
         });
     
         this.#client.on("connection_reestablished", () => {
-            this.LogInfo(`OPCUAIf: Connection re-established\n`);
+            self.LogInfo(`OPCUAIf: Connection re-established\n`);
         });
     
         this.#client.on("connection_failed", () => {
-            this.LogInfo(`OPCUAIf: Connection failed\n`);
+            self.LogInfo(`OPCUAIf: Connection failed\n`);
         });
         this.#client.on("start_reconnection", () => {
-            this.LogInfo(`OPCUAIf: Starting reconnection\n`);
+            self.LogInfo(`OPCUAIf: Starting reconnection\n`);
         });
     
         this.#client.on("after_reconnection", (err) => {
-            this.LogInfo(`OPCUAIf: After Reconnection event => ${err}\n`);
+            self.LogInfo(`OPCUAIf: After Reconnection event => ${err}\n`);
         });
         this.#client.on("security_token_renewed", () => {
-            this.LogInfo(`OPCUAIf: security_token_renewed\n`);
+            self.LogDebug(`OPCUAIf: security_token_renewed\n`);
         })
         this.#client.on("lifetime_75", (token) => {})
     
@@ -179,16 +177,16 @@ export class OPCUAIf extends BaseIf {
         this.#session = await this.#client.createSession();
     
         this.#session.on("session_closed", (statusCode) => {
-            this.LogInfo(`OPCUAIf: Session has been closed\n`);
+            self.LogInfo(`OPCUAIf: Session has been closed\n`);
         })
         this.#session.on("session_restored", () => {
-            this.LogInfo(`OPCUAIf: Session has been restored\n`);
+            self.LogInfo(`OPCUAIf: Session has been restored\n`);
         });
         this.#session.on("keepalive", (lastKnownServerState) => {
-            this.LogInfo(`OPCUAIf: KeepAlive lastKnownServerState ${lastKnownServerState}\n`);
+            self.LogInfo(`OPCUAIf: KeepAlive lastKnownServerState ${lastKnownServerState}\n`);
         });
         this.#session.on("keepalive_failure", () => {
-            this.LogInfo(`OPCUAIf: KeepAlive failure\n`);
+            self.LogInfo(`OPCUAIf: KeepAlive failure\n`);
         });
     
         this.#sub = await this.#session.createSubscription2({
@@ -208,6 +206,17 @@ export class OPCUAIf extends BaseIf {
     
     async Subscribe(nodeID) {
         // install monitored item
+
+        const keys = Object.keys(this.monitoreditems)
+        for (let i = 0; i < keys.length; i++) {
+            const key = keys[i]
+            const elem = this.monitoreditems[key]
+            if (elem == nodeID){
+                // already registered => return itemid
+                return key
+            }
+        }
+
         const itemToMonitor = {
             nodeId: resolveNodeId(nodeID),
             attributeId: AttributeIds.Value
@@ -228,8 +237,8 @@ export class OPCUAIf extends BaseIf {
         monitoredItem.on("changed", function (dataValue) {
             var nodeId = self.monitoreditems[this.monitoredItemId]
             var buttonID = self.buttons[this.monitoredItemId]
-            this.LogDebug("OPCUAIf: monitored item changed:  ", this.monitoredItemId,nodeId, dataValue.value.value,"\n");
-            self.myEmitter.emit('monitored item changed',buttonID,nodeId, dataValue.value.value)
+            self.LogInfo(`OPCUAIf: monitored item changed: ${nodeId} => ${dataValue.value.value}\n`);
+            self.emit('monitored item changed',buttonID,nodeId, dataValue.value.value)
         });
 
         return monitoredItem.monitoredItemId;
@@ -269,9 +278,9 @@ export class OPCUAIf extends BaseIf {
         await this.#session.write(nodesToWrite, function(err,statusCodes) {
             if (!err) {              
                 if (statusCodes && statusCodes[0].value != 0){
-                    self.LogInfo(`OPCUAIf: status $statusCodes\n`);
+                    self.LogInfo(`OPCUAIf: status ${statusCodes}\n`);
                 }else{
-                    self.LogInfo(`OPCUAIf: wrote $nodeID => $value\n`);
+                    self.LogInfo(`OPCUAIf: wrote ${nodeID} => ${value}\n`);
                 }
             }else{
                 self.LogError("OPCUAIf: write NOT ok",nodeID, value,"\n");

package/package.json

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