Merge branch 'release52' into feat/vite-ui-bundler2

Author: Julusian

.github/workflows/sonar.yaml

@@ -13,6 +13,7 @@ jobs:
     name: SonarCloud
     runs-on: ubuntu-latest
     if: ${{ github.repository_owner == 'nrkno' && !github.event.pull_request.head.repo.fork }}
+    timeout-minutes: 15
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/trivy.yml

@@ -11,6 +11,8 @@ jobs:
     strategy:
       matrix:
         image: ["server-core", "playout-gateway", "mos-gateway"]
+    timeout-minutes: 15
+
     steps:
       - name: Run Trivy vulnerability scanner (json)
         uses: aquasecurity/trivy-action@0.24.0

DEVELOPER.md

@@ -19,7 +19,7 @@ Follow these instructions to start up Sofie Core in development mode. (For produ
 ### Prerequisites
 
 - Install [Node.js](https://nodejs.org) 14 (using [nvm](https://github.com/nvm-sh/nvm) or [nvm-windows](https://github.com/coreybutler/nvm-windows) is the recommended way to install Node.js)
-- Install [Meteor](https://www.meteor.com/install) (`npm install --global meteor`)
+- Install [Meteor](https://www.meteor.com/install) (`npm install --global meteor@2`)
 - Install [Node.js](https://nodejs.org) 18 (using the same method you used above, you can uninstall node 14 if needed)
 - Install an older version of corepack (`npm install --global corepack@0.15.3`)
 - Enable [corepack](https://nodejs.org/api/corepack.html#corepack) (`corepack enable`) as administrator/root. If `corepack` is not found, you may need to install it first with `npm install --global corepack`

meteor/package.json

@@ -66,7 +66,7 @@
 		"object-path": "^0.11.8",
 		"p-lazy": "^3.1.0",
 		"semver": "^7.5.4",
-		"superfly-timeline": "9.0.0",
+		"superfly-timeline": "9.0.1",
 		"threadedclass": "^1.2.2",
 		"timecode": "0.0.4",
 		"type-fest": "^3.13.1",

meteor/server/api/client.ts

@@ -64,7 +64,7 @@ export namespace ServerClientAPI {
 			userEvent,
 			eventTime,
 			`worker.${jobName}`,
-			[jobArguments],
+			jobArguments as any,
 			async (_credentials, userActionMetadata) => {
 				checkArgs()
 
@@ -91,7 +91,7 @@ export namespace ServerClientAPI {
 			userEvent,
 			eventTime,
 			`worker.${jobName}`,
-			[jobArguments],
+			jobArguments as any,
 			async (_credentials, userActionMetadata) => {
 				checkArgs()
 
@@ -111,7 +111,7 @@ export namespace ServerClientAPI {
 		playlistId: RundownPlaylistId,
 		checkArgs: () => void,
 		methodName: string,
-		args: any[],
+		args: Record<string, unknown>,
 		fcn: (access: VerifiedRundownPlaylistContentAccess) => Promise<T>
 	): Promise<ClientAPI.ClientResponse<T>> {
 		return runUserActionInLog(context, userEvent, eventTime, methodName, args, async () => {
@@ -132,7 +132,7 @@ export namespace ServerClientAPI {
 		rundownId: RundownId,
 		checkArgs: () => void,
 		methodName: string,
-		args: any[],
+		args: Record<string, unknown>,
 		fcn: (access: VerifiedRundownContentAccess) => Promise<T>
 	): Promise<ClientAPI.ClientResponse<T>> {
 		return runUserActionInLog(context, userEvent, eventTime, methodName, args, async () => {
@@ -184,7 +184,7 @@ export namespace ServerClientAPI {
 		userEvent: string,
 		eventTime: Time,
 		methodName: string,
-		methodArgs: unknown[],
+		methodArgs: Record<string, unknown>,
 		fcn: (credentials: BasicAccessContext, userActionMetadata: UserActionMetadata) => Promise<TRes>
 	): Promise<ClientAPI.ClientResponse<TRes>> {
 		// If we are in the test write auth check mode, then bypass all special logic to ensure errors dont get mangled

meteor/server/api/ingest/mosDevice/actions.ts

@@ -13,6 +13,7 @@ import { generateRundownSource, getPeripheralDeviceFromRundown, runIngestOperati
 import { IngestJobs } from '@sofie-automation/corelib/dist/worker/ingest'
 import { DEFAULT_MOS_TIMEOUT_TIME } from '@sofie-automation/shared-lib/dist/core/constants'
 import { executePeripheralDeviceFunctionWithCustomTimeout } from '../../peripheralDevice/executeFunction'
+import { getMosTypes } from '@mos-connection/helper'
 
 export namespace MOSDeviceActions {
 	export async function reloadRundown(
@@ -72,9 +73,15 @@ export namespace MOSDeviceActions {
 		if (!mosPayload.Body)
 			throw new Meteor.Error(500, `Part Cache for "${partCache.externalId}" missing FullStory content!`)
 
-		const story = mosPayload.Body.filter(
-			(item) => item.Type === 'storyItem' && item.Content.ID === piece.externalId
-		)[0].Content
+		const mosTypes = getMosTypes(false)
+
+		const story = mosPayload.Body.find(
+			(item) =>
+				item.itemType === 'storyItem' && mosTypes.mosString128.stringify(item.Content.ID) === piece.externalId
+		)?.Content as MOS.IMOSItem | undefined
+
+		if (!story) throw new Meteor.Error(404, `Story "${piece.externalId}" not found in mosPayload`)
+
 		const timeBase = story.TimeBase || 1
 		const modifiedFields = {
 			EditorialStart: (inPoint * timeBase) as number | undefined,

meteor/server/api/rest/v1/buckets.ts

@@ -52,7 +52,7 @@ export class BucketsServerAPI implements BucketsRestAPI {
 			event,
 			getCurrentTime(),
 			'bucketsCreateNewBucket',
-			[bucket],
+			{ bucket },
 			async () => {
 				check(bucket.studioId, String)
 				check(bucket.name, String)
@@ -80,7 +80,7 @@ export class BucketsServerAPI implements BucketsRestAPI {
 			event,
 			getCurrentTime(),
 			'bucketsRemoveBucket',
-			[bucketId],
+			{ bucketId },
 			async () => {
 				check(bucketId, String)
 
@@ -100,7 +100,7 @@ export class BucketsServerAPI implements BucketsRestAPI {
 			event,
 			getCurrentTime(),
 			'bucketsEmptyBucket',
-			[bucketId],
+			{ bucketId },
 			async () => {
 				check(bucketId, String)
 
@@ -120,7 +120,7 @@ export class BucketsServerAPI implements BucketsRestAPI {
 			event,
 			getCurrentTime(),
 			'bucketsRemoveBucketAdLib',
-			[externalId],
+			{ externalId },
 			async () => {
 				const bucketAdLibPiecePromise = BucketAdLibs.findOneAsync(
 					{ externalId },
@@ -167,7 +167,7 @@ export class BucketsServerAPI implements BucketsRestAPI {
 			event,
 			getCurrentTime(),
 			'bucketAdlibImport',
-			[bucketId, showStyleBaseId, ingestItem],
+			{ bucketId, showStyleBaseId, ingestItem },
 			async () => {
 				check(bucketId, String)
 				check(showStyleBaseId, String)

meteor/server/api/rest/v1/playlists.ts

@@ -330,7 +330,7 @@ class PlaylistsServerAPI implements PlaylistsRestAPI {
 				check(rundownPlaylistId, String)
 			},
 			'reloadPlaylist',
-			[rundownPlaylistId],
+			{ rundownPlaylistId },
 			async (access) => {
 				const reloadResponse = await ServerRundownAPI.resyncRundownPlaylist(access)
 				const success = !reloadResponse.rundownsResponses.reduce((missing, rundownsResponse) => {
@@ -458,11 +458,11 @@ class PlaylistsServerAPI implements PlaylistsRestAPI {
 		)
 	}
 
-	async clearSourceLayer(
+	async clearSourceLayers(
 		connection: Meteor.Connection,
 		event: string,
 		rundownPlaylistId: RundownPlaylistId,
-		sourceLayerId: string
+		sourceLayerIds: string[]
 	): Promise<ClientAPI.ClientResponse<void>> {
 		const rundownPlaylist = await RundownPlaylists.findOneAsync(rundownPlaylistId)
 		if (!rundownPlaylist)
@@ -489,13 +489,13 @@ class PlaylistsServerAPI implements PlaylistsRestAPI {
 			rundownPlaylistId,
 			() => {
 				check(rundownPlaylistId, String)
-				check(sourceLayerId, String)
+				check(sourceLayerIds, [String])
 			},
 			StudioJobs.StopPiecesOnSourceLayers,
 			{
 				playlistId: rundownPlaylistId,
 				partInstanceId: rundownPlaylist.currentPartInfo.partInstanceId,
-				sourceLayerIds: [sourceLayerId],
+				sourceLayerIds: sourceLayerIds,
 			}
 		)
 	}
@@ -786,6 +786,26 @@ export function registerRoutes(registerRoute: APIRegisterHook<PlaylistsRestAPI>)
 		}
 	)
 
+	registerRoute<{ playlistId: string }, { sourceLayerIds: string[] }, void>(
+		'put',
+		'/playlists/:playlistId/clear-sourcelayers',
+		new Map([
+			[404, [UserErrorMessage.RundownPlaylistNotFound]],
+			[412, [UserErrorMessage.InactiveRundown]],
+		]),
+		playlistsAPIFactory,
+		async (serverAPI, connection, event, params, body) => {
+			const playlistId = protectString<RundownPlaylistId>(params.playlistId)
+			const sourceLayerIds = body?.sourceLayerIds
+			logger.info(`API POST: clear-sourcelayers ${playlistId} ${sourceLayerIds}`)
+
+			check(playlistId, String)
+			check(sourceLayerIds, Array<String>)
+
+			return await serverAPI.clearSourceLayers(connection, event, playlistId, sourceLayerIds)
+		}
+	)
+
 	registerRoute<{ playlistId: string; sourceLayerId: string }, never, void>(
 		'delete',
 		'/playlists/:playlistId/sourceLayer/:sourceLayerId',
@@ -801,7 +821,7 @@ export function registerRoutes(registerRoute: APIRegisterHook<PlaylistsRestAPI>)
 
 			check(playlistId, String)
 			check(sourceLayerId, String)
-			return await serverAPI.clearSourceLayer(connection, event, playlistId, sourceLayerId)
+			return await serverAPI.clearSourceLayers(connection, event, playlistId, [sourceLayerId])
 		}
 	)
 

meteor/server/api/rest/v1/studios.ts

@@ -176,7 +176,7 @@ class StudiosServerAPI implements StudiosRestAPI {
 			event,
 			getCurrentTime(),
 			'switchRouteSet',
-			[studioId, routeSetId, state],
+			{ studioId, routeSetId, state },
 			async () => {
 				check(studioId, String)
 				check(routeSetId, String)