wip

Author: Julusian

meteor/server/api/deviceTriggers/StudioDeviceTriggerManager.ts

@@ -30,8 +30,6 @@ import { SomeAction, SomeBlueprintTrigger } from '@sofie-automation/blueprints-i
 import { DeviceActions } from '@sofie-automation/shared-lib/dist/core/model/ShowStyle'
 import { DummyReactiveVar } from '@sofie-automation/meteor-lib/dist/triggers/reactive-var'
 import { MeteorTriggersContext } from './triggersContext'
-import { Tracker } from 'meteor/tracker'
-import { TriggerTrackerComputation } from '@sofie-automation/meteor-lib/dist/triggers/triggersContext'
 
 export class StudioDeviceTriggerManager {
 	#lastShowStyleBaseId: ShowStyleBaseId | null = null
@@ -45,11 +43,7 @@ export class StudioDeviceTriggerManager {
 		StudioActionManagers.set(studioId, new StudioActionManager())
 	}
 
-	async updateTriggers(
-		cache: ContentCache,
-		showStyleBaseId: ShowStyleBaseId,
-		computation: Tracker.Computation | null
-	): Promise<void> {
+	async updateTriggers(cache: ContentCache, showStyleBaseId: ShowStyleBaseId): Promise<void> {
 		const studioId = this.studioId
 		this.#lastShowStyleBaseId = showStyleBaseId
 
@@ -171,10 +165,7 @@ export class StudioDeviceTriggerManager {
 
 					addedPreviewIds.push(adLibPreviewId)
 				} else {
-					const previewedAdLibs = await thisAction.preview(
-						context,
-						computation as any as TriggerTrackerComputation | null
-					)
+					const previewedAdLibs = await thisAction.preview(context, null)
 
 					previewedAdLibs.forEach((adLib) => {
 						const adLibPreviewId = protectString<PreviewWrappedAdLibId>(

meteor/server/api/deviceTriggers/observer.ts

@@ -44,7 +44,7 @@ MeteorStartupAsync(async () => {
 		const manager = new StudioDeviceTriggerManager(studioId)
 		const observer = new StudioObserver(studioId, (showStyleBaseId, cache) => {
 			workInQueue(async () => {
-				await manager.updateTriggers(cache, showStyleBaseId, null)
+				await manager.updateTriggers(cache, showStyleBaseId)
 			})
 
 			return () => {

meteor/server/api/deviceTriggers/triggersContext.ts

@@ -10,8 +10,6 @@ import { MeteorCall } from '../methods'
 import { ClientAPI } from '@sofie-automation/meteor-lib/dist/api/client'
 import { UserAction } from '@sofie-automation/meteor-lib/dist/userAction'
 import { TFunction } from 'i18next'
-import { Tracker } from 'meteor/tracker'
-
 import { logger } from '../../logging'
 import { IBaseFilterLink, IRundownPlaylistFilterLink } from '@sofie-automation/blueprints-integration'
 import { PartId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
@@ -48,23 +46,19 @@ class MeteorTriggersCollectionWrapper<DBInterface extends { _id: ProtectedString
 	}
 
 	async findFetchAsync(
-		computation: TriggerTrackerComputation | null,
+		_computation: TriggerTrackerComputation | null,
 		selector: any,
 		options?: any
 	): Promise<Array<DBInterface>> {
-		return Tracker.withComputation(computation as Tracker.Computation | null, async () => {
-			return this.#collection.findFetchAsync(selector, options)
-		})
+		return this.#collection.findFetchAsync(selector, options)
 	}
 
 	async findOneAsync(
-		computation: TriggerTrackerComputation | null,
+		_computation: TriggerTrackerComputation | null,
 		selector: any,
 		options?: any
 	): Promise<DBInterface | undefined> {
-		return Tracker.withComputation(computation as Tracker.Computation | null, async () => {
-			return this.#collection.findOneAsync(selector, options)
-		})
+		return this.#collection.findOneAsync(selector, options)
 	}
 }
 
@@ -102,8 +96,8 @@ export const MeteorTriggersContext: TriggersContext = {
 		)
 	},
 
-	withComputation: async (computation, func) => {
-		return Tracker.withComputation(computation as Tracker.Computation | null, func)
+	withComputation: async (_computation, func) => {
+		return func()
 	},
 
 	memoizedIsolatedAutorun: async <TArgs extends any[], TRes>(