Merge branch 'nrk/fix/various-fixes' into release52-test

Author: nytamin

meteor/server/publications/partsUI/publication.ts

@@ -1,5 +1,5 @@
 import { PartId, RundownPlaylistId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { check } from 'meteor/check'
+import { check, Match } from 'meteor/check'
 import {
 	CustomPublishCollection,
 	SetupObserversResult,
@@ -189,7 +189,7 @@ meteorCustomPublish(
 	MeteorPubSub.uiParts,
 	CustomCollectionName.UIParts,
 	async function (pub, playlistId: RundownPlaylistId | null) {
-		check(playlistId, String)
+		check(playlistId, Match.Optional(String))
 
 		triggerWriteAccessBecauseNoCheckNecessary()
 

packages/playout-gateway/src/tsrHandler.ts

@@ -280,6 +280,7 @@ export class TSRHandler {
 		this.tsr.connectionManager.on('connectionEvent:connectionChanged', (id, status) => {
 			const coreTsrHandler = this._coreTsrHandlers[id]
 			if (!coreTsrHandler) return
+			if (!coreTsrHandler._device) return // Not initialized yet
 
 			coreTsrHandler.statusChanged(status)
 

packages/server-core-integration/src/__tests__/index.spec.ts

@@ -482,21 +482,21 @@ describe('coreConnection', () => {
 		})
 
 		// Set child connection:
-		const coreChild = await coreParent.createChild({
+		const coreChild0 = await coreParent.createChild({
 			deviceId: protectString('JestTestChild'),
 			deviceSubType: PERIPHERAL_SUBTYPE_PROCESS,
 			deviceName: 'Jest test framework child',
 		})
 
 		const onChildError = jest.fn()
-		coreChild.on('error', onChildError)
+		coreChild0.on('error', onChildError)
 
-		expect(coreChild.connected).toEqual(true)
+		expect(coreChild0.connected).toEqual(true)
 
 		// Close parent connection:
-		await coreParent.destroy()
+		await coreParent.destroy() // This will also close all children
 
-		expect(coreChild.connected).toEqual(false)
+		expect(coreChild0.connected).toEqual(false)
 
 		// connect parent again:
 
@@ -505,10 +505,20 @@ describe('coreConnection', () => {
 			port: corePort,
 		})
 
-		expect(coreChild.connected).toEqual(true)
+		// Create a new child connection:
+		const coreChild2 = await coreParent.createChild({
+			deviceId: protectString('JestTestChild'),
+			deviceSubType: PERIPHERAL_SUBTYPE_PROCESS,
+			deviceName: 'Jest test framework child',
+		})
+
+		const onChildError2 = jest.fn()
+		coreChild2.on('error', onChildError2)
+
+		expect(coreChild2.connected).toEqual(true)
 
 		await coreParent.destroy()
-		await coreChild.destroy()
+		await coreChild2.destroy()
 
 		expect(onChildError).toHaveBeenCalledTimes(0)
 		expect(onParentError).toHaveBeenCalledTimes(0)

packages/server-core-integration/src/lib/coreConnection.ts

@@ -212,6 +212,16 @@ export class CoreConnection<
 	async createChild(coreOptions: ChildCoreOptions): Promise<CoreConnectionChild<PubSubTypes, PubSubCollections>> {
 		const child = new CoreConnectionChild<PubSubTypes, PubSubCollections>(coreOptions)
 
+		this._children.push(child)
+
+		// Set the max listeners to a higher value, so that we don't get warnings:
+		this.setMaxListeners(
+			// Base count, can be increased if needed:
+			10 +
+				// Each child adds 2 listeners:
+				this._children.length * 2
+		)
+
 		await child.init(this, this._coreOptions)
 
 		return child