Merge branch 'release52' into release53

nytamin · nytamin · commit 72a92110979b · 2025-05-27T13:23:11.000+02:00
# Conflicts:
#	packages/blueprints-integration/CHANGELOG.md
#	packages/documentation/docs/user-guide/installation/installing-sofie-server-core.md
#	packages/lerna.json
#	packages/mos-gateway/CHANGELOG.md
#	packages/playout-gateway/CHANGELOG.md
#	packages/server-core-integration/CHANGELOG.md
#	packages/webui/src/client/ui/Prompter/PrompterView.tsx
diff --git a/meteor/Dockerfile b/meteor/Dockerfile
@@ -60,4 +60,6 @@ COPY --from=1 /opt/bundle /opt/core
 COPY meteor/docker-entrypoint.sh /opt
 
 WORKDIR /opt/core/
+RUN chown -R 1000:1000 /opt/core
+USER 1000
 CMD ["/opt/docker-entrypoint.sh"]
diff --git a/meteor/Dockerfile.circle b/meteor/Dockerfile.circle
@@ -5,5 +5,7 @@ RUN apk add --no-cache tzdata
 
 COPY meteor/bundle /opt/core
 COPY meteor/docker-entrypoint.sh /opt
-WORKDIR /opt/core/
+WORKDIR /opt/core
+RUN chown -R 1000:1000 /opt/core
+USER 1000
 CMD ["/opt/docker-entrypoint.sh"]
