fix: todos

Author: Julusian

meteor/server/publications/peripheralDeviceForDevice.ts

@@ -68,7 +68,8 @@ export function convertPeripheralDeviceForGateway(
 			const allDeviceSettingsInStudio = applyAndValidateOverrides(
 				studio.peripheralDeviceSettings.deviceSettings
 			).obj
-			deviceSettings = allDeviceSettingsInStudio[peripheralDevice.studioAndConfigId.configId] ?? deviceSettings
+			deviceSettings =
+				allDeviceSettingsInStudio[peripheralDevice.studioAndConfigId.configId]?.options ?? deviceSettings
 		}
 
 		switch (peripheralDevice.category) {

packages/mos-gateway/src/mosHandler.ts

@@ -39,6 +39,7 @@ import { MosDeviceConfig } from './generated/devices'
 import { PeripheralDeviceForDevice } from '@sofie-automation/server-core-integration'
 import _ = require('underscore')
 import { MosStatusHandler } from './mosStatusHandler'
+import { isPromise } from 'util/types'
 
 export interface MosConfig {
 	self: IConnectionConfig
@@ -61,7 +62,7 @@ interface MosDeviceHandle {
 	readonly deviceOptions: Readonly<MosDeviceConfig>
 
 	// Once connected, a core handler is setup
-	coreMosHandler?: CoreMosDeviceHandler
+	coreMosHandler?: CoreMosDeviceHandler | Promise<CoreMosDeviceHandler>
 
 	// If writing back story/item status is enabled, the setup handler
 	statusHandler?: MosStatusHandler
@@ -288,10 +289,9 @@ export class MosHandler {
 				return
 			}
 
-			// nocommit - this is a bit of a race condition, as the deviceEntry is updated via an await
+			// This is either a promise, if a handler is currently being setup, or the handler itself
 			if (deviceEntry.coreMosHandler) {
 				this._logger.error(`Got connection for mosDevice "${mosDevice.idPrimary}" which is already setup!`)
-				// nocommit - do anything else?
 				return
 			}
 
@@ -444,7 +444,7 @@ export class MosHandler {
 	private sendStatusOfAllMosDevices() {
 		// Send an update to Core of the status of all mos devices
 		for (const handler of this._allMosDevices.values()) {
-			if (handler.coreMosHandler) {
+			if (handler.coreMosHandler && !isPromise(handler.coreMosHandler)) {
 				handler.coreMosHandler.onMosConnectionChanged(handler.mosDevice.getConnectionStatus())
 			}
 		}