fix: make openMediaHotStandby option pr subdevice, and rename from hotStandby to openMediaHotStandby

Author: olzzon

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

@@ -61,13 +61,20 @@
 							"ui:title": "(Optional) MOS Query Port",
 							"ui:description": "Connect to an alternate port for 'query' port MOS messages",
 							"default": 10542
-						}	
+						}
 					},
-					"required": ["lower", "upper", "query"],
+					"required": [
+						"lower",
+						"upper",
+						"query"
+					],
 					"additionalProperties": false
 				}
 			},
-			"required": ["id", "host"],
+			"required": [
+				"id",
+				"host"
+			],
 			"additionalProperties": false
 		},
 		"secondary": {
@@ -105,10 +112,10 @@
 					"ui:description": "How often to ping NRCS to determine connection status",
 					"default": 30000
 				},
-				"hotStandby": {
+				"openMediaHotStandby": {
 					"type": "boolean",
-					"ui:title": "Secondary: Hot Standby",
-					"ui:description": "Is the secondary connection a hot standby for the primary",
+					"ui:title": "Secondary: OpenMedia Hot Standby",
+					"ui:description": "Is the secondary connection a OpenMedia hot standby for the primary",
 					"default": false
 				},
 				"ports": {
@@ -132,16 +139,25 @@
 							"ui:title": "(Optional) MOS Query Port",
 							"ui:description": "Connect to an alternate port for 'query' port MOS messages",
 							"default": 10542
-						}	
+						}
 					},
-					"required": ["lower", "upper", "query"],
+					"required": [
+						"lower",
+						"upper",
+						"query"
+					],
 					"additionalProperties": false
-				}				
+				}
 			},
-			"required": ["id", "host"],
+			"required": [
+				"id",
+				"host"
+			],
 			"additionalProperties": false
 		}
 	},
-	"required": ["primary"],
+	"required": [
+		"primary"
+	],
 	"additionalProperties": false
-}
+}

packages/mos-gateway/src/CoreMosDeviceHandler.ts

@@ -75,15 +75,15 @@ export class CoreMosDeviceHandler {
 	private _pendingStoryItemChanges: Array<IStoryItemChange> = []
 	private _pendingChangeTimeout: number = 60 * 1000
 	private mosTypes: MosTypes
-	private _hotStandby: boolean
+	private _openMediaHotStandby: boolean
 
 	private _messageQueue: Queue
 
-	constructor(parent: CoreHandler, mosDevice: IMOSDevice, mosHandler: MosHandler, hotStandby: boolean) {
+	constructor(parent: CoreHandler, mosDevice: IMOSDevice, mosHandler: MosHandler, openMediaHotStandby: boolean) {
 		this._coreParentHandler = parent
 		this._mosDevice = mosDevice
 		this._mosHandler = mosHandler
-		this._hotStandby = hotStandby
+		this._openMediaHotStandby = openMediaHotStandby
 
 		this._messageQueue = new Queue()
 
@@ -140,7 +140,7 @@ export class CoreMosDeviceHandler {
 		let statusCode: StatusCode
 		const messages: Array<string> = []
 
-		if (this._hotStandby) {
+		if (this._openMediaHotStandby) {
 			// OpenMedia treats secondary server as hot-standby
 			// And thus is not considered as a warning if it's not connected
 			if (connectionStatus.PrimaryConnected) {

packages/mos-gateway/src/coreHandler.ts

@@ -145,10 +145,10 @@ export class CoreHandler {
 	async registerMosDevice(
 		mosDevice: IMOSDevice,
 		mosHandler: MosHandler,
-		hotStandby: boolean
+		openMediaHotStandby: boolean
 	): Promise<CoreMosDeviceHandler> {
 		this.logger.info('registerMosDevice -------------')
-		const coreMos = new CoreMosDeviceHandler(this, mosDevice, mosHandler, hotStandby)
+		const coreMos = new CoreMosDeviceHandler(this, mosDevice, mosHandler, openMediaHotStandby)
 
 		this._coreMosHandlers.push(coreMos)
 		return coreMos.init().then(() => {

packages/mos-gateway/src/generated/devices.ts

@@ -24,7 +24,7 @@ export interface MosDeviceConfig {
 		dontUseQueryPort?: boolean
 		timeout?: number
 		heartbeatInterval?: number
-		hotStandby?: boolean
+		openMediaHotStandby?: boolean
 		ports?: {
 			lower: number
 			upper: number

packages/mos-gateway/src/mosHandler.ts

@@ -59,15 +59,15 @@ export class MosHandler {
 	private _logger: Winston.Logger
 	private _disposed = false
 	private _settings?: MosGatewayConfig
-	private _hotStandby: boolean
+	private _openMediaHotStandby: Record<string, boolean>
 	private _coreHandler: CoreHandler | undefined
 	private _observers: Array<Observer<any>> = []
 	private _triggerupdateDevicesTimeout: any = null
 	private mosTypes: MosTypes
 
 	constructor(logger: Winston.Logger) {
 		this._logger = logger
-		this._hotStandby = false
+		this._openMediaHotStandby = {}
 		this.mosTypes = getMosTypes(this.strict) // temporary, another will be set upon init()
 	}
 	async init(config: MosConfig, coreHandler: CoreHandler): Promise<void> {
@@ -243,7 +243,11 @@ export class MosHandler {
 
 				if (!this._coreHandler) throw Error('_coreHandler is undefined!')
 
-				const coreMosHandler = await this._coreHandler.registerMosDevice(mosDevice, this, this._hotStandby)
+				const coreMosHandler = await this._coreHandler.registerMosDevice(
+					mosDevice,
+					this,
+					mosDevice.idSecondary ? this._openMediaHotStandby[mosDevice.idSecondary] : false
+				)
 				// this._logger.info('mosDevice registered -------------')
 				// Setup message flow between the devices:
 
@@ -420,7 +424,8 @@ export class MosHandler {
 			for (const [deviceId, device] of Object.entries<{ options: MosDeviceConfig }>(devices)) {
 				if (device) {
 					if (device.options.secondary) {
-						this._hotStandby = device.options.secondary?.hotStandby || false
+						this._openMediaHotStandby[device.options.secondary.id] =
+							device.options.secondary?.openMediaHotStandby || false
 						// If the host isn't set, don't use secondary:
 						if (!device.options.secondary.host || !device.options.secondary.id)
 							delete device.options.secondary