Update to fix #1 so the project can be run on M1 Apple Silicone.

Author: chrisspiegl

README.md

@@ -20,7 +20,7 @@ npm install -g pnpm
 
 ### Installation
 
-1. Download thie Repository ([ZIP](https://github.com/chrisspiegl/midi2atem/archive/refs/heads/main.zip))
+1. Download this Repository ([ZIP](https://github.com/chrisspiegl/midi2atem/archive/refs/heads/main.zip))
 2. Unzip and open Terminal into that folder
 3. run `pnpm install`
 4. start the app with `pnpm start`

config.default.yaml

@@ -13,6 +13,9 @@ atem:
   enabled: false
   address: 192.168.10.240
 
+hotkeys:
+  enabled: false
+
 msPerFrame: 33.33333333 # 30fps = 33.33333333 | 24fps = 41.66666667
 
 inputMapping:
@@ -67,7 +70,7 @@ dve:
       sizeY: 360
       positionX: 9700
       positionY: -5100
-      maskEnabled: false
+      maskEnabled: true
       maskTop: 0
       maskBottom: 0
       maskRight: 0
@@ -163,14 +166,30 @@ macros:
   actions:
   - action: KeyboardFire
     combination:
-      - LeftSuper
+      - LeftControl
+      - LeftAlt
+      - Left
+  - action: Delay
+    duration: 1000
+  - action: KeyboardFire
+    combination:
+      - LeftControl
+      - LeftAlt
       - Left
   - action: Delay
     duration: 1000
   - action: KeyboardFire
     combination:
-      - LeftSuper
+      - LeftControl
+      - LeftAlt
       - Right
+  - action: Delay
+    duration: 1000
+  - action: KeyboardFire
+    combination:
+      - LeftControl
+      - LeftAlt
+      - Num2
 
 - name: TestMacro
   actions:

index.js

@@ -1,8 +1,8 @@
-import _ from 'lodash'
+import { find, isEmpty, difference, flatten } from 'lodash-es'
 import got from 'got'
 import merge from 'deepmerge'
 import { Enums } from 'atem-connection'
-import { EventEmitter } from 'inf-ee'
+// import { EventEmitter } from 'inf-ee'
 
 import { ControllerWebServer } from './ControllerWebServer.js'
 import { ControllerAtem } from './ControllerAtem.js'
@@ -118,32 +118,32 @@ export class ControlThemAll {
   midiOnNoteOn(msg) {
     console.log(`NOTE ON:`, msg)
     const { note, velocity: value, channel } = msg
-    const buttonConfig = _.find(this.config.buttons, { note })
+    const buttonConfig = find(this.config.buttons, { note })
     console.log(`buttonConfig:`, buttonConfig)
-    if (_.isEmpty(buttonConfig)) return
+    if (isEmpty(buttonConfig)) return
     const actionConfig = buttonConfig.noteOn
     console.log(`buttonConfig:`, actionConfig)
-    if (_.isEmpty(actionConfig)) return
+    if (isEmpty(actionConfig)) return
     const buttonActionFunction = this.getButtonAction(actionConfig.action)
     if (buttonActionFunction) buttonActionFunction(actionConfig, value)
   }
 
   midiOnNoteOff(msg) {
     console.log(`NOTE OFF:`, msg)
     const { note, velocity: value, channel } = msg
-    const buttonConfig = _.find(this.config.buttons, { note })
+    const buttonConfig = find(this.config.buttons, { note })
     console.log(`buttonConfig:`, buttonConfig)
-    if (_.isEmpty(buttonConfig)) return
+    if (isEmpty(buttonConfig)) return
     const actionConfig = buttonConfig.noteOff || buttonConfig
-    if (_.isEmpty(actionConfig)) return
+    if (isEmpty(actionConfig)) return
     const buttonActionFunction = this.getButtonAction(actionConfig.action)
     if (buttonActionFunction) buttonActionFunction(actionConfig, value)
   }
 
   midiOnControllerChange(msg) {
     console.log(`CONTROLLER CHANGE:`, msg)
     const { controller: note, value, channel } = msg
-    const controllerConfig = _.find(this.config.controllers, { note })
+    const controllerConfig = find(this.config.controllers, { note })
     console.log(`controllerConfig:`, controllerConfig)
     const controlAction = this.getControllerAction(controllerConfig.action)
     if (controlAction) controlAction(controllerConfig, value)
@@ -315,10 +315,10 @@ export class ControlThemAll {
       RunMacro: async (options, value) => {
         // console.log(`options:`, options)
         const { name } = options
-        const macroConfig = _.find(this.config.macros, { name })
+        const macroConfig = find(this.config.macros, { name })
         const { actions } = macroConfig
         for (const actionConfig of actions) {
-          if (_.isEmpty(actionConfig) || _.isEmpty(actionConfig.action)) return
+          if (isEmpty(actionConfig) || isEmpty(actionConfig.action)) return
           const buttonActionFunction = this.getButtonAction(actionConfig.action)
           // console.log(`before ${actionConfig.action}`)
           if (buttonActionFunction) await buttonActionFunction(actionConfig, value)
@@ -361,10 +361,10 @@ export class ControlThemAll {
           console.log('url must be present')
           return
         }
-        type = (!_.isEmpty(type)) ? type.toLowerCase() : 'get'
+        type = (!isEmpty(type)) ? type.toLowerCase() : 'get'
         type = ['get', 'post', 'path', 'delete', 'put', 'head'].includes(type) ? type : 'get'
-        body = (type !== 'get' && !_.isEmpty(body)) ? body : undefined
-        headers = (!_.isEmpty(headers)) ? headers : { 'Content-Type': 'application/json' }
+        body = (type !== 'get' && !isEmpty(body)) ? body : undefined
+        headers = (!isEmpty(headers)) ? headers : { 'Content-Type': 'application/json' }
         try {
           const response = await got[type](options.url, { body, headers })
           console.log('HTTP Request Response: ', response.body)
@@ -607,23 +607,39 @@ export class ControlThemAll {
   }
 
   getButtonsByAction(action) {
-    return _.map(_.filter(this.config.buttons, (el) => el.action === action || el.noteOn?.action == action || el.noteOff?.action == action), (el) => el.note)
+    return this.config.buttons
+      .filter(
+        (el) =>
+          el.action === action ||
+          el.noteOn?.action == action ||
+          el.noteOff?.action == action
+      )
+      .map((el) => el.note);
+    // return map(filter(this.config.buttons, (el) => el.action === action || el.noteOn?.action == action || el.noteOff?.action == action), (el) => el.note)
   }
 
   getButtonsByNoteOffAction(action) {
-    return _.map(_.filter(this.config.buttons, (el) => el.noteOff?.action == action), (el) => el.note)
+    this.config.buttons
+      .filter((el) => el.noteOff?.action == action)
+      .map((el) => el.note);
+    // return map(filter(this.config.buttons, (el) => el.noteOff?.action == action), (el) => el.note)
   }
 
   getButtonsByNoteOnAction(action) {
-    return _.map(_.filter(this.config.buttons, (el) => el.noteOn?.action == action), (el) => el.note)
+    return this.config.buttons
+      .filter((el) => el.noteOn?.action == action)
+      .map((el) => el.note);
+    // return map(filter(this.config.buttons, (el) => el.noteOn?.action == action), (el) => el.note)
   }
 
   getControllersByAction(action) {
-    return _.filter(this.config.controllers, (el) => el.action === action)
+    return this.config.controllers.filter((el) => el.action === action);
+    // return filter(this.config.controllers, (el) => el.action === action)
   }
 
   getControllersByName(name) {
-    return _.filter(this.config.controllers, (el) => el.name === name)
+    return this.config.controllers.filter((el) => el.name === name);
+    // return filter(this.config.controllers, (el) => el.name === name)
   }
 
   updateButtonState(buttonStates, overwrite = {}, via = 'action') {
@@ -632,7 +648,7 @@ export class ControlThemAll {
       return { state: 'noteoff', value: buttonState.defaultValue || 0, ...buttonState, ...overwrite}
     })
     this.config.buttons = this.config.buttons.map((button) => {
-      let updatedButtonState = _.find(buttonStates, (el) => el[via] === button[via])
+      let updatedButtonState = find(buttonStates, (el) => el[via] === button[via])
       if (updatedButtonState) {
         button.value = updatedButtonState.value
         button.state = updatedButtonState.state
@@ -645,7 +661,7 @@ export class ControlThemAll {
     const buttonsForDveSelection = this.config.feedback.buttonsForActiveUpstreamKeyerFillSource
     const nameOfInput = Object.keys(this.config.inputMapping).find(key => this.config.inputMapping[key] === this.config.dve.fillSource)
     const buttonActiveDveFillSource = buttonsForDveSelection[nameOfInput]
-    this.switchButtonLightOff(_.difference(_.flatten(Object.values(buttonsForDveSelection)), buttonActiveDveFillSource))
+    this.switchButtonLightOff(difference(flatten(Object.values(buttonsForDveSelection)), buttonActiveDveFillSource))
     this.switchButtonLightOn(buttonActiveDveFillSource)
   }
 
@@ -655,7 +671,7 @@ export class ControlThemAll {
       return { state: 'cc', value: controllerState.defaultValue || 0, ...controllerState, ...overwrite}
     })
     this.config.controllers = this.config.controllers.map((controller) => {
-      let updatedControllerState = _.find(controllerStates, (el) => el[via] === controller[via])
+      let updatedControllerState = find(controllerStates, (el) => el[via] === controller[via])
       if (updatedControllerState) {
         controller.value = updatedControllerState.value
       }
@@ -669,7 +685,7 @@ export class ControlThemAll {
     const { controllers } = this.config
     controllerStates = controllerStates.map((controllerState) => merge(controllerState, { state: 'cc', value: controllerState.defaultValue || 0 }))
     controllers.map((controller) => {
-      let updatedControllerState = _.find(controllerStates, (el) => el.action === controller.action)
+      let updatedControllerState = find(controllerStates, (el) => el.action === controller.action)
       if (updatedControllerState) controller.value = updatedControllerState.value
       return controller
     })
@@ -732,8 +748,8 @@ export class ControlThemAll {
         const buttonsForProgramInputWithDve = this.config.feedback.buttonsForProgramInputWithDve
         const nameOfInput = Object.keys(this.config.inputMapping).find(key => this.config.inputMapping[key] === programInput)
         const buttonsForProgramInput = (hasDve) ? buttonsForProgramInputWithDve[nameOfInput] : buttonsForProgramInputWithoutDve[nameOfInput]
-        const buttonsForProgramInputAll = [..._.flatten(Object.values(buttonsForProgramInputWithoutDve)), ..._.flatten(Object.values(buttonsForProgramInputWithDve))]
-        this.switchButtonLightOff(_.difference(buttonsForProgramInputAll, buttonsForProgramInput))
+        const buttonsForProgramInputAll = [...flatten(Object.values(buttonsForProgramInputWithoutDve)), ...flatten(Object.values(buttonsForProgramInputWithDve))]
+        this.switchButtonLightOff(difference(buttonsForProgramInputAll, buttonsForProgramInput))
         this.switchButtonLightOn(buttonsForProgramInput)
 
         this.updateDveButtons()
@@ -763,7 +779,7 @@ export class ControlThemAll {
       console.log('Server closing: Doing the cleanup.')
 
       if (this.controllerMidi.isConnected()) {
-        this.switchButtonLightOff(_.flatten(this.config.buttons.map((el) => [el.note])))
+        this.switchButtonLightOff(flatten(this.config.buttons.map((el) => [el.note])))
         this.controllerMidi.updateButtonsViaState(this.config.buttons)
         this.updatecontrollerState(this.config.controllers.map((el) => merge(el, { state: 'cc', value: 0 })))
         this.controllerMidi.updateControllersViaState(this.config.controllers)

package.json

@@ -2,45 +2,41 @@
   "type": "module",
   "private": true,
   "name": "controlthemall",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "scripts": {
-    "preinstall": "npx only-allow pnpm",
-    "dev": "pnpm run start:dev",
-    "start": "node .",
-    "start:dev": "nodemon ./index.js",
-    "build": "pnpm run build:ncc && pnpm run build:caxa",
-    "build:app": "pnpm run build:ncc && pnpm run build:caxa:app",
-    "build:ncc": "ncc build index.js -o dist/ncc",
-    "build:caxa": "caxa --input \"dist/ncc\" --output \"dist/bin/ControlThemAll\" -- \"{{caxa}}/node_modules/.bin/node\" \"{{caxa}}/index.js\"",
-    "build:caxa:app": "caxa --input \"dist/ncc\" --output \"dist/bin/ControlThemAll.app\" -- \"{{caxa}}/node_modules/.bin/node\" \"{{caxa}}/index.js\""
+    "dev": "run-s start:dev",
+    "start": "run-s start:dev",
+    "start:dev": "nodemon .",
+    "cu": "ncu",
+    "cu:fix": "ncu -u"
   },
   "main": "index.js",
   "bin": "index.js",
   "dependencies": {
-    "@nut-tree/nut-js": "^1.6.1-next.20210603163242",
-    "atem-connection": "3.0.0-nightly-latest-20210530-132658-16c3cdd.0",
-    "atem-state": "^0.10.1",
-    "debug": "^4.3.1",
-    "deep-object-diff": "^1.1.0",
+    "@nut-tree/nut-js": "^2.0.0-RC1",
+    "atem-connection": "3.0.0-nightly-latest-20211125-222857-2b30eea.0",
+    "atem-state": "^0.12.2",
+    "debug": "^4.3.3",
     "deepmerge": "^4.2.2",
     "detect-port": "^1.3.0",
-    "easymidi": "^2.0.5",
-    "express": "^4.17.1",
-    "got": "^11.8.2",
+    "easymidi": "^2.1.0",
+    "express": "^4.17.2",
+    "got": "^12.0.0",
     "inf-ee": "^1.0.4",
-    "lodash": "^4.17.21",
+    "lodash-es": "^4.17.21",
     "throttle-debounce": "^3.0.1",
     "yaml": "^1.10.2"
   },
   "devDependencies": {
-    "caxa": "^2.0.0",
-    "nodemon": "^2.0.7"
+    "nodemon": "^2.0.15",
+    "npm-check-updates": "^12.0.5",
+    "npm-run-all": "^4.1.5"
   },
   "author": {
     "name": "Chris Spiegl",
     "email": "chris@chrisspiegl.com",
     "url": "https://chrisspiegl.com/"
   },
-  "homepage": "https://github.com/chrisspiegl/midi2atem",
+  "homepage": "https://github.com/chrisspiegl/ControlThemAll",
   "license": "UNLICENSED"
 }