From c185ed44918347b87c7e48c5d222fe0eb0c4dc71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 09:54:49 +0000 Subject: [PATCH 1/3] chore(deps): bump actions/setup-node from 3 to 4 (#300) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/node.yaml | 12 ++++++------ .github/workflows/publish.yaml | 4 ++-- .github/workflows/sonar.yaml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/node.yaml b/.github/workflows/node.yaml index 424df4aa5..b7df0477f 100644 --- a/.github/workflows/node.yaml +++ b/.github/workflows/node.yaml @@ -23,7 +23,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: '.node-version' - name: Prepare Environment @@ -49,7 +49,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: '.node-version' - name: Prepare Environment @@ -79,7 +79,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - name: Prepare Environment @@ -122,7 +122,7 @@ jobs: with: fetch-depth: 0 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: '.node-version' - name: Check release is desired @@ -191,7 +191,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: '.node-version' - name: Prepare Environment @@ -225,7 +225,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: '.node-version' - name: Prepare Environment diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index f6f9468bd..dd668ab6e 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: ${{ matrix.node-version }} - name: Prepare Environment @@ -48,7 +48,7 @@ jobs: with: fetch-depth: 0 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version-file: '.node-version' - name: Check release is desired diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml index 9ff52bfc4..fe0a78db2 100644 --- a/.github/workflows/sonar.yaml +++ b/.github/workflows/sonar.yaml @@ -21,7 +21,7 @@ jobs: fetch-depth: 0 - name: Use Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: 16 - name: Prepare Environment From 9f6786b6019e512ad0538a6bbf924e5654f43359 Mon Sep 17 00:00:00 2001 From: Mint de Wit Date: Fri, 24 Nov 2023 16:09:59 +0100 Subject: [PATCH 2/3] chore: add more logging to multi-osc --- .../src/integrations/multiOsc/index.ts | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/packages/timeline-state-resolver/src/integrations/multiOsc/index.ts b/packages/timeline-state-resolver/src/integrations/multiOsc/index.ts index ad9b6630f..d9024cecc 100644 --- a/packages/timeline-state-resolver/src/integrations/multiOsc/index.ts +++ b/packages/timeline-state-resolver/src/integrations/multiOsc/index.ts @@ -56,7 +56,10 @@ export class MultiOSCMessageDevice extends DeviceWithState { - this._connections[connectionId] = new OSCConnection() + const connection = new OSCConnection() + connection.on('error', (err) => this.emit('error', 'Error in MultiOSC connection ' + connectionId, err)) + connection.on('debug', (...args) => this.emit('debug', 'from connection ' + connectionId, ...args)) + this._connections[connectionId] = connection }) } this._doOnTime = new DoOnTime( @@ -70,7 +73,18 @@ export class MultiOSCMessageDevice extends DeviceWithState { for (const connOptions of initOptions.connections) { - await this._connections[connOptions.connectionId]?.connect({ + const conn = this._connections[connOptions.connectionId] + + if (!conn) { + this.emit( + 'error', + 'Could not initialise device', + new Error('Connection ' + connOptions.connectionId + ' not initialised') + ) + continue + } + + await conn.connect({ ...connOptions, oscSender: this._deviceOptions?.oscSenders?.[connOptions.connectionId] || undefined, }) From d64f1905655e35ab948030eff31451f0f24a11ad Mon Sep 17 00:00:00 2001 From: Balte de Wit Date: Wed, 29 Nov 2023 17:17:53 +0100 Subject: [PATCH 3/3] 8.1.1 --- CHANGELOG.md | 8 ++++++++ lerna.json | 2 +- packages/quick-tsr/CHANGELOG.md | 8 ++++++++ packages/quick-tsr/package.json | 4 ++-- packages/timeline-state-resolver/CHANGELOG.md | 8 ++++++++ packages/timeline-state-resolver/package.json | 2 +- 6 files changed, 28 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6634a9a08..f8a8712b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [8.1.1](https://github.com/nrkno/sofie-timeline-state-resolver/compare/8.1.0...8.1.1) (2023-11-29) + +**Note:** Version bump only for package timeline-state-resolver-packages + + + + + ## [8.1.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/8.0.0...8.1.0) (2023-10-19) diff --git a/lerna.json b/lerna.json index a1a20387a..1017b65c1 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "8.1.0", + "version": "8.1.1", "npmClient": "yarn", "useWorkspaces": true } \ No newline at end of file diff --git a/packages/quick-tsr/CHANGELOG.md b/packages/quick-tsr/CHANGELOG.md index 54204c3df..a671fa962 100644 --- a/packages/quick-tsr/CHANGELOG.md +++ b/packages/quick-tsr/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [8.1.1](https://github.com/nrkno/sofie-timeline-state-resolver/compare/8.1.0...8.1.1) (2023-11-29) + +**Note:** Version bump only for package quick-tsr + + + + + ## [8.1.0](https://github.com/nrkno/sofie-timeline-state-resolver/compare/8.0.0...8.1.0) (2023-10-19) **Note:** Version bump only for package quick-tsr diff --git a/packages/quick-tsr/package.json b/packages/quick-tsr/package.json index fb2f43d4d..45ff095d9 100644 --- a/packages/quick-tsr/package.json +++ b/packages/quick-tsr/package.json @@ -1,7 +1,7 @@ { "name": "quick-tsr", "private": true, - "version": "8.1.0", + "version": "8.1.1", "description": "Read timeline from file, use TSR, play stuff", "main": "dist/index.js", "typings": "dist/index.d.ts", @@ -63,7 +63,7 @@ "dependencies": { "chokidar": "^3.2.1", "fast-clone": "^1.5.13", - "timeline-state-resolver": "8.1.0", + "timeline-state-resolver": "8.1.1", "tslib": "^2.4.1", "underscore": "^1.9.1" } diff --git a/packages/timeline-state-resolver/CHANGELOG.md b/packages/timeline-state-resolver/CHANGELOG.md index ff0987cd3..7eab3034c 100644 --- a/packages/timeline-state-resolver/CHANGELOG.md +++ b/packages/timeline-state-resolver/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [8.1.1](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/8.1.0...8.1.1) (2023-11-29) + +**Note:** Version bump only for package timeline-state-resolver + + + + + ## [8.1.0](https://github.com/nrkno/tv-automation-state-timeline-resolver/compare/8.0.0...8.1.0) (2023-10-19) diff --git a/packages/timeline-state-resolver/package.json b/packages/timeline-state-resolver/package.json index ce1eb40b7..2733d2835 100644 --- a/packages/timeline-state-resolver/package.json +++ b/packages/timeline-state-resolver/package.json @@ -1,6 +1,6 @@ { "name": "timeline-state-resolver", - "version": "8.1.0", + "version": "8.1.1", "description": "Have timeline, control stuff", "main": "dist/index.js", "typings": "dist/index.d.ts",