feat: Added mixertimeout support for Midas mixers. For a fast warning…

… if mixer is not responding.
tv2 · Oct 6, 2021 · b25efd5 · b25efd5
1 parent c9c49ca
commit b25efd5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/server/constants/mixerProtocols/midasMaster.ts b/server/constants/mixerProtocols/midasMaster.ts
@@ -23,6 +23,7 @@ export const MidasMaster: IMixerProtocol = {
         },
     ],
     pingTime: 9500,
+    mixerTimeout: 2000,
     initializeCommands: [
         {
             mixerMessage: '/ch/{channel}/mix/fader',

diff --git a/server/utils/mixerConnections/OscMixerConnection.ts b/server/utils/mixerConnections/OscMixerConnection.ts
@@ -41,7 +41,8 @@ export class OscMixerConnection {
     mixerIndex: number
     cmdChannelIndex: number
     oscConnection: any
-    mixerOnlineTimer: any
+    mixerOnlineTimer: NodeJS.Timeout
+    timeoutTimer: NodeJS.Timeout
     commandBuffer: IOscCommand[] = []
 
     constructor(mixerProtocol: IMixerProtocol, mixerIndex: number) {
@@ -92,7 +93,11 @@ export class OscMixerConnection {
             })
             .on('message', (message: any) => {
                 clearTimeout(this.mixerOnlineTimer)
+                this.resetMixerTimeout()
                 if (!state.settings[0].mixers[this.mixerIndex].mixerOnline) {
+                    logger.info(
+                        `Audio Mixer number: ${this.mixerIndex + 1} is Online`
+                    )
                     this.mixerOnline(true)
                 }
                 logger.verbose('Received OSC message: ' + message.address, {})
@@ -413,17 +418,30 @@ export class OscMixerConnection {
 
     pingMixerCommand() {
         //Ping OSC mixer if mixerProtocol needs it.
-        this.mixerProtocol.pingCommand.map((command) => {
+        this.mixerProtocol.pingCommand.forEach((command) => {
             let value = command.value || 0
             let type = command.type || 'i'
             this.sendOutMessage(command.mixerMessage, 0, value, type)
         })
         global.mainThreadHandler.updateFullClientStore()
         this.mixerOnlineTimer = setTimeout(() => {
+            logger.warn(`Audio Mixer number: ${this.mixerIndex + 1} is Offline`)
             store.dispatch(storeSetMixerOnline(this.mixerIndex, false))
         }, this.mixerProtocol.pingTime)
     }
 
+    resetMixerTimeout() {
+        // Check mixer Timeout response if protocol needs it:
+        if (this.mixerProtocol.mixerTimeout > 0) {
+            clearTimeout(this.timeoutTimer)
+            this.timeoutTimer = setTimeout(() => {
+                logger.warn(
+                    `Audio Mixer number: ${this.mixerIndex + 1} timeout`
+                )
+            }, this.mixerProtocol.mixerTimeout)
+        }
+    }
+
     checkFxCommands(message: any) {
         Object.keys(fxParamsList).forEach((keyName: string) => {
             if (!isNaN(parseFloat(keyName))) {