Merge branch 'upstream/release52' into upstream/server-side-notifications

Author: Julusian

meteor/package.json

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

meteor/yarn.lock

@@ -1211,7 +1211,7 @@ __metadata:
     node-fetch: ^2.7.0
     p-lazy: ^3.1.0
     p-timeout: ^4.1.0
-    superfly-timeline: 9.0.1
+    superfly-timeline: 9.0.2
     threadedclass: ^1.2.2
     tslib: ^2.6.2
     type-fest: ^3.13.1
@@ -2349,7 +2349,7 @@ __metadata:
     prettier: ^2.8.8
     semver: ^7.5.4
     standard-version: ^9.5.0
-    superfly-timeline: 9.0.1
+    superfly-timeline: 9.0.2
     threadedclass: ^1.2.2
     timecode: 0.0.4
     ts-jest: ^29.1.2
@@ -10026,12 +10026,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"superfly-timeline@npm:9.0.1":
-  version: 9.0.1
-  resolution: "superfly-timeline@npm:9.0.1"
+"superfly-timeline@npm:9.0.2":
+  version: 9.0.2
+  resolution: "superfly-timeline@npm:9.0.2"
   dependencies:
     tslib: ^2.6.0
-  checksum: 4267eed691fe9ce9f89bf17c8aed1a98206938dd6d850c64b083e4fd3a3dc5329801c76c757450c9520375bad100ce512cc6d6a3e4a997bdfa14a4e7d65f09f2
+  checksum: d628d467d5384f5667bc10b877478c5b8b0a91774b5d5c5e9d9d3134b8f1b760225f2fbbb0f9ccd3e55f930c9f3719f81b9347b94ea853fbc0a18bc121d97665
   languageName: node
   linkType: hard
 

packages/blueprints-integration/CHANGELOG.md

@@ -3,6 +3,46 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
+## [1.51.1-2](https://github.com/nrkno/sofie-core/compare/v1.51.1-1...v1.51.1-2) (2024-10-24)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
+## [1.51.1-1](https://github.com/nrkno/sofie-core/compare/v1.51.1-0...v1.51.1-1) (2024-10-18)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
+## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
+## [1.51.1-0](https://github.com/nrkno/sofie-core/compare/v1.51.0...v1.51.1-0) (2024-10-18)
+
+**Note:** Version bump only for package @sofie-automation/blueprints-integration
+
+
+
+
+
 # [1.51.0](https://github.com/nrkno/sofie-core/compare/v1.51.0-in-testing.3...v1.51.0) (2024-10-07)
 
 **Note:** Version bump only for package @sofie-automation/blueprints-integration

packages/blueprints-integration/src/context/adlibActionContext.ts

@@ -4,6 +4,7 @@ import type { IShowStyleUserContext } from './showStyleContext'
 import { IPartAndPieceActionContext } from './partsAndPieceActionContext'
 import { IExecuteTSRActionsContext } from './executeTsrActionContext'
 import { IBlueprintPart, IBlueprintPartInstance, IBlueprintPiece } from '..'
