feat(EAV-488): add packages topic to LSG

Author: ianshade

meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts

@@ -32,7 +32,6 @@ import _ from 'underscore'
 import { getSideEffect } from '@sofie-automation/meteor-lib/dist/collections/ExpectedPackages'
 import { getActiveRoutes, getRoutedMappings } from '@sofie-automation/meteor-lib/dist/collections/Studios'
 import { ensureHasTrailingSlash, generateTranslation, unprotectString } from '../../lib/tempLib'
-import { PieceContentStatusObj } from '@sofie-automation/meteor-lib/dist/api/pieceContentStatus'
 import { MediaObjects, PackageContainerPackageStatuses, PackageInfos } from '../../collections'
 import {
 	mediaObjectFieldSpecifier,
@@ -43,6 +42,7 @@ import {
 	PackageInfoLight,
 	PieceDependencies,
 } from './common'
+import { PieceContentStatusObj } from '@sofie-automation/corelib/dist/dataModel/PieceContentStatus'
 
 interface ScanInfoForPackages {
 	[packageId: string]: ScanInfoForPackage

meteor/server/publications/pieceContentStatusUI/rundown/publication.ts

@@ -13,8 +13,7 @@ import {
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
 import { ReadonlyDeep } from 'type-fest'
-import { CustomCollectionName, MeteorPubSub } from '@sofie-automation/meteor-lib/dist/api/pubsub'
-import { UIPieceContentStatus } from '@sofie-automation/meteor-lib/dist/api/rundownNotifications'
+import { UIPieceContentStatus } from '@sofie-automation/corelib/dist/dataModel/PieceContentStatus'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import {
 	MediaObjects,
@@ -57,6 +56,8 @@ import { PieceContentStatusStudio } from '../checkPieceContentStatus'
 import { check, Match } from 'meteor/check'
 import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
 import { triggerWriteAccessBecauseNoCheckNecessary } from '../../../security/securityVerify'
+import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
+import { CustomCollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
 
 interface UIPieceContentStatusesArgs {
 	readonly rundownPlaylistId: RundownPlaylistId
@@ -469,15 +470,15 @@ function updatePartAndSegmentInfoForExistingDocs(
 }
 
 meteorCustomPublish(
-	MeteorPubSub.uiPieceContentStatuses,
+	CorelibPubSub.uiPieceContentStatuses,
 	CustomCollectionName.UIPieceContentStatuses,
 	async function (pub, rundownPlaylistId: RundownPlaylistId | null) {
 		check(rundownPlaylistId, Match.Maybe(String))
 
 		triggerWriteAccessBecauseNoCheckNecessary()
 
 		if (!rundownPlaylistId) {
-			logger.info(`Pub.${CustomCollectionName.UISegmentPartNotes}: Not playlistId`)
+			logger.info(`Pub.${CustomCollectionName.UIPieceContentStatuses}: Not playlistId`)
 			return
 		}
 
@@ -487,7 +488,7 @@ meteorCustomPublish(
 			UIPieceContentStatusesState,
 			UIPieceContentStatusesUpdateProps
 		>(
-			`pub_${MeteorPubSub.uiPieceContentStatuses}_${rundownPlaylistId}`,
+			`pub_${CorelibPubSub.uiPieceContentStatuses}_${rundownPlaylistId}`,
 			{ rundownPlaylistId },
 			setupUIPieceContentStatusesPublicationObservers,
 			manipulateUIPieceContentStatusesPublicationData,

meteor/server/publications/pieceContentStatusUI/rundown/regenerateItems.ts

@@ -6,7 +6,7 @@ import {
 	RundownBaselineAdLibActionId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { ReadonlyDeep } from 'type-fest'
-import { UIPieceContentStatus } from '@sofie-automation/meteor-lib/dist/api/rundownNotifications'
+import { UIPieceContentStatus } from '@sofie-automation/corelib/dist/dataModel/PieceContentStatus'
 import { literal, protectString } from '../../../lib/tempLib'
 import { CustomPublishCollection } from '../../../lib/customPublication'
 import { ContentCache } from './reactiveContentCache'

packages/corelib/src/dataModel/Collections.ts

@@ -48,3 +48,10 @@ export enum CollectionName {
 	Workers = 'workers',
 	WorkerThreads = 'workersThreads',
 }
+
+/**
+ * Ids of possible Custom collections, populated by DDP subscriptions
+ */
+export enum CustomCollectionName {
+	UIPieceContentStatuses = 'uiPieceContentStatuses',
+}

packages/corelib/src/dataModel/PieceContentStatus.ts

@@ -0,0 +1,50 @@
+import { ITranslatableMessage, PackageInfo } from '@sofie-automation/blueprints-integration'
+import { ProtectedString } from '../protectedString'
+import {
+	RundownId,
+	PartId,
+	SegmentId,
+	PieceId,
+	AdLibActionId,
+	RundownBaselineAdLibActionId,
+	PieceInstanceId,
+} from './Ids'
+import { PieceStatusCode } from './Piece'
+
+export type UIPieceContentStatusId = ProtectedString<'UIPieceContentStatus'>
+export interface UIPieceContentStatus {
+	_id: UIPieceContentStatusId
+
+	segmentRank: number
+	partRank: number
+
+	rundownId: RundownId
+	partId: PartId | undefined
+	segmentId: SegmentId | undefined
+
+	pieceId: PieceId | AdLibActionId | RundownBaselineAdLibActionId | PieceInstanceId
+	isPieceInstance: boolean
+
+	name: string | ITranslatableMessage
+	segmentName: string | undefined
+
+	status: PieceContentStatusObj
+}
+
+export interface PieceContentStatusObj {
+	status: PieceStatusCode
+	messages: ITranslatableMessage[]
+
+	freezes: Array<PackageInfo.Anomaly>
+	blacks: Array<PackageInfo.Anomaly>
+	scenes: Array<number>
+
+	thumbnailUrl: string | undefined
+	previewUrl: string | undefined
+
+	packageName: string | null
+
+	contentDuration: number | undefined
+
+	progress: number | undefined
+}

packages/corelib/src/pubsub.ts

@@ -1,5 +1,5 @@
 import { DBPart } from './dataModel/Part'
-import { CollectionName } from './dataModel/Collections'
+import { CollectionName, CustomCollectionName } from './dataModel/Collections'
 import { MongoQuery } from './mongo'
 import { AdLibAction } from './dataModel/AdlibAction'
 import { AdLibPiece } from './dataModel/AdLibPiece'
@@ -37,6 +37,7 @@ import {
 } from '@sofie-automation/shared-lib/dist/core/model/Ids'
 import { BlueprintId, BucketId, RundownPlaylistActivationId, SegmentId, ShowStyleVariantId } from './dataModel/Ids'
 import { PackageInfoDB } from './dataModel/PackageInfos'
+import { UIPieceContentStatus } from './dataModel/PieceContentStatus'
 
 /**
  * Ids of possible DDP subscriptions for any the UI and gateways accessing the Rundown & RundownPlaylist model.
@@ -180,6 +181,12 @@ export enum CorelibPubSub {
 	 * Fetch all the PackageInfos owned by a PeripheralDevice
 	 */
 	packageInfos = 'packageInfos',
+
+	/**
+	 * Fetch the Pieces content-status in the given RundownPlaylist
+	 * If the id is null, nothing will be returned
+	 */
+	uiPieceContentStatuses = 'uiPieceContentStatuses',
 }
 
 /**
@@ -317,6 +324,10 @@ export interface CorelibPubSubTypes {
 		token?: string
 	) => CollectionName.PackageContainerStatuses
 	[CorelibPubSub.packageInfos]: (deviceId: PeripheralDeviceId, token?: string) => CollectionName.PackageInfos
+
+	[CorelibPubSub.uiPieceContentStatuses]: (
+		rundownPlaylistId: RundownPlaylistId | null
+	) => CustomCollectionName.UIPieceContentStatuses
 }
 
 export type CorelibPubSubCollections = {
@@ -347,4 +358,8 @@ export type CorelibPubSubCollections = {
 	[CollectionName.Studios]: DBStudio
 	[CollectionName.Timelines]: TimelineComplete
 	[CollectionName.TimelineDatastore]: DBTimelineDatastoreEntry
+} & CorelibPubSubCustomCollections
+
+export type CorelibPubSubCustomCollections = {
+	[CustomCollectionName.UIPieceContentStatuses]: UIPieceContentStatus
 }

packages/live-status-gateway/api/asyncapi.yaml

@@ -48,6 +48,7 @@ channels:
           - $ref: '#/components/messages/activePieces'
           - $ref: '#/components/messages/segments'
           - $ref: '#/components/messages/adLibs'
+          - $ref: '#/components/messages/packages'
 components:
   messages:
     ping:
@@ -124,3 +125,8 @@ components:
       description: AdLibs in active Playlist
       payload:
         $ref: './schemas/adLibs.yaml#/$defs/adLibs'
+    packages:
+      name: packages
+      description: Status of Packages expected by Pieces
+      payload:
+        $ref: './schemas/packages.yaml#/$defs/packages'

packages/live-status-gateway/api/schemas/packages.yaml

@@ -0,0 +1,63 @@
+title: Packages
+description: Packages schema for websocket subscriptions
+$defs:
+  packages:
+    type: object
+    properties:
+      event:
+        type: string
+        const: packages
+      rundownPlaylistId:
+        description: Unique id of the rundown playlist, or null if no playlist is active
+        oneOf:
+          - type: string
+          - type: 'null'
+      packages:
+        description: The Package statuses for this playlist
+        type: array
+        items:
+          $ref: '#/$defs/package'
+    required: [event, rundownPlaylistId, packages]
+    additionalProperties: false
+    examples:
+      - event: packages
+        rundownPlaylistId: 'OKAgZmZ0Buc99lE_2uPPSKVbMrQ_'
+        packages:
+          $ref: '#/$defs/package/examples'
+  package:
+    type: object
+    properties:
+      packageName:
+        description: Name of the package
+        oneOf:
+          - type: string
+          - type: 'null'
+      statusCode:
+        description: Status code
+        type: number
+      rundownId:
+        description: Id of the Rundown that expects this package
+        type: string
+      partId:
+        description: Id of the Part that expects this package
+        type: string
+      segmentId:
+        description: Id of the Segment that expects this package
+        type: string
+      pieceId:
+        description: Id of the Piece that expects this package
+        type: string
+      thumbnailUrl:
+        description: URL where the thumbnail can be accessed
+        type: string
+      previewUrl:
+        description: URL where the preview can be accessed
+        type: string
+    required: [packageName, statusCode, rundownId, pieceId]
+    additionalProperties: false
+    examples:
+      - packageName: 'MV000123.mxf'
+        statusCode: 0
+        rundownId: 'y9HauyWkcxQS3XaAOsW40BRLLsI_'
+        pieceId: 'C6K_yIMuGFUk8X_L9A9_jRT6aq4_'
+        thumbnailUrl: 'https://package-manager.local/package/MV000123.mov_thumbnail.jpg'

packages/live-status-gateway/src/collections/pieceContentStatusesHandler.ts

@@ -0,0 +1,76 @@
+import { Logger } from 'winston'
+import { CoreHandler } from '../coreHandler'
+import { Collection, PickArr, PublicationCollection } from '../wsHandler'
+import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
+import { UIPieceContentStatus } from '@sofie-automation/corelib/dist/dataModel/PieceContentStatus'
+import throttleToNextTick from '@sofie-automation/shared-lib/dist/lib/throttleToNextTick'
+import { RundownPlaylistId } from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
+import { CollectionHandlers } from '../liveStatusServer'
+import { CustomCollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
+
+const PLAYLIST_KEYS = ['_id'] as const
+type Playlist = PickArr<DBRundownPlaylist, typeof PLAYLIST_KEYS>
+
+export class PieceContentStatusesHandler
+	extends PublicationCollection<
+		UIPieceContentStatus[],
+		CorelibPubSub.uiPieceContentStatuses,
+		CustomCollectionName.UIPieceContentStatuses
+	>
+	implements Collection<UIPieceContentStatus[]>
+{
+	private _currentPlaylistId: RundownPlaylistId | undefined
+
+	private _throttledUpdateAndNotify = throttleToNextTick(() => {
+		this.updateAndNotify()
+	})
+
+	constructor(logger: Logger, coreHandler: CoreHandler) {
+		super(CustomCollectionName.UIPieceContentStatuses, CorelibPubSub.uiPieceContentStatuses, logger, coreHandler)
+	}
+
+	init(handlers: CollectionHandlers): void {
+		super.init(handlers)
+
+		handlers.playlistHandler.subscribe(this.onPlaylistUpdated, PLAYLIST_KEYS)
+	}
+
+	changed(): void {
+		this._throttledUpdateAndNotify()
+	}
+
+	private updateCollectionData() {
+		const collection = this.getCollectionOrFail()
+		this._collectionData = collection.find({})
+	}
+
+	private clearCollectionData() {
+		this._collectionData = []
+	}
+
+	onPlaylistUpdated = (playlist: Playlist | undefined): void => {
+		this.logUpdateReceived('playlist', `rundownPlaylistId ${playlist?._id}`)
+		const prevPlaylistId = this._currentPlaylistId
+		this._currentPlaylistId = playlist?._id
+
+		if (this._currentPlaylistId) {
+			if (prevPlaylistId !== this._currentPlaylistId) {
+				this.stopSubscription()
+				this.setupSubscription(this._currentPlaylistId)
+			}
+		} else {
+			this.clearAndNotify()
+		}
+	}
+
+	private clearAndNotify() {
+		this.clearCollectionData()
+		this.notify(this._collectionData)
+	}
+
+	private updateAndNotify() {
+		this.updateCollectionData()
+		this.notify(this._collectionData)
+	}
+}

packages/live-status-gateway/src/liveStatusServer.ts

@@ -23,6 +23,8 @@ import { PartsHandler } from './collections/partsHandler'
 import { PieceInstancesHandler } from './collections/pieceInstancesHandler'
 import { AdLibsTopic } from './topics/adLibsTopic'
 import { ActivePiecesTopic } from './topics/activePiecesTopic'
+import { PieceContentStatusesHandler } from './collections/pieceContentStatusesHandler'
+import { PackagesTopic } from './topics/packagesTopic'
 
 export interface CollectionHandlers {
 	studioHandler: StudioHandler
@@ -40,6 +42,7 @@ export interface CollectionHandlers {
 	adLibsHandler: AdLibsHandler
 	globalAdLibActionsHandler: GlobalAdLibActionsHandler
 	globalAdLibsHandler: GlobalAdLibsHandler
+	pieceContentStatusesHandler: PieceContentStatusesHandler
 }
 
 export class LiveStatusServer {
@@ -72,6 +75,7 @@ export class LiveStatusServer {
 		const adLibsHandler = new AdLibsHandler(this._logger, this._coreHandler)
 		const globalAdLibActionsHandler = new GlobalAdLibActionsHandler(this._logger, this._coreHandler)
 		const globalAdLibsHandler = new GlobalAdLibsHandler(this._logger, this._coreHandler)
+		const pieceContentStatusesHandler = new PieceContentStatusesHandler(this._logger, this._coreHandler)
 
 		const handlers: CollectionHandlers = {
 			studioHandler,
@@ -89,6 +93,7 @@ export class LiveStatusServer {
 			adLibsHandler,
 			globalAdLibActionsHandler,
 			globalAdLibsHandler,
+			pieceContentStatusesHandler,
 		}
 
 		for (const handlerName in handlers) {
@@ -100,12 +105,14 @@ export class LiveStatusServer {
 		const activePlaylistTopic = new ActivePlaylistTopic(this._logger, handlers)
 		const segmentsTopic = new SegmentsTopic(this._logger, handlers)
 		const adLibsTopic = new AdLibsTopic(this._logger, handlers)
+		const packageStatusTopic = new PackagesTopic(this._logger, handlers)
 
 		rootChannel.addTopic(StatusChannels.studio, studioTopic)
 		rootChannel.addTopic(StatusChannels.activePlaylist, activePlaylistTopic)
 		rootChannel.addTopic(StatusChannels.activePieces, activePiecesTopic)
 		rootChannel.addTopic(StatusChannels.segments, segmentsTopic)
 		rootChannel.addTopic(StatusChannels.adLibs, adLibsTopic)
+		rootChannel.addTopic(StatusChannels.packages, packageStatusTopic)
 
 		const wss = new WebSocketServer({ port: 8080 })
 		wss.on('connection', (ws, request) => {