fix: limit scope of loading of NrcsIngestData for ingestDeviceRundownStatus publication

Author: Julusian

meteor/server/publications/ingestStatus/createIngestRundownStatus.ts

@@ -9,12 +9,8 @@ import {
 } from '@sofie-automation/shared-lib/dist/ingest/rundownStatus'
 import type { ReadonlyDeep } from 'type-fest'
 import _ from 'underscore'
-import type { ContentCache, PartFields, PartInstanceFields, PlaylistFields } from './reactiveContentCache'
-import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import type { ContentCache, PartCompact, PartInstanceCompact, PlaylistCompact } from './reactiveContentCache'
 import { ReactiveCacheCollection } from '../lib/ReactiveCacheCollection'
-import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
-import { IngestPart } from '@sofie-automation/blueprints-integration'
-import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 
 export function createIngestRundownStatus(
@@ -75,7 +71,7 @@ export function createIngestRundownStatus(
 						nrcsPart.data.externalId
 					)
 
-					return createIngestPartStatus(playlist, partInstances, parts, nrcsPart.data as IngestPart)
+					return createIngestPartStatus(playlist, partInstances, parts, nrcsPart.data.externalId)
 				})
 			),
 		})
@@ -85,12 +81,12 @@ export function createIngestRundownStatus(
 }
 
 function findPartInstancesForIngestPart(
-	playlist: Pick<DBRundownPlaylist, PlaylistFields> | undefined,
+	playlist: PlaylistCompact | undefined,
 	rundownId: RundownId,
-	partInstancesCache: ReadonlyDeep<ReactiveCacheCollection<Pick<PartInstance, PartInstanceFields>>>,
+	partInstancesCache: ReadonlyDeep<ReactiveCacheCollection<PartInstanceCompact>>,
 	partExternalId: string
 ) {
-	const result: Record<string, Pick<PartInstance, PartInstanceFields>> = {}
+	const result: Record<string, PartInstanceCompact> = {}
 	if (!playlist) return result
 
 	const candidatePartInstances = partInstancesCache
@@ -132,10 +128,10 @@ function findPartInstancesForIngestPart(
 }
 
 function createIngestPartStatus(
-	playlist: Pick<DBRundownPlaylist, PlaylistFields> | undefined,
-	partInstances: Record<string, Pick<PartInstance, PartInstanceFields>>,
-	parts: Pick<DBPart, PartFields>[],
-	ingestPart: IngestPart
+	playlist: PlaylistCompact | undefined,
+	partInstances: Record<string, PartInstanceCompact>,
+	parts: PartCompact[],
+	ingestPartExternalId: string
 ): IngestPartStatus {
 	// Determine the playback status from the PartInstance
 	let playbackStatus = IngestPartPlaybackStatus.UNKNOWN
@@ -144,7 +140,7 @@ function createIngestPartStatus(
 
 	const itemsReady: IngestPartNotifyItemReady[] = []
 
-	const updateStatusWithPart = (part: Pick<DBPart, PartFields>) => {
+	const updateStatusWithPart = (part: PartCompact) => {
 		// If the part affects the ready status, update it
 		if (typeof part.ingestNotifyPartReady === 'boolean') {
 			isReady = (isReady ?? true) && part.ingestNotifyPartReady
@@ -158,7 +154,7 @@ function createIngestPartStatus(
 
 	// Loop through the partInstances, starting off the state
 	if (playlist) {
-		for (const partInstance of Object.values<Pick<PartInstance, PartInstanceFields>>(partInstances)) {
+		for (const partInstance of Object.values<PartInstanceCompact>(partInstances)) {
 			if (!partInstance) continue
 
 			if (partInstance.part.shouldNotifyCurrentPlayingPart) {
@@ -185,7 +181,7 @@ function createIngestPartStatus(
 	}
 
 	return {
-		externalId: ingestPart.externalId,
+		externalId: ingestPartExternalId,
 
 		isReady: isReady,
 		itemsReady: itemsReady,

meteor/server/publications/ingestStatus/reactiveContentCache.ts

@@ -8,23 +8,27 @@ 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' | 'activationId' | 'rehearsal' | 'currentPartInfo' | 'nextPartInfo'
-export const playlistFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBRundownPlaylist, PlaylistFields>>>({
+export type PlaylistCompact = Pick<
+	DBRundownPlaylist,
+	'_id' | 'activationId' | 'rehearsal' | 'currentPartInfo' | 'nextPartInfo'
+>
+export const playlistFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<PlaylistCompact>>({
 	_id: 1,
 	activationId: 1,
 	rehearsal: 1,
 	currentPartInfo: 1,
 	nextPartInfo: 1,
 })
 
-export type RundownFields = '_id' | 'externalId' | 'playlistId'
-export const rundownFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBRundown, RundownFields>>>({
+export type RundownCompact = Pick<DBRundown, '_id' | 'externalId' | 'playlistId'>
+export const rundownFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<RundownCompact>>({
 	_id: 1,
 	externalId: 1,
 	playlistId: 1,
 })
 
-export type PartFields =
+export type PartCompact = Pick<
+	DBPart,
 	| '_id'
 	| 'rundownId'
 	| 'segmentId'
@@ -33,7 +37,8 @@ export type PartFields =
 	| 'ingestNotifyPartReady'
 	| 'ingestNotifyItemsReady'
 	| 'ingestNotifyPartExternalId'
-export const partFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBPart, PartFields>>>({
+>
+export const partFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<PartCompact>>({
 	_id: 1,
 	rundownId: 1,
 	segmentId: 1,
@@ -44,36 +49,50 @@ export const partFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBP
 	ingestNotifyPartExternalId: 1,
 })
 
-export type PartInstanceFields = '_id' | 'rundownId' | 'segmentId' | 'part' | 'takeCount'
-export const partInstanceFieldSpecifier = literal<
-	MongoFieldSpecifierOnesStrict<Pick<PartInstance, PartInstanceFields>>
->({
+export type PartInstanceCompact = Pick<PartInstance, '_id' | 'rundownId' | 'segmentId' | 'part' | 'takeCount'>
+export const partInstanceFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<PartInstanceCompact>>({
 	_id: 1,
 	rundownId: 1,
 	segmentId: 1,
 	part: 1, // This could be more granular, but it should be pretty stable
 	takeCount: 1,
 })
 
+export type NrcsIngestDataCacheObjCompact = Pick<
+	NrcsIngestDataCacheObj,
+	'_id' | 'type' | 'rundownId' | 'segmentId' | 'partId'
+> & { data: { externalId: string } }
+export const nrcsIngestDataCacheObjSpecifier = literal<MongoFieldSpecifierOnesStrict<NrcsIngestDataCacheObjCompact>>({
+	_id: 1,
+	type: 1,
+	rundownId: 1,
+	segmentId: 1,
+	partId: 1,
+	data: {
+		// We need to be very selective here, as the payload portion could contain data not safe for minimongo
+		externalId: 1,
+	},
+})
+
 export interface ContentCache {
 	RundownIds: RundownId[]
 
-	Playlists: ReactiveCacheCollection<Pick<DBRundownPlaylist, PlaylistFields>>
-	Rundowns: ReactiveCacheCollection<Pick<DBRundown, RundownFields>>
-	NrcsIngestData: ReactiveCacheCollection<NrcsIngestDataCacheObj>
-	Parts: ReactiveCacheCollection<Pick<DBPart, PartFields>>
-	PartInstances: ReactiveCacheCollection<Pick<PartInstance, PartInstanceFields>>
+	Playlists: ReactiveCacheCollection<PlaylistCompact>
+	Rundowns: ReactiveCacheCollection<RundownCompact>
+	NrcsIngestData: ReactiveCacheCollection<NrcsIngestDataCacheObjCompact>
+	Parts: ReactiveCacheCollection<PartCompact>
+	PartInstances: ReactiveCacheCollection<PartInstanceCompact>
 }
 
 export function createReactiveContentCache(rundownIds: RundownId[]): ContentCache {
 	const cache: ContentCache = {
 		RundownIds: rundownIds,
 
-		Playlists: new ReactiveCacheCollection<Pick<DBRundownPlaylist, PlaylistFields>>('playlists'),
-		Rundowns: new ReactiveCacheCollection<Pick<DBRundown, RundownFields>>('rundowns'),
-		NrcsIngestData: new ReactiveCacheCollection<NrcsIngestDataCacheObj>('nrcsIngestData'), // TODO - is this needed?
-		Parts: new ReactiveCacheCollection<Pick<DBPart, PartFields>>('parts'),
-		PartInstances: new ReactiveCacheCollection<Pick<PartInstance, PartInstanceFields>>('partInstances'),
+		Playlists: new ReactiveCacheCollection<PlaylistCompact>('playlists'),
+		Rundowns: new ReactiveCacheCollection<RundownCompact>('rundowns'),
+		NrcsIngestData: new ReactiveCacheCollection<NrcsIngestDataCacheObjCompact>('nrcsIngestData'),
+		Parts: new ReactiveCacheCollection<PartCompact>('parts'),
+		PartInstances: new ReactiveCacheCollection<PartInstanceCompact>('partInstances'),
 	}
 
 	return cache

meteor/server/publications/ingestStatus/rundownContentObserver.ts

@@ -3,6 +3,7 @@ import { RundownId, RundownPlaylistId } from '@sofie-automation/corelib/dist/dat
 import { logger } from '../../logging'
 import {
 	ContentCache,
+	nrcsIngestDataCacheObjSpecifier,
 	partFieldSpecifier,
 	partInstanceFieldSpecifier,
 	playlistFieldSpecifier,
@@ -111,7 +112,9 @@ export class RundownContentObserver {
 					},
 				},
 				cache.NrcsIngestData.link(),
-				{},
+				{
+					projection: nrcsIngestDataCacheObjSpecifier,
+				},
 				{
 					nonMutatingCallbacks: true,
 				}