Merge remote-tracking branch 'upstream/release53' into upstream/fix-autoscroll-detaches-onair-line

Author: olzzon

.github/actions/setup-meteor/action.yaml

@@ -3,5 +3,5 @@ description: "Setup Meteor"
 runs:
   using: "composite"
   steps:
-    - run: curl "https://install.meteor.com/?release=3.1" | sh
+    - run: curl "https://install.meteor.com/?release=3.1.2" | sh
       shell: bash

.node-version

@@ -1 +1 @@
-22.11
+22.13.1

meteor/.meteor/packages

@@ -8,14 +8,14 @@
 
 # but you can also edit it by hand.
 
-meteor@2.0.1
-[email protected].3
+meteor@2.1.0
+[email protected].5
 [email protected]
 
-mongo@2.0.2 # The database Meteor supports right now
+mongo@2.1.0 # The database Meteor supports right now
 
-[email protected].9 # Enable ECMAScript2015+ syntax in app code
-typescript@5.4.3 # Enable TypeScript syntax in .ts and .tsx modules
+[email protected].10 # Enable ECMAScript2015+ syntax in app code
+typescript@5.6.3 # Enable TypeScript syntax in .ts and .tsx modules
 
 [email protected] # Meteor's client-side reactive programming library
 

meteor/.meteor/release

@@ -1 +1 @@
-[email protected]
+[email protected].2

meteor/.meteor/versions

@@ -1,5 +1,5 @@
-allow-deny@2.0.0
-[email protected].2
+allow-deny@2.1.0
+[email protected].3
 [email protected]
 [email protected]
 [email protected]
@@ -8,9 +8,9 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-ddp-client@3.0.3
+ddp-client@3.1.0
 [email protected]
-ddp-server@3.0.3
+ddp-server@3.1.0
 [email protected]
 [email protected]
 [email protected]
@@ -24,26 +24,26 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-meteor@2.0.2
+meteor@2.1.0
 [email protected]
-modern-browsers@0.1.11
+modern-browsers@0.2.0
 [email protected]
 [email protected]
-mongo@2.0.3
+mongo@2.1.0
 [email protected]
 [email protected]
 [email protected]
-[email protected].0
+[email protected].2
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 [email protected]
-socket-stream-client@0.5.3
+socket-stream-client@0.6.0
 [email protected]
 [email protected]
-[email protected].4
+[email protected].5
 [email protected]
 zodern:[email protected]

meteor/Dockerfile

@@ -15,7 +15,7 @@ RUN yarn install && yarn build
 
 # BUILD IMAGE
 FROM node:22
-RUN curl "https://install.meteor.com/?release=3.1" | sh
+RUN curl "https://install.meteor.com/?release=3.1.2" | sh
 
 # Temporary change the NODE_ENV env variable, so that all libraries are installed:
 ENV NODE_ENV_TMP $NODE_ENV
@@ -30,6 +30,8 @@ COPY meteor /opt/core/meteor
 COPY scripts /opt/core/scripts
 WORKDIR /opt/core/meteor
 
+# remove the dev only assets from the webui output
+RUN rm -Rf /opt/core/packages/webui/dist/dev
 # move the webui to the correct place
 RUN rm -Rf /opt/core/meteor/public
 RUN cp -R /opt/core/packages/webui/dist /opt/core/meteor/public

meteor/package.json

