From f4402ddc6b9998e9cdf6d04f3c766ba94056d4bd Mon Sep 17 00:00:00 2001 From: Mint de Wit Date: Wed, 28 Aug 2024 14:52:40 +0200 Subject: [PATCH 1/8] fix: filter mappings by deviceid --- .../src/__tests__/conductor.spec.ts | 20 ++++++++++++------- .../timeline-state-resolver/src/conductor.ts | 7 ++++++- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/packages/timeline-state-resolver/src/__tests__/conductor.spec.ts b/packages/timeline-state-resolver/src/__tests__/conductor.spec.ts index cc23db37c..3c3650bc6 100644 --- a/packages/timeline-state-resolver/src/__tests__/conductor.spec.ts +++ b/packages/timeline-state-resolver/src/__tests__/conductor.spec.ts @@ -58,10 +58,16 @@ describe('Conductor', () => { deviceId: 'device1', options: {}, } - const myLayerMapping: Mappings = { + const device0Mappings: Mappings = { myLayer0: myLayerMapping0, + } + const device1Mappings: Mappings = { myLayer1: myLayerMapping1, } + const myLayerMapping: Mappings = { + ...device0Mappings, + ...device1Mappings, + } const conductor = new Conductor({ multiThreadedResolver: false, @@ -139,14 +145,14 @@ describe('Conductor', () => { }, time: 10005, }), - myLayerMapping // TODO - is this correct? + device0Mappings // TODO - is this correct? ) expect(device0.handleState).toHaveBeenNthCalledWith( 2, expect.objectContaining({ time: 11000, }), - myLayerMapping // TODO - is this correct? + device0Mappings // TODO - is this correct? ) expect(device0.handleState).toHaveBeenNthCalledWith( 3, @@ -154,7 +160,7 @@ describe('Conductor', () => { layers: {}, time: 12000, }), - myLayerMapping // TODO - is this correct? + device0Mappings // TODO - is this correct? ) // Ensure device1 has been fed sensible states @@ -165,7 +171,7 @@ describe('Conductor', () => { expect.objectContaining({ layers: {}, }), - myLayerMapping // TODO - is this correct? + device1Mappings // TODO - is this correct? ) expect(device1.handleState).toHaveBeenNthCalledWith( 2, @@ -180,14 +186,14 @@ describe('Conductor', () => { }), }, }), - myLayerMapping // TODO - is this correct? + device1Mappings // TODO - is this correct? ) expect(device1.handleState).toHaveBeenNthCalledWith( 3, expect.objectContaining({ layers: {}, }), - myLayerMapping // TODO - is this correct? + device1Mappings // TODO - is this correct? ) // Remove the device diff --git a/packages/timeline-state-resolver/src/conductor.ts b/packages/timeline-state-resolver/src/conductor.ts index 0be3bdd07..008a13b73 100644 --- a/packages/timeline-state-resolver/src/conductor.ts +++ b/packages/timeline-state-resolver/src/conductor.ts @@ -1087,8 +1087,13 @@ export class Conductor extends EventEmitter { deviceId: string, time: number, state: Timeline.TimelineState, - mappings: Mappings + unfilteredMappings: Mappings ) { + // only take mappings that are for this deviceId + const mappings = Object.fromEntries( + Object.entries>(unfilteredMappings).filter(([_, mapping]) => mapping.deviceId === deviceId) + ) + if (!this._deviceStates[deviceId]) this._deviceStates[deviceId] = [] // find all references to the datastore that are in this state From 940e68ab09a37df7ce53944d888757a4a6f5a9c9 Mon Sep 17 00:00:00 2001 From: Mint de Wit Date: Wed, 28 Aug 2024 14:54:18 +0200 Subject: [PATCH 2/8] fix: use sequential send mode for quantel --- packages/timeline-state-resolver/src/service/devices.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/timeline-state-resolver/src/service/devices.ts b/packages/timeline-state-resolver/src/service/devices.ts index 19c07b6ad..98574cbb5 100644 --- a/packages/timeline-state-resolver/src/service/devices.ts +++ b/packages/timeline-state-resolver/src/service/devices.ts @@ -146,6 +146,6 @@ export const DevicesDict: Record = { deviceClass: QuantelDevice, canConnect: true, deviceName: (deviceId: string) => 'Quantel' + deviceId, - executionMode: () => 'salvo', + executionMode: () => 'sequential', }, } From 17e3b755a64752dbafa73b5841332e265ce428db Mon Sep 17 00:00:00 2001 From: Mint de Wit Date: Fri, 30 Aug 2024 11:34:49 +0200 Subject: [PATCH 3/8] chore: remove some comments --- .../src/__tests__/conductor.spec.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/timeline-state-resolver/src/__tests__/conductor.spec.ts b/packages/timeline-state-resolver/src/__tests__/conductor.spec.ts index 3c3650bc6..984d97067 100644 --- a/packages/timeline-state-resolver/src/__tests__/conductor.spec.ts +++ b/packages/timeline-state-resolver/src/__tests__/conductor.spec.ts @@ -145,14 +145,14 @@ describe('Conductor', () => { }, time: 10005, }), - device0Mappings // TODO - is this correct? + device0Mappings ) expect(device0.handleState).toHaveBeenNthCalledWith( 2, expect.objectContaining({ time: 11000, }), - device0Mappings // TODO - is this correct? + device0Mappings ) expect(device0.handleState).toHaveBeenNthCalledWith( 3, @@ -160,7 +160,7 @@ describe('Conductor', () => { layers: {}, time: 12000, }), - device0Mappings // TODO - is this correct? + device0Mappings ) // Ensure device1 has been fed sensible states @@ -171,7 +171,7 @@ describe('Conductor', () => { expect.objectContaining({ layers: {}, }), - device1Mappings // TODO - is this correct? + device1Mappings ) expect(device1.handleState).toHaveBeenNthCalledWith( 2, @@ -186,14 +186,14 @@ describe('Conductor', () => { }), }, }), - device1Mappings // TODO - is this correct? + device1Mappings ) expect(device1.handleState).toHaveBeenNthCalledWith( 3, expect.objectContaining({ layers: {}, }), - device1Mappings // TODO - is this correct? + device1Mappings ) // Remove the device From 81af9f7a1e3c24cfd1bbd85e5497198ff4c612bc Mon Sep 17 00:00:00 2001 From: Johan Nyman Date: Wed, 4 Sep 2024 12:55:52 +0200 Subject: [PATCH 4/8] fix: update timeline dependency (see https://github.com/SuperFlyTV/supertimeline/pull/102 ) --- packages/timeline-state-resolver/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/timeline-state-resolver/package.json b/packages/timeline-state-resolver/package.json index 7e4e25048..a5b2841a9 100644 --- a/packages/timeline-state-resolver/package.json +++ b/packages/timeline-state-resolver/package.json @@ -109,7 +109,7 @@ "p-timeout": "^3.2.0", "simple-oauth2": "^5.0.0", "sprintf-js": "^1.1.3", - "superfly-timeline": "^9.0.0", + "superfly-timeline": "^9.0.1", "threadedclass": "^1.2.1", "timeline-state-resolver-types": "9.1.0", "tslib": "^2.6.2", diff --git a/yarn.lock b/yarn.lock index a2c1e94d0..e246970b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11099,12 +11099,12 @@ asn1@evs-broadcast/node-asn1: languageName: node linkType: hard -"superfly-timeline@npm:^9.0.0": - version: 9.0.0 - resolution: "superfly-timeline@npm:9.0.0" +"superfly-timeline@npm:^9.0.1": + version: 9.0.1 + resolution: "superfly-timeline@npm:9.0.1" dependencies: tslib: ^2.6.0 - checksum: bb56fc6d6884f2956cdc1f18edceff48bc693c2329b009170e4d399ce70b8123ef38ddada0f0479eb359690eae39e7e578a9ec4ba326d6e4704653f74cde1a6d + checksum: 4267eed691fe9ce9f89bf17c8aed1a98206938dd6d850c64b083e4fd3a3dc5329801c76c757450c9520375bad100ce512cc6d6a3e4a997bdfa14a4e7d65f09f2 languageName: node linkType: hard @@ -11403,7 +11403,7 @@ asn1@evs-broadcast/node-asn1: p-timeout: ^3.2.0 simple-oauth2: ^5.0.0 sprintf-js: ^1.1.3 - superfly-timeline: ^9.0.0 + superfly-timeline: ^9.0.1 threadedclass: ^1.2.1 timeline-state-resolver-types: 9.1.0 tslib: ^2.6.2 From 84a53cd5f1ee0978767d46ad766c01841559983d Mon Sep 17 00:00:00 2001 From: Jan Starzak Date: Thu, 5 Sep 2024 10:18:26 +0200 Subject: [PATCH 5/8] feat: allow sequential executionMode to paralelize multiple queues of Commands --- .../src/index.ts | 1 + .../httpSend/__tests__/httpsend.spec.ts | 2 ++ .../src/integrations/httpSend/index.ts | 7 ++++-- .../src/integrations/quantel/connection.ts | 9 ++++---- .../src/service/commandExecutor.ts | 23 ++++++++++++------- .../src/service/device.ts | 2 ++ 6 files changed, 29 insertions(+), 15 deletions(-) diff --git a/packages/timeline-state-resolver-types/src/index.ts b/packages/timeline-state-resolver-types/src/index.ts index 6d40b27cb..3941ce56b 100644 --- a/packages/timeline-state-resolver-types/src/index.ts +++ b/packages/timeline-state-resolver-types/src/index.ts @@ -170,5 +170,6 @@ export interface ActionExecutionResult { export enum ActionExecutionResultCode { Error = 'ERROR', + IgnoredNotRelevant = 'IGNORED', Ok = 'OK', } diff --git a/packages/timeline-state-resolver/src/integrations/httpSend/__tests__/httpsend.spec.ts b/packages/timeline-state-resolver/src/integrations/httpSend/__tests__/httpsend.spec.ts index 10a5c58fd..bc9fbe6ec 100644 --- a/packages/timeline-state-resolver/src/integrations/httpSend/__tests__/httpsend.spec.ts +++ b/packages/timeline-state-resolver/src/integrations/httpSend/__tests__/httpsend.spec.ts @@ -346,6 +346,7 @@ describe('HTTP-Send', () => { content: content, layer: 'layer0', }, + queueId: undefined, }, ]) await Promise.all(commands.map(async (c) => device.sendCommand(c))) @@ -362,6 +363,7 @@ describe('HTTP-Send', () => { content: content, layer: 'layer0', }, + queueId: undefined, }, ]) } diff --git a/packages/timeline-state-resolver/src/integrations/httpSend/index.ts b/packages/timeline-state-resolver/src/integrations/httpSend/index.ts index a03b3eb6e..1f5dc6911 100644 --- a/packages/timeline-state-resolver/src/integrations/httpSend/index.ts +++ b/packages/timeline-state-resolver/src/integrations/httpSend/index.ts @@ -136,6 +136,7 @@ export class HTTPSendDevice extends Device= 200 && response.statusCode < 300) { this.context.logger.debug( `HTTPSend: ${command.content.type}: Good statuscode response on url "${command.content.url}": ${response.statusCode} (${context})` ) diff --git a/packages/timeline-state-resolver/src/integrations/quantel/connection.ts b/packages/timeline-state-resolver/src/integrations/quantel/connection.ts index 7c5fce368..cddd9f7f6 100644 --- a/packages/timeline-state-resolver/src/integrations/quantel/connection.ts +++ b/packages/timeline-state-resolver/src/integrations/quantel/connection.ts @@ -591,11 +591,10 @@ export class QuantelManager extends EventEmitter { }) } public clearAllWaitWithPort(portId: string) { - if (!this._waitWithPorts[portId]) { - _.each(this._waitWithPorts[portId], (fcn) => { - fcn(true) - }) - } + if (!this._waitWithPorts[portId]) return + _.each(this._waitWithPorts[portId], (fcn) => { + fcn(true) + }) } /** * Returns true if the wait was cleared from someone else diff --git a/packages/timeline-state-resolver/src/service/commandExecutor.ts b/packages/timeline-state-resolver/src/service/commandExecutor.ts index 761513822..ba3b03137 100644 --- a/packages/timeline-state-resolver/src/service/commandExecutor.ts +++ b/packages/timeline-state-resolver/src/service/commandExecutor.ts @@ -1,3 +1,4 @@ +import * as _ from 'underscore' import { BaseDeviceAPI, CommandWithContext } from './device' import { Measurement } from './measure' import { StateHandlerContext } from './stateHandler' @@ -50,15 +51,21 @@ export class CommandExecutor { ): Promise { const start = Date.now() // note - would be better to use monotonic time here but BigInt's are annoying - for (const command of commands || []) { - const timeToWait = totalTime - (Date.now() - start) - if (timeToWait > 0) await wait(timeToWait) + const commandQueues = _.groupBy(commands || [], (command) => command.queueId ?? '$$default') - measurement?.executeCommand(command) - await this.sendCommand(command).catch((e) => { - this.logger.error('Error while executing command', e) + await Promise.allSettled( + Object.values(commandQueues).map(async (commandsInQueue): Promise => { + for (const command of commandsInQueue) { + const timeToWait = totalTime - (Date.now() - start) + if (timeToWait > 0) await wait(timeToWait) + + measurement?.executeCommand(command) + await this.sendCommand(command).catch((e) => { + this.logger.error('Error while executing command', e) + }) + measurement?.finishedCommandExecution(command) + } }) - measurement?.finishedCommandExecution(command) - } + ) } } diff --git a/packages/timeline-state-resolver/src/service/device.ts b/packages/timeline-state-resolver/src/service/device.ts index 7884faf3e..4c392baa5 100644 --- a/packages/timeline-state-resolver/src/service/device.ts +++ b/packages/timeline-state-resolver/src/service/device.ts @@ -18,6 +18,8 @@ export type CommandWithContext = { timelineObjId: string /** this command is to be executed x ms _before_ the scheduled time */ preliminary?: number + /** commands with different queueId's can be executed in paralel in sequential mode */ + queueId?: string } /** From 5797d0ddd8e810ad16544df28b7887d6da6396d8 Mon Sep 17 00:00:00 2001 From: Jan Starzak Date: Mon, 9 Sep 2024 11:12:58 +0200 Subject: [PATCH 6/8] Update packages/timeline-state-resolver/src/service/device.ts Co-authored-by: Julian Waller --- packages/timeline-state-resolver/src/service/device.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/timeline-state-resolver/src/service/device.ts b/packages/timeline-state-resolver/src/service/device.ts index 4c392baa5..50fe277f4 100644 --- a/packages/timeline-state-resolver/src/service/device.ts +++ b/packages/timeline-state-resolver/src/service/device.ts @@ -18,7 +18,7 @@ export type CommandWithContext = { timelineObjId: string /** this command is to be executed x ms _before_ the scheduled time */ preliminary?: number - /** commands with different queueId's can be executed in paralel in sequential mode */ + /** commands with different queueId's can be executed in parallel in sequential mode */ queueId?: string } From 107e4368ddb1d2a50ba46a906f3f1d5f26ece1fa Mon Sep 17 00:00:00 2001 From: Jan Starzak Date: Mon, 9 Sep 2024 12:47:19 +0200 Subject: [PATCH 7/8] chore: fix release script --- package.json | 1 + yarn.lock | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/package.json b/package.json index 96329c1d8..a2e8fe18e 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,7 @@ "@types/sprintf-js": "^1.1.4", "@types/underscore": "^1.11.15", "@types/ws": "^7.4.7", + "conventional-changelog-conventionalcommits": "^4.6.3", "jest": "^29.7.0", "lerna": "^6.6.2", "open-cli": "^7.2.0", diff --git a/yarn.lock b/yarn.lock index e246970b2..151447f0c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3788,6 +3788,17 @@ asn1@evs-broadcast/node-asn1: languageName: node linkType: hard +"conventional-changelog-conventionalcommits@npm:^4.6.3": + version: 4.6.3 + resolution: "conventional-changelog-conventionalcommits@npm:4.6.3" + dependencies: + compare-func: ^2.0.0 + lodash: ^4.17.15 + q: ^1.5.1 + checksum: 7b8e8a21ebb56f9aaa510e12917b7c609202072c3e71089e0a09630c37c2e8146cdb04364809839b0e3eb55f807fe84d03b2079500b37f6186d505848be5c562 + languageName: node + linkType: hard + "conventional-changelog-core@npm:4.2.4": version: 4.2.4 resolution: "conventional-changelog-core@npm:4.2.4" @@ -11352,6 +11363,7 @@ asn1@evs-broadcast/node-asn1: "@types/sprintf-js": ^1.1.4 "@types/underscore": ^1.11.15 "@types/ws": ^7.4.7 + conventional-changelog-conventionalcommits: ^4.6.3 jest: ^29.7.0 lerna: ^6.6.2 open-cli: ^7.2.0 From 5c359565fef3b0e05868aa05d56d9bdd1716a061 Mon Sep 17 00:00:00 2001 From: Jan Starzak Date: Mon, 9 Sep 2024 12:47:48 +0200 Subject: [PATCH 8/8] 9.2.0-alpha.0 --- CHANGELOG.md | 16 ++++++++++++++++ lerna.json | 2 +- packages/quick-tsr/CHANGELOG.md | 4 ++++ packages/quick-tsr/package.json | 4 ++-- .../timeline-state-resolver-types/CHANGELOG.md | 6 ++++++ .../timeline-state-resolver-types/package.json | 2 +- packages/timeline-state-resolver/CHANGELOG.md | 12 ++++++++++++ packages/timeline-state-resolver/package.json | 4 ++-- yarn.lock | 8 ++++---- 9 files changed, 48 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0203b3bfb..c920ead07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [9.2.0-alpha.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.1.0...9.2.0-alpha.0) (2024-09-09) + + +### Features + +* allow sequential executionMode to paralelize multiple queues of Commands ([84a53cd](https://github.com/nrkno/sofie-timeline-state-resolver/commit/84a53cd5f1ee0978767d46ad766c01841559983d)) + + +### Bug Fixes + +* filter mappings by deviceid ([f4402dd](https://github.com/nrkno/sofie-timeline-state-resolver/commit/f4402ddc6b9998e9cdf6d04f3c766ba94056d4bd)) +* update timeline dependency (see https://github.com/SuperFlyTV/supertimeline/pull/102 ) ([81af9f7](https://github.com/nrkno/sofie-timeline-state-resolver/commit/81af9f7a1e3c24cfd1bbd85e5497198ff4c612bc)) +* use sequential send mode for quantel ([940e68a](https://github.com/nrkno/sofie-timeline-state-resolver/commit/940e68ab09a37df7ce53944d888757a4a6f5a9c9)) + + + ## [9.1.0](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/9.0.2...9.1.0) (2024-08-19) diff --git a/lerna.json b/lerna.json index ed34deedf..8a6a2675b 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "9.1.0", + "version": "9.2.0-alpha.0", "npmClient": "yarn", "useWorkspaces": true } diff --git a/packages/quick-tsr/CHANGELOG.md b/packages/quick-tsr/CHANGELOG.md index 7471ccced..a793551a7 100644 --- a/packages/quick-tsr/CHANGELOG.md +++ b/packages/quick-tsr/CHANGELOG.md @@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [9.2.0-alpha.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.1.0...9.2.0-alpha.0) (2024-09-09) + +**Note:** Version bump only for package quick-tsr + ## [9.1.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.2...9.1.0) (2024-08-19) **Note:** Version bump only for package quick-tsr diff --git a/packages/quick-tsr/package.json b/packages/quick-tsr/package.json index 18209c098..b405c0805 100644 --- a/packages/quick-tsr/package.json +++ b/packages/quick-tsr/package.json @@ -1,7 +1,7 @@ { "name": "quick-tsr", "private": true, - "version": "9.1.0", + "version": "9.2.0-alpha.0", "description": "Read timeline from file, use TSR, play stuff", "main": "dist/index.js", "typings": "dist/index.d.ts", @@ -64,7 +64,7 @@ "chokidar": "^3.6.0", "fast-clone": "^1.5.13", "threadedclass": "^1.2.1", - "timeline-state-resolver": "9.1.0", + "timeline-state-resolver": "9.2.0-alpha.0", "tslib": "^2.6.2", "underscore": "^1.13.6" } diff --git a/packages/timeline-state-resolver-types/CHANGELOG.md b/packages/timeline-state-resolver-types/CHANGELOG.md index a328333a5..9aefdf542 100644 --- a/packages/timeline-state-resolver-types/CHANGELOG.md +++ b/packages/timeline-state-resolver-types/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [9.2.0-alpha.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.1.0...9.2.0-alpha.0) (2024-09-09) + +### Features + +- allow sequential executionMode to paralelize multiple queues of Commands ([84a53cd](https://github.com/nrkno/sofie-timeline-state-resolver/commit/84a53cd5f1ee0978767d46ad766c01841559983d)) + ## [9.1.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/9.0.2...9.1.0) (2024-08-19) ### Features diff --git a/packages/timeline-state-resolver-types/package.json b/packages/timeline-state-resolver-types/package.json index 6ab5c2e66..0b5c87734 100644 --- a/packages/timeline-state-resolver-types/package.json +++ b/packages/timeline-state-resolver-types/package.json @@ -1,6 +1,6 @@ { "name": "timeline-state-resolver-types", - "version": "9.1.0", + "version": "9.2.0-alpha.0", "description": "Have timeline, control stuff", "main": "dist/index.js", "typings": "dist/index.d.ts", diff --git a/packages/timeline-state-resolver/CHANGELOG.md b/packages/timeline-state-resolver/CHANGELOG.md index 79c65985d..ecdf723cd 100644 --- a/packages/timeline-state-resolver/CHANGELOG.md +++ b/packages/timeline-state-resolver/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [9.2.0-alpha.0](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/9.1.0...9.2.0-alpha.0) (2024-09-09) + +### Features + +- allow sequential executionMode to paralelize multiple queues of Commands ([84a53cd](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/84a53cd5f1ee0978767d46ad766c01841559983d)) + +### Bug Fixes + +- filter mappings by deviceid ([f4402dd](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/f4402ddc6b9998e9cdf6d04f3c766ba94056d4bd)) +- update timeline dependency (see https://github.com/SuperFlyTV/supertimeline/pull/102 ) ([81af9f7](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/81af9f7a1e3c24cfd1bbd85e5497198ff4c612bc)) +- use sequential send mode for quantel ([940e68a](https://github.com/nrkno/tv-automation-state-timeline-resolver/commit/940e68ab09a37df7ce53944d888757a4a6f5a9c9)) + ## [9.1.0](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/9.0.2...9.1.0) (2024-08-19) ### Features diff --git a/packages/timeline-state-resolver/package.json b/packages/timeline-state-resolver/package.json index a5b2841a9..e2bf57d91 100644 --- a/packages/timeline-state-resolver/package.json +++ b/packages/timeline-state-resolver/package.json @@ -1,6 +1,6 @@ { "name": "timeline-state-resolver", - "version": "9.1.0", + "version": "9.2.0-alpha.0", "description": "Have timeline, control stuff", "main": "dist/index.js", "typings": "dist/index.d.ts", @@ -111,7 +111,7 @@ "sprintf-js": "^1.1.3", "superfly-timeline": "^9.0.1", "threadedclass": "^1.2.1", - "timeline-state-resolver-types": "9.1.0", + "timeline-state-resolver-types": "9.2.0-alpha.0", "tslib": "^2.6.2", "tv-automation-quantel-gateway-client": "^3.1.7", "type-fest": "^3.13.1", diff --git a/yarn.lock b/yarn.lock index 151447f0c..cd90d916c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9929,7 +9929,7 @@ asn1@evs-broadcast/node-asn1: chokidar: ^3.6.0 fast-clone: ^1.5.13 threadedclass: ^1.2.1 - timeline-state-resolver: 9.1.0 + timeline-state-resolver: 9.2.0-alpha.0 tslib: ^2.6.2 underscore: ^1.13.6 languageName: unknown @@ -11376,7 +11376,7 @@ asn1@evs-broadcast/node-asn1: languageName: unknown linkType: soft -"timeline-state-resolver-types@9.1.0, timeline-state-resolver-types@workspace:packages/timeline-state-resolver-types": +"timeline-state-resolver-types@9.2.0-alpha.0, timeline-state-resolver-types@workspace:packages/timeline-state-resolver-types": version: 0.0.0-use.local resolution: "timeline-state-resolver-types@workspace:packages/timeline-state-resolver-types" dependencies: @@ -11384,7 +11384,7 @@ asn1@evs-broadcast/node-asn1: languageName: unknown linkType: soft -"timeline-state-resolver@9.1.0, timeline-state-resolver@workspace:packages/timeline-state-resolver": +"timeline-state-resolver@9.2.0-alpha.0, timeline-state-resolver@workspace:packages/timeline-state-resolver": version: 0.0.0-use.local resolution: "timeline-state-resolver@workspace:packages/timeline-state-resolver" dependencies: @@ -11417,7 +11417,7 @@ asn1@evs-broadcast/node-asn1: sprintf-js: ^1.1.3 superfly-timeline: ^9.0.1 threadedclass: ^1.2.1 - timeline-state-resolver-types: 9.1.0 + timeline-state-resolver-types: 9.2.0-alpha.0 tslib: ^2.6.2 tv-automation-quantel-gateway-client: ^3.1.7 type-fest: ^3.13.1