fix

Author: Julusian

packages/corelib/src/dataModel/PieceInstance.ts

@@ -36,9 +36,8 @@ export interface PieceInstance {
 	rundownId: RundownId
 	/**
 	 * The part instance this piece belongs to.
-	 * If null, the instance belongs to the rundown itself.
 	 */
-	partInstanceId: PartInstanceId | null
+	partInstanceId: PartInstanceId
 
 	/** Whether this PieceInstance is a temprorary wrapping of a Piece */
 	readonly isTemporary?: boolean

packages/job-worker/src/playout/abPlayback/abSessionHelper.ts

@@ -108,7 +108,6 @@ export class AbSessionHelper {
 		}
 
 		// We only want to consider sessions already tagged to this partInstance
-		// nocommit - is this sane for piece instances without a partInstanceId?
 		const existingSession = sessionsToConsider.find((s) =>
 			s.partInstanceIds?.includes(pieceInstance.partInstanceId)
 		)
@@ -195,10 +194,12 @@ export class AbSessionHelper {
 
 		// Find an normal partInstance
 		const partInstanceId = tlObj.partInstanceId
-		const partInstanceSession = sessionsToConsider.find((s) => s.partInstanceIds?.includes(partInstanceId))
-		if (partInstanceSession) {
-			partInstanceSession.keep = true
-			return partInstanceSession.id
+		if (partInstanceId) {
+			const partInstanceSession = sessionsToConsider.find((s) => s.partInstanceIds?.includes(partInstanceId))
+			if (partInstanceSession) {
+				partInstanceSession.keep = true
+				return partInstanceSession.id
+			}
 		}
 
 		// If it is lookahead, then we run differently

packages/job-worker/src/playout/timings/piecePlayback.ts

@@ -16,37 +16,26 @@ export function onPiecePlaybackStarted(
 	context: JobContext,
 	playoutModel: PlayoutModel,
 	data: {
-		partInstanceId: PartInstanceId | null
+		partInstanceId: PartInstanceId
 		pieceInstanceId: PieceInstanceId
 		startedPlayback: Time
 	}
 ): void {
 	const playlist = playoutModel.playlist
 
-	if (!data.partInstanceId) {
-		// nocommit - implement for rundown owned
-		logger.warn(`onPiecePlaybackStarted: Received for a piece without a partInstance`)
+	if (!playlist.activationId) {
+		logger.warn(`onPiecePlaybackStarted: Received for inactive RundownPlaylist "${playlist._id}"`)
 		return
 	}
 
 	const partInstance = playoutModel.getPartInstance(data.partInstanceId)
 	if (!partInstance) {
-		if (!playlist.activationId) {
-			logger.warn(`onPiecePlaybackStarted: Received for inactive RundownPlaylist "${playlist._id}"`)
-		} else {
-			throw new Error(`PartInstance "${data.partInstanceId}" in RundownPlaylist "${playlist._id}" not found!`)
-		}
-		return
+		throw new Error(`PartInstance "${data.partInstanceId}" in RundownPlaylist "${playlist._id}" not found!`)
 	}
 
 	const pieceInstance = partInstance.getPieceInstance(data.pieceInstanceId)
 	if (!pieceInstance) {
-		if (!playlist.activationId) {
-			logger.warn(`onPiecePlaybackStarted: Received for inactive RundownPlaylist "${playlist._id}"`)
-		} else {
-			throw new Error(`PieceInstance "${data.partInstanceId}" in RundownPlaylist "${playlist._id}" not found!`)
-		}
-		return
+		throw new Error(`PieceInstance "${data.partInstanceId}" in RundownPlaylist "${playlist._id}" not found!`)
 	}
 
 	const isPlaying = !!(
@@ -74,16 +63,15 @@ export function onPiecePlaybackStopped(
 	context: JobContext,
 	playoutModel: PlayoutModel,
 	data: {
-		partInstanceId: PartInstanceId | null
+		partInstanceId: PartInstanceId
 		pieceInstanceId: PieceInstanceId
 		stoppedPlayback: Time
 	}
 ): void {
 	const playlist = playoutModel.playlist
 
-	if (!data.partInstanceId) {
-		// nocommit - implement for rundown owned
-		logger.warn(`onPiecePlaybackStopped: Received for a piece without a partInstance`)
+	if (!playlist.activationId) {
+		logger.warn(`onPiecePlaybackStopped: Received for inactive RundownPlaylist "${playlist._id}"`)
 		return
 	}
 
@@ -95,12 +83,7 @@ export function onPiecePlaybackStopped(
 
 	const pieceInstance = partInstance.getPieceInstance(data.pieceInstanceId)
 	if (!pieceInstance) {
-		if (!playlist.activationId) {
-			logger.warn(`onPiecePlaybackStopped: Received for inactive RundownPlaylist "${playlist._id}"`)
-		} else {
-			throw new Error(`PieceInstance "${data.partInstanceId}" in RundownPlaylist "${playlist._id}" not found!`)
-		}
-		return
+		throw new Error(`PieceInstance "${data.partInstanceId}" in RundownPlaylist "${playlist._id}" not found!`)
 	}
 
 	const isPlaying = !!(

packages/shared-lib/src/peripheralDevice/peripheralDeviceAPI.ts

@@ -8,7 +8,7 @@ export interface PartPlaybackCallbackData {
 }
 export interface PiecePlaybackCallbackData {
 	rundownPlaylistId: RundownPlaylistId
-	partInstanceId: PartInstanceId | null
+	partInstanceId: PartInstanceId
 	pieceInstanceId: PieceInstanceId
 	dynamicallyInserted?: boolean
 }