feat: partInstances invalid state SOFIE-317

.github/workflows/publish-libs.yml

@@ -68,14 +68,14 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version-file: '.node-version'
+          node-version-file: ".node-version"
       - name: Prepare Environment
         run: |
           corepack enable
 
           cd packages
           yarn install
-          yarn lerna run --scope \*\*/${{ matrix.package-name }} --include-dependencies --stream build
+          yarn build:single ${{ matrix.package-name }}/tsconfig.build.json
         env:
           CI: true
       - name: Run typecheck and linter
@@ -119,7 +119,7 @@ jobs:
 
           cd packages
           yarn install
-          yarn lerna run --scope \*\*/${{ matrix.package-name }} --include-dependencies --stream build
+          yarn build:single ${{ matrix.package-name }}/tsconfig.build.json
         env:
           CI: true
       - name: Run tests
@@ -145,7 +145,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version-file: '.node-version'
+          node-version-file: ".node-version"
       - name: Prepare Environment
         run: |
           corepack enable
@@ -222,7 +222,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v6
         with:
-          node-version-file: '.node-version'
+          node-version-file: ".node-version"
 
       - name: Download release artifact
         uses: actions/download-artifact@v6

.github/workflows/sonar.yaml

@@ -43,6 +43,10 @@ jobs:
 
           yarn config set cacheFolder /home/runner/lint-core-cache
           yarn
+
+          # setup zodern:types. No linters are setup, so this simply installs the packages
+          yarn meteor lint
+
           yarn build:packages
         env:
           CI: true

.gitignore

@@ -15,6 +15,8 @@ meteor-settings.json
 .github/workflows/forkSync.yml
 .github/workflows/forkSynk.yml
 
+**/*.tsbuildinfo
+
 .pnp.*
 .yarn/*
 !.yarn/patches

meteor/package.json

@@ -14,10 +14,10 @@
 		"unit": "jest",
 		"unitci": "jest --maxWorkers 2 --coverage",
 		"unitcov": "jest --coverage",
-		"test": "yarn check-types && yarn unit",
+		"test": "yarn unit",
 		"watch": "jest --watch",
 		"update-snapshots": "jest --updateSnapshot",
-		"ci:lint": "yarn check-types && yarn lint",
+		"ci:lint": "yarn lint",
 		"cov-open": "open-cli coverage/lcov-report/index.html",
 		"cov": "yarn unitcov && yarn cov-open",
 		"license-validate": "node ../scripts/checkLicenses.js --allowed=\"MIT,BSD,ISC,Apache,Unlicense,CC0,LGPL,CC BY 3.0,CC BY 4.0,MPL 2.0,Python 2.0\" --excludePackages=timecode,rxjs/ajax,rxjs/fetch,rxjs/internal-compatibility,nw-pre-gyp-module-test,rxjs/operators,rxjs/testing,rxjs/webSocket,undefined,i18next-conv,@fortawesome/fontawesome-common-types,argv,indexof,custom-license,private,public-domain-module,@sofie-automation/corelib,@sofie-automation/shared-lib,@sofie-automation/job-worker",
@@ -32,9 +32,7 @@
 		"prepareChangelog": "run release --prerelease --release-as patch",
 		"validate:all-dependencies": "run validate:prod-dependencies && run validate:dev-dependencies && run license-validate",
 		"validate:prod-dependencies": "yarn npm audit --environment production",
-		"validate:dev-dependencies": "yarn npm audit --environment development --severity moderate",
-		"check-types": "tsc --noEmit -p tsconfig.json",
-		"watch-types": "run check-types --watch"
+		"validate:dev-dependencies": "yarn npm audit --environment development --severity moderate"
 	},
 	"dependencies": {
 		"@babel/runtime": "^7.26.7",

meteor/server/api/__tests__/cleanup.test.ts

@@ -203,7 +203,7 @@ async function setDefaultDatatoDB(env: DefaultEnvironment, now: number) {
 		startSegmentId: segmentId,
 		timelineObjectsString: '' as any,
 	}
-	const pieceId = await Pieces.mutableCollection.insertAsync(piece)
+	await Pieces.mutableCollection.insertAsync(piece)
 
 	await AdLibActions.mutableCollection.insertAsync({
 		_id: getRandomId(),
@@ -265,22 +265,15 @@ async function setDefaultDatatoDB(env: DefaultEnvironment, now: number) {
 	})
 	const packageId = await ExpectedPackages.mutableCollection.insertAsync({
 		_id: getRandomId(),
-		blueprintPackageId: '',
-		// @ts-expect-error bucketId is not a part of all ExpectedPackageDBs
-		bucketId,
-		content: {} as any,
-		contentVersionHash: '',
-		created: 0,
-		fromPieceType: '' as any,
-		layers: [],
-		pieceId,
-		rundownId,
-		segmentId,
-		sideEffect: {} as any,
 		studioId,
-		sources: {} as any,
-		type: '' as any,
-		version: {} as any,
+		rundownId,
+		bucketId: null,
+		created: 0,
+		package: {} as any,
+		ingestSources: [],
+		playoutSources: {
+			pieceInstanceIds: [],
+		},
 	})
 	await ExpectedPackageWorkStatuses.insertAsync({
 		_id: getRandomId(),

meteor/server/api/ingest/debug.ts

@@ -8,7 +8,6 @@ import { QueueStudioJob } from '../../worker/worker'
 import { StudioJobs } from '@sofie-automation/corelib/dist/worker/studio'
 import { RundownPlaylistId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { MeteorDebugMethods } from '../../methods'
-import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 
 MeteorDebugMethods({
 	/**
@@ -47,31 +46,4 @@ MeteorDebugMethods({
 			segmentExternalId: segment.externalId,
 		})
 	},
-	/**
-	 * Regenerate all the expected packages for all rundowns in the system.
-	 * Additionally it will recreate any expectedPlayoutItems.
-	 * This shouldn't be necessary as ingest will do this for each rundown as part of its workflow
-	 */
-	debug_recreateExpectedPackages: async () => {
-		const rundowns = (await Rundowns.findFetchAsync(
-			{},
-			{
-				projection: {
-					_id: 1,
-					studioId: 1,
-					source: 1,
-				},
-			}
-		)) as Array<Pick<DBRundown, '_id' | 'studioId' | 'source'>>
-
-		await Promise.all(
-			rundowns
-				.filter((rundown) => rundown.source.type !== 'snapshot')
-				.map(async (rundown) =>
-					runIngestOperation(rundown.studioId, IngestJobs.ExpectedPackagesRegenerate, {
-						rundownId: rundown._id,
-					})
-				)
-		)
-	},
 })

