loupedeck-commander 1.2.1 → 1.2.2

package/common/BaseLoupeDeckHandler.mjs

@@ -1,313 +1,313 @@
-import {discover, HAPTIC,LoupedeckDevice } from 'loupedeck'
-import { ApplicationConfig } from './ApplicationConfig.mjs'
-import { ButtonField, StopInterfaces, InitializeInterfaces,opcuainterface} from './touchbuttons.mjs'
-
-export class BaseLoupeDeckHandler {
-  device = undefined
-  appConfig = undefined
-  profileConfigs = []
-  currentProfile = 0
-  screens = {}
-  buttons = {}
-  screenUpdate = {}
-  stopping = false
-
-  constructor (config) {
-    console.log(`INIT with config ${config}`)
-    this.loadConfig(config)
-  }
-
-  /**
-   * event handler - start
-   */
-  async start () {
-    console.info('Start')
-    while (!this.device && !this.stopping) {
-      try {
-        var list = await LoupedeckDevice.list()
-        if (list.length>0){
-          var element = list[0]
-          console.log("Connecting to device")
-          console.log("Path:         ", element.path)
-          console.log("vendorId:     ", element.vendorId, element.productId)
-          console.log("serialNumber: ", element.serialNumber)
-        }
-
-        this.device = await discover()
-        
-        
-        
-      } catch (e) {
-        console.error(`${e}. Reattempting in 3 seconds...`)
-        await new Promise(resolve => setTimeout(resolve, 3000))
-      }
-
-      if (this.stopping){
-        return
-      }
-    }
-    console.info(`✅ Discovered Device ${this.device.type}`)
-
-    const self = this
-
-    this.device.on('connect', (address) => { self.onConnected(address) })
-    this.device.on('down', (event) => { self.onButtonDown(event) })
-    this.device.on('up', (event) => { self.onButtonUp(event) })
-    this.device.on('rotate', (event) => { self.onRotate(event) })
-    this.device.on('touchstart', (event) => { self.onTouchStart(event) })
-    this.device.on('touchmove', (event) => { self.onTouchMove(event) })
-    this.device.on('touchend', (event) => { self.onTouchEnd(event) })
-    this.device.on('disconnect', (event) => { self.disconnectDevice(event) })
-
-    console.info(`✅ Registered callbacks`)
-  }
-
-  /**
-   * event handler - loupedeck device disconnected
-   */
-  async disconnectDevice (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')
-
-    try {
-      console.info(`Closing Device`)
-      this.stopping = true
-      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))
-      }
-      if (this.device){
-        this.device.reconnectInterval = 0
-        await this.device.close()
-        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) {}
-
-    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
-    if (this.appConfig.profiles.length >= id) {
-      this.currentProfile = id
-    }else{
-      return
-    }
-
-    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)
-    // knob Display is only available in the CT-version - not with live:
-    if (dKnob) {
-      this.screens.knob = new ButtonField('knob', 1, 1, dKnob.width, dKnob.height, profile.touch.knob,profile)
-    }
-
-    this.buttons = new ButtonField('buttons', 1, 1, 0, 0, profile.buttons,profile)
-
-    await this.screens.center.load()
-    await this.screens.right.load()
-    await this.screens.left.load()
-    if (dKnob) {
-      await this.screens.knob.load()
-    }
-    await this.buttons.load()
-
-    await this.screens.center.draw(this.device)
-    if (dKnob) {
-      await this.screens.knob.draw(this.device)
-    }
-
-    this.buttons.setState(this.currentProfile+1,1)
-    this.buttons.setState(oldProfile+1,1)
-        
-    await this.buttons.draw(this.device)
-  }
-
-  /**
-   * get the dictionary iwth the current profile settings
-   */
-  getCurrentProfile () {
-    return this.appConfig.profiles[this.currentProfile]
-  }
-
-  /**
-   * 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}`)
-    
-    await this.activateProfile(0)
-
-    var profile = this.getCurrentProfile()
-    await InitializeInterfaces(profile,this.buttons.setState)
-
-    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')
-  }
-
-  /**
-   * Fore an update of all screens
-   */
-  async updateScreens () {
-    const keys = Object.keys(this.screenUpdate)
-    for (let i = 0; i < keys.length; i++) {
-      const screen = keys[i]
-      await this.screens[screen].draw(this.device)
-    }
-    this.screenUpdate = {}
-  }
-
-  /**
-   * Button Down Handler - triggered through Event Button Down - connected to LoupeDeck Event
-   */
-  async onButtonDown (event) {
-    let ok = false
-    const id = event.id
-    ok = await this.buttons.pressed(id)
-    await this.buttons.draw(this.device)
-    return ok
-  }
-
-  /**
-   * Button Up Handler - triggered through Event Button Up - connected to LoupeDeck Event
-   */
-  async onButtonUp (event) {
-    let ok = false
-    const id = event.id
-    ok = await this.buttons.released(id)
-    await this.buttons.draw(this.device)
-
-    /*if (this.currentProfile != id){
-      this.activateProfile(id-1)
-    }*/
-    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
-    for (let i = 0; i < changedTouches.length; i++) {
-      const screen = changedTouches[i].target.screen
-      let id = changedTouches[i].target.key
-      this.screenUpdate[screen] = true
-      if (id === undefined) {
-        id = 0
-      }
-      ok = await this.screens[screen].pressed(id)
-    }
-    await this.updateScreens()
-    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
-    for (let i = 0; i < changedTouches.length; i++) {
-      const x = changedTouches[i].x
-      const y = changedTouches[i].y
-      const screen = changedTouches[i].target.screen
-      let id = changedTouches[i].target.key
-      if (id === undefined) {
-        id = 0 // for left/right
-      }
-      ok = await this.screens[screen].touchmove(id, x, y)
-    }
-    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
-    for (let i = 0; i < changedTouches.length; i++) {
-      const elem = changedTouches[i].target
-      let id = changedTouches[i].target.key
-      if (id === undefined) {
-        id = 0
-      }
-      this.screenUpdate[elem.screen] = true
-
-      ok = await this.screens[elem.screen].released(id)
-    }
-    await this.updateScreens()
-    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
-
-    ok = await this.screens.center.changed(buttonID,nodeid,val)
-    
-    await this.updateScreens()
-    return ok
-  }
-
-  
-}
+import {discover, HAPTIC,LoupedeckDevice } from 'loupedeck'
+import { ApplicationConfig } from './ApplicationConfig.mjs'
+import { ButtonField, StopInterfaces, InitializeInterfaces,opcuainterface} from './touchbuttons.mjs'
+
+export class BaseLoupeDeckHandler {
+  device = undefined
+  appConfig = undefined
+  profileConfigs = []
+  currentProfile = 0
+  screens = {}
+  buttons = {}
+  screenUpdate = {}
+  stopping = false
+
+  constructor (config) {
+    console.log(`INIT with config ${config}`)
+    this.loadConfig(config)
+  }
+
+  /**
+   * event handler - start
+   */
+  async start () {
+    console.info('Start')
+    while (!this.device && !this.stopping) {
+      try {
+        var list = await LoupedeckDevice.list()
+        if (list.length>0){
+          var element = list[0]
+          console.log("Connecting to device")
+          console.log("Path:         ", element.path)
+          console.log("vendorId:     ", element.vendorId, element.productId)
+          console.log("serialNumber: ", element.serialNumber)
+        }
+
+        this.device = await discover()
+        
+        
+        
+      } catch (e) {
+        console.error(`${e}. Reattempting in 3 seconds...`)
+        await new Promise(resolve => setTimeout(resolve, 3000))
+      }
+
+      if (this.stopping){
+        return
+      }
+    }
+    console.info(`✅ Discovered Device ${this.device.type}`)
+
+    const self = this
+
+    this.device.on('connect', (address) => { self.onConnected(address) })
+    this.device.on('down', (event) => { self.onButtonDown(event) })
+    this.device.on('up', (event) => { self.onButtonUp(event) })
+    this.device.on('rotate', (event) => { self.onRotate(event) })
+    this.device.on('touchstart', (event) => { self.onTouchStart(event) })
+    this.device.on('touchmove', (event) => { self.onTouchMove(event) })
+    this.device.on('touchend', (event) => { self.onTouchEnd(event) })
+    this.device.on('disconnect', (event) => { self.disconnectDevice(event) })
+
+    console.info(`✅ Registered callbacks`)
+  }
+
+  /**
+   * event handler - loupedeck device disconnected
+   */
+  async disconnectDevice (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')
+
+    try {
+      console.info(`Closing Device`)
+      this.stopping = true
+      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))
+      }
+      if (this.device){
+        this.device.reconnectInterval = 0
+        await this.device.close()
+        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) {}
+
+    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
+    if (this.appConfig.profiles.length >= id) {
+      this.currentProfile = id
+    }else{
+      return
+    }
+
+    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)
+    // knob Display is only available in the CT-version - not with live:
+    if (dKnob) {
+      this.screens.knob = new ButtonField('knob', 1, 1, dKnob.width, dKnob.height, profile.touch.knob,profile)
+    }
+
+    this.buttons = new ButtonField('buttons', 1, 1, 0, 0, profile.buttons,profile)
+
+    await this.screens.center.load()
+    await this.screens.right.load()
+    await this.screens.left.load()
+    if (dKnob) {
+      await this.screens.knob.load()
+    }
+    await this.buttons.load()
+
+    await this.screens.center.draw(this.device)
+    if (dKnob) {
+      await this.screens.knob.draw(this.device)
+    }
+
+    this.buttons.setState(this.currentProfile+1,1)
+    this.buttons.setState(oldProfile+1,1)
+        
+    await this.buttons.draw(this.device)
+  }
+
+  /**
+   * get the dictionary iwth the current profile settings
+   */
+  getCurrentProfile () {
+    return this.appConfig.profiles[this.currentProfile]
+  }
+
+  /**
+   * 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}`)
+    
+    await this.activateProfile(0)
+
+    var profile = this.getCurrentProfile()
+    await InitializeInterfaces(profile,this.buttons.setState)
+
+    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')
+  }
+
+  /**
+   * Fore an update of all screens
+   */
+  async updateScreens () {
+    const keys = Object.keys(this.screenUpdate)
+    for (let i = 0; i < keys.length; i++) {
+      const screen = keys[i]
+      await this.screens[screen].draw(this.device)
+    }
+    this.screenUpdate = {}
+  }
+
+  /**
+   * Button Down Handler - triggered through Event Button Down - connected to LoupeDeck Event
+   */
+  async onButtonDown (event) {
+    let ok = false
+    const id = event.id
+    ok = await this.buttons.pressed(id)
+    await this.buttons.draw(this.device)
+    return ok
+  }
+
+  /**
+   * Button Up Handler - triggered through Event Button Up - connected to LoupeDeck Event
+   */
+  async onButtonUp (event) {
+    let ok = false
+    const id = event.id
+    ok = await this.buttons.released(id)
+    await this.buttons.draw(this.device)
+
+    /*if (this.currentProfile != id){
+      this.activateProfile(id-1)
+    }*/
+    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
+    for (let i = 0; i < changedTouches.length; i++) {
+      const screen = changedTouches[i].target.screen
+      let id = changedTouches[i].target.key
+      this.screenUpdate[screen] = true
+      if (id === undefined) {
+        id = 0
+      }
+      ok = await this.screens[screen].pressed(id)
+    }
+    await this.updateScreens()
+    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
+    for (let i = 0; i < changedTouches.length; i++) {
+      const x = changedTouches[i].x
+      const y = changedTouches[i].y
+      const screen = changedTouches[i].target.screen
+      let id = changedTouches[i].target.key
+      if (id === undefined) {
+        id = 0 // for left/right
+      }
+      ok = await this.screens[screen].touchmove(id, x, y)
+    }
+    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
+    for (let i = 0; i < changedTouches.length; i++) {
+      const elem = changedTouches[i].target
+      let id = changedTouches[i].target.key
+      if (id === undefined) {
+        id = 0
+      }
+      this.screenUpdate[elem.screen] = true
+
+      ok = await this.screens[elem.screen].released(id)
+    }
+    await this.updateScreens()
+    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
+
+    ok = await this.screens.center.changed(buttonID,nodeid,val)
+    
+    await this.updateScreens()
+    return ok
+  }
+
+  
+}

