Merge branch 'release51' into test/release51

nytamin · nytamin · commit 898d8ff8a0d2 · 2025-01-08T10:20:51.000+01:00
diff --git a/meteor/CHANGELOG.md b/meteor/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.51.5](///compare/v1.51.4...v1.51.5) (2025-01-07)
+
+
+### Bug Fixes
+
+* **job-worker/playout:** Hold mode doesn't work at all a7d6999
+
 ### [1.51.4](///compare/v1.51.3...v1.51.4) (2024-12-04)
 
 
diff --git a/meteor/package.json b/meteor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "automation-core",
-	"version": "1.51.4",
+	"version": "1.51.5",
 	"private": true,
 	"engines": {
 		"node": ">=14.19.1"
diff --git a/meteor/yarn.lock b/meteor/yarn.lock
@@ -1321,7 +1321,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@sofie-automation/blueprints-integration@portal:../packages/blueprints-integration::locator=automation-core%40workspace%3A."
   dependencies:
-    "@sofie-automation/shared-lib": 1.51.4
+    "@sofie-automation/shared-lib": 1.51.5
     tslib: ^2.6.2
     type-fest: ^3.13.1
   languageName: node
@@ -1362,8 +1362,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@sofie-automation/corelib@portal:../packages/corelib::locator=automation-core%40workspace%3A."
   dependencies:
-    "@sofie-automation/blueprints-integration": 1.51.4
-    "@sofie-automation/shared-lib": 1.51.4
+    "@sofie-automation/blueprints-integration": 1.51.5
+    "@sofie-automation/shared-lib": 1.51.5
     fast-clone: ^1.5.13
     i18next: ^21.10.0
     influx: ^5.9.3
@@ -1394,9 +1394,9 @@ __metadata:
   resolution: "@sofie-automation/job-worker@portal:../packages/job-worker::locator=automation-core%40workspace%3A."
   dependencies:
     "@slack/webhook": ^6.1.0
-    "@sofie-automation/blueprints-integration": 1.51.4
-    "@sofie-automation/corelib": 1.51.4
-    "@sofie-automation/shared-lib": 1.51.4
+    "@sofie-automation/blueprints-integration": 1.51.5
+    "@sofie-automation/corelib": 1.51.5
+    "@sofie-automation/shared-lib": 1.51.5
     amqplib: ^0.10.3
     deepmerge: ^4.3.1
     elastic-apm-node: ^3.51.0
diff --git a/packages/blueprints-integration/CHANGELOG.md b/packages/blueprints-integration/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.
 
+## [1.51.5](https://github.com/nrkno/sofie-core/compare/v1.51.4...v1.51.5) (2025-01-07)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
 ## [1.51.4](https://github.com/nrkno/sofie-core/compare/v1.51.3...v1.51.4) (2024-12-04)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
diff --git a/packages/blueprints-integration/package.json b/packages/blueprints-integration/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sofie-automation/blueprints-integration",
-	"version": "1.51.4",
+	"version": "1.51.5",
 	"description": "Library to define the interaction between core and the blueprints.",
 	"main": "dist/index.js",
 	"typings": "dist/index.d.ts",
@@ -38,7 +38,7 @@
 		"/LICENSE"
 	],
 	"dependencies": {
-		"@sofie-automation/shared-lib": "1.51.4",
+		"@sofie-automation/shared-lib": "1.51.5",
 		"tslib": "^2.6.2",
 		"type-fest": "^3.13.1"
 	},
diff --git a/packages/corelib/package.json b/packages/corelib/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sofie-automation/corelib",
-	"version": "1.51.4",
+	"version": "1.51.5",
 	"private": true,
 	"description": "Internal library for some types shared by core and workers",
 	"main": "dist/index.js",
@@ -39,8 +39,8 @@
 		"/LICENSE"
 	],
 	"dependencies": {
-		"@sofie-automation/blueprints-integration": "1.51.4",
-		"@sofie-automation/shared-lib": "1.51.4",
+		"@sofie-automation/blueprints-integration": "1.51.5",
+		"@sofie-automation/shared-lib": "1.51.5",
 		"fast-clone": "^1.5.13",
 		"i18next": "^21.10.0",
 		"influx": "^5.9.3",
diff --git a/packages/documentation/package.json b/packages/documentation/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "sofie-documentation",
-	"version": "1.51.4",
+	"version": "1.51.5",
 	"private": true,
 	"scripts": {
 		"docusaurus": "docusaurus",
diff --git a/packages/job-worker/package.json b/packages/job-worker/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sofie-automation/job-worker",
-	"version": "1.51.4",
+	"version": "1.51.5",
 	"description": "Worker for things",
 	"main": "dist/index.js",
 	"license": "MIT",
@@ -41,9 +41,9 @@
 	],
 	"dependencies": {
 		"@slack/webhook": "^6.1.0",
-		"@sofie-automation/blueprints-integration": "1.51.4",
-		"@sofie-automation/corelib": "1.51.4",
-		"@sofie-automation/shared-lib": "1.51.4",
+		"@sofie-automation/blueprints-integration": "1.51.5",
+		"@sofie-automation/corelib": "1.51.5",
+		"@sofie-automation/shared-lib": "1.51.5",
 		"amqplib": "^0.10.3",
 		"deepmerge": "^4.3.1",
 		"elastic-apm-node": "^3.51.0",
diff --git a/packages/job-worker/src/playout/model/PlayoutModel.ts b/packages/job-worker/src/playout/model/PlayoutModel.ts
@@ -234,6 +234,11 @@ export interface PlayoutModel extends PlayoutModelReadonly, StudioPlayoutModelBa
 	 */
 	cycleSelectedPartInstances(): void
 
+	/**
+	 * Reset the hold state to a base state
+	 */
+	resetHoldState(): void
+
 	/**
 	 * Set the RundownPlaylist as deactivated
 	 */
diff --git a/packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts b/packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts
@@ -420,15 +420,13 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 		this.playlistImpl.nextPartInfo = null
 		this.playlistImpl.lastTakeTime = getCurrentTime()
 
-		if (!this.playlistImpl.holdState || this.playlistImpl.holdState === RundownHoldState.COMPLETE) {
-			this.playlistImpl.holdState = RundownHoldState.NONE
-		} else {
-			this.playlistImpl.holdState = this.playlistImpl.holdState + 1
-		}
-
 		this.#playlistHasChanged = true
 	}
 
+	resetHoldState(): void {
+		this.setHoldState(RundownHoldState.NONE)
+	}
+
 	deactivatePlaylist(): void {
 		delete this.playlistImpl.activationId
 
diff --git a/packages/job-worker/src/playout/take.ts b/packages/job-worker/src/playout/take.ts
@@ -178,20 +178,23 @@ export async function performTakeToNextedPart(
 		}
 	}
 
+	// If hold is COMPLETE, clear the hold state by this take
 	if (playoutModel.playlist.holdState === RundownHoldState.COMPLETE) {
 		playoutModel.setHoldState(RundownHoldState.NONE)
 
-		// If hold is active, then this take is to clear it
+		// If hold is ACTIVE, then this take is to complete it
 	} else if (playoutModel.playlist.holdState === RundownHoldState.ACTIVE) {
 		await completeHold(context, playoutModel, await pShowStyle, currentPartInstance)
 
+		await updateTimeline(context, playoutModel)
+
 		if (span) span.end()
 
 		return
 	}
 
 	const takePartInstance = nextPartInstance
-	if (!takePartInstance) throw new Error('takePart not found!')
+	if (!takePartInstance) throw new Error('takePartInstance not found!')
 	const takeRundown = playoutModel.getRundown(takePartInstance.partInstance.rundownId)
 	if (!takeRundown)
 		throw new Error(`takeRundown: takeRundown not found! ("${takePartInstance.partInstance.rundownId}")`)
@@ -263,12 +266,10 @@ export async function performTakeToNextedPart(
 	// Once everything is synced, we can choose the next part
 	await setNextPart(context, playoutModel, nextPart, false)
 
-	// Setup the parts for the HOLD we are starting
-	if (
-		playoutModel.playlist.previousPartInfo &&
-		(playoutModel.playlist.holdState as RundownHoldState) === RundownHoldState.ACTIVE
-	) {
-		startHold(context, currentPartInstance, nextPartInstance)
+	// If the Hold is PENDING, make it active
+	if (playoutModel.playlist.holdState === RundownHoldState.PENDING) {
+		// Setup the parts for the HOLD we are starting
+		activateHold(context, playoutModel, currentPartInstance, takePartInstance)
 	}
 	await afterTake(context, playoutModel, takePartInstance)
 
@@ -535,35 +536,39 @@ export async function afterTake(
 /**
  * A Hold starts by extending the "extendOnHold"-able pieces in the previous Part.
  */
-function startHold(
+function activateHold(
 	context: JobContext,
+	playoutModel: PlayoutModel,
 	holdFromPartInstance: PlayoutPartInstanceModel | null,
 	holdToPartInstance: PlayoutPartInstanceModel | undefined
 ) {
 	if (!holdFromPartInstance) throw new Error('previousPart not found!')
 	if (!holdToPartInstance) throw new Error('currentPart not found!')
-	const span = context.startSpan('startHold')
+	const span = context.startSpan('activateHold')
+
+	playoutModel.setHoldState(RundownHoldState.ACTIVE)
 
 	// Make a copy of any item which is flagged as an 'infinite' extension
 	const pieceInstancesToCopy = holdFromPartInstance.pieceInstances.filter((p) => !!p.pieceInstance.piece.extendOnHold)
-	pieceInstancesToCopy.forEach((instance) => {
-		if (!instance.pieceInstance.infinite) {
-			// mark current one as infinite
-			instance.prepareForHold()
-
-			// This gets deleted once the nextpart is activated, so it doesnt linger for long
-			const extendedPieceInstance = holdToPartInstance.insertHoldPieceInstance(instance)
-
-			const content = clone(instance.pieceInstance.piece.content) as VTContent | undefined
-			if (content?.fileName && content.sourceDuration && instance.pieceInstance.plannedStartedPlayback) {
-				content.seek = Math.min(
-					content.sourceDuration,
-					getCurrentTime() - instance.pieceInstance.plannedStartedPlayback
-				)
-			}
-			extendedPieceInstance.updatePieceProps({ content })
+	for (const instance of pieceInstancesToCopy) {
+		// skip any infinites
+		if (instance.pieceInstance.infinite) continue
+
+		instance.prepareForHold()
+
+		// This gets deleted once the nextpart is activated, so it doesnt linger for long
+		const extendedPieceInstance = holdToPartInstance.insertHoldPieceInstance(instance)
+
+		const content = clone(instance.pieceInstance.piece.content) as VTContent | undefined
+		if (content?.fileName && content.sourceDuration && instance.pieceInstance.plannedStartedPlayback) {
+			content.seek = Math.min(
+				content.sourceDuration,
+				getCurrentTime() - instance.pieceInstance.plannedStartedPlayback
+			)
 		}
-	})
+		extendedPieceInstance.updatePieceProps({ content })
+	}
+
 	if (span) span.end()
 }
 
@@ -575,19 +580,16 @@ async function completeHold(
 ): Promise<void> {
 	playoutModel.setHoldState(RundownHoldState.COMPLETE)
 
-	if (playoutModel.playlist.currentPartInfo) {
-		if (!currentPartInstance) throw new Error('currentPart not found!')
+	if (!playoutModel.playlist.currentPartInfo) return
+	if (!currentPartInstance) throw new Error('currentPart not found!')
 
-		// Clear the current extension line
-		innerStopPieces(
-			context,
-			playoutModel,
-			showStyleCompound.sourceLayers,
-			currentPartInstance,
-			(p) => !!p.infinite?.fromHold,
-			undefined
-		)
-	}
-
-	await updateTimeline(context, playoutModel)
+	// Clear the current extension line
+	innerStopPieces(
+		context,
+		playoutModel,
+		showStyleCompound.sourceLayers,
+		currentPartInstance,
+		(p) => !!p.infinite?.fromHold,
+		undefined
+	)
 }
diff --git a/packages/job-worker/src/playout/timings/partPlayback.ts b/packages/job-worker/src/playout/timings/partPlayback.ts
@@ -58,6 +58,7 @@ export async function onPartPlaybackStarted(
 			// this is the next part, clearly an autoNext has taken place
 
 			playoutModel.cycleSelectedPartInstances()
+			playoutModel.resetHoldState()
 
 			reportPartInstanceHasStarted(context, playoutModel, playingPartInstance, data.startedPlayback)
 
diff --git a/packages/lerna.json b/packages/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.51.4",
+  "version": "1.51.5",
   "npmClient": "yarn",
   "useWorkspaces": true
 }
diff --git a/packages/live-status-gateway/package.json b/packages/live-status-gateway/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "live-status-gateway",
-	"version": "1.51.4",
+	"version": "1.51.5",
 	"private": true,
 	"description": "Provides state from Sofie over sockets",
 	"license": "MIT",
@@ -53,10 +53,10 @@
 		"production"
 	],
 	"dependencies": {
-		"@sofie-automation/blueprints-integration": "1.51.4",
-		"@sofie-automation/corelib": "1.51.4",
-		"@sofie-automation/server-core-integration": "1.51.4",
-		"@sofie-automation/shared-lib": "1.51.4",
+		"@sofie-automation/blueprints-integration": "1.51.5",
+		"@sofie-automation/corelib": "1.51.5",
+		"@sofie-automation/server-core-integration": "1.51.5",
+		"@sofie-automation/shared-lib": "1.51.5",
 		"debug": "^4.3.4",
 		"fast-clone": "^1.5.13",
 		"influx": "^5.9.3",
diff --git a/packages/mos-gateway/CHANGELOG.md b/packages/mos-gateway/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.
 
+## [1.51.5](https://github.com/nrkno/sofie-core/compare/v1.51.4...v1.51.5) (2025-01-07)
+
+**Note:** Version bump only for package mos-gateway
+
+
+
+
+
 ## [1.51.4](https://github.com/nrkno/sofie-core/compare/v1.51.3...v1.51.4) (2024-12-04)
 
 **Note:** Version bump only for package mos-gateway
diff --git a/packages/mos-gateway/package.json b/packages/mos-gateway/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "mos-gateway",
-	"version": "1.51.4",
+	"version": "1.51.5",
 	"private": true,
 	"description": "MOS-Gateway for the Sofie project",
 	"license": "MIT",
@@ -66,8 +66,8 @@
 	],
 	"dependencies": {
 		"@mos-connection/connector": "4.1.1",
-		"@sofie-automation/server-core-integration": "1.51.4",
-		"@sofie-automation/shared-lib": "1.51.4",
+		"@sofie-automation/server-core-integration": "1.51.5",
+		"@sofie-automation/shared-lib": "1.51.5",
 		"tslib": "^2.6.2",
 		"type-fest": "^3.13.1",
 		"underscore": "^1.13.6",
diff --git a/packages/openapi/package.json b/packages/openapi/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@sofie-automation/openapi",
-	"version": "1.51.4",
+	"version": "1.51.5",
 	"license": "MIT",
 	"repository": {
 		"type": "git",
diff --git a/packages/package.json b/packages/package.json
@@ -65,4 +65,4 @@
 	},
 	"name": "packages",
 	"packageManager": "yarn@3.5.0"
-}
+}
diff --git a/packages/playout-gateway/CHANGELOG.md b/packages/playout-gateway/CHANGELOG.md
diff --git a/packages/playout-gateway/package.json b/packages/playout-gateway/package.json
diff --git a/packages/server-core-integration/CHANGELOG.md b/packages/server-core-integration/CHANGELOG.md
diff --git a/packages/server-core-integration/package.json b/packages/server-core-integration/package.json
diff --git a/packages/shared-lib/package.json b/packages/shared-lib/package.json
diff --git a/packages/yarn.lock b/packages/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "automation-core",`
`3`		`- "version": "1.51.4",`
	`3`	`+ "version": "1.51.5",`
`4`	`4`	`"private": true,`
`5`	`5`	`"engines": {`
`6`	`6`	`"node": ">=14.19.1"`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "sofie-documentation",`
`3`		`- "version": "1.51.4",`
	`3`	`+ "version": "1.51.5",`
`4`	`4`	`"private": true,`
`5`	`5`	`"scripts": {`
`6`	`6`	`"docusaurus": "docusaurus",`