Merge branch 'bbc-release53' into upstream release53

Author: olzzon

.github/workflows/node.yaml

@@ -502,16 +502,19 @@ jobs:
           - node-version: 22.x
             package-name: job-worker
             send-coverage: true
-          # No tests for the gateways yet
+          # No tests for some gateways yet
           # - node-version: 22.x
           #   package-name: playout-gateway
-          # - node-version: 22.x
-          #   package-name: mos-gateway
+          #   send-coverage: true
+          - node-version: 22.x
+            package-name: mos-gateway
+            send-coverage: true
           - node-version: 22.x
             package-name: live-status-gateway
             send-coverage: true
           - node-version: 22.x
             package-name: webui
+            send-coverage: true
           # manual meteor-lib as it only needs a couple of versions
           - node-version: 22.x
             package-name: meteor-lib

meteor/__mocks__/helpers/database.ts

@@ -476,6 +476,7 @@ export async function setupMockShowStyleBlueprint(
 						rundown,
 						globalAdLibPieces: [],
 						globalActions: [],
+						globalPieces: [],
 						baseline: { timelineObjects: [] },
 					}
 				},

meteor/server/api/deviceTriggers/TagsService.ts

@@ -4,12 +4,14 @@ import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceIns
 import { PieceInstanceFields, ContentCache } from './reactiveContentCacheForPieceInstances'
 import { SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import {
+	createPartCurrentTimes,
 	PieceInstanceWithTimings,
 	processAndPrunePieceInstanceTimings,
 } from '@sofie-automation/corelib/dist/playout/processAndPrune'
 import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
 import { IWrappedAdLib } from '@sofie-automation/meteor-lib/dist/triggers/actionFilterChainCompilers'
 import { areSetsEqual, doSetsIntersect } from '@sofie-automation/corelib/dist/lib'
+import { getCurrentTime } from '../../lib/lib'
 
 export class TagsService {
 	protected onAirPiecesTags: Set<string> = new Set()
@@ -130,12 +132,11 @@ export class TagsService {
 	): PieceInstanceWithTimings[] {
 		// Approximate when 'now' is in the PartInstance, so that any adlibbed Pieces will be timed roughly correctly
 		const partStarted = partInstanceTimings?.plannedStartedPlayback
-		const nowInPart = partStarted === undefined ? 0 : Date.now() - partStarted
 
 		return processAndPrunePieceInstanceTimings(
 			sourceLayers,
 			pieceInstances as PieceInstance[],
-			nowInPart,
+			createPartCurrentTimes(getCurrentTime(), partStarted),
 			false,
 			false
 		)

meteor/server/api/ingest/packageInfo.ts

@@ -35,6 +35,7 @@ export async function onUpdatedPackageInfo(packageId: ExpectedPackageId, _doc: P
 			case ExpectedPackageDBType.ADLIB_ACTION:
 			case ExpectedPackageDBType.BASELINE_ADLIB_PIECE:
 			case ExpectedPackageDBType.BASELINE_ADLIB_ACTION:
+			case ExpectedPackageDBType.BASELINE_PIECE:
 			case ExpectedPackageDBType.RUNDOWN_BASELINE_OBJECTS:
 				onUpdatedPackageInfoForRundownDebounce(pkg)
 				break

meteor/server/api/rest/v1/typeConversion.ts

@@ -395,6 +395,7 @@ export function studioSettingsFrom(apiStudioSettings: APIStudioSettings): Comple
 		enableBuckets: apiStudioSettings.enableBuckets ?? true, // Backwards compatible
 		enableEvaluationForm: apiStudioSettings.enableEvaluationForm ?? true, // Backwards compatible
 		mockPieceContentStatus: apiStudioSettings.mockPieceContentStatus,
+		rundownGlobalPiecesPrepareTime: apiStudioSettings.rundownGlobalPiecesPrepareTime,
 	}
 }
 
@@ -421,6 +422,7 @@ export function APIStudioSettingsFrom(settings: IStudioSettings): Complete<APISt
 		enableBuckets: settings.enableBuckets,
 		enableEvaluationForm: settings.enableEvaluationForm,
 		mockPieceContentStatus: settings.mockPieceContentStatus,
+		rundownGlobalPiecesPrepareTime: settings.rundownGlobalPiecesPrepareTime,
 	}
 }
 

meteor/server/collections/collection.ts

@@ -234,7 +234,8 @@ export interface AsyncOnlyReadOnlyMongoCollection<DBInterface extends { _id: Pro
 	observeChanges(
 		selector: MongoQuery<DBInterface> | DBInterface['_id'],
 		callbacks: PromisifyCallbacks<ObserveChangesCallbacks<DBInterface>>,
-		options?: Omit<FindOptions<DBInterface>, 'fields'>
+		findOptions?: Omit<FindOptions<DBInterface>, 'fields'>,
+		callbackOptions?: { nonMutatingCallbacks?: boolean | undefined }
 	): Promise<Meteor.LiveQueryHandle>
 
 	/**

meteor/server/collections/implementations/asyncCollection.ts

@@ -141,7 +141,8 @@ export class WrappedAsyncMongoCollection<DBInterface extends { _id: ProtectedStr
 	async observeChanges(
 		selector: MongoQuery<DBInterface> | DBInterface['_id'],
 		callbacks: PromisifyCallbacks<ObserveChangesCallbacks<DBInterface>>,
-		options?: FindOptions<DBInterface>
+		findOptions?: FindOptions<DBInterface>,
+		callbackOptions?: { nonMutatingCallbacks?: boolean | undefined }
 	): Promise<Meteor.LiveQueryHandle> {
 		const span = profiler.startSpan(`MongoCollection.${this.name}.observeChanges`)
 		if (span) {
@@ -152,8 +153,8 @@ export class WrappedAsyncMongoCollection<DBInterface extends { _id: ProtectedStr
 		}
 		try {
 			const res = await this._collection
-				.find((selector ?? {}) as any, options as any)
-				.observeChangesAsync(callbacks)
+				.find((selector ?? {}) as any, findOptions as any)
+				.observeChangesAsync(callbacks, callbackOptions)
 			if (span) span.end()
 			return res
 		} catch (e) {

meteor/server/collections/index.ts

@@ -59,6 +59,7 @@ export const CoreSystem = createAsyncOnlyMongoCollection<ICoreSystem>(Collection
 			'logo',
 			'blueprintId',
 			'settingsWithOverrides',
+			'enableMonitorBlockedThread',
 		])
 	},
 })

meteor/server/lib/rest/v1/studios.ts

@@ -223,4 +223,5 @@ export interface APIStudioSettings {
 	enableBuckets?: boolean
 	enableEvaluationForm?: boolean
 	mockPieceContentStatus?: boolean
+	rundownGlobalPiecesPrepareTime?: number
 }

meteor/server/migration/1_50_0.ts

@@ -926,7 +926,7 @@ export const addSteps = addMigrationSteps('1.50.0', [
 				PartId
 			>()
 			for (const piece of pieces) {
-				partIdLookup.set(piece._id, piece.startPartId)
+				if (piece.startPartId) partIdLookup.set(piece._id, piece.startPartId)
 			}
 			for (const adlib of adlibPieces) {
 				if (adlib.partId) partIdLookup.set(adlib._id, adlib.partId)