+import { IRouteSetMethods } from './routeSetContext'
 
 /** Actions */
 export interface IDataStoreMethods {
@@ -24,7 +25,8 @@ export interface IActionExecutionContext
 		IEventContext,
 		IDataStoreMethods,
 		IPartAndPieceActionContext,
-		IExecuteTSRActionsContext {
+		IExecuteTSRActionsContext,
+		IRouteSetMethods {
 	/** Fetch the showstyle config for the specified part */
 	// getNextShowStyleConfig(): Readonly<{ [key: string]: ConfigItemValue }>
 
@@ -38,8 +40,6 @@ export interface IActionExecutionContext
 	/** Insert a queued part to follow the current part */
 	queuePart(part: IBlueprintPart, pieces: IBlueprintPiece[]): Promise<IBlueprintPartInstance>
 
-	/** Switch RouteSet State*/
-	switchRouteSet(routeSetId: string, state: boolean | 'toggle'): Promise<void>
 	/** Misc actions */
 	// updateAction(newManifest: Pick<IBlueprintAdLibActionManifest, 'description' | 'payload'>): void // only updates itself. to allow for the next one to do something different
 	// executePeripheralDeviceAction(deviceId: string, functionName: string, args: any[]): Promise<any>

packages/blueprints-integration/src/context/routeSetContext.ts

@@ -0,0 +1,9 @@
+import { StudioRouteSet } from '@sofie-automation/shared-lib/dist/core/model/StudioRouteSet'
+
+export interface IRouteSetMethods {
+	/** Returns a list of the Routesets */
+	listRouteSets(): Promise<Record<string, StudioRouteSet>>
+
+	/** Switch RouteSet State */
+	switchRouteSet(routeSetId: string, state: boolean | 'toggle'): Promise<void>
+}

packages/blueprints-integration/src/documents/part.ts

@@ -54,9 +54,6 @@ export interface IBlueprintMutatablePart<TPrivateData = unknown, TPublicData = u
 	/** Expected duration of the line, in milliseconds */
 	expectedDuration?: number
 
-	/** Budget duration of this part, in milliseconds */
-	budgetDuration?: number
-
 	/** Whether this segment line supports being used in HOLD */
 	holdMode?: PartHoldMode
 

packages/blueprints-integration/src/documents/segment.ts

@@ -4,12 +4,25 @@ export enum SegmentDisplayMode {
 	List = 'list',
 }
 
+export enum CountdownType {
+	/** Should count down till the end of the current part */
+	PART_EXPECTED_DURATION = 'part_expected_duration',
+	/** Should count down till the end of the segment's budget */
+	SEGMENT_BUDGET_DURATION = 'segment_budget_duration',
+}
+
 export interface SegmentTimingInfo {
 	/** A unix timestamp of when the segment is expected to begin. Affects rundown timing. */
 	expectedStart?: number
 
 	/** A unix timestamp of when the segment is expected to end. Affects rundown timing. */
 	expectedEnd?: number
+
+	/** Budget duration of this segment, in milliseconds */
+	budgetDuration?: number
+
+	/** Defines the behavior of countdowns during this segment. Default: `CountdownType.PART_EXPECTED_DURATION` */
+	countdownType?: CountdownType
 }
 
 /** The Segment generated from Blueprint */

packages/corelib/src/dataModel/RundownPlaylist.ts

@@ -164,7 +164,10 @@ export interface DBRundownPlaylist {
 	lastIncorrectPartPlaybackReported?: Time
 	/** Actual time of each rundown starting playback */
 	rundownsStartedPlayback?: Record<string, Time>
-	/** Actual time of SOME segments starting playback - usually just the previous and current one */
+	/**
+	 * Actual time of SOME segments starting playback - usually just the previous and current one
+	 * This is not using SegmentId, but SegmentPlayoutId
+	 */
 	segmentsStartedPlayback?: Record<string, Time>
 	/** Time of the last take */
 	lastTakeTime?: Time

packages/corelib/src/overrideOpHelper.ts

@@ -162,12 +162,15 @@ export interface OverrideOpHelperBatcher extends OverrideOpHelperForItemContents
 export type OverrideOpHelper = () => OverrideOpHelperBatcher
 
 export class OverrideOpHelperImpl implements OverrideOpHelperBatcher {
-	readonly #saveOverrides: SaveOverridesFunction
+	readonly #saveOverrides: SaveOverridesFunction | null
 	readonly #object: ObjectWithOverrides<any>
 
-	constructor(saveOverrides: SaveOverridesFunction, object: ObjectWithOverrides<any>) {
+	constructor(
+		saveOverrides: SaveOverridesFunction | null,
+		object: ObjectWithOverrides<any> | ReadonlyDeep<ObjectWithOverrides<any>>
+	) {
 		this.#saveOverrides = saveOverrides
-		this.#object = { ...object }
+		this.#object = { defaults: object.defaults, overrides: [...object.overrides] }
 	}
 
 	clearItemOverrides = (itemId: string, subPath: string): this => {
@@ -314,6 +317,12 @@ export class OverrideOpHelperImpl implements OverrideOpHelperBatcher {
 	}
 
 	commit = (): void => {
+		if (!this.#saveOverrides) throw new Error('Cannot commit changes without a save function')
+
 		this.#saveOverrides(this.#object.overrides)
 	}
+
+	getPendingOps = (): SomeObjectOverrideOp[] => {
+		return this.#object.overrides
+	}
 }

packages/job-worker/package.json

@@ -52,7 +52,7 @@
 		"node-fetch": "^2.7.0",
 		"p-lazy": "^3.1.0",
 		"p-timeout": "^4.1.0",
-		"superfly-timeline": "9.0.1",
+		"superfly-timeline": "9.0.2",
 		"threadedclass": "^1.2.2",
 		"tslib": "^2.6.2",
 		"type-fest": "^3.13.1",