Merge branch 'release50' into release51

nrkno · Oct 9, 2023 · 8ae3d54 · 8ae3d54
2 parents 6c70fd4 + 4e57e19
commit 8ae3d54
Show file tree

Hide file tree

Showing 17 changed files with 181 additions and 200 deletions.
diff --git a/.github/workflows/node.yaml b/.github/workflows/node.yaml
@@ -21,7 +21,7 @@ jobs:
         lib-name: [timeline-state-resolver, timeline-state-resolver-types, quick-tsr]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
@@ -47,7 +47,7 @@ jobs:
     timeout-minutes: 15
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
@@ -77,7 +77,7 @@ jobs:
         lib-name: [timeline-state-resolver, timeline-state-resolver-types]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -118,7 +118,7 @@ jobs:
       # - validate-dependencies
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Use Node.js
@@ -190,7 +190,7 @@ jobs:
         lib-name: [timeline-state-resolver, timeline-state-resolver-types]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
@@ -224,7 +224,7 @@ jobs:
         lib-name: [timeline-state-resolver, timeline-state-resolver-types]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/prune-tags.yml b/.github/workflows/prune-tags.yml
@@ -21,7 +21,7 @@ jobs:
     timeout-minutes: 15
     steps:
       - name: Checkout repo with all tags
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0    
 

diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -17,7 +17,7 @@ jobs:
         lib-name: [timeline-state-resolver, timeline-state-resolver-types]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
         with:
@@ -44,7 +44,7 @@ jobs:
       - test
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Use Node.js
@@ -89,5 +89,8 @@ jobs:
         run: |
           echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
           yarn lerna publish from-package --tag-version-prefix='' --dist-tag ${{ steps.do-publish.outputs.publish }} --yes --no-verify-access
+
+          NEW_VERSION=$(node -p "require('./packages/timeline-state-resolver/package.json').version")
+          echo "**Published:** $NEW_VERSION" >> $GITHUB_STEP_SUMMARY
         env:
           CI: true
diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
@@ -15,7 +15,7 @@ jobs:
     if: ${{ github.repository_owner == 'nrkno' }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/packages/quick-tsr/CHANGELOG.md b/packages/quick-tsr/CHANGELOG.md
@@ -34,6 +34,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 - add ci for quick-tsr ([9f2c3d1](https://github.com/nrkno/sofie-timeline-state-resolver/commit/9f2c3d1f6606af55228d96be5a064b585e6f8287))
 - quick-tsr typing errors ([#267](https://github.com/nrkno/sofie-timeline-state-resolver/issues/267)) ([95b2eae](https://github.com/nrkno/sofie-timeline-state-resolver/commit/95b2eae93450db5f6f4d9f26c96380fa56b08a03))
 
+## [8.0.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/7.5.1...8.0.0) (2023-10-05)
+
 ## [8.0.0-release49.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/8.0.0-release48.2...8.0.0-release49.0) (2023-03-21)
 
 ## [8.0.0-release48.2](https://github.com/nrkno/sofie-timeline-state-resolver/compare/7.5.0...8.0.0-release48.2) (2023-03-21)

diff --git a/packages/timeline-state-resolver-types/CHANGELOG.md b/packages/timeline-state-resolver-types/CHANGELOG.md
@@ -50,6 +50,16 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 - add types support for vMix stingers 3 and 4 ([44fa27d](https://github.com/nrkno/sofie-timeline-state-resolver/commit/44fa27d164bd717b58d7f1d1255d56d132007865))
 
+## [8.0.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/7.5.1...8.0.0) (2023-10-05)
+
+### Features
+
+- atem audio routing control SOFIE-2512 ([#274](https://github.com/nrkno/sofie-timeline-state-resolver/issues/274)) ([de9dfd1](https://github.com/nrkno/sofie-timeline-state-resolver/commit/de9dfd138452794bd7ad83a2fd1e82d2849abdcd))
+
+### Bug Fixes
+
+- export lawo parametertype ([65a73c4](https://github.com/nrkno/sofie-timeline-state-resolver/commit/65a73c41eb31cc2a18df9f0d282255c6cf6a171b))
+
 ## [8.0.0-release49.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/8.0.0-release48.2...8.0.0-release49.0) (2023-03-21)
 
 ## [8.0.0-release48.2](https://github.com/nrkno/sofie-timeline-state-resolver/compare/7.5.0...8.0.0-release48.2) (2023-03-21)

diff --git a/packages/timeline-state-resolver-types/src/generated/casparCG.ts b/packages/timeline-state-resolver-types/src/generated/casparCG.ts
@@ -25,10 +25,6 @@ export interface CasparCGOptions {
 	 * Interval (ms) for retrying to load media that previously failed. (-1 disables, 0 uses the default interval)
 	 */
 	retryInterval?: number
-	/**
-	 * whether to use the CasparCG-SCHEDULE command to run future commands, or the internal (backwards-compatible) command queue
-	 */
-	useScheduling?: boolean
 }
 
 export interface MappingCasparCGLayer {

diff --git a/packages/timeline-state-resolver/CHANGELOG.md b/packages/timeline-state-resolver/CHANGELOG.md
@@ -62,6 +62,16 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 - **vmix:** show a BAD status code when vMix is not initialized ([370be3a](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/370be3af2f01bada232ea244c76b6c5507e9773f))
 - wrap singular.live JSON commands in an array ([cc5b7ec](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/cc5b7ec61d456de993cbc0e25963c93ec8b65f38))
 
+## [8.0.0](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/7.5.1...8.0.0) (2023-10-05)
+
+### Features
+
+- atem audio routing control SOFIE-2512 ([#274](https://github.com/nrkno/tv-automation-state-timeline-resolver/issues/274)) ([de9dfd1](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/de9dfd138452794bd7ad83a2fd1e82d2849abdcd))
+
+### Bug Fixes
+
+- handle some additional cases in casparCG trackedState SOFIE-2359 ([#259](https://github.com/nrkno/tv-automation-state-timeline-resolver/issues/259)) ([810959f](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/810959f06a13caef2e16fb9d90d8d8257ba1620e))
+
 ## [8.0.0-release49.0](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/8.0.0-release48.2...8.0.0-release49.0) (2023-03-21)
 
 ## [8.0.0-release48.2](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/7.5.0...8.0.0-release48.2) (2023-03-21)

diff --git a/packages/timeline-state-resolver/examples/testChangeTimelineQuickly.ts b/packages/timeline-state-resolver/examples/testChangeTimelineQuickly.ts
@@ -13,7 +13,6 @@ const a = async function () {
 	await tsr.addDevice('casparcg0', {
 		type: DeviceType.CASPARCG,
 		options: {
-			// useScheduling: true,
 			host: '127.0.0.1',
 			// port: 5250
 		},

diff --git a/packages/timeline-state-resolver/package.json b/packages/timeline-state-resolver/package.json
@@ -92,7 +92,7 @@
 		"atem-connection": "2.5.0",
 		"atem-state": "0.13.0",
 		"cacheable-lookup": "^5.0.3",
-		"casparcg-connection": "^6.0.3",
+		"casparcg-connection": "^6.0.6",
 		"casparcg-state": "^3.0.2",
 		"debug": "^4.3.4",
 		"deepmerge": "^4.3.1",
@@ -112,7 +112,7 @@
 		"threadedclass": "^1.2.1",
 		"timeline-state-resolver-types": "9.1.0-release51",
 		"tslib": "^2.5.1",
-		"tv-automation-quantel-gateway-client": "^3.1.11-agent-debug-20230117-160455-c2c4ee4.0",
+		"tv-automation-quantel-gateway-client": "^3.1.7",
 		"underscore": "^1.13.6",
 		"underscore-deep-extend": "^1.1.5",
 		"utf-8-validate": "^5.0.10",

diff --git a/packages/timeline-state-resolver/src/conductor.ts b/packages/timeline-state-resolver/src/conductor.ts
@@ -428,8 +428,8 @@ export class Conductor extends EventEmitter<ConductorEvents> {
 		options?: { signal?: AbortSignal }
 	): Promise<BaseRemoteDeviceIntegration<DeviceOptionsBase<any>>> {
 		let newDevice: BaseRemoteDeviceIntegration<DeviceOptionsBase<any>> | undefined
-		const throwIfAborted = () => this.throwIfAborted(options?.signal, deviceId, 'creation')
 		try {
+			const throwIfAborted = () => this.throwIfAborted(options?.signal, deviceId, 'creation')
 			if (this.devices.has(deviceId)) {
 				throw new Error(`Device "${deviceId}" already exists when creating device`)
 			}
@@ -451,7 +451,7 @@ export class Conductor extends EventEmitter<ConductorEvents> {
 
 			if (!newDevicePromise) {
 				const type: any = deviceOptions.type
-				return Promise.reject(`No matching device type for "${type}" ("${DeviceType[type]}") found in conductor`)
+				throw new Error(`No matching device type for "${type}" ("${DeviceType[type]}") found in conductor`)
 			}
 
 			newDevice = await makeImmediatelyAbortable(async () => {
@@ -476,15 +476,16 @@ export class Conductor extends EventEmitter<ConductorEvents> {
 				throw new Error(`Device "${deviceId}" already exists when creating device`)
 			}
 			throwIfAborted()
-			this.devices.set(deviceId, newDevice)
-
-			return newDevice
 		} catch (e) {
 			await this.terminateUnwantedDevice(newDevice)
-			this.devices.delete(deviceId)
+
 			this.emit('error', 'conductor.createDevice', e)
-			return Promise.reject(e)
+			throw e
 		}
+
+		this.devices.set(deviceId, newDevice)
+
+		return newDevice
 	}
 
 	private throwIfAborted(signal: AbortSignal | undefined, deviceId: string, action: string) {

diff --git a/packages/timeline-state-resolver/src/integrations/casparCG/$schemas/options.json b/packages/timeline-state-resolver/src/integrations/casparCG/$schemas/options.json
@@ -42,12 +42,6 @@
 			"ui:title": "Media retry interval",
 			"ui:description": "Time between retries for media that could not be loaded on first try. Set to -1 to disable.",
 			"default": 0
-		},
-		"useScheduling": {
-			"type": "boolean",
-			"description": "whether to use the CasparCG-SCHEDULE command to run future commands, or the internal (backwards-compatible) command queue",
-			"ui:title": "Use CasparCG Timecode Scheduler",
-			"default": false
 		}
 	},
 	"required": ["host"],

diff --git a/packages/timeline-state-resolver/src/integrations/casparCG/__tests__/casparcg.spec.ts b/packages/timeline-state-resolver/src/integrations/casparCG/__tests__/casparcg.spec.ts
@@ -55,7 +55,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: true,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -134,7 +133,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: true,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -202,7 +200,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: false,
 				fps: 50,
 			},
 			commandReceiver: commandReceiver0,
@@ -285,7 +282,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: false,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -359,7 +355,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: true,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -449,7 +444,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: true,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -529,7 +523,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: true,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -610,7 +603,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: true,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -727,7 +719,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: true,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -847,7 +838,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: true,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -986,7 +976,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: true,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -1092,7 +1081,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: true,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -1197,7 +1185,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: true,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -1298,7 +1285,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: true,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -1388,7 +1374,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: true,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -1473,7 +1458,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: false,
 				retryInterval: undefined, // disable retries explicitly, we will manually trigger them
 			},
 			commandReceiver: commandReceiver0,
@@ -1601,7 +1585,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: false,
 				retryInterval: undefined, // disable retries explicitly, we will manually trigger them
 			},
 			commandReceiver: commandReceiver0,
@@ -1731,7 +1714,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: false,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -1828,7 +1810,6 @@ describe('CasparCG', () => {
 			type: DeviceType.CASPARCG,
 			options: {
 				host: '127.0.0.1',
-				useScheduling: false,
 			},
 			commandReceiver: commandReceiver0,
 			skipVirginCheck: true,
@@ -1943,7 +1924,6 @@ describe('CasparCG', () => {
 // 			type: DeviceType.CASPARCG,
 // 			options: {
 // 				host: '127.0.0.1',
-// 				useScheduling: false,
 // 				retryInterval: undefined, // disable retries explicitly, we will manually trigger them
 // 			},
 // 			commandReceiver: commandReceiver0,