diff --git a/packages/blueprints-integration/CHANGELOG.md b/packages/blueprints-integration/CHANGELOG.md
@@ -30,6 +30,10 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 - routeset config defined in blueprints ([e839b97](https://github.com/nrkno/sofie-core/commit/e839b97c0205df38e5bc7ab816a9c79406a7d767))
 - update meteor to 3.1 and node to 22 ([61b6854](https://github.com/nrkno/sofie-core/commit/61b6854261a03f04e81416b9d37ee995e3a10108))
 
+## [1.51.7](https://github.com/nrkno/sofie-core/compare/v1.51.6...v1.51.7) (2025-05-06)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
 ## [1.51.6](https://github.com/nrkno/sofie-core/compare/v1.51.5...v1.51.6) (2025-01-14)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration
diff --git a/packages/corelib/src/playout/processAndPrune.ts b/packages/corelib/src/playout/processAndPrune.ts
@@ -15,15 +15,7 @@ function getPieceStartTimeAsReference(newPieceStart: number | 'now'): number | R
 }
 
 function getPieceStartTimeWithinPart(p: ReadonlyDeep<PieceInstance>): 'now' | number {
-	// If the piece is dynamically inserted, then its preroll should be factored into its start time, but not for any infinite continuations
-	const isStartOfAdlib =
-		!!p.dynamicallyInserted && !(p.infinite?.fromPreviousPart || p.infinite?.fromPreviousPlayhead)
-
-	if (isStartOfAdlib && p.piece.enable.start !== 'now') {
-		return p.piece.enable.start + (p.piece.prerollDuration ?? 0)
-	} else {
-		return p.piece.enable.start
-	}
+	return p.piece.enable.start
 }
 
 function isClear(piece?: ReadonlyDeep<PieceInstance>): boolean {
diff --git a/packages/documentation/docs/user-guide/installation/installing-sofie-server-core.md b/packages/documentation/docs/user-guide/installation/installing-sofie-server-core.md
@@ -8,7 +8,7 @@ sidebar_position: 2
 
 ### **Prerequisites**
 
-**\(Linux\)** Install [Docker](https://docs.docker.com/install/linux/docker-ce/ubuntu/) and [docker-compose](https://www.digitalocean.com/community/tutorials/how-to-install-docker-compose-on-ubuntu-18-04).  
+**\(Linux\)** Install [Docker](https://docs.docker.com/install/linux/docker-ce/ubuntu/) and [docker-compose](https://www.digitalocean.com/community/tutorials/how-to-install-docker-compose-on-ubuntu-18-04).
 **\(Windows\)** Install [Docker for Windows](https://hub.docker.com/editions/community/docker-ce-desktop-windows).
 
 ### Installation
@@ -121,6 +121,12 @@ Then open a terminal, `cd your-sofie-folder` and `sudo docker-compose up` \(just
 
 Once the installation is done, Sofie should be running on [http://localhost:3000](http://localhost:3000)
 
+Next, you will need to install a Rundown Gateway. Visit [Rundowns & Newsroom Systems](installing-a-gateway/rundown-or-newsroom-system-connection/intro.md) to see which _Rundown Gateway_ is best suited for _your_ production environment.
+
+:::note
+Starting with Sofie version 1.52.0, `sofietv` container images will run as UID 1000.
+:::
+
 ### Tips for running in production
 
 There are some things not covered in this guide needed to run _Sofie_ in a production environment:
@@ -133,7 +139,7 @@ There are some things not covered in this guide needed to run _Sofie_ in a produ
 
 Installation instructions for installing Sofie-Core or the various gateways are available in the README file in their respective github repos.
 
-Common prerequisites are [Node.js](https://nodejs.org/) and [Yarn](https://yarnpkg.com/).  
+Common prerequisites are [Node.js](https://nodejs.org/) and [Yarn](https://yarnpkg.com/).
 Links to the repos are listed at [Applications & Libraries](../../for-developers/libraries.md).
 
 [_Sofie&nbsp;Core_ GitHub Page for Developers](https://github.com/nrkno/sofie-core)
diff --git a/packages/job-worker/src/playout/__tests__/timeline.test.ts b/packages/job-worker/src/playout/__tests__/timeline.test.ts
@@ -1286,8 +1286,9 @@ describe('Timeline', () => {
 					})
 
 					const pieceOffset = 12560
+
 					// Simulate the piece timing confirmation from playout-gateway
-					await doSimulatePiecePlaybackTimings(playlistId, pieceOffset, 2)
+					await doSimulatePiecePlaybackTimings(playlistId, pieceOffset, 2) // This pieceOffset includes the partPreroll
 
 					// Now we have a concrete time
 					await checkTimings({
@@ -1457,16 +1458,14 @@ describe('Timeline', () => {
 					// Simulate the piece timing confirmation from playout-gateway
 					await doSimulatePiecePlaybackTimings(playlistId, pieceOffset, 2)
 
-					const pieceOffsetWithPreroll = pieceOffset + 340
-
 					// Now we have a concrete time
 					await checkTimings({
 						previousPart: null,
 						currentPieces: {
 							piece000: {
 								controlObj: {
 									start: 500, // This one gave the preroll
-									end: pieceOffsetWithPreroll,
+									end: pieceOffset,
 								},
 								childGroup: {
 									preroll: 500,
@@ -1485,7 +1484,7 @@ describe('Timeline', () => {
 							[adlibbedPieceId]: {
 								// Our adlibbed piece
 								controlObj: {
-									start: pieceOffsetWithPreroll,
+									start: pieceOffset,
 								},
 								childGroup: {
 									preroll: 340,
diff --git a/packages/job-worker/src/playout/timeline/__tests__/pieceGroup.test.ts b/packages/job-worker/src/playout/timeline/__tests__/pieceGroup.test.ts
@@ -539,7 +539,7 @@ describe('Pieces', () => {
 				classes: [],
 				enable: {
 					...enable,
-					end: 400,
+					end: 600,
 				},
 			})
 		})
diff --git a/packages/job-worker/src/playout/timeline/multi-gateway.ts b/packages/job-worker/src/playout/timeline/multi-gateway.ts
@@ -225,14 +225,15 @@ function deNowifyCurrentPieces(
 	const objectsNotDeNowified: TimelineObjRundown[] = []
 	// The relative time for 'now' to be resolved to, inside of the part group
 	const nowInPart = targetNowTime - currentPartGroupStartTime
+	const nowInPartWithoutPreroll = nowInPart - (currentPartInstance.partInstance.partPlayoutTimings?.toPartDelay ?? 0)
 
 	// Ensure any pieces in the currentPartInstance have their now replaced
 	for (const pieceInstance of currentPartInstance.pieceInstances) {
 		if (pieceInstance.pieceInstance.piece.enable.start === 'now') {
 			pieceInstance.updatePieceProps({
 				enable: {
 					...pieceInstance.pieceInstance.piece.enable,
-					start: nowInPart,
+					start: nowInPartWithoutPreroll,
 				},
 			})
 		}
diff --git a/packages/job-worker/src/playout/timeline/part.ts b/packages/job-worker/src/playout/timeline/part.ts
@@ -66,7 +66,7 @@ export function transformPartIntoTimeline(
 				nowInParentGroup,
 				pieceInstance,
 				pieceEnable,
-				0,
+				pieceInstance.dynamicallyInserted ? 0 : partTimings.toPartDelay,
 				pieceGroupFirstObjClasses,
 				isInHold,
 				false
diff --git a/packages/job-worker/src/playout/timeline/piece.ts b/packages/job-worker/src/playout/timeline/piece.ts
@@ -95,13 +95,8 @@ export function getPieceEnableInsidePart(
 ): TSR.Timeline.TimelineEnable {
 	const pieceEnable: TSR.Timeline.TimelineEnable = { ...pieceInstance.piece.enable }
 	if (typeof pieceEnable.start === 'number') {
-		if (pieceInstance.dynamicallyInserted) {
-			// timed adlibbed pieces needs to factor in their preroll
-			pieceEnable.start += pieceInstance.piece.prerollDuration || 0
-		} else {
-			// timed planned pieces should be offset based on the preroll of the part
-			pieceEnable.start += partTimings.toPartDelay
-		}
+		// pieces should be offset based on the preroll of the part
+		pieceEnable.start += partTimings.toPartDelay
 	}
 
 	// If the part has an end time, we can consider post-roll
diff --git a/packages/job-worker/src/playout/timeline/pieceGroup.ts b/packages/job-worker/src/playout/timeline/pieceGroup.ts
@@ -136,7 +136,7 @@ export function createPieceGroupAndCap(
 	let resolvedEndCap: number | string | undefined
 	// If the start has been adjusted, the end needs to be updated to compensate
 	if (typeof pieceInstance.resolvedEndCap === 'number') {
-		resolvedEndCap = pieceInstance.resolvedEndCap - (pieceStartOffset ?? 0)
+		resolvedEndCap = pieceInstance.resolvedEndCap + (pieceStartOffset ?? 0)
 	} else if (pieceInstance.resolvedEndCap) {
 		// TODO - there could already be a piece with a cap of 'now' that we could use as our end time
 		// As the cap is for 'now', rather than try to get tsr to understand `end: 'now'`, we can create a 'now' object to tranlate it
diff --git a/packages/job-worker/src/playout/timings/timelineTriggerTime.ts b/packages/job-worker/src/playout/timings/timelineTriggerTime.ts
@@ -13,6 +13,7 @@ import { PieceTimelineMetadata } from '../timeline/pieceGroup.js'
 import { deserializeTimelineBlob } from '@sofie-automation/corelib/dist/dataModel/Timeline'
 import { ReadonlyDeep } from 'type-fest'
 import { AnyBulkWriteOperation } from 'mongodb'
+import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
 
 /**
  * Called from Playout-gateway when the trigger-time of a timeline object has updated
@@ -40,20 +41,38 @@ export async function handleTimelineTriggerTime(context: JobContext, data: OnTim
 						(id): id is PartInstanceId => id !== null
 					)
 
-					// We only need the PieceInstances, so load just them
-					const pieceInstances = await context.directCollections.PieceInstances.findFetch({
-						rundownId: { $in: rundownIDs },
-						partInstanceId: {
-							$in: partInstanceIDs,
-						},
-					})
+					// We only need the PieceInstances and PartInstances, so load just them
+					const [pieceInstances, partInstances] = await Promise.all([
+						context.directCollections.PieceInstances.findFetch({
+							rundownId: { $in: rundownIDs },
+							partInstanceId: {
+								$in: partInstanceIDs,
+							},
+						}),
+						context.directCollections.PartInstances.findFetch(
+							{
+								rundownId: { $in: rundownIDs },
+								_id: {
+									$in: partInstanceIDs,
+								},
+							},
+							{
+								projection: {
+									_id: 1,
+									partPlayoutTimings: 1,
+								},
+							}
+						) as Promise<Array<Pick<DBPartInstance, '_id' | 'partPlayoutTimings'>>>,
+					])
 					const pieceInstancesMap = normalizeArrayToMap(pieceInstances, '_id')
+					const partInstanceMap = normalizeArrayToMap(partInstances, '_id')
 
 					// Take ownership of the playlist in the db, so that we can mutate the timeline and piece instances
 					const changes = timelineTriggerTimeInner(
 						context,
 						studioCache,
 						data.results,
+						partInstanceMap,
 						pieceInstancesMap,
 						activePlaylist
 					)
@@ -62,7 +81,7 @@ export async function handleTimelineTriggerTime(context: JobContext, data: OnTim
 				})
 			} else {
 				// No playlist is active. no extra lock needed
-				timelineTriggerTimeInner(context, studioCache, data.results, undefined, undefined)
+				timelineTriggerTimeInner(context, studioCache, data.results, undefined, undefined, undefined)
 			}
 		})
 	}
@@ -107,6 +126,7 @@ function timelineTriggerTimeInner(
 	context: JobContext,
 	studioPlayoutModel: StudioPlayoutModel,
 	results: OnTimelineTriggerTimeProps['results'],
+	partInstances: Map<PartInstanceId, Pick<DBPartInstance, '_id' | 'partPlayoutTimings'>> | undefined,
 	pieceInstances: Map<PieceInstanceId, PieceInstance> | undefined,
 	activePlaylist: ReadonlyDeep<DBRundownPlaylist> | undefined
 ) {
@@ -142,7 +162,7 @@ function timelineTriggerTimeInner(
 
 				const objPieceInstanceId = (obj.metaData as Partial<PieceTimelineMetadata> | undefined)
 					?.triggerPieceInstanceId
-				if (objPieceInstanceId && activePlaylist && pieceInstances) {
+				if (objPieceInstanceId && activePlaylist && pieceInstances && partInstances) {
 					logger.debug('Update PieceInstance: ', {
 						pieceId: objPieceInstanceId,
 						time: new Date(o.time).toTimeString(),
@@ -154,8 +174,12 @@ function timelineTriggerTimeInner(
 						pieceInstance.dynamicallyInserted !== undefined &&
 						pieceInstance.piece.enable.start === 'now'
 					) {
-						pieceInstance.piece.enable.start = o.time
-						changes.setStartTime.set(pieceInstance._id, o.time)
+						const partPrerollDuration =
+							partInstances.get(pieceInstance.partInstanceId)?.partPlayoutTimings?.toPartDelay ?? 0
+
+						const adjustedStartTime = o.time - partPrerollDuration
+						pieceInstance.piece.enable.start = adjustedStartTime
+						changes.setStartTime.set(pieceInstance._id, adjustedStartTime)
 
 						const takeTime = pieceInstance.dynamicallyInserted
 						lastTakeTime = lastTakeTime === undefined ? takeTime : Math.max(lastTakeTime, takeTime)
diff --git a/packages/lerna.json b/packages/lerna.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.53.0-in-development",
-	"npmClient": "yarn",
-	"$schema": "node_modules/lerna/schemas/lerna-schema.json"
+  "version": "1.53.0-in-development",
+  "npmClient": "yarn",
+  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }
diff --git a/packages/live-status-gateway/Dockerfile b/packages/live-status-gateway/Dockerfile
@@ -29,4 +29,6 @@ COPY --from=0 /opt/shared-lib /opt/shared-lib
 COPY --from=0 /opt/corelib /opt/corelib
 
 WORKDIR /opt/live-status-gateway
+RUN chown -R 1000:1000 /opt/live-status-gateway
+USER 1000
 CMD ["node", "dist/index.js"]
diff --git a/packages/live-status-gateway/Dockerfile.circle b/packages/live-status-gateway/Dockerfile.circle
@@ -10,4 +10,6 @@ COPY shared-lib /opt/shared-lib
 COPY corelib /opt/corelib
 
 WORKDIR /opt/live-status-gateway
+RUN chown -R 1000:1000 /opt/live-status-gateway
+USER 1000
 CMD ["node", "dist/index.js"]
diff --git a/packages/mos-gateway/CHANGELOG.md b/packages/mos-gateway/CHANGELOG.md
@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [1.52.0-in-testing.0](https://github.com/nrkno/sofie-core/compare/v1.51.6...v1.52.0-in-testing.0) (2025-02-04)
+## [1.51.7](https://github.com/nrkno/sofie-core/compare/v1.51.6...v1.51.7) (2025-05-06)
 
 ### Bug Fixes
 
diff --git a/packages/mos-gateway/Dockerfile b/packages/mos-gateway/Dockerfile
@@ -23,4 +23,6 @@ COPY --from=0 /opt/server-core-integration /opt/server-core-integration
 COPY --from=0 /opt/shared-lib /opt/shared-lib
 
 WORKDIR /opt/mos-gateway
+RUN chown -R 1000:1000 /opt/mos-gateway
+USER 1000
 CMD ["node", "dist/index.js"]
diff --git a/packages/mos-gateway/Dockerfile.circle b/packages/mos-gateway/Dockerfile.circle
@@ -8,4 +8,6 @@ COPY server-core-integration /opt/server-core-integration
 COPY shared-lib /opt/shared-lib
 
 WORKDIR /opt/mos-gateway
+RUN chown -R 1000:1000 /opt/mos-gateway
+USER 1000
 CMD ["node", "dist/index.js"]
diff --git a/packages/playout-gateway/CHANGELOG.md b/packages/playout-gateway/CHANGELOG.md
@@ -11,6 +11,17 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 - modify datastore in `onRundownActivate` SOFIE-3310 ([#1240](https://github.com/nrkno/sofie-core/issues/1240)) ([8a0759f](https://github.com/nrkno/sofie-core/commit/8a0759f610497e37493e8a798aa0dd13f4f57119))
 - update meteor to 3.1 and node to 22 ([61b6854](https://github.com/nrkno/sofie-core/commit/61b6854261a03f04e81416b9d37ee995e3a10108))
 
+## [1.51.7](https://github.com/nrkno/sofie-core/compare/v1.51.6...v1.51.7) (2025-05-06)
+
+
+### Bug Fixes
+
+* update timeline-state-resolver to a test version ([fbe3a55](https://github.com/nrkno/sofie-core/commit/fbe3a556e6e98d7dc70b8995c65a5eeb2c9593f9))
+
+
+
+
+
 ## [1.51.6](https://github.com/nrkno/sofie-core/compare/v1.51.5...v1.51.6) (2025-01-14)
 
 ### Bug Fixes
diff --git a/packages/playout-gateway/Dockerfile b/packages/playout-gateway/Dockerfile
@@ -23,4 +23,6 @@ COPY --from=0 /opt/server-core-integration /opt/server-core-integration
 COPY --from=0 /opt/shared-lib /opt/shared-lib
 
 WORKDIR /opt/playout-gateway
+RUN chown -R 1000:1000 /opt/playout-gateway
+USER 1000
 CMD ["node", "dist/index.js"]
diff --git a/packages/playout-gateway/Dockerfile.circle b/packages/playout-gateway/Dockerfile.circle
@@ -8,4 +8,6 @@ COPY server-core-integration /opt/server-core-integration
 COPY shared-lib /opt/shared-lib
 
 WORKDIR /opt/playout-gateway
+RUN chown -R 1000:1000 /opt/playout-gateway
+USER 1000
 CMD ["node", "dist/index.js"]
diff --git a/packages/server-core-integration/CHANGELOG.md b/packages/server-core-integration/CHANGELOG.md
@@ -12,6 +12,10 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 - support for http header in packagemanager ([1e5bbc6](https://github.com/nrkno/sofie-core/commit/1e5bbc669fe67fedf48027524232ad6696fc8909))
 - update meteor to 3.1 and node to 22 ([61b6854](https://github.com/nrkno/sofie-core/commit/61b6854261a03f04e81416b9d37ee995e3a10108))
 
+## [1.51.7](https://github.com/nrkno/sofie-core/compare/v1.51.6...v1.51.7) (2025-05-06)
+
+**Note:** Version bump only for package @sofie-automation/server-core-integration
+
 ## [1.51.6](https://github.com/nrkno/sofie-core/compare/v1.51.5...v1.51.6) (2025-01-14)
 
 **Note:** Version bump only for package @sofie-automation/server-core-integration
diff --git a/packages/webui/src/client/ui/Prompter/PrompterView.tsx b/packages/webui/src/client/ui/Prompter/PrompterView.tsx
@@ -369,7 +369,7 @@ export class PrompterViewContent extends React.Component<Translated<IProps & ITr
 		this._lastAnimation = animate(window.scrollY, scrollToPosition, {
 			duration: 0.4,
 			ease: 'easeOut',
-			onUpdate: (latest: number) => window.scrollTo(0, latest),
+			onUpdate: (latest) => window.scrollTo({ left: 0, top: latest, behavior: 'instant' }),
 		})
 	}
 	listAnchorPositions(startY: number, endY: number, sortDirection = 1): [number, Element][] {
