wip: id collisions

Author: Julusian

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

@@ -15,15 +15,17 @@ import type { ExpectedPackageIngestSource } from '@sofie-automation/corelib/dist
 export class WatchedPackagesHelper {
 	private readonly packages = new Map<
 		ExpectedPackageId,
-		ReadonlyDeep<IngestExpectedPackage<ExpectedPackageIngestSource>>
+		ReadonlyDeep<IngestExpectedPackage<ExpectedPackageIngestSource>>[]
 	>()
 
 	private constructor(
 		packages: ReadonlyDeep<IngestExpectedPackage<ExpectedPackageIngestSource>[]>,
 		private readonly packageInfos: ReadonlyDeep<PackageInfoDB[]>
 	) {
 		for (const pkg of packages) {
-			this.packages.set(pkg.packageId, pkg)
+			const arr = this.packages.get(pkg.packageId) || []
+			arr.push(pkg)
+			this.packages.set(pkg.packageId, arr)
 		}
 	}
 
@@ -152,8 +154,10 @@ export class WatchedPackagesHelper {
 		func: (pkg: ReadonlyDeep<IngestExpectedPackage<ExpectedPackageIngestSource>>) => boolean
 	): WatchedPackagesHelper {
 		const watchedPackages: ReadonlyDeep<IngestExpectedPackage<ExpectedPackageIngestSource>>[] = []
-		for (const pkg of this.packages.values()) {
-			if (func(pkg)) watchedPackages.push(pkg)
+		for (const packages of this.packages.values()) {
+			for (const pkg of packages) {
+				if (func(pkg)) watchedPackages.push(pkg)
+			}
 		}
 
 		const newPackageIds = new Set(watchedPackages.map((p) => p.packageId))
@@ -167,10 +171,13 @@ export class WatchedPackagesHelper {
 	}
 
 	getPackageInfo(packageId: string): Readonly<Array<PackageInfo.Any>> {
-		for (const pkg of this.packages.values()) {
-			if (pkg.package._id === packageId) {
-				const info = this.packageInfos.filter((p) => p.packageId === pkg.packageId)
-				return unprotectObjectArray(info)
+		// nocommit - can this/should this do more scoping by source?
+		for (const packages of this.packages.values()) {
+			for (const pkg of packages) {
+				if (pkg.package._id === packageId) {
+					const info = this.packageInfos.filter((p) => p.packageId === pkg.packageId)
+					return unprotectObjectArray(info)
+				}
 			}
 		}