fix: Broken merge

Author: PeterC89

packages/mos-gateway/src/$schemas/devices.json

@@ -140,36 +140,8 @@
 			},
 			"required": ["id", "host"],
 			"additionalProperties": false
-		},
-		"statuses": {
-			"type": "object",
-			"ui:title": "Statuses",
-			"title": "MosDeviceStatusesConfig",
-			"properties": {
-				"enabled": {
-					"type": "boolean",
-					"ui:title": "Write Statuses to NRCS",
-					"ui:description": "",
-					"ui:summaryTitle": "Statuses",
-					"default": true
-				},
-				"sendInRehearsal": {
-					"type": "boolean",
-					"ui:title": "Send when in Rehearsal mode",
-					"ui:description": "",
-					"default": false
-				},
-				"onlySendPlay": {
-					"type": "boolean",
-					"ui:title": "Only send PLAY statuses",
-					"ui:description": "",
-					"default": false
-				}
-			},
-			"required": ["enabled"],
-			"additionalProperties": false
 		}
 	},
-	"required": ["primary", "statuses"],
+	"required": ["primary"],
 	"additionalProperties": false
 }

packages/mos-gateway/src/CoreMosDeviceHandler.ts

@@ -4,7 +4,6 @@ import {
 	protectString,
 	Observer,
 	PeripheralDevicePubSub,
-	stringifyError,
 } from '@sofie-automation/server-core-integration'
 import {
 	IMOSConnectionStatus,
@@ -22,6 +21,7 @@ import {
 	IMOSItem,
 	IMOSROReadyToAir,
 	IMOSROFullStory,
+	IMOSObjectStatus,
 	IMOSROAck,
 	getMosTypes,
 	MosTypes,
@@ -112,7 +112,9 @@ export class CoreMosDeviceHandler {
 			deviceName: this._mosDevice.idPrimary,
 		})
 		this.core.on('error', (err) => {
-			this._coreParentHandler.logger.error(`Core Error: ${stringifyError(err)}`)
+			this._coreParentHandler.logger.error(
+				'Core Error: ' + (typeof err === 'string' ? err : err.message || err.toString())
+			)
 		})
 
 		this.setupSubscriptionsAndObservers()
@@ -136,7 +138,7 @@ export class CoreMosDeviceHandler {
 		Promise.all([
 			this.core.autoSubscribe(PeripheralDevicePubSub.peripheralDeviceCommands, this.core.deviceId),
 		]).catch((e) => {
-			this._coreParentHandler.logger.error(stringifyError(e))
+			this._coreParentHandler.logger.error(e)
 		})
 
 		this._coreParentHandler.logger.info('CoreMos: Setting up observers..')
@@ -347,6 +349,42 @@ export class CoreMosDeviceHandler {
 		// console.log('GOT REPLY', results)
 		return this.fixMosData(ro)
 	}
+	async setROStatus(roId: string, status: IMOSObjectStatus): Promise<any> {
+		// console.log('setStoryStatus')
+		const result = await this._mosDevice.sendRunningOrderStatus({
+			ID: this.mosTypes.mosString128.create(roId),
+			Status: status,
+			Time: this.mosTypes.mosTime.create(new Date()),
+		})
+
+		// console.log('got result', result)
+		return this.fixMosData(result)
+	}
+	async setStoryStatus(roId: string, storyId: string, status: IMOSObjectStatus): Promise<any> {
+		// console.log('setStoryStatus')
+		const result = await this._mosDevice.sendStoryStatus({
+			RunningOrderId: this.mosTypes.mosString128.create(roId),
+			ID: this.mosTypes.mosString128.create(storyId),
+			Status: status,
+			Time: this.mosTypes.mosTime.create(new Date()),
+		})
+
+		// console.log('got result', result)
+		return this.fixMosData(result)
+	}
+	async setItemStatus(roId: string, storyId: string, itemId: string, status: IMOSObjectStatus): Promise<any> {
+		// console.log('setStoryStatus')
+		const result = await this._mosDevice.sendItemStatus({
+			RunningOrderId: this.mosTypes.mosString128.create(roId),
+			StoryId: this.mosTypes.mosString128.create(storyId),
+			ID: this.mosTypes.mosString128.create(itemId),
+			Status: status,
+			Time: this.mosTypes.mosTime.create(new Date()),
+		})
+
+		// console.log('got result', result)
+		return this.fixMosData(result)
+	}
 	async replaceStoryItem(
 		roID: string,
 		storyID: string,

packages/mos-gateway/src/connector.ts

@@ -44,19 +44,14 @@ export class Connector implements IConnector {
 			this._logger.info('Process initialized')
 
 			this._logger.info('Initializing Core...')
-			this.coreHandler = await CoreHandler.create(
-				this._logger,
-				this._config.core,
-				certificates,
-				this._config.device
-			)
+			await this.initCore(certificates)
 
 			if (!this.coreHandler) throw Error('coreHandler is undefined!')
 
 			new HealthEndpoints(this, this.coreHandler, config.health)
 
 			this._logger.info('Initializing Mos...')
-			this.mosHandler = await MosHandler.create(this._logger, this._config.mos, this.coreHandler)
+			await this.initMos()
 
 			this._logger.info('Initialization done')
 			this.initialized = true
@@ -67,15 +62,40 @@ export class Connector implements IConnector {
 
 			this._logger.info('Shutting down in 10 seconds!')
 
-			this.dispose().catch((e2) => this._logger.error(stringifyError(e2)))
+			this.dispose().catch((e2) => this._logger.error(e2))
 
 			setTimeout(() => {
 				// eslint-disable-next-line n/no-process-exit
 				process.exit(0)
 			}, 10 * 1000)
 		}
 	}
+	async initCore(certificates: Buffer[]): Promise<void> {
+		if (!this._config) {
+			throw Error('_config is undefined!')
+		}
+
+		this.coreHandler = new CoreHandler(this._logger, this._config.device)
+
+		if (!this.coreHandler) {
+			throw Error('coreHandler is undefined!')
+		}
+
+		return this.coreHandler.init(this._config.core, certificates)
+	}
+	async initMos(): Promise<void> {
+		this.mosHandler = new MosHandler(this._logger)
 
+		if (!this._config) {
+			throw Error('_config is undefined!')
+		}
+
+		if (!this.coreHandler) {
+			throw Error('coreHandler is undefined!')
+		}
+
+		return this.mosHandler.init(this._config.mos, this.coreHandler)
+	}
 	async dispose(): Promise<void> {
 		if (this.mosHandler) await this.mosHandler.dispose()
 

packages/mos-gateway/src/coreHandler.ts

@@ -44,23 +44,12 @@ export class CoreHandler implements ICoreHandler {
 	private _coreConfig?: CoreConfig
 	private _certificates?: Buffer[]
 
-	public static async create(
-		logger: Winston.Logger,
-		config: CoreConfig,
-		certificates: Buffer[],
-		deviceOptions: DeviceConfig
-	): Promise<CoreHandler> {
-		const handler = new CoreHandler(logger, deviceOptions)
-		await handler.init(config, certificates)
-		return handler
-	}
-
-	private constructor(logger: Winston.Logger, deviceOptions: DeviceConfig) {
+	constructor(logger: Winston.Logger, deviceOptions: DeviceConfig) {
 		this.logger = logger
 		this._deviceOptions = deviceOptions
 	}
 
-	private async init(config: CoreConfig, certificates: Buffer[]): Promise<void> {
+	async init(config: CoreConfig, certificates: Buffer[]): Promise<void> {
 		// this.logger.info('========')
 		this._coreConfig = config
 		this._certificates = certificates