@@ -3,7 +3,7 @@
 	"version": "1.53.0-in-development",
 	"private": true,
 	"engines": {
-		"node": ">=22.11"
+		"node": ">=22.13.1"
 	},
 	"scripts": {
 		"preinstall": "node -v",

meteor/server/api/__tests__/cleanup.test.ts

@@ -410,6 +410,7 @@ async function setDefaultDatatoDB(env: DefaultEnvironment, now: number) {
 		generationVersions: {} as any,
 		timelineBlob: '' as any,
 		timelineHash: '' as any,
+		regenerateTimelineToken: undefined,
 	})
 	await TimelineDatastore.mutableCollection.insertAsync({
 		_id: getRandomId(),

meteor/server/api/deviceTriggers/PieceInstancesObserver.ts

@@ -0,0 +1,99 @@
+import { Meteor } from 'meteor/meteor'
+import { RundownPlaylistActivationId, ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { RundownPlaylists, ShowStyleBases, PieceInstances, PartInstances } from '../../collections'
+import { logger } from '../../logging'
+import { rundownPlaylistFieldSpecifier } from './reactiveContentCache'
+import {
+	ContentCache,
+	createReactiveContentCache,
+	partInstanceFieldSpecifier,
+	pieceInstanceFieldSpecifier,
+} from './reactiveContentCacheForPieceInstances'
+import { waitForAllObserversReady } from '../../publications/lib/lib'
+
+const REACTIVITY_DEBOUNCE = 20
+
+type ChangedHandler = (cache: ContentCache) => () => void
+
+export class PieceInstancesObserver {
+	#observers: Meteor.LiveQueryHandle[] = []
+	#cache: ContentCache
+	#cancelCache: () => void
+	#cleanup: (() => void) | undefined
+	#disposed = false
+
+	constructor(onChanged: ChangedHandler) {
+		const { cache, cancel: cancelCache } = createReactiveContentCache(() => {
+			this.#cleanup = onChanged(cache)
+			if (this.#disposed) this.#cleanup()
+		}, REACTIVITY_DEBOUNCE)
+
+		this.#cache = cache
+		this.#cancelCache = cancelCache
+	}
+
+	static async create(
+		activationId: RundownPlaylistActivationId,
+		showStyleBaseId: ShowStyleBaseId,
+		onChanged: ChangedHandler
+	): Promise<PieceInstancesObserver> {
+		logger.silly(`Creating PieceInstancesObserver for activationId "${activationId}"`)
+
+		const observer = new PieceInstancesObserver(onChanged)
+
+		await observer.initObservers(activationId, showStyleBaseId)
+
+		return observer
+	}
+
+	private async initObservers(activationId: RundownPlaylistActivationId, showStyleBaseId: ShowStyleBaseId) {
+		this.#observers = await waitForAllObserversReady([
+			RundownPlaylists.observeChanges(
+				{
+					activationId,
+				},
+				this.#cache.RundownPlaylists.link(),
+				{
+					projection: rundownPlaylistFieldSpecifier,
+				}
+			),
+			ShowStyleBases.observeChanges(showStyleBaseId, this.#cache.ShowStyleBases.link()),
+			PieceInstances.observeChanges(
+				{
+					playlistActivationId: activationId,
+					reset: { $ne: true },
+					disabled: { $ne: true },
+					reportedStoppedPlayback: { $exists: false },
+					'piece.virtual': { $ne: true },
+				},
+				this.#cache.PieceInstances.link(),
+				{
+					projection: pieceInstanceFieldSpecifier,
+				}
+			),
+			PartInstances.observeChanges(
+				{
+					playlistActivationId: activationId,
+					reset: { $ne: true },
+					'timings.reportedStoppedPlayback': { $ne: true },
+				},
+				this.#cache.PartInstances.link(),
+				{
+					projection: partInstanceFieldSpecifier,
+				}
+			),
+		])
+	}
+
+	public get cache(): ContentCache {
+		return this.#cache
+	}
+
+	public stop = (): void => {
+		this.#disposed = true
+		this.#cancelCache()
+		this.#observers.forEach((observer) => observer.stop())
+		this.#cleanup?.()
+		this.#cleanup = undefined
+	}
+}

meteor/server/api/deviceTriggers/StudioDeviceTriggerManager.ts

@@ -25,16 +25,20 @@ import { protectString } from '../../lib/tempLib'
 import { StudioActionManager, StudioActionManagers } from './StudioActionManagers'
 import { DeviceTriggerMountedActionAdlibsPreview, DeviceTriggerMountedActions } from './observer'
 import { ContentCache } from './reactiveContentCache'
+import { ContentCache as PieceInstancesContentCache } from './reactiveContentCacheForPieceInstances'
 import { logger } from '../../logging'
 import { SomeAction, SomeBlueprintTrigger } from '@sofie-automation/blueprints-integration'
 import { DeviceActions } from '@sofie-automation/shared-lib/dist/core/model/ShowStyle'
 import { DummyReactiveVar } from '@sofie-automation/meteor-lib/dist/triggers/reactive-var'
 import { MeteorTriggersContext } from './triggersContext'
+import { TagsService } from './TagsService'
 
 export class StudioDeviceTriggerManager {
 	#lastShowStyleBaseId: ShowStyleBaseId | null = null
 
-	constructor(public studioId: StudioId) {
+	lastCache: ContentCache | undefined
+
+	constructor(public studioId: StudioId, protected tagsService: TagsService) {
 		if (StudioActionManagers.get(studioId)) {
 			logger.error(`A StudioActionManager for "${studioId}" already exists`)
 			return
@@ -45,6 +49,7 @@ export class StudioDeviceTriggerManager {
 
 	async updateTriggers(cache: ContentCache, showStyleBaseId: ShowStyleBaseId): Promise<void> {
 		const studioId = this.studioId
+		this.lastCache = cache
 		this.#lastShowStyleBaseId = showStyleBaseId
 
 		const [showStyleBase, rundownPlaylist] = await Promise.all([
@@ -79,6 +84,8 @@ export class StudioDeviceTriggerManager {
 		const upsertedDeviceTriggerMountedActionIds: DeviceTriggerMountedActionId[] = []
 		const touchedActionIds: DeviceActionId[] = []
 
+		this.tagsService.clearObservedTags()
+
 		for (const rawTriggeredAction of allTriggeredActions) {
 			const triggeredAction = convertDocument(rawTriggeredAction)
 
@@ -163,6 +170,8 @@ export class StudioDeviceTriggerManager {
 								sourceLayerType: undefined,
 								sourceLayerName: undefined,
 								styleClassNames: triggeredAction.styleClassNames,
+								isActive: undefined,
+								isNext: undefined,
 							}),
 						})
 					} else {
@@ -174,6 +183,9 @@ export class StudioDeviceTriggerManager {
 							)
 
 							addedPreviewIds.push(adLibPreviewId)
+
+							this.tagsService.observeTallyTags(adLib)
+							const { isActive, isNext } = this.tagsService.getTallyStateFromTags(adLib)
 							return DeviceTriggerMountedActionAdlibsPreview.upsertAsync(adLibPreviewId, {
 								$set: literal<PreviewWrappedAdLib>({
 									...adLib,
@@ -192,6 +204,8 @@ export class StudioDeviceTriggerManager {
 										  }
 										: undefined,
 									styleClassNames: triggeredAction.styleClassNames,
+									isActive,
+									isNext,
 								}),
 							})
 						})
@@ -224,6 +238,18 @@ export class StudioDeviceTriggerManager {
 		actionManager.deleteActionsOtherThan(touchedActionIds)
 	}
 
+	protected async updateTriggersFromLastCache(): Promise<void> {
+		if (!this.lastCache || !this.#lastShowStyleBaseId) return
+		return this.updateTriggers(this.lastCache, this.#lastShowStyleBaseId)
+	}
+
+	async updatePieceInstances(cache: PieceInstancesContentCache, showStyleBaseId: ShowStyleBaseId): Promise<void> {
+		const shouldUpdateTriggers = this.tagsService.updatePieceInstances(cache, showStyleBaseId)
+		if (shouldUpdateTriggers) {
+			await this.updateTriggersFromLastCache()
+		}
+	}
+
 	async clearTriggers(): Promise<void> {
 		const studioId = this.studioId
 		const showStyleBaseId = this.#lastShowStyleBaseId