From 8850e815e6072fd658622bc12e3b4c346b1617f5 Mon Sep 17 00:00:00 2001 From: Julian Waller Date: Wed, 10 Sep 2025 15:55:12 +0100 Subject: [PATCH 1/2] fix: update tsr --- meteor/yarn.lock | 10 ++--- packages/playout-gateway/package.json | 2 +- packages/playout-gateway/src/coreHandler.ts | 14 ------ packages/shared-lib/package.json | 2 +- packages/yarn.lock | 48 ++++++++++++--------- 5 files changed, 35 insertions(+), 41 deletions(-) diff --git a/meteor/yarn.lock b/meteor/yarn.lock index 86a71cc769..fd46bf382e 100644 --- a/meteor/yarn.lock +++ b/meteor/yarn.lock @@ -1244,7 +1244,7 @@ __metadata: resolution: "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A." dependencies: "@mos-connection/model": "npm:^4.2.2" - timeline-state-resolver-types: "npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0" + timeline-state-resolver-types: "npm:10.0.0-nightly-release53-20250908-063535-af36ced74.0" tslib: "npm:^2.8.1" type-fest: "npm:^4.33.0" languageName: node @@ -9983,12 +9983,12 @@ __metadata: languageName: node linkType: hard -"timeline-state-resolver-types@npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0": - version: 9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0 - resolution: "timeline-state-resolver-types@npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0" +"timeline-state-resolver-types@npm:10.0.0-nightly-release53-20250908-063535-af36ced74.0": + version: 10.0.0-nightly-release53-20250908-063535-af36ced74.0 + resolution: "timeline-state-resolver-types@npm:10.0.0-nightly-release53-20250908-063535-af36ced74.0" dependencies: tslib: "npm:^2.6.3" - checksum: 10/15c09f1d9ff815506471a1d1ee0405d39c6565d6fd8cf8478a9dac92c34004360d22f77b3d06371fa69b283b14a75d15c31b65b91185c9df6c5ca82ca285eebe + checksum: 10/e26e2c5dc6ba1d68458862c35035be060f088e5582c85c3a99215830557e46f9ab43f7c2813105f664288f49ef2ee6e81eb4e084480befde2ab0fc748f3f6429 languageName: node linkType: hard diff --git a/packages/playout-gateway/package.json b/packages/playout-gateway/package.json index b04709f23f..335fa1f102 100644 --- a/packages/playout-gateway/package.json +++ b/packages/playout-gateway/package.json @@ -60,7 +60,7 @@ "@sofie-automation/shared-lib": "1.53.0-in-development", "debug": "^4.4.0", "influx": "^5.9.7", - "timeline-state-resolver": "9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0", + "timeline-state-resolver": "10.0.0-nightly-release53-20250908-063535-af36ced74.0", "tslib": "^2.8.1", "underscore": "^1.13.7", "winston": "^3.17.0" diff --git a/packages/playout-gateway/src/coreHandler.ts b/packages/playout-gateway/src/coreHandler.ts index 0337549fd2..b482424bc0 100644 --- a/packages/playout-gateway/src/coreHandler.ts +++ b/packages/playout-gateway/src/coreHandler.ts @@ -315,20 +315,6 @@ export class CoreHandler { process.exit(0) }, 1000) } - async devicesMakeReady(okToDestroyStuff?: boolean, activeRundownId?: string): Promise { - if (this._tsrHandler) { - return this._tsrHandler.tsr.devicesMakeReady(okToDestroyStuff, activeRundownId) - } else { - throw Error('TSR not set up!') - } - } - async devicesStandDown(okToDestroyStuff?: boolean): Promise { - if (this._tsrHandler) { - return this._tsrHandler.tsr.devicesStandDown(okToDestroyStuff) - } else { - throw Error('TSR not set up!') - } - } pingResponse(message: string): void { this.core.setPingResponse(message) } diff --git a/packages/shared-lib/package.json b/packages/shared-lib/package.json index 90b2d6751d..da96e9e46c 100644 --- a/packages/shared-lib/package.json +++ b/packages/shared-lib/package.json @@ -39,7 +39,7 @@ ], "dependencies": { "@mos-connection/model": "^4.2.2", - "timeline-state-resolver-types": "9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0", + "timeline-state-resolver-types": "10.0.0-nightly-release53-20250908-063535-af36ced74.0", "tslib": "^2.8.1", "type-fest": "^4.33.0" }, diff --git a/packages/yarn.lock b/packages/yarn.lock index 3782bbc746..42a57a1ad0 100644 --- a/packages/yarn.lock +++ b/packages/yarn.lock @@ -6373,7 +6373,7 @@ __metadata: resolution: "@sofie-automation/shared-lib@workspace:shared-lib" dependencies: "@mos-connection/model": "npm:^4.2.2" - timeline-state-resolver-types: "npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0" + timeline-state-resolver-types: "npm:10.0.0-nightly-release53-20250908-063535-af36ced74.0" tslib: "npm:^2.8.1" type-fest: "npm:^4.33.0" languageName: unknown @@ -23226,7 +23226,7 @@ asn1@evs-broadcast/node-asn1: "@sofie-automation/shared-lib": "npm:1.53.0-in-development" debug: "npm:^4.4.0" influx: "npm:^5.9.7" - timeline-state-resolver: "npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0" + timeline-state-resolver: "npm:10.0.0-nightly-release53-20250908-063535-af36ced74.0" tslib: "npm:^2.8.1" underscore: "npm:^1.13.7" winston: "npm:^3.17.0" @@ -27622,7 +27622,7 @@ asn1@evs-broadcast/node-asn1: languageName: node linkType: hard -"superfly-timeline@npm:9.1.2, superfly-timeline@npm:^9.1.2": +"superfly-timeline@npm:9.1.2": version: 9.1.2 resolution: "superfly-timeline@npm:9.1.2" dependencies: @@ -27631,6 +27631,15 @@ asn1@evs-broadcast/node-asn1: languageName: node linkType: hard +"superfly-timeline@npm:^9.2.0": + version: 9.2.0 + resolution: "superfly-timeline@npm:9.2.0" + dependencies: + tslib: "npm:^2.6.0" + checksum: 10/254cbb359bc17fcaf181d47bd5f931eadc99d2dfc5883e60bf299ab136214eec7ef65e317bba8a4af59815e2665b3b9f4d0e03e9c266617537b1629a213820aa + languageName: node + linkType: hard + "supports-color@npm:^5.3.0, supports-color@npm:^5.5.0": version: 5.5.0 resolution: "supports-color@npm:5.5.0" @@ -27971,29 +27980,29 @@ asn1@evs-broadcast/node-asn1: languageName: node linkType: hard -"timeline-state-resolver-api@npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0": - version: 9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0 - resolution: "timeline-state-resolver-api@npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0" +"timeline-state-resolver-api@npm:10.0.0-nightly-release53-20250908-063535-af36ced74.0": + version: 10.0.0-nightly-release53-20250908-063535-af36ced74.0 + resolution: "timeline-state-resolver-api@npm:10.0.0-nightly-release53-20250908-063535-af36ced74.0" dependencies: tslib: "npm:^2.6.3" peerDependencies: - timeline-state-resolver-types: 9.4.0-release53 - checksum: 10/3f6ff65983b5d4da074d41afc100bdc6fc7796b06ddbbcebfc2e290a9a402d58f668d5343f1e08a01d9131e4bae032567879edbb572e3d3459fc4241bcd7316a + timeline-state-resolver-types: 10.0.0-release53 + checksum: 10/562990051b6f0030d9ea0166e24f9f438f9f1d763258e8f0d0ac032660c62c4394b826910213140609a63527800a53b68e16b4beeb348dad95f4d4f0c05923fc languageName: node linkType: hard -"timeline-state-resolver-types@npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0": - version: 9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0 - resolution: "timeline-state-resolver-types@npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0" +"timeline-state-resolver-types@npm:10.0.0-nightly-release53-20250908-063535-af36ced74.0": + version: 10.0.0-nightly-release53-20250908-063535-af36ced74.0 + resolution: "timeline-state-resolver-types@npm:10.0.0-nightly-release53-20250908-063535-af36ced74.0" dependencies: tslib: "npm:^2.6.3" - checksum: 10/15c09f1d9ff815506471a1d1ee0405d39c6565d6fd8cf8478a9dac92c34004360d22f77b3d06371fa69b283b14a75d15c31b65b91185c9df6c5ca82ca285eebe + checksum: 10/e26e2c5dc6ba1d68458862c35035be060f088e5582c85c3a99215830557e46f9ab43f7c2813105f664288f49ef2ee6e81eb4e084480befde2ab0fc748f3f6429 languageName: node linkType: hard -"timeline-state-resolver@npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0": - version: 9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0 - resolution: "timeline-state-resolver@npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0" +"timeline-state-resolver@npm:10.0.0-nightly-release53-20250908-063535-af36ced74.0": + version: 10.0.0-nightly-release53-20250908-063535-af36ced74.0 + resolution: "timeline-state-resolver@npm:10.0.0-nightly-release53-20250908-063535-af36ced74.0" dependencies: "@tv2media/v-connection": "npm:^7.3.4" atem-connection: "npm:3.5.0" @@ -28013,13 +28022,12 @@ asn1@evs-broadcast/node-asn1: osc: "npm:^2.4.5" p-all: "npm:^3.0.0" p-queue: "npm:^6.6.2" - p-timeout: "npm:^3.2.0" simple-oauth2: "npm:^5.1.0" sprintf-js: "npm:^1.1.3" - superfly-timeline: "npm:^9.1.2" + superfly-timeline: "npm:^9.2.0" threadedclass: "npm:^1.2.2" - timeline-state-resolver-api: "npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0" - timeline-state-resolver-types: "npm:9.4.0-nightly-release53-20250730-145840-ce6dce9c1.0" + timeline-state-resolver-api: "npm:10.0.0-nightly-release53-20250908-063535-af36ced74.0" + timeline-state-resolver-types: "npm:10.0.0-nightly-release53-20250908-063535-af36ced74.0" tslib: "npm:^2.6.3" tv-automation-quantel-gateway-client: "npm:^3.1.7" type-fest: "npm:^3.13.1" @@ -28027,7 +28035,7 @@ asn1@evs-broadcast/node-asn1: utf-8-validate: "npm:^6.0.4" ws: "npm:^8.18.0" xml-js: "npm:^1.6.11" - checksum: 10/e609b2471a1660dde83f9821de874952f212820a7962cf2fa0d92730fe1f083b0e3090e16cf3c9da79e8ae30ec780ac14209001364525661a9a13ed87ab02e70 + checksum: 10/2069e3567dd657dd5e6ae855711dca576842b967e47f197f36a2f181353a0a5f4cdcbf2c6ec31b7c3b74ea739b01d065d045362e72da76b60665c9c0aab5c609 languageName: node linkType: hard From 57b737a645ce16575842ab3890aa6797f997622c Mon Sep 17 00:00:00 2001 From: Julian Waller Date: Wed, 10 Sep 2025 15:57:37 +0100 Subject: [PATCH 2/2] chore: yarn dedupe --- meteor/yarn.lock | 38 +++--------------- packages/yarn.lock | 99 ++-------------------------------------------- 2 files changed, 10 insertions(+), 127 deletions(-) diff --git a/meteor/yarn.lock b/meteor/yarn.lock index fd46bf382e..2b193f7375 100644 --- a/meteor/yarn.lock +++ b/meteor/yarn.lock @@ -3521,15 +3521,15 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": - version: 4.3.4 - resolution: "debug@npm:4.3.4" +"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": + version: 4.4.0 + resolution: "debug@npm:4.4.0" dependencies: - ms: "npm:2.1.2" + ms: "npm:^2.1.3" peerDependenciesMeta: supports-color: optional: true - checksum: 10/0073c3bcbd9cb7d71dd5f6b55be8701af42df3e56e911186dfa46fac3a5b9eb7ce7f377dd1d3be6db8977221f8eb333d945216f645cf56f6b688cd484837d255 + checksum: 10/1847944c2e3c2c732514b93d11886575625686056cd765336212dc15de2d2b29612b6cd80e1afba767bb8e1803b778caf9973e98169ef1a24a7a7009e1820367 languageName: node linkType: hard @@ -3542,18 +3542,6 @@ __metadata: languageName: node linkType: hard -"debug@npm:^4.0.1": - version: 4.4.0 - resolution: "debug@npm:4.4.0" - dependencies: - ms: "npm:^2.1.3" - peerDependenciesMeta: - supports-color: - optional: true - checksum: 10/1847944c2e3c2c732514b93d11886575625686056cd765336212dc15de2d2b29612b6cd80e1afba767bb8e1803b778caf9973e98169ef1a24a7a7009e1820367 - languageName: node - linkType: hard - "debuglog@npm:^1.0.1": version: 1.0.1 resolution: "debuglog@npm:1.0.1" @@ -7455,14 +7443,7 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.3": - version: 7.0.3 - resolution: "minipass@npm:7.0.3" - checksum: 10/04d72c8a437de54a024f3758ff17c0226efb532ef37dbdaca1ea6039c7b9b1704e612abbd2e3a0d2c825c64eb0a9ab266c843baa71d18ad1a279baecee28ed97 - languageName: node - linkType: hard - -"minipass@npm:^7.1.2": +"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.3, minipass@npm:^7.1.2": version: 7.1.2 resolution: "minipass@npm:7.1.2" checksum: 10/c25f0ee8196d8e6036661104bacd743785b2599a21de5c516b32b3fa2b83113ac89a2358465bc04956baab37ffb956ae43be679b2262bf7be15fce467ccd7950 @@ -7578,13 +7559,6 @@ __metadata: languageName: node linkType: hard -"ms@npm:2.1.2": - version: 2.1.2 - resolution: "ms@npm:2.1.2" - checksum: 10/673cdb2c3133eb050c745908d8ce632ed2c02d85640e2edb3ace856a2266a813b30c613569bf3354fdf4ea7d1a1494add3bfa95e2713baa27d0c2c71fc44f58f - languageName: node - linkType: hard - "ms@npm:^2.0.0, ms@npm:^2.1.1, ms@npm:^2.1.3": version: 2.1.3 resolution: "ms@npm:2.1.3" diff --git a/packages/yarn.lock b/packages/yarn.lock index 42a57a1ad0..c5b5b7940d 100644 --- a/packages/yarn.lock +++ b/packages/yarn.lock @@ -8353,16 +8353,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:8.23.0": - version: 8.23.0 - resolution: "@typescript-eslint/scope-manager@npm:8.23.0" - dependencies: - "@typescript-eslint/types": "npm:8.23.0" - "@typescript-eslint/visitor-keys": "npm:8.23.0" - checksum: 10/eb4624ccd907c21ca49c4600dec0c447349d7e987cda21181c008dc5ce855590e311efabe73b79b15da0948ce5f63ce0c33613ab4a39ea95578b099b724392e3 - languageName: node - linkType: hard - "@typescript-eslint/scope-manager@npm:8.30.1": version: 8.30.1 resolution: "@typescript-eslint/scope-manager@npm:8.30.1" @@ -8388,13 +8378,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:8.23.0": - version: 8.23.0 - resolution: "@typescript-eslint/types@npm:8.23.0" - checksum: 10/e2a68bc6e89226e47e495a91e0614aa5c3c4580b11f7fd99ac6728c1fce92f10755b0d7ade3cf6d3eb1209cd9cd0f29bd742f8dddc394b28bcead7025394eaa2 - languageName: node - linkType: hard - "@typescript-eslint/types@npm:8.30.1": version: 8.30.1 resolution: "@typescript-eslint/types@npm:8.30.1" @@ -8402,24 +8385,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:8.23.0": - version: 8.23.0 - resolution: "@typescript-eslint/typescript-estree@npm:8.23.0" - dependencies: - "@typescript-eslint/types": "npm:8.23.0" - "@typescript-eslint/visitor-keys": "npm:8.23.0" - debug: "npm:^4.3.4" - fast-glob: "npm:^3.3.2" - is-glob: "npm:^4.0.3" - minimatch: "npm:^9.0.4" - semver: "npm:^7.6.0" - ts-api-utils: "npm:^2.0.1" - peerDependencies: - typescript: ">=4.8.4 <5.8.0" - checksum: 10/ddc9790d460bea065eeed3760759c034aef307e72c51b5ec7d869fdc77f18c28354c9e35841b44eebbdc54241bab4154809ae8213d33593a9bff20dc3b247fc3 - languageName: node - linkType: hard - "@typescript-eslint/typescript-estree@npm:8.30.1": version: 8.30.1 resolution: "@typescript-eslint/typescript-estree@npm:8.30.1" @@ -8438,7 +8403,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:8.30.1": +"@typescript-eslint/utils@npm:8.30.1, @typescript-eslint/utils@npm:^6.0.0 || ^7.0.0 || ^8.0.0, @typescript-eslint/utils@npm:^8.21.0": version: 8.30.1 resolution: "@typescript-eslint/utils@npm:8.30.1" dependencies: @@ -8453,31 +8418,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/utils@npm:^6.0.0 || ^7.0.0 || ^8.0.0, @typescript-eslint/utils@npm:^8.21.0": - version: 8.23.0 - resolution: "@typescript-eslint/utils@npm:8.23.0" - dependencies: - "@eslint-community/eslint-utils": "npm:^4.4.0" - "@typescript-eslint/scope-manager": "npm:8.23.0" - "@typescript-eslint/types": "npm:8.23.0" - "@typescript-eslint/typescript-estree": "npm:8.23.0" - peerDependencies: - eslint: ^8.57.0 || ^9.0.0 - typescript: ">=4.8.4 <5.8.0" - checksum: 10/72588d617ee5b1fa1020d008a7ff714a4a1e0fc1167aa9ff4b8ae71a37b25f43b2d40bca3380c56bb84d4092b6cac8d5d14d74e290e80217175ccf8237faf22a - languageName: node - linkType: hard - -"@typescript-eslint/visitor-keys@npm:8.23.0": - version: 8.23.0 - resolution: "@typescript-eslint/visitor-keys@npm:8.23.0" - dependencies: - "@typescript-eslint/types": "npm:8.23.0" - eslint-visitor-keys: "npm:^4.2.0" - checksum: 10/fd473849b85e564e31aec64feb3417a4e16e48bf21f1959fbab56258e19c21ef47bbdb523c64a8921cdc82a5083735418890b6f74b564fd1ece305c977a0f7a6 - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:8.30.1": version: 8.30.1 resolution: "@typescript-eslint/visitor-keys@npm:8.30.1" @@ -9550,7 +9490,7 @@ asn1@evs-broadcast/node-asn1: languageName: node linkType: hard -"axios@npm:1.9.0": +"axios@npm:1.9.0, axios@npm:^1.7.4, axios@npm:^1.7.8": version: 1.9.0 resolution: "axios@npm:1.9.0" dependencies: @@ -9561,17 +9501,6 @@ asn1@evs-broadcast/node-asn1: languageName: node linkType: hard -"axios@npm:^1.7.4, axios@npm:^1.7.8": - version: 1.7.9 - resolution: "axios@npm:1.7.9" - dependencies: - follow-redirects: "npm:^1.15.6" - form-data: "npm:^4.0.0" - proxy-from-env: "npm:^1.1.0" - checksum: 10/b7a5f660ea53ba9c2a745bf5ad77ad8bf4f1338e13ccc3f9f09f810267d6c638c03dac88b55dae8dc98b79c57d2d6835be651d58d2af97c174f43d289a9fd007 - languageName: node - linkType: hard - "babel-jest@npm:^29.7.0": version: 29.7.0 resolution: "babel-jest@npm:29.7.0" @@ -15124,7 +15053,7 @@ asn1@evs-broadcast/node-asn1: languageName: node linkType: hard -"fs-extra@npm:11.3.0": +"fs-extra@npm:11.3.0, fs-extra@npm:^11.1.1, fs-extra@npm:^11.2.0": version: 11.3.0 resolution: "fs-extra@npm:11.3.0" dependencies: @@ -15135,17 +15064,6 @@ asn1@evs-broadcast/node-asn1: languageName: node linkType: hard -"fs-extra@npm:^11.1.1, fs-extra@npm:^11.2.0": - version: 11.2.0 - resolution: "fs-extra@npm:11.2.0" - dependencies: - graceful-fs: "npm:^4.2.0" - jsonfile: "npm:^6.0.1" - universalify: "npm:^2.0.0" - checksum: 10/0579bf6726a4cd054d4aa308f10b483f52478bb16284f32cf60b4ce0542063d551fca1a08a2af365e35db21a3fa5a06cf2a6ed614004b4368982bc754cb816b3 - languageName: node - linkType: hard - "fs-extra@npm:^9.0.0": version: 9.1.0 resolution: "fs-extra@npm:9.1.0" @@ -26163,7 +26081,7 @@ asn1@evs-broadcast/node-asn1: languageName: node linkType: hard -"rxjs@npm:7.8.2": +"rxjs@npm:7.8.2, rxjs@npm:^7.5.5": version: 7.8.2 resolution: "rxjs@npm:7.8.2" dependencies: @@ -26181,15 +26099,6 @@ asn1@evs-broadcast/node-asn1: languageName: node linkType: hard -"rxjs@npm:^7.5.5": - version: 7.8.1 - resolution: "rxjs@npm:7.8.1" - dependencies: - tslib: "npm:^2.1.0" - checksum: 10/b10cac1a5258f885e9dd1b70d23c34daeb21b61222ee735d2ec40a8685bdca40429000703a44f0e638c27a684ac139e1c37e835d2a0dc16f6fc061a138ae3abb - languageName: node - linkType: hard - "safe-array-concat@npm:^1.0.0, safe-array-concat@npm:^1.1.3": version: 1.1.3 resolution: "safe-array-concat@npm:1.1.3"