Merge branch 'master' into release50

.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
@@ -192,7 +192,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
@@ -226,7 +226,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

.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

.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

lerna.json

@@ -2,4 +2,4 @@
   "version": "9.0.0-release50.7",
   "npmClient": "yarn",
   "useWorkspaces": true
-}
+}

packages/quick-tsr/CHANGELOG.md

@@ -63,6 +63,10 @@ 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.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

packages/timeline-state-resolver/CHANGELOG.md

@@ -140,6 +140,10 @@ 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.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)
 
 ### Features

packages/timeline-state-resolver/src/integrations/multiOsc/index.ts

@@ -57,7 +57,10 @@ export class MultiOSCMessageDevice extends DeviceWithState<OSCDeviceState, Devic
 		super(deviceId, deviceOptions, getCurrentTime)
 		if (deviceOptions.options) {
 			deviceOptions.options.connections.forEach(({ connectionId }) => {
-				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(
@@ -71,7 +74,18 @@ export class MultiOSCMessageDevice extends DeviceWithState<OSCDeviceState, Devic
 	}
 	async init(initOptions: MultiOSCOptions): Promise<boolean> {
 		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,
 			})