wip: some statuses are piped through now

Author: Julusian

meteor/server/publications/ingestStatus/publication.ts

@@ -43,7 +43,7 @@ async function setupIngestRundownStatusPublicationObservers(
 	triggerUpdate: TriggerUpdate<IngestRundownStatusUpdateProps>
 ): Promise<SetupObserversResult> {
 	const rundownsObserver = await RundownsObserver.createForPeripheralDevice(args.deviceId, async (rundownIds) => {
-		logger.silly(`Creating new RundownContentObserver`)
+		logger.silly(`Creating new RundownContentObserver`, rundownIds)
 
 		// TODO - can this be done cheaper?
 		const cache = createReactiveContentCache(rundownIds)
@@ -181,10 +181,19 @@ function regenerateForRundown(cache: ReadonlyDeep<ContentCache>, rundownId: Rund
 		_id: rundownId,
 		externalId: rundown.externalId,
 
+		active: 'inactive',
+
 		segments: [],
 	}
 
-	const playlist = cache.Playlists.findOne(rundown.playlistId)
+	const playlist = cache.Playlists.findOne({
+		_id: rundown.playlistId,
+		activationId: { $exists: true },
+	})
+
+	if (playlist) {
+		newDoc.active = playlist.rehearsal ? 'rehearsal' : 'active'
+	}
 
 	const nrcsSegments = cache.NrcsIngestData.find({ rundownId, type: NrcsIngestCacheType.SEGMENT }).fetch()
 	for (const nrcsSegment of nrcsSegments) {
@@ -203,7 +212,7 @@ function regenerateForRundown(cache: ReadonlyDeep<ContentCache>, rundownId: Rund
 					const part = cache.Parts.findOne({ rundownId, _id: nrcsPart.partId })
 					const partInstance = cache.PartInstances.findOne({
 						rundownId,
-						segmentId: nrcsPart.segmentId,
+						// segmentId: nrcsPart.segmentId, // nocommit - these don't match for some reason
 						'part._id': nrcsPart.partId,
 						// nocommit TODO - prefer the currentPartInstance
 						_id: {
@@ -218,10 +227,10 @@ function regenerateForRundown(cache: ReadonlyDeep<ContentCache>, rundownId: Rund
 
 						if (isCurrentPartInstance) {
 							// If the current, it is playing
-							playbackStatus = IngestPartPlaybackStatus.PLAYING
+							playbackStatus = IngestPartPlaybackStatus.PLAY
 						} else {
 							// If not the current, but has been played, it is stopped
-							playbackStatus = IngestPartPlaybackStatus.STOPPED
+							playbackStatus = IngestPartPlaybackStatus.STOP
 						}
 					}
 
@@ -249,13 +258,7 @@ meteorCustomPublish(
 	async function (pub, deviceId: PeripheralDeviceId, token: string | undefined) {
 		check(deviceId, String)
 
-		const peripheralDevice = await checkAccessAndGetPeripheralDevice(deviceId, token, this)
-
-		const studioId = peripheralDevice.studioId
-		if (!studioId) {
-			logger.warn(`Pub.packageManagerPackageContainers: device "${peripheralDevice._id}" has no studioId`)
-			return this.ready()
-		}
+		await checkAccessAndGetPeripheralDevice(deviceId, token, this)
 
 		await setUpCollectionOptimizedObserver<
 			IngestRundownStatus,

meteor/server/publications/ingestStatus/reactiveContentCache.ts

@@ -9,9 +9,11 @@ import type { RundownId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import type { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import type { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 
-export type PlaylistFields = '_id' | 'currentPartInfo' | 'nextPartInfo'
+export type PlaylistFields = '_id' | 'activationId' | 'rehearsal' | 'currentPartInfo' | 'nextPartInfo'
 export const playlistFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBRundownPlaylist, PlaylistFields>>>({
 	_id: 1,
+	activationId: 1,
+	rehearsal: 1,
 	currentPartInfo: 1,
 	nextPartInfo: 1,
 })

meteor/server/publications/ingestStatus/rundownContentObserver.ts

@@ -9,7 +9,7 @@ import {
 	rundownFieldSpecifier,
 	// segmentFieldSpecifier,
 } from './reactiveContentCache'
-import { PartInstances, Parts, RundownPlaylists, Rundowns } from '../../collections'
+import { NrcsIngestDataCache, PartInstances, Parts, RundownPlaylists, Rundowns } from '../../collections'
 import { waitForAllObserversReady } from '../lib/lib'
 import _ from 'underscore'
 import { ReactiveMongoObserverGroup, ReactiveMongoObserverGroupHandle } from '../lib/observerGroup'
@@ -47,10 +47,10 @@ export class RundownContentObserver {
 					},
 					{
 						added: (doc) => {
-							cache.Playlists.upsert(doc._id, { $set: doc as Partial<Document> })
+							cache.Playlists.upsert(doc._id, doc)
 						},
 						changed: (doc) => {
-							cache.Playlists.upsert(doc._id, { $set: doc as Partial<Document> })
+							cache.Playlists.upsert(doc._id, doc)
 						},
 						removed: (doc) => {
 							cache.Playlists.remove(doc._id)
@@ -98,10 +98,22 @@ export class RundownContentObserver {
 				}
 			),
 			PartInstances.observeChanges(
-				{ rundownId: { $in: rundownIds }, reset: { $ne: true }, orphaned: { $exists: false } },
+				{
+					rundownId: { $in: rundownIds },
+					reset: { $ne: true },
+					orphaned: { $exists: false },
+				},
 				cache.PartInstances.link(),
 				{ fields: partInstanceFieldSpecifier }
 			),
+			NrcsIngestDataCache.observeChanges(
+				{
+					rundownId: {
+						$in: rundownIds,
+					},
+				},
+				cache.NrcsIngestData.link()
+			),
 
 			observer.#playlistIdObserver,
 		])

packages/job-worker/src/playout/activePlaylistActions.ts

@@ -145,8 +145,6 @@ export async function deactivateRundownPlaylistInner(
 	let rundown: ReadonlyDeep<DBRundown> | undefined
 	if (currentPartInstance) {
 		rundown = playoutModel.getRundown(currentPartInstance.partInstance.rundownId)?.rundown
-
-		playoutModel.queueNotifyCurrentlyPlayingPartEvent(currentPartInstance.partInstance.rundownId, null)
 	} else if (nextPartInstance) {
 		rundown = playoutModel.getRundown(nextPartInstance.partInstance.rundownId)?.rundown
 	}

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

@@ -263,13 +263,6 @@ export interface PlayoutModel extends PlayoutModelReadonly, StudioPlayoutModelBa
 	 */
 	queuePartInstanceTimingEvent(partInstanceId: PartInstanceId): void
 
-	/**
-	 * Queue a `NotifyCurrentlyPlayingPart` operation to be performed upon completion of this Playout operation
-	 * @param rundownId The Rundown to report the notification to
-	 * @param partInstance The PartInstance the event is in relation to
-	 */
-	queueNotifyCurrentlyPlayingPartEvent(rundownId: RundownId, partInstance: PlayoutPartInstanceModel | null): void
-
 	/**
 	 * Remove all loaded PartInstances marked as `rehearsal` from this RundownPlaylist
 	 */

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

@@ -273,7 +273,6 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 	#timelineHasChanged = false
 
 	#pendingPartInstanceTimingEvents = new Set<PartInstanceId>()
-	#pendingNotifyCurrentlyPlayingPartEvent = new Map<RundownId, string | null>()
 
 	get hackDeletedPartInstanceIds(): PartInstanceId[] {
 		const result: PartInstanceId[] = []
@@ -520,13 +519,6 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 		this.#pendingPartInstanceTimingEvents.add(partInstanceId)
 	}
 
-	queueNotifyCurrentlyPlayingPartEvent(rundownId: RundownId, partInstance: PlayoutPartInstanceModel | null): void {
-		if (partInstance && partInstance.partInstance.part.shouldNotifyCurrentPlayingPart) {
-			this.#pendingNotifyCurrentlyPlayingPartEvent.set(rundownId, partInstance.partInstance.part.externalId)
-		} else if (!partInstance) {
-			this.#pendingNotifyCurrentlyPlayingPartEvent.set(rundownId, null)
-		}
-	}
 
 	removeAllRehearsalPartInstances(): void {
 		const partInstancesToRemove: PartInstanceId[] = []
@@ -689,20 +681,7 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 		}
 		this.#pendingPartInstanceTimingEvents.clear()
 
-		for (const [rundownId, partExternalId] of this.#pendingNotifyCurrentlyPlayingPartEvent) {
-			// This is low-prio, defer so that it's executed well after publications has been updated,
-			// so that the playout gateway has had the chance to learn about the timeline changes
-			this.context
-				.queueEventJob(EventsJobs.NotifyCurrentlyPlayingPart, {
-					rundownId: rundownId,
-					isRehearsal: !!this.playlist.rehearsal,
-					partExternalId: partExternalId,
-				})
-				.catch((e) => {
-					logger.warn(`Failed to queue NotifyCurrentlyPlayingPart job: ${stringifyError(e)}`)
-				})
-		}
-		this.#pendingNotifyCurrentlyPlayingPartEvent.clear()
+
 
 		if (span) span.end()
 	}

packages/job-worker/src/playout/take.ts

@@ -547,8 +547,6 @@ export async function afterTake(
 
 	await updateTimeline(context, playoutModel)
 
-	playoutModel.queueNotifyCurrentlyPlayingPartEvent(takePartInstance.partInstance.rundownId, takePartInstance)
-
 	if (span) span.end()
 }