Merge pull request #312 from nrkno/feat/hyperdeck-state-handler

nrkno · Dec 18, 2023 · 5dd45c1 · 5dd45c1
2 parents a238f67 + ff5e91e
commit 5dd45c1
Show file tree

Hide file tree

Showing 11 changed files with 1,194 additions and 1,172 deletions.
diff --git a/packages/timeline-state-resolver/package.json b/packages/timeline-state-resolver/package.json
@@ -100,7 +100,7 @@
 		"eventemitter3": "^4.0.7",
 		"got": "^11.8.6",
 		"hpagent": "^1.2.0",
-		"hyperdeck-connection": "^0.5.0",
+		"hyperdeck-connection": "2.0.0-nightly-master-20231205-105655-157a483.0",
 		"klona": "^2.0.6",
 		"obs-websocket-js": "^4.0.3",
 		"osc": "^2.4.4",

diff --git a/packages/timeline-state-resolver/src/__mocks__/hyperdeck-connection.ts b/packages/timeline-state-resolver/src/__mocks__/hyperdeck-connection.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events'
 
-import { TransportStatus, Commands } from 'hyperdeck-connection'
+import { TransportStatus, Commands, VideoFormat, SlotStatus } from 'hyperdeck-connection'
 
 const setTimeoutOrg = setTimeout
 
@@ -9,7 +9,7 @@ export interface HyperdeckOptions {
 	debug?: boolean
 }
 
-export { TransportStatus, Commands }
+export { TransportStatus, Commands, VideoFormat, SlotStatus }
 
 const hyperdeckmockInstances: Array<Hyperdeck> = []
 
@@ -24,7 +24,7 @@ export class Hyperdeck extends EventEmitter {
 	private _host: string
 	private _port: number
 
-	private _mockCommandReceiver?: (cmd: Commands.AbstractCommand) => Promise<any>
+	private _mockCommandReceiver?: (cmd: Commands.AbstractCommand<any>) => Promise<any>
 
 	constructor(_options?: HyperdeckOptions) {
 		super()
@@ -51,6 +51,9 @@ export class Hyperdeck extends EventEmitter {
 	async disconnect(): Promise<void> {
 		this._connectionActive = false
 
+		const ind = hyperdeckmockInstances.indexOf(this)
+		if (ind !== -1) hyperdeckmockInstances.splice(ind, 1)
+
 		if (!this._connected) return Promise.resolve()
 
 		return new Promise((resolve, reject) => {
@@ -62,7 +65,7 @@ export class Hyperdeck extends EventEmitter {
 		})
 	}
 
-	async sendCommand(command: Commands.AbstractCommand): Promise<any> {
+	async sendCommand(command: Commands.AbstractCommand<any>): Promise<any> {
 		if (this._mockCommandReceiver) {
 			return this._mockCommandReceiver(command)
 		}
@@ -75,7 +78,7 @@ export class Hyperdeck extends EventEmitter {
 			const res: Commands.DeviceInfoCommandResponse = {
 				protocolVersion: 1.9,
 				model: 'Mock HyperDeck for TSR',
-				slots: '2',
+				slots: 2,
 			}
 			return Promise.resolve(res)
 		} else if (command instanceof Commands.TransportInfoCommand) {
@@ -87,7 +90,7 @@ export class Hyperdeck extends EventEmitter {
 		return Promise.resolve()
 	}
 
-	public setMockCommandReceiver(fcn: (cmd: Commands.AbstractCommand) => Promise<any>) {
+	public setMockCommandReceiver(fcn: (cmd: Commands.AbstractCommand<any>) => Promise<any>) {
 		this._mockCommandReceiver = fcn
 	}
 	get connected() {

diff --git a/packages/timeline-state-resolver/src/conductor.ts b/packages/timeline-state-resolver/src/conductor.ts
@@ -29,6 +29,7 @@ import {
 	DeviceOptionsAtem,
 	DeviceOptionsTCPSend,
 	DeviceOptionsQuantel,
+	DeviceOptionsHyperdeck,
 } from 'timeline-state-resolver-types'
 
 import { DoOnTime } from './devices/doOnTime'
@@ -41,7 +42,6 @@ import { DeviceContainer } from './devices/deviceContainer'
 import { CasparCGDevice, DeviceOptionsCasparCGInternal } from './integrations/casparCG'
 import { LawoDevice, DeviceOptionsLawoInternal } from './integrations/lawo'
 import { PanasonicPtzDevice, DeviceOptionsPanasonicPTZInternal } from './integrations/panasonicPTZ'
-import { HyperdeckDevice, DeviceOptionsHyperdeckInternal } from './integrations/hyperdeck'
 import { PharosDevice, DeviceOptionsPharosInternal } from './integrations/pharos'
 import { SisyfosMessageDevice, DeviceOptionsSisyfosInternal } from './integrations/sisyfos'
 import { SingularLiveDevice, DeviceOptionsSingularLiveInternal } from './integrations/singularLive'
@@ -528,15 +528,6 @@ export class Conductor extends EventEmitter<ConductorEvents> {
 					getCurrentTime,
 					threadedClassOptions
 				)
-			case DeviceType.HYPERDECK:
-				return DeviceContainer.create<DeviceOptionsHyperdeckInternal, typeof HyperdeckDevice>(
-					'../../dist/integrations/hyperdeck/index.js',
-					'HyperdeckDevice',
-					deviceId,
-					deviceOptions,
-					getCurrentTime,
-					threadedClassOptions
-				)
 			case DeviceType.PHAROS:
 				return DeviceContainer.create<DeviceOptionsPharosInternal, typeof PharosDevice>(
 					'../../dist/integrations/pharos/index.js',
@@ -631,6 +622,7 @@ export class Conductor extends EventEmitter<ConductorEvents> {
 			case DeviceType.ATEM:
 			case DeviceType.HTTPSEND:
 			case DeviceType.HTTPWATCHER:
+			case DeviceType.HYPERDECK:
 			case DeviceType.OSC:
 			case DeviceType.SHOTOKU:
 			case DeviceType.TCPSEND:
@@ -1544,7 +1536,7 @@ export type DeviceOptionsAnyInternal =
 	| DeviceOptionsHTTPWatcher
 	| DeviceOptionsPanasonicPTZInternal
 	| DeviceOptionsTCPSend
-	| DeviceOptionsHyperdeckInternal
+	| DeviceOptionsHyperdeck
 	| DeviceOptionsPharosInternal
 	| DeviceOptionsOBSInternal
 	| DeviceOptionsOSC