Rework playout connection management (sofie 1152) (Sofie-Automation#1271)

* chore: wip

* chore: wip

* chore: update tsr

---------

Co-authored-by: Johan Nyman <[email protected]>

Author: Mint de Wit

meteor/yarn.lock

@@ -1242,7 +1242,7 @@ __metadata:
   resolution: "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A."
   dependencies:
     "@mos-connection/model": v4.2.0-alpha.1
-    timeline-state-resolver-types: 9.2.0-nightly-release52-20240909-111856-517f0ee37.0
+    timeline-state-resolver-types: 9.2.0-nightly-release52-20240923-122840-58cfbb259.0
     tslib: ^2.6.2
     type-fest: ^3.13.1
   languageName: node
@@ -10197,12 +10197,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"timeline-state-resolver-types@npm:9.2.0-nightly-release52-20240909-111856-517f0ee37.0":
-  version: 9.2.0-nightly-release52-20240909-111856-517f0ee37.0
-  resolution: "timeline-state-resolver-types@npm:9.2.0-nightly-release52-20240909-111856-517f0ee37.0"
+"timeline-state-resolver-types@npm:9.2.0-nightly-release52-20240923-122840-58cfbb259.0":
+  version: 9.2.0-nightly-release52-20240923-122840-58cfbb259.0
+  resolution: "timeline-state-resolver-types@npm:9.2.0-nightly-release52-20240923-122840-58cfbb259.0"
   dependencies:
     tslib: ^2.6.3
-  checksum: 6f9526e3e60021b722fd152272a7697a2b78517fb800a9e0879170388dcfeaaa2d386f80b9868b20bffe058033c9158077f93294cff7907c5d8a6d7b27e186f6
+  checksum: c041363201bcfc0daac2ebca021b09fddc1f5b12fdeb932d9c19bfadc3ee308aa81f36c74c005edad2e756ed1c6465de779bfca5ed63ffd940878bf015497231
   languageName: node
   linkType: hard
 

packages/playout-gateway/package.json

@@ -60,7 +60,7 @@
 		"@sofie-automation/shared-lib": "1.52.0-in-development",
 		"debug": "^4.3.4",
 		"influx": "^5.9.3",
-		"timeline-state-resolver": "9.2.0-nightly-release52-20240909-111856-517f0ee37.0",
+		"timeline-state-resolver": "9.2.0-nightly-release52-20240923-122840-58cfbb259.0",
 		"tslib": "^2.6.2",
 		"underscore": "^1.13.6",
 		"winston": "^3.11.0"

packages/playout-gateway/src/coreHandler.ts

@@ -346,7 +346,7 @@ export class CoreHandler {
 
 		const devices: any[] = []
 		if (this._tsrHandler) {
-			for (const device of this._tsrHandler.tsr.getDevices()) {
+			for (const device of this._tsrHandler.tsr.connectionManager.getConnections()) {
 				devices.push({
 					instanceId: device.instanceId,
 					deviceId: device.deviceId,
@@ -416,24 +416,17 @@ export class CoreTSRDeviceHandler {
 	public _deviceId: string
 	public _device!: BaseRemoteDeviceIntegration<DeviceOptionsAny>
 	private _coreParentHandler: CoreHandler
-	private _tsrHandler: TSRHandler
 	private _hasGottenStatusChange = false
 	private _deviceStatus: PeripheralDeviceAPI.PeripheralDeviceStatusObject = {
 		statusCode: StatusCode.BAD,
 		messages: ['Starting up...'],
 	}
 	private disposed = false
 
-	constructor(
-		parent: CoreHandler,
-		device: Promise<BaseRemoteDeviceIntegration<DeviceOptionsAny>>,
-		deviceId: string,
-		tsrHandler: TSRHandler
-	) {
+	constructor(parent: CoreHandler, device: Promise<BaseRemoteDeviceIntegration<DeviceOptionsAny>>, deviceId: string) {
 		this._coreParentHandler = parent
 		this._devicePr = device
 		this._deviceId = deviceId
-		this._tsrHandler = tsrHandler
 	}
 	async init(): Promise<void> {
 		this._device = await this._devicePr
@@ -455,10 +448,11 @@ export class CoreTSRDeviceHandler {
 			)
 		})
 
+		console.log('has got status? ' + this._hasGottenStatusChange)
 		if (!this._hasGottenStatusChange) {
 			this._deviceStatus = await this._device.device.getStatus()
-			this.sendStatus()
 		}
+		this.sendStatus()
 		if (this.disposed) throw new Error('CoreTSRDeviceHandler cant init, is disposed')
 		await this.setupSubscriptionsAndObservers()
 		if (this.disposed) throw new Error('CoreTSRDeviceHandler cant init, is disposed')
@@ -490,8 +484,9 @@ export class CoreTSRDeviceHandler {
 		// setup observers
 		this._coreParentHandler.setupObserverForPeripheralDeviceCommands(this)
 	}
-	statusChanged(deviceStatus: Partial<PeripheralDeviceAPI.PeripheralDeviceStatusObject>): void {
-		this._hasGottenStatusChange = true
+	statusChanged(deviceStatus: Partial<PeripheralDeviceAPI.PeripheralDeviceStatusObject>, fromDevice = true): void {
+		console.log('device ' + this._deviceId + ' status set to ' + deviceStatus.statusCode)
+		if (fromDevice) this._hasGottenStatusChange = true
 
 		this._deviceStatus = {
 			...this._deviceStatus,
@@ -545,7 +540,8 @@ export class CoreTSRDeviceHandler {
 	async dispose(subdevice: 'keepSubDevice' | 'removeSubDevice' = 'keepSubDevice'): Promise<void> {
 		this._observers.forEach((obs) => obs.stop())
 
-		await this._tsrHandler.tsr.removeDevice(this._deviceId)
+		if (!this.core) return
+
 		await this.core.setStatus({
 			statusCode: StatusCode.BAD,
 			messages: ['Uninitialized'],