meteor/server/api/ingest/packageInfo.ts

@@ -1,10 +1,7 @@
 import {
-	ExpectedPackageDBFromBucketAdLib,
-	ExpectedPackageDBFromBucketAdLibAction,
-	ExpectedPackageDBFromStudioBaselineObjects,
 	ExpectedPackageDBType,
-	ExpectedPackageFromRundown,
-	ExpectedPackageFromRundownBaseline,
+	ExpectedPackageDB,
+	ExpectedPackageIngestSourceBucket,
 } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 import { PackageInfoDB } from '@sofie-automation/corelib/dist/dataModel/PackageInfos'
 import { ExpectedPackages, Rundowns } from '../../collections'
@@ -28,8 +25,10 @@ export async function onUpdatedPackageInfo(packageId: ExpectedPackageId, _doc: P
 		return
 	}
 
-	if (pkg.listenToPackageInfoUpdates) {
-		switch (pkg.fromPieceType) {
+	for (const source of pkg.ingestSources) {
+		if (!source.listenToPackageInfoUpdates) continue
+
+		switch (source.fromPieceType) {
 			case ExpectedPackageDBType.PIECE:
 			case ExpectedPackageDBType.ADLIB_PIECE:
 			case ExpectedPackageDBType.ADLIB_ACTION:
@@ -41,39 +40,44 @@ export async function onUpdatedPackageInfo(packageId: ExpectedPackageId, _doc: P
 				break
 			case ExpectedPackageDBType.BUCKET_ADLIB:
 			case ExpectedPackageDBType.BUCKET_ADLIB_ACTION:
-				onUpdatedPackageInfoForBucketItemDebounce(pkg)
+				onUpdatedPackageInfoForBucketItemDebounce(pkg, source)
 				break
 			case ExpectedPackageDBType.STUDIO_BASELINE_OBJECTS:
 				onUpdatedPackageInfoForStudioBaselineDebounce(pkg)
 				break
 			default:
-				assertNever(pkg)
+				assertNever(source)
 				break
 		}
 	}
 }
 
 const pendingRundownPackageUpdates = new Map<RundownId, Array<ExpectedPackageId>>()
-function onUpdatedPackageInfoForRundownDebounce(pkg: ExpectedPackageFromRundown | ExpectedPackageFromRundownBaseline) {
-	const existingEntry = pendingRundownPackageUpdates.get(pkg.rundownId)
+function onUpdatedPackageInfoForRundownDebounce(pkg: ExpectedPackageDB) {
+	if (!pkg.rundownId) {
+		logger.error(`Updating ExpectedPackage "${pkg._id}" not possibe: missing rundownId`)
+		return
+	}
+
+	const rundownId = pkg.rundownId
+
+	const existingEntry = pendingRundownPackageUpdates.get(rundownId)
 	if (existingEntry) {
 		// already queued, add to the batch
 		existingEntry.push(pkg._id)
 	} else {
-		pendingRundownPackageUpdates.set(pkg.rundownId, [pkg._id])
+		pendingRundownPackageUpdates.set(rundownId, [pkg._id])
 	}
 
 	// TODO: Scaling - this won't batch correctly if package manager directs calls to multiple instances
 	lazyIgnore(
-		`onUpdatedPackageInfoForRundown_${pkg.rundownId}`,
+		`onUpdatedPackageInfoForRundown_${rundownId}`,
 		() => {
-			const packageIds = pendingRundownPackageUpdates.get(pkg.rundownId)
+			const packageIds = pendingRundownPackageUpdates.get(rundownId)
 			if (packageIds) {
-				pendingRundownPackageUpdates.delete(pkg.rundownId)
-				onUpdatedPackageInfoForRundown(pkg.rundownId, packageIds).catch((e) => {
-					logger.error(
-						`Updating ExpectedPackages for Rundown "${pkg.rundownId}" failed: ${stringifyError(e)}`
-					)
+				pendingRundownPackageUpdates.delete(rundownId)
+				onUpdatedPackageInfoForRundown(rundownId, packageIds).catch((e) => {
+					logger.error(`Updating ExpectedPackages for Rundown "${rundownId}" failed: ${stringifyError(e)}`)
 				})
 			}
 		},
@@ -108,19 +112,24 @@ async function onUpdatedPackageInfoForRundown(
 	})
 }
 
-function onUpdatedPackageInfoForBucketItemDebounce(
-	pkg: ExpectedPackageDBFromBucketAdLib | ExpectedPackageDBFromBucketAdLibAction
-) {
+function onUpdatedPackageInfoForBucketItemDebounce(pkg: ExpectedPackageDB, source: ExpectedPackageIngestSourceBucket) {
+	if (!pkg.bucketId) {
+		logger.error(`Updating ExpectedPackage "${pkg._id}" for Bucket "${pkg.bucketId}" not possible`)
+		return
+	}
+
+	const bucketId = pkg.bucketId
+
 	lazyIgnore(
-		`onUpdatedPackageInfoForBucket_${pkg.studioId}_${pkg.bucketId}_${pkg.pieceExternalId}`,
+		`onUpdatedPackageInfoForBucket_${pkg.studioId}_${bucketId}_${source.pieceExternalId}`,
 		() => {
 			runIngestOperation(pkg.studioId, IngestJobs.BucketItemRegenerate, {
-				bucketId: pkg.bucketId,
-				externalId: pkg.pieceExternalId,
+				bucketId: bucketId,
+				externalId: source.pieceExternalId,
 			}).catch((err) => {
 				logger.error(
-					`Updating ExpectedPackages for Bucket "${pkg.bucketId}" Item "${
-						pkg.pieceExternalId
+					`Updating ExpectedPackages for Bucket "${bucketId}" Item "${
+						source.pieceExternalId
 					}" failed: ${stringifyError(err)}`
 				)
 			})
@@ -129,7 +138,7 @@ function onUpdatedPackageInfoForBucketItemDebounce(
 	)
 }
 
-function onUpdatedPackageInfoForStudioBaselineDebounce(pkg: ExpectedPackageDBFromStudioBaselineObjects) {
+function onUpdatedPackageInfoForStudioBaselineDebounce(pkg: ExpectedPackageDB) {
 	lazyIgnore(
 		`onUpdatedPackageInfoForStudioBaseline_${pkg.studioId}`,
 		() => {

meteor/server/api/integration/expectedPackages.ts

@@ -34,6 +34,7 @@ import {
 } from '../../collections'
 import { logger } from '../../logging'
 import _ from 'underscore'
+import { ExpectedPackageDB } from '@sofie-automation/corelib/dist/dataModel/ExpectedPackages'
 
 export namespace PackageManagerIntegration {
 	export async function updateExpectedPackageWorkStatuses(
@@ -99,9 +100,17 @@ export namespace PackageManagerIntegration {
 					const fromPackageIds = workStatus.fromPackages.map((p) => p.id)
 					if (fromPackageIds.length) {
 						ps.push(
-							ExpectedPackages.findOneAsync({
-								_id: { $in: fromPackageIds },
-							}).then((expPackage) => {
+							ExpectedPackages.findOneAsync(
+								{
+									_id: { $in: fromPackageIds },
+								},
+								{
+									projection: {
+										_id: 1,
+										studioId: 1,
+									},
+								}
+							).then((expPackage: Pick<ExpectedPackageDB, '_id' | 'studioId'> | undefined) => {
 								if (!expPackage)
 									throw new Meteor.Error(404, `ExpectedPackages "${fromPackageIds}" not found`)