Merge remote-tracking branch 'nrk/release52' into bbc-release52

Author: Mint de Wit

meteor/package.json

@@ -67,7 +67,7 @@
 		"object-path": "^0.11.8",
 		"p-lazy": "^3.1.0",
 		"semver": "^7.5.4",
-		"superfly-timeline": "9.0.1",
+		"superfly-timeline": "9.0.2",
 		"threadedclass": "^1.2.2",
 		"timecode": "0.0.4",
 		"type-fest": "^3.13.1",

meteor/yarn.lock

@@ -1211,7 +1211,7 @@ __metadata:
     node-fetch: ^2.7.0
     p-lazy: ^3.1.0
     p-timeout: ^4.1.0
-    superfly-timeline: 9.0.1
+    superfly-timeline: 9.0.2
     threadedclass: ^1.2.2
     tslib: ^2.6.2
     type-fest: ^3.13.1
@@ -2349,7 +2349,7 @@ __metadata:
     prettier: ^2.8.8
     semver: ^7.5.4
     standard-version: ^9.5.0
-    superfly-timeline: 9.0.1
+    superfly-timeline: 9.0.2
     threadedclass: ^1.2.2
     timecode: 0.0.4
     ts-jest: ^29.1.2
@@ -10026,12 +10026,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"superfly-timeline@npm:9.0.1":
-  version: 9.0.1
-  resolution: "superfly-timeline@npm:9.0.1"
+"superfly-timeline@npm:9.0.2":
+  version: 9.0.2
+  resolution: "superfly-timeline@npm:9.0.2"
   dependencies:
     tslib: ^2.6.0
-  checksum: 4267eed691fe9ce9f89bf17c8aed1a98206938dd6d850c64b083e4fd3a3dc5329801c76c757450c9520375bad100ce512cc6d6a3e4a997bdfa14a4e7d65f09f2
+  checksum: d628d467d5384f5667bc10b877478c5b8b0a91774b5d5c5e9d9d3134b8f1b760225f2fbbb0f9ccd3e55f930c9f3719f81b9347b94ea853fbc0a18bc121d97665
   languageName: node
   linkType: hard
 

packages/blueprints-integration/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
+## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
+## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
+## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
+## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
 # [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration

packages/blueprints-integration/src/context/adlibActionContext.ts

@@ -4,6 +4,7 @@ import type { IShowStyleUserContext } from './showStyleContext'
 import { IPartAndPieceActionContext } from './partsAndPieceActionContext'
 import { IExecuteTSRActionsContext } from './executeTsrActionContext'
 import { IBlueprintPart, IBlueprintPartInstance, IBlueprintPiece } from '..'