package/common/cmd-executer.mjs

@@ -1,16 +1,16 @@
-import { exec } from 'child_process'
-
-export async function sh (cmd) {
-  // console.log('TRIGGER -> ', cmd)
-
-  return new Promise(function (resolve, reject) {
-    exec(cmd, (err, stdout, stderr) => {
-      console.log('executed cmd, stdout:', stdout)
-      if (err) {
-        reject(err)
-      } else {
-        resolve({ stdout, stderr })
-      }
-    })
-  })
-}
+import { exec } from 'child_process'
+
+export async function sh (cmd) {
+  // console.log('TRIGGER -> ', cmd)
+
+  return new Promise(function (resolve, reject) {
+    exec(cmd, (err, stdout, stderr) => {
+      console.log('executed cmd, stdout:', stdout)
+      if (err) {
+        reject(err)
+      } else {
+        resolve({ stdout, stderr })
+      }
+    })
+  })
+}

package/common/index.mjs

@@ -1,5 +1,5 @@
-import { BaseLoupeDeckHandler } from './BaseLoupeDeckHandler.mjs'
-
-module.exports = {
-  BaseLoupeDeckHandler
-}
+import { BaseLoupeDeckHandler } from './BaseLoupeDeckHandler.mjs'
+
+module.exports = {
+  BaseLoupeDeckHandler
+}