chore: refactor http-watch device SOFIE-2482

nrkno · Aug 15, 2023 · 1688d16 · 1688d16
1 parent 920da05
commit 1688d16
Show file tree

Hide file tree

Showing 7 changed files with 375 additions and 422 deletions.
diff --git a/packages/timeline-state-resolver/src/conductor.ts b/packages/timeline-state-resolver/src/conductor.ts
@@ -21,6 +21,7 @@ import {
 	TimelineDatastoreReferencesContent,
 	DeviceOptionsMultiOSC,
 	TimelineDatastoreReferences,
+	DeviceOptionsHTTPWatcher,
 } from 'timeline-state-resolver-types'
 
 import { DoOnTime } from './devices/doOnTime'
@@ -40,7 +41,6 @@ import { HyperdeckDevice, DeviceOptionsHyperdeckInternal } from './integrations/
 import { TCPSendDevice, DeviceOptionsTCPSendInternal } from './integrations/tcpSend'
 import { PharosDevice, DeviceOptionsPharosInternal } from './integrations/pharos'
 import { DeviceOptionsOSCInternal } from './integrations/osc'
-import { HTTPWatcherDevice, DeviceOptionsHTTPWatcherInternal } from './integrations/httpWatcher'
 import { QuantelDevice, DeviceOptionsQuantelInternal } from './integrations/quantel'
 import { SisyfosMessageDevice, DeviceOptionsSisyfosInternal } from './integrations/sisyfos'
 import { SingularLiveDevice, DeviceOptionsSingularLiveInternal } from './integrations/singularLive'
@@ -524,15 +524,6 @@ export class Conductor extends EventEmitter<ConductorEvents> {
 					getCurrentTime,
 					threadedClassOptions
 				)
-			case DeviceType.HTTPWATCHER:
-				return DeviceContainer.create<DeviceOptionsHTTPWatcherInternal, typeof HTTPWatcherDevice>(
-					'../../dist/integrations/httpWatcher/index.js',
-					'HTTPWatcherDevice',
-					deviceId,
-					deviceOptions,
-					getCurrentTime,
-					threadedClassOptions
-				)
 			case DeviceType.LAWO:
 				return DeviceContainer.create<DeviceOptionsLawoInternal, typeof LawoDevice>(
 					'../../dist/integrations/lawo/index.js',
@@ -678,6 +669,7 @@ export class Conductor extends EventEmitter<ConductorEvents> {
 					threadedClassOptions
 				)
 			case DeviceType.HTTPSEND:
+			case DeviceType.HTTPWATCHER:
 			case DeviceType.OSC:
 				// presumably this device is implemented in the new service handler
 				return RemoteDeviceInstance.create(
@@ -1577,7 +1569,7 @@ export type DeviceOptionsAnyInternal =
 	| DeviceOptionsAtemInternal
 	| DeviceOptionsLawoInternal
 	| DeviceOptionsHTTPSendInternal
-	| DeviceOptionsHTTPWatcherInternal
+	| DeviceOptionsHTTPWatcher
 	| DeviceOptionsPanasonicPTZInternal
 	| DeviceOptionsTCPSendInternal
 	| DeviceOptionsHyperdeckInternal