+import { IRouteSetMethods } from './routeSetContext'
 
 /** Actions */
 export interface IDataStoreMethods {
@@ -24,7 +25,8 @@ export interface IActionExecutionContext
 		IEventContext,
 		IDataStoreMethods,
 		IPartAndPieceActionContext,
-		IExecuteTSRActionsContext {
+		IExecuteTSRActionsContext,
+		IRouteSetMethods {
 	/** Fetch the showstyle config for the specified part */
 	// getNextShowStyleConfig(): Readonly<{ [key: string]: ConfigItemValue }>
 
@@ -38,8 +40,6 @@ export interface IActionExecutionContext
 	/** Insert a queued part to follow the current part */
 	queuePart(part: IBlueprintPart, pieces: IBlueprintPiece[]): Promise<IBlueprintPartInstance>
 
-	/** Switch RouteSet State*/
-	switchRouteSet(routeSetId: string, state: boolean | 'toggle'): Promise<void>
 	/** Misc actions */
 	// updateAction(newManifest: Pick<IBlueprintAdLibActionManifest, 'description' | 'payload'>): void // only updates itself. to allow for the next one to do something different
 	// executePeripheralDeviceAction(deviceId: string, functionName: string, args: any[]): Promise<any>

packages/blueprints-integration/src/context/routeSetContext.ts

@@ -0,0 +1,9 @@
+import { StudioRouteSet } from '@sofie-automation/shared-lib/dist/core/model/StudioRouteSet'
+
+export interface IRouteSetMethods {
+	/** Returns a list of the Routesets */
+	listRouteSets(): Promise<Record<string, StudioRouteSet>>
+
+	/** Switch RouteSet State */
+	switchRouteSet(routeSetId: string, state: boolean | 'toggle'): Promise<void>
+}

packages/job-worker/package.json

@@ -52,7 +52,7 @@
 		"node-fetch": "^2.7.0",
 		"p-lazy": "^3.1.0",
 		"p-timeout": "^4.1.0",
-		"superfly-timeline": "9.0.1",
+		"superfly-timeline": "9.0.2",
 		"threadedclass": "^1.2.2",
 		"tslib": "^2.6.2",
 		"type-fest": "^3.13.1",

packages/job-worker/src/blueprints/context/adlibActions.ts

@@ -13,6 +13,7 @@ import {
 	Time,
 	TSR,
 	IBlueprintPlayoutDevice,
+	StudioRouteSet,
 } from '@sofie-automation/blueprints-integration'
 import { PartInstanceId, PeripheralDeviceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ReadonlyDeep } from 'type-fest'
@@ -30,6 +31,7 @@ import { executePeripheralDeviceAction, listPlayoutDevices } from '../../periphe
 import { ActionPartChange, PartAndPieceInstanceActionService } from './services/PartAndPieceInstanceActionService'
 import { BlueprintQuickLookInfo } from '@sofie-automation/blueprints-integration/dist/context/quickLoopInfo'
 import { setNextPartFromPart } from '../../playout/setNext'
+import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 
 export class DatastoreActionExecutionContext
 	extends ShowStyleUserContext
@@ -198,6 +200,10 @@ export class ActionExecutionContext extends ShowStyleUserContext implements IAct
 		partInstance.blockTakeUntil(time)
 	}
 
+	async listRouteSets(): Promise<Record<string, StudioRouteSet>> {
+		return applyAndValidateOverrides(this._context.studio.routeSetsWithOverrides).obj
+	}
+
 	async switchRouteSet(routeSetId: string, state: boolean | 'toggle'): Promise<void> {
 		const affectsTimeline = this._playoutModel.switchRouteSet(routeSetId, state)
 		this.forceRegenerateTimeline = this.forceRegenerateTimeline || affectsTimeline

packages/job-worker/src/ingest/syncChangesToPartInstance.ts

@@ -30,6 +30,7 @@ import { validateAdlibTestingPartInstanceProperties } from '../playout/adlibTest
 import { ReadonlyDeep } from 'type-fest'
 import { convertIngestModelToPlayoutRundownWithSegments } from './commit'
 import { convertNoteToNotification } from '../notifications/util'
+import { PlayoutRundownModel } from '../playout/model/PlayoutRundownModel'
 
 type PlayStatus = 'previous' | 'current' | 'next'
 type SyncedInstance = {
@@ -130,12 +131,22 @@ export async function syncChangesToPartInstances(
 					pieceInstances: pieceInstancesInPart.map((p) => convertPieceInstanceToBlueprints(p.pieceInstance)),
 				}
 
+				const part = newPart ?? existingPartInstance.partInstance.part
+
+				let playoutRundownModelForPart: PlayoutRundownModel | undefined = playoutRundownModel
+				// Handle a case where the part is in a different rundown than the playoutRundownModel:
+				if (playoutRundownModel.rundown._id !== part.rundownId) {
+					playoutRundownModelForPart = playoutModel.getRundown(part.rundownId)
+				}
+				if (!playoutRundownModelForPart)
+					throw new Error(`Internal Error: playoutRundownModelForPart is undefined (it should never be)`)
+
 				const proposedPieceInstances = getPieceInstancesForPart(
 					context,
 					playoutModel,
 					previousPartInstance,
-					playoutRundownModel,
-					newPart ?? existingPartInstance.partInstance.part,
+					playoutRundownModelForPart,
+					part,
 					await piecesThatMayBeActive,
 					existingPartInstance.partInstance._id
 				)
@@ -207,6 +218,7 @@ export async function syncChangesToPartInstances(
 					})
 				}
 
+				// Make sure an adlib-testing part is still labeled correctly. This could happen if the partInstance used any recently updated adlibs
 				validateAdlibTestingPartInstanceProperties(context, playoutModel, existingPartInstance)
 
 				if (existingPartInstance.partInstance._id === playoutModel.playlist.currentPartInfo?.partInstanceId) {

packages/job-worker/src/playout/model/PlayoutPartInstanceModel.ts

@@ -173,6 +173,11 @@ export interface PlayoutPartInstanceModel {
 	 * @param time Reported stopped time
 	 */
 	setReportedStoppedPlayback(time: Time): boolean
+	/**
+	 * Set the Reported stopped playback time, including still-playing PieceInstances
+	 * @param time Reported stopped time on all available objects
+	 */
+	setReportedStoppedPlaybackWithPieceInstances(time: Time): boolean
 
 	/**
 	 * Set the rank of this PartInstance, to update it's position in the Segment

packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts

@@ -505,6 +505,11 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 	deactivatePlaylist(): void {
 		delete this.playlistImpl.activationId
 
+		if (this.currentPartInstance) {
+			this.currentPartInstance.setReportedStoppedPlaybackWithPieceInstances(getCurrentTime())
+			this.queuePartInstanceTimingEvent(this.currentPartInstance.partInstance._id)
+		}
+
 		this.clearSelectedPartInstances()
 		this.playlistImpl.quickLoop = this.quickLoopService.getUpdatedPropsByClearingMarkers()