fix: change part mos item statuses to be an array, to avoid minimongo key errors

Author: Julusian

meteor/server/publications/ingestStatus/createIngestRundownStatus.ts

@@ -127,7 +127,7 @@ function createIngestPartStatus(
 		externalId: ingestPart.externalId,
 
 		isReady: isReady ?? null,
-		itemsReady: itemsReady ?? {},
+		itemsReady: itemsReady ?? [],
 
 		playbackStatus,
 	}

packages/blueprints-integration/src/documents/part.ts

@@ -1,6 +1,7 @@
 import type { UserEditingDefinition } from '../userEditing'
 import type { NoteSeverity } from '../lib'
 import type { ITranslatableMessage } from '../translations'
+import type { IngestPartNotifyItemReady } from '@sofie-automation/shared-lib/dist/ingest/rundownStatus'
 
 /** Timings for the inTransition, when supported and allowed */
 export interface IBlueprintPartInTransition {
@@ -65,7 +66,7 @@ export interface IBlueprintMutatablePart<TPrivateData = unknown, TPublicData = u
 	ingestNotifyPartReady?: boolean | null
 
 	/** Report items as ready to the ingest-device. Only named items will be reported, using the boolean value provided */
-	ingestNotifyItemsReady?: Record<string, boolean | undefined>
+	ingestNotifyItemsReady?: IngestPartNotifyItemReady[]
 
 	/** Classes to set on the TimelineGroupObj for this part */
 	classes?: string[]

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

@@ -60,6 +60,7 @@ import {
 } from '@sofie-automation/blueprints-integration/dist/userEditing'
 import type { PlayoutMutatablePart } from '../../playout/model/PlayoutPartInstanceModel'
 import { BlueprintQuickLookInfo } from '@sofie-automation/blueprints-integration/dist/context/quickLoopInfo'
+import { IngestPartNotifyItemReady } from '@sofie-automation/shared-lib/dist/ingest/rundownStatus'
 
 /**
  * Convert an object to have all the values of all keys (including optionals) be 'true'
@@ -274,7 +275,7 @@ export function convertPartToBlueprints(part: ReadonlyDeep<DBPart>): IBlueprintP
 		holdMode: part.holdMode,
 		shouldNotifyCurrentPlayingPart: part.shouldNotifyCurrentPlayingPart,
 		ingestNotifyPartReady: part.ingestNotifyPartReady,
-		ingestNotifyItemsReady: clone(part.ingestNotifyItemsReady),
+		ingestNotifyItemsReady: clone<IngestPartNotifyItemReady[] | undefined>(part.ingestNotifyItemsReady),
 		classes: clone<string[] | undefined>(part.classes),
 		classesForNext: clone<string[] | undefined>(part.classesForNext),
 		displayDurationGroup: part.displayDurationGroup,

packages/mos-gateway/src/mosStatus/diff.ts

@@ -1,6 +1,7 @@
 import { IMOSObjectStatus } from '@mos-connection/connector'
 import type { MosDeviceStatusesConfig } from '../generated/devices'
 import {
+	IngestPartNotifyItemReady,
 	IngestPartPlaybackStatus,
 	type IngestPartStatus,
 	type IngestRundownStatus,
@@ -51,14 +52,12 @@ export function diffStatuses(
 			})
 
 			// Clear any items too
-			for (const [itemId, isReady] of Object.entries<boolean | undefined>(story.itemsReady)) {
-				if (isReady === undefined) continue
-
+			for (const itemStatus of story.itemsReady) {
 				statuses.push({
 					type: 'item',
 					rundownExternalId,
 					storyId,
-					itemId: itemId,
+					itemId: itemStatus.externalId,
 					mosStatus: MOS_STATUS_UNKNOWN,
 				})
 			}
@@ -88,21 +87,35 @@ export function diffStatuses(
 			})
 		}
 
-		// Diff each item in the story
-		const previousItemStatuses = previousStatus?.itemsReady ?? {}
-		const allItemIds = new Set<string>([...Object.keys(status.itemsReady), ...Object.keys(previousItemStatuses)])
+		const allItemIds = new Set<string>()
+		const previousItemStatuses = new Map<string, IngestPartNotifyItemReady>()
+		const newItemStatuses = new Map<string, IngestPartNotifyItemReady>()
 
+		for (const itemStatus of previousStatus?.itemsReady ?? []) {
+			previousItemStatuses.set(itemStatus.externalId, itemStatus)
+			allItemIds.add(itemStatus.externalId)
+		}
+		for (const itemStatus of status.itemsReady) {
+			newItemStatuses.set(itemStatus.externalId, itemStatus)
+			allItemIds.add(itemStatus.externalId)
+		}
+
+		// Diff each item in the story
 		for (const itemId of allItemIds) {
-			const newReady = status.itemsReady[itemId]
-			const previousReady = previousItemStatuses[itemId]
+			const newItemStatus = newItemStatuses.get(itemId)
+			const previousItemStatus = previousItemStatuses.get(itemId)
 
-			const newMosStatus =
-				newReady !== undefined
-					? buildMosStatus(config, status.playbackStatus, newReady, newStatuses?.active)
-					: null
+			const newMosStatus = newItemStatus
+				? buildMosStatus(config, status.playbackStatus, newItemStatus.ready, newStatuses?.active)
+				: null
 			const previousMosStatus =
-				previousReady !== undefined && previousStatus
-					? buildMosStatus(config, previousStatus.playbackStatus, previousReady, previousStatuses?.active)
+				previousItemStatus && previousStatus
+					? buildMosStatus(
+							config,
+							previousStatus.playbackStatus,
+							previousItemStatus.ready,
+							previousStatuses?.active
+					  )
 					: null
 
 			if ((newMosStatus !== null || previousMosStatus !== null) && previousMosStatus !== newMosStatus) {

packages/shared-lib/src/ingest/rundownStatus.ts

@@ -30,7 +30,7 @@ export interface IngestPartStatus {
 
 	isReady: boolean | null
 
-	itemsReady: Record<string, boolean | undefined>
+	itemsReady: IngestPartNotifyItemReady[]
 
 	playbackStatus: IngestPartPlaybackStatus
 }
@@ -40,3 +40,8 @@ export enum IngestPartPlaybackStatus {
 	PLAY = 'play',
 	STOP = 'stop',
 }
+
+export interface IngestPartNotifyItemReady {
+	externalId: string
+	ready: boolean
+}