Update release51 with fixes from release50

CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.0.1](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/9.0.0...9.0.1) (2024-04-02)
+
+
+### Bug Fixes
+
+* **vMix:** handling XML messages with multi-byte characters ([e811ef0](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/e811ef09f6118c69ea337e0b1eb969a663546bde))
+
+
+
 ## [9.0.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.8...9.0.0) (2024-02-23)
 
 **Note:** Version bump only for package timeline-state-resolver-packages

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "9.0.0",
+  "version": "9.0.1",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

packages/quick-tsr/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.0.1](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0...9.0.1) (2024-04-02)
+
+**Note:** Version bump only for package quick-tsr
+
+
+
+
+
 ## [9.0.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.8...9.0.0) (2024-02-23)
 
 **Note:** Version bump only for package quick-tsr

packages/quick-tsr/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "quick-tsr",
 	"private": true,
-	"version": "9.0.0",
+	"version": "9.0.1",
 	"description": "Read timeline from file, use TSR, play stuff",
 	"main": "dist/index.js",
 	"typings": "dist/index.d.ts",
@@ -63,7 +63,7 @@
 	"dependencies": {
 		"chokidar": "^3.5.3",
 		"fast-clone": "^1.5.13",
-		"timeline-state-resolver": "9.0.0",
+		"timeline-state-resolver": "9.0.1",
 		"tslib": "^2.5.1",
 		"underscore": "^1.13.6"
 	}

packages/timeline-state-resolver-types/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.0.1](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0...9.0.1) (2024-04-02)
+
+**Note:** Version bump only for package timeline-state-resolver-types
+
+
+
+
+
 ## [9.0.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.0-release50.8...9.0.0) (2024-02-23)
 
 **Note:** Version bump only for package timeline-state-resolver-types

packages/timeline-state-resolver-types/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "timeline-state-resolver-types",
-	"version": "9.0.0",
+	"version": "9.0.1",
 	"description": "Have timeline, control stuff",
 	"main": "dist/index.js",
 	"typings": "dist/index.d.ts",

packages/timeline-state-resolver-types/src/generated/vizMSE.ts

@@ -71,12 +71,20 @@ export interface VizMSEOptions {
 
 export type SomeMappingVizMSE = Record<string, never>
 
+export interface VizResetPayload {
+	/**
+	 * Optional property that helps track what rundown is active for optimisation reasons
+	 */
+	activeRundownPlaylistId?: string
+}
+
 export interface ActivatePayload {
 	activeRundownPlaylistId: string
 	clearAll?: boolean
 }
 
 export enum VizMSEActions {
+	VizReset = 'vizReset',
 	PurgeRundown = 'purgeRundown',
 	Activate = 'activate',
 	StandDown = 'standDown',

packages/timeline-state-resolver/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [9.0.1](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/9.0.0...9.0.1) (2024-04-02)
+
+
+### Bug Fixes
+
+* **vMix:** handling XML messages with multi-byte characters ([e811ef0](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/e811ef09f6118c69ea337e0b1eb969a663546bde))
+
+
+
 ## [9.0.0](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/9.0.0-release50.8...9.0.0) (2024-02-23)
 
 **Note:** Version bump only for package timeline-state-resolver

packages/timeline-state-resolver/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "timeline-state-resolver",
-	"version": "9.0.0",
+	"version": "9.0.1",
 	"description": "Have timeline, control stuff",
 	"main": "dist/index.js",
 	"typings": "dist/index.d.ts",
@@ -91,7 +91,7 @@
 		"@tv2media/v-connection": "^7.3.2",
 		"atem-connection": "2.5.0",
 		"atem-state": "0.13.0",
-		"casparcg-connection": "6.2.0",
+		"casparcg-connection": "6.2.1",
 		"casparcg-state": "3.0.3",
 		"debug": "^4.3.4",
 		"deepmerge": "^4.3.1",
@@ -108,7 +108,7 @@
 		"sprintf-js": "^1.1.2",
 		"superfly-timeline": "^8.3.1",
 		"threadedclass": "^1.2.1",
-		"timeline-state-resolver-types": "9.0.0",
+		"timeline-state-resolver-types": "9.0.1",
 		"tslib": "^2.5.1",
 		"tv-automation-quantel-gateway-client": "^3.1.7",
 		"underscore": "^1.13.6",

packages/timeline-state-resolver/src/__mocks__/net.ts

@@ -67,7 +67,7 @@ export class Socket extends EventEmitter {
 	public mockClose() {
 		this.setClosed()
 	}
-	public mockData(data: Buffer) {
+	public mockData(data: string) {
 		this.emit('data', data)
 	}
 

packages/timeline-state-resolver/src/integrations/vizMSE/$schemas/actions.json

@@ -1,6 +1,24 @@
 {
 	"$schema": "../../../$schemas/action-schema.json",
 	"actions": [
+		{
+			"id": "vizReset",
+			"name": "Reset",
+			"description": "Purges all rundowns, clears the engine and reactivates the Viz playlist",
+			"destructive": true,
+			"timeout": 10000,
+			"payload": {
+				"type": "object",
+				"properties": {
+					"activeRundownPlaylistId": {
+						"name": "Rundown playlist ID",
+						"description": "Optional property that helps track what rundown is active for optimisation reasons",
+						"type": "string"
+					}
+				},
+				"additionalProperties": false
+			}
+		},
 		{
 			"id": "purgeRundown",
 			"name": "Purge Viz Rundown",
@@ -15,8 +33,12 @@
 			"payload": {
 				"type": "object",
 				"properties": {
-					"activeRundownPlaylistId": { "type": "string" },
-					"clearAll": { "type": "boolean" }
+					"activeRundownPlaylistId": {
+						"type": "string"
+					},
+					"clearAll": {
+						"type": "boolean"
+					}
 				},
 				"required": ["activeRundownPlaylistId"],
 				"additionalProperties": false

packages/timeline-state-resolver/src/integrations/vizMSE/index.ts

@@ -20,6 +20,7 @@ import {
 	SomeMappingVizMSE,
 	TimelineContentVIZMSEElementPilot,
 	TimelineContentVIZMSEElementInternal,
+	VizResetPayload,
 } from 'timeline-state-resolver-types'
 
 import { createMSE, MSE } from '@tv2media/v-connection'
@@ -267,6 +268,15 @@ export class VizMSEDevice extends DeviceWithState<VizMSEState, DeviceOptionsVizM
 			commands: this._initOptions?.clearAllCommands || [],
 		})
 	}
+	public async resetViz(payload: VizResetPayload): Promise<void> {
+		await this.purgeRundown(true) // note - this might not be 100% necessary
+		await this.clearEngines()
+		await this._vizmseManager?.activate(payload?.activeRundownPlaylistId)
+
+		// lastly make sure we reset so timeline state is sent again
+		this.clearStates()
+		this.emit('resetResolver')
+	}
 
 	async executeAction(actionId: string, payload?: Record<string, any> | undefined): Promise<ActionExecutionResult> {
 		switch (actionId) {
@@ -280,6 +290,9 @@ export class VizMSEDevice extends DeviceWithState<VizMSEState, DeviceOptionsVizM
 			case VizMSEActions.ClearAllEngines:
 				await this.clearEngines()
 				return { result: ActionExecutionResultCode.Ok }
+			case VizMSEActions.VizReset:
+				await this.resetViz(payload ?? {})
+				return { result: ActionExecutionResultCode.Ok }
 			default:
 				return { result: ActionExecutionResultCode.Ok, response: t('Action "{{id}}" not found', { actionId }) }
 		}