wip: fix another waitForPromise

Author: Julusian

meteor/server/api/ingest/rundownInput.ts

@@ -429,19 +429,19 @@ async function onMediaObjectChanged(newDocument: MediaObject, oldDocument?: Medi
 
 		for (const mediaObjectUpdatedIds of updateIds) {
 			if (validSegmentIds.has(mediaObjectUpdatedIds.segmentId)) {
-				try {
-					lazyIgnore(
-						`updateSegmentFromMediaObject_${mediaObjectUpdatedIds.segmentId}`,
-						async () => updateSegmentFromCache(newDocument.studioId, mediaObjectUpdatedIds),
-						200
-					)
-				} catch (exception) {
-					logger.error(
-						`Error thrown while updating Segment from cache after MediaObject changed: ${stringifyError(
-							exception
-						)}`
-					)
-				}
+				lazyIgnore(
+					`updateSegmentFromMediaObject_${mediaObjectUpdatedIds.segmentId}`,
+					() => {
+						updateSegmentFromCache(newDocument.studioId, mediaObjectUpdatedIds).catch((e) => {
+							logger.error(
+								`Error thrown while updating Segment from cache after MediaObject changed: ${stringifyError(
+									e
+								)}`
+							)
+						})
+					},
+					200
+				)
 			}
 		}
 	}

meteor/server/lib/lib.ts

@@ -57,7 +57,7 @@ export function MeteorWrapAsync(func: Function, context?: Object): any {
 }
 
 const lazyIgnoreCache: { [name: string]: number } = {}
-export function lazyIgnore(name: string, f1: () => Promise<void> | void, t: number): void {
+export function lazyIgnore(name: string, f1: () => void, t: number): void {
 	// Don't execute the function f1 until the time t has passed.
 	// Subsequent calls will extend the laziness and ignore the previous call
 
@@ -66,12 +66,11 @@ export function lazyIgnore(name: string, f1: () => Promise<void> | void, t: numb
 	}
 	lazyIgnoreCache[name] = Meteor.setTimeout(() => {
 		delete lazyIgnoreCache[name]
-		if (Meteor.isClient) {
-			f1()?.catch((e) => {
-				throw new Error(e)
-			})
-		} else {
-			waitForPromise(f1())
+
+		try {
+			f1()
+		} catch (e) {
+			logger.error(`Unhandled error in lazyIgnore "${name}": ${stringifyError(e)}`)
 		}
 	}, t)
 }

meteor/server/publications/lib/observerChain.ts

@@ -3,7 +3,8 @@ import { Meteor } from 'meteor/meteor'
 import { MongoCursor } from '@sofie-automation/meteor-lib/dist/collections/lib'
 import { Simplify } from 'type-fest'
 import { assertNever } from '../../lib/tempLib'
-import { waitForPromise } from '../../lib/lib'
+import { logger } from '../../logging'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 /**
  * https://stackoverflow.com/a/66011942
@@ -41,18 +42,18 @@ export function observerChain(): Pick<Link<{}>, 'next'> {
 			throw new Error('nextChanged: Unfinished observer chain. This is a memory leak.')
 		}
 
-		function changedLink(collectorObject: Record<string, any>) {
+		async function changedLink(collectorObject: Record<string, any>) {
 			if (previousObserver) {
 				previousObserver.stop()
 				previousObserver = null
 			}
-			const cursorResult = waitForPromise(chainedCursor(collectorObject))
+			const cursorResult = await chainedCursor(collectorObject)
 			if (cursorResult === null) {
 				nextStop()
 				return
 			}
 
-			previousObserver = cursorResult.observe({
+			previousObserver = await cursorResult.observeAsync({
 				added: (doc) => {
 					if (!chainedKey) throw new Error('Chained key needs to be defined')
 					const newCollectorObject: Record<string, any> = {
@@ -96,10 +97,10 @@ export function observerChain(): Pick<Link<{}>, 'next'> {
 		}
 
 		return {
-			changed: (obj: Record<string, any>) => {
+			changed: async (obj: Record<string, any>) => {
 				switch (mode) {
 					case 'next':
-						changedLink(obj)
+						await changedLink(obj)
 						break
 					case 'end':
 						changedEnd(obj)
@@ -160,7 +161,9 @@ export function observerChain(): Pick<Link<{}>, 'next'> {
 			const nextLink = link.next(key, cursorChain)
 			setImmediate(
 				Meteor.bindEnvironment(() => {
-					changed({})
+					changed({}).catch((e) => {
+						logger.error(`Error in observerChain: ${stringifyError(e)}`)
+					})
 				})
 			)
 			return nextLink as any