merge 'release49' into release50

nrkno · Sep 5, 2023 · 0f5523d · 0f5523d
2 parents 4cb7106 + 65a73c4
commit 0f5523d
Show file tree

Hide file tree

Showing 9 changed files with 135 additions and 178 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/packages/timeline-state-resolver/CHANGELOG.md b/packages/timeline-state-resolver/CHANGELOG.md
@@ -284,6 +284,14 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 - translations for actions ([df4cb43](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/df4cb43cf16a8e2ae34c1fe44801c5a327f9b01e))
 - update for casparcg-connection rewrite ([5dfdd23](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/5dfdd2320caf89432d36513026c1259e2cf3d366))
 
+## [7.5.1](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/7.5.0...7.5.1) (2023-09-04)
+
+### Bug Fixes
+
+- casparcg disconnect handler may not fire ([74c1f8a](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/74c1f8ac6626bdc9c7ac2bb2737550306905f4b1))
+- **sisyfos:** remove local port & terminate correctly ([c11801a](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/c11801a1f787e3fbd965416138e973c3c940d1b7))
+- terminate devices fully ([028167a](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/028167ae7dbc1e2cb5f70820554068d434bed75d))
+
 # [7.5.0](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/7.5.0-release47.7...7.5.0) (2023-02-28)
 
 **Note:** Version bump only for package timeline-state-resolver

diff --git a/packages/timeline-state-resolver/src/integrations/atem/index.ts b/packages/timeline-state-resolver/src/integrations/atem/index.ts
@@ -141,6 +141,10 @@ export class AtemDevice extends DeviceWithState<DeviceState, DeviceOptionsAtemIn
 				.catch(() => {
 					resolve(false)
 				})
+				.finally(() => {
+					this._atem.destroy().catch(() => null)
+					this._atem.removeAllListeners()
+				})
 		})
 	}
 

diff --git a/packages/timeline-state-resolver/src/integrations/casparCG/index.ts b/packages/timeline-state-resolver/src/integrations/casparCG/index.ts
@@ -211,11 +211,16 @@ export class CasparCGDevice extends DeviceWithState<State, DeviceOptionsCasparCG
 			if (!this._ccg) {
 				resolve(true)
 				return
-			}
-			this._ccg.disconnect()
-			this._ccg.once('disconnect', () => {
+			} else if (!this._ccg.connected) {
+				this._ccg.once('disconnect', () => {
+					resolve(true)
+					this._ccg.removeAllListeners()
+				})
+				this._ccg.disconnect()
+			} else {
+				this._ccg.removeAllListeners()
 				resolve(true)
-			})
+			}
 		})
 	}
 	/** Called by the Conductor a bit before a .handleState is called */

diff --git a/packages/timeline-state-resolver/src/integrations/httpSend/index.ts b/packages/timeline-state-resolver/src/integrations/httpSend/index.ts
@@ -116,6 +116,7 @@ export class HTTPSendDevice extends DeviceWithState<HTTPSendState, DeviceOptions
 	}
 	async terminate() {
 		this._doOnTime.dispose()
+		this.activeLayers.clear()
 		return Promise.resolve(true)
 	}
 	getStatus(): DeviceStatus {

diff --git a/packages/timeline-state-resolver/src/integrations/osc/index.ts b/packages/timeline-state-resolver/src/integrations/osc/index.ts
@@ -83,6 +83,8 @@ export class OscDevice extends EventEmitter implements Device<OSCOptions, OscDev
 		return Promise.resolve(true) // This device doesn't have any initialization procedure
 	}
 	async terminate(): Promise<boolean> {
+		this._oscClient.close()
+		this._oscClient.removeAllListeners()
 		return true
 	}
 

diff --git a/packages/timeline-state-resolver/src/integrations/shotoku/index.ts b/packages/timeline-state-resolver/src/integrations/shotoku/index.ts
@@ -124,6 +124,7 @@ export class ShotokuDevice extends DeviceWithState<ShotokuDeviceState, DeviceOpt
 	}
 	async terminate() {
 		this._doOnTime.dispose()
+		await this._shotoku.dispose()
 		return Promise.resolve(true)
 	}
 	getStatus(): DeviceStatus {

diff --git a/packages/timeline-state-resolver/src/integrations/sisyfos/index.ts b/packages/timeline-state-resolver/src/integrations/sisyfos/index.ts
@@ -157,6 +157,8 @@ export class SisyfosMessageDevice extends DeviceWithState<SisyfosState, DeviceOp
 	}
 	async terminate() {
 		this._doOnTime.dispose()
+		this._sisyfos.dispose()
+		this._sisyfos.removeAllListeners()
 		return Promise.resolve(true)
 	}
 	getStatus(): DeviceStatus {

diff --git a/packages/timeline-state-resolver/src/integrations/vizMSE/index.ts b/packages/timeline-state-resolver/src/integrations/vizMSE/index.ts
@@ -151,6 +151,7 @@ export class VizMSEDevice extends DeviceWithState<VizMSEState, DeviceOptionsVizM
 	async terminate(): Promise<boolean> {
 		if (this._vizmseManager) {
 			await this._vizmseManager.terminate()
+			this._vizmseManager.removeAllListeners()
 			delete this._vizmseManager
 		}
 		this._doOnTime.dispose()