homebridge-xbox-tv 2.7.7-beta.9 → 2.7.8

package/config.schema.json

@@ -556,16 +556,47 @@
 							"type": "string",
 							"oneOf": [
 								{
-									"title": "View",
+									"title": "Game Pad View",
 									"enum": [
 										"view"
 									]
 								},
 								{
-									"title": "Nexus",
+									"title": "Game Pad Nexus",
 									"enum": [
 										"nexus"
 									]
+								},
+								{
+									"title": "Game Pad Menu",
+									"enum": [
+										"menu1"
+									]
+								},
+								{
+									"title": "Game Pad A",
+									"enum": [
+										"a"
+									]
+								}
+								,
+								{
+									"title": "Game Pad B",
+									"enum": [
+										"b"
+									]
+								},
+								{
+									"title": "Game Pad X",
+									"enum": [
+										"x"
+									]
+								},
+								{
+									"title": "Game Pad Y",
+									"enum": [
+										"y"
+									]
 								}
 							],
 							"description": "Here select the function of info button in RC.",
@@ -805,13 +836,13 @@
 					"expanded": false,
 					"items": [
 						"devices[].enableMqtt",
+						"devices[].mqttDebug",
 						"devices[].mqttHost",
 						"devices[].mqttPort",
 						"devices[].mqttPrefix",
 						"devices[].mqttAuth",
 						"devices[].mqttUser",
-						"devices[].mqttPasswd",
-						"devices[].mqttDebug"
+						"devices[].mqttPasswd"
 					]
 				}
 			]

package/index.js

@@ -113,8 +113,11 @@ class XBOXDEVICE {
 		this.inputsReference = [];
 		this.inputsOneStoreProductId = [];
 
+		this.sensorInputsServices = [];
 		this.sensorInputsReference = [];
 		this.sensorInputsDisplayType = [];
+		this.buttonsServices = [];
+
 
 		this.power = false;
 		this.volume = 0;
@@ -369,7 +372,6 @@ class XBOXDEVICE {
 	//Prepare accessory
 	prepareAccessory() {
 		this.log.debug('prepareAccessory');
-
 		//accessory
 		const accessoryName = this.name;
 		const accessoryUUID = UUID.generate(this.xboxLiveId);
@@ -377,38 +379,52 @@ class XBOXDEVICE {
 		const accessory = new Accessory(accessoryName, accessoryUUID, accessoryCategory);
 
 		//Pinformation service
-		this.log.debug('prepareInformationService');
-		const manufacturer = this.manufacturer;
-		const modelName = this.modelName;
-		const serialNumber = this.serialNumber;
-		const firmwareRevision = this.firmwareRevision;
-
 		this.informationService = accessory.getService(Service.AccessoryInformation)
-			.setCharacteristic(Characteristic.Manufacturer, manufacturer)
-			.setCharacteristic(Characteristic.Model, modelName)
-			.setCharacteristic(Characteristic.SerialNumber, serialNumber)
-			.setCharacteristic(Characteristic.FirmwareRevision, firmwareRevision);
+			.setCharacteristic(Characteristic.Manufacturer, this.manufacturer)
+			.setCharacteristic(Characteristic.Model, this.modelName)
+			.setCharacteristic(Characteristic.SerialNumber, this.serialNumber)
+			.setCharacteristic(Characteristic.FirmwareRevision, this.firmwareRevision);
 
 		//Prepare television service
 		this.log.debug('prepareTelevisionService');
 		this.televisionService = new Service.Television(`${accessoryName} Television`, 'Television');
-		this.televisionService.setCharacteristic(Characteristic.ConfiguredName, accessoryName);
+		this.televisionService.getCharacteristic(Characteristic.ConfiguredName)
+			.onGet(async () => {
+				const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} Accessory Nane: ${accessoryName}.`);
+				return accessoryName;
+			})
+			.onSet(async (value) => {
+				try {
+					this.name = value;
+					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Accessory Name: ${value}`);
+				} catch (error) {
+					this.log.error(`Device: ${this.host} ${accessoryName}, set Brightness error: ${error}`);
+				};
+			});
 		this.televisionService.getCharacteristic(Characteristic.SleepDiscoveryMode)
 			.onGet(async () => {
-				const state = 1; //not discoverable, alvays discoverable
+				const state = 1;
+				const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, Discovery Mode: ${state ? 'Always Discoverable' : 'Not Discoverable'}`);
 				return state;
 			})
+			.onSet(async (state) => {
+				try {
+					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Discovery Mode: ${state ? 'Always Discoverable' : 'Not Discoverable'}`);
+				} catch (error) {
+					this.log.error(`Device: ${this.host} ${accessoryName}, set Discovery Mode error: ${error}`);
+				};
+			});
 
 		this.televisionService.getCharacteristic(Characteristic.Active)
 			.onGet(async () => {
 				const state = this.power;
-				const logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host} ${accessoryName}, get Power state successful: ${state ? 'ON' : 'OFF'}`);
+				const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, Power: ${state ? 'ON' : 'OFF'}`);
 				return state;
 			})
 			.onSet(async (state) => {
 				try {
 					const setPower = state ? await this.xboxLocalApi.powerOn() : await this.xboxLocalApi.powerOff();
-					const logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host} ${accessoryName}, set Power successful: ${state ? 'ON' : 'OFF'}`);
+					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Power: ${state ? 'ON' : 'OFF'}`);
 				} catch (error) {
 					this.log.error(`Device: ${this.host} ${accessoryName}, set Power, error: ${error}`);
 				};
@@ -420,7 +436,7 @@ class XBOXDEVICE {
 				const inputName = this.inputsName[inputIdentifier];
 				const inputReference = this.inputsReference[inputIdentifier];
 				const inputOneStoreProductId = this.inputsOneStoreProductId[inputIdentifier];
-				const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, get Input successful, input: ${inputName}, reference: ${inputReference}, product Id: ${inputOneStoreProductId}`);
+				const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, Input: ${inputName}, Reference: ${inputReference}, Product Id: ${inputOneStoreProductId}`);
 				return inputIdentifier;
 			})
 			.onSet(async (inputIdentifier) => {
@@ -443,7 +459,7 @@ class XBOXDEVICE {
 							await this.xboxWebApi.launchApp(inputOneStoreProductId);
 							break;
 					}
-					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Input successful, input: ${inputName},, reference: ${inputReference}, product Id: ${inputOneStoreProductId}`);
+					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Input: ${inputName}, Reference: ${inputReference}, Product Id: ${inputOneStoreProductId}`);
 				} catch (error) {
 					this.log.error(`Device: ${this.host} ${accessoryName}, set Input error: ${JSON.stringify(error, null, 2)}`);
 				};
@@ -495,9 +511,9 @@ class XBOXDEVICE {
 					};
 
 					await this.xboxWebApi.sendButtonPress(command);
-					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, Remote Key command successful: ${command}`);
+					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, Remote Key: ${command}`);
 				} catch (error) {
-					this.log.error(`Device: ${this.host} ${accessoryName}, set Remote Key command error: ${JSON.stringify(error, null, 2)}`);
+					this.log.error(`Device: ${this.host} ${accessoryName}, set Remote Key error: ${JSON.stringify(error, null, 2)}`);
 				};
 			});
 
@@ -506,7 +522,7 @@ class XBOXDEVICE {
 				//apple, 0 - PLAY, 1 - PAUSE, 2 - STOP, 3 - LOADING, 4 - INTERRUPTED
 				//xbox, 0 - STOP, 1 - PLAY, 2 - PAUSE
 				const value = [2, 0, 1, 3, 4][this.mediaState];
-				const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, get Current Media state successful: ${['PLAY', 'PAUSE', 'STOP', 'LOADING', 'INTERRUPTED'][value]}`);
+				const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, Current Media: ${['PLAY', 'PAUSE', 'STOP', 'LOADING', 'INTERRUPTED'][value]}`);
 				return value;
 			});
 
@@ -514,16 +530,16 @@ class XBOXDEVICE {
 			.onGet(async () => {
 				//0 - PLAY, 1 - PAUSE, 2 - STOP
 				const value = [2, 0, 1, 3, 4][this.mediaState];
-				const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, get Target Media state successful: ${['PLAY', 'PAUSE', 'STOP', 'LOADING', 'INTERRUPTED'][value]}`);
+				const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, Target Media: ${['PLAY', 'PAUSE', 'STOP', 'LOADING', 'INTERRUPTED'][value]}`);
 				return value;
 			})
 			.onSet(async (value) => {
 				try {
 					const newMediaState = value;
 					const setMediaState = this.power ? false : false;
-					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Target Media state successful: ${['PLAY', 'PAUSE', 'STOP', 'LOADING', 'INTERRUPTED'][value]}`);
+					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Target Media: ${['PLAY', 'PAUSE', 'STOP', 'LOADING', 'INTERRUPTED'][value]}`);
 				} catch (error) {
-					this.log.error(`Device: ${this.host} ${accessoryName} set Target Media state error: ${error}`);
+					this.log.error(`Device: ${this.host} ${accessoryName} set Target Media error: ${error}`);
 				};
 			});
 
@@ -541,9 +557,9 @@ class XBOXDEVICE {
 
 					const channelName = 'systemInput';
 					await this.xboxWebApi.sendButtonPress(command);
-					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Power Mode Selection command successful: ${command}`);
+					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Power Mode Selection: ${command === 'nexus' ? 'SHOW' : 'HIDE'}`);
 				} catch (error) {
-					this.log.error(`Device: ${this.host} ${accessoryName}, set Power Mode Selection command error: ${error}`);
+					this.log.error(`Device: ${this.host} ${accessoryName}, set Power Mode Selection error: ${error}`);
 				};
 			});
 
@@ -552,10 +568,21 @@ class XBOXDEVICE {
 		//Prepare speaker service
 		this.log.debug('prepareSpeakerService');
 		this.speakerService = new Service.TelevisionSpeaker(`${accessoryName} Speaker`, 'Speaker');
-		this.speakerService
-			.setCharacteristic(Characteristic.Active, Characteristic.Active.ACTIVE)
-			.setCharacteristic(Characteristic.VolumeControlType, Characteristic.VolumeControlType.ABSOLUTE)
-			.getCharacteristic(Characteristic.VolumeSelector)
+		this.speakerService.getCharacteristic(Characteristic.Active)
+			.onGet(async () => {
+				const state = this.power;
+				return state;
+			})
+			.onSet(async (state) => {
+			});
+
+		this.speakerService.getCharacteristic(Characteristic.VolumeControlType)
+			.onGet(async () => {
+				const state = 3; //none, relative, relative with current, absolute
+				return state;
+			});
+
+		this.speakerService.getCharacteristic(Characteristic.VolumeSelector)
 			.onSet(async (command) => {
 				try {
 					switch (command) {
@@ -568,35 +595,35 @@ class XBOXDEVICE {
 					};
 
 					await this.xboxWebApi.sendButtonPress(command);
-					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Volume command successful: ${command}`);
+					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Volume Selector: ${command}`);
 				} catch (error) {
-					this.log.error(`Device: ${this.host} ${accessoryName}, set Volume command error: ${error}`);
+					this.log.error(`Device: ${this.host} ${accessoryName}, set Volume Selector error: ${error}`);
 				};
-			});
+			})
 
 		this.speakerService.getCharacteristic(Characteristic.Volume)
 			.onGet(async () => {
 				const volume = this.volume;
-				const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, get Volume successful: ${volume}`);
+				const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, Volume: ${volume}`);
 				return volume;
 			})
 			.onSet(async (volume) => {
 				if (volume === 0 || volume === 100) {
 					volume = this.volume;
 				};
-				const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Volume successful: ${volume}`);
+				const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Volume: ${volume}`);
 			});
 
 		this.speakerService.getCharacteristic(Characteristic.Mute)
 			.onGet(async () => {
 				const state = this.mute;
-				const logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host} ${accessoryName}, get Mute successful: ${state ? 'ON' : 'OFF'}`);
+				const logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host} ${accessoryName}, Mute: ${state ? 'ON' : 'OFF'}`);
 				return state;
 			})
 			.onSet(async (state) => {
 				try {
 					const toggleMute = state ? await this.xboxWebApi.mute() : await this.xboxWebApi.unmute();
-					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Mute successful: ${state ? 'ON' : 'OFF'}`);
+					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Mute: ${state ? 'ON' : 'OFF'}`);
 				} catch (error) {
 					this.log.error(`Device: ${this.host} ${accessoryName}, set Mute error: ${error}`);
 				};
@@ -692,10 +719,10 @@ class XBOXDEVICE {
 		const debug = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, read saved Inputs: ${JSON.stringify(savedInputs, null, 2)}`) : false;
 
 		const savedInputsNames = fs.readFileSync(this.inputsNamesFile).length > 2 ? JSON.parse(fs.readFileSync(this.inputsNamesFile)) : {};
-		const debug1 = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, read saved Inputs names: ${JSON.stringify(savedInputsNames, null, 2)}`) : false;
+		const debug1 = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, read saved Inputs Nnames: ${JSON.stringify(savedInputsNames, null, 2)}`) : false;
 
 		const savedInputsTargetVisibility = fs.readFileSync(this.inputsTargetVisibilityFile).length > 2 ? JSON.parse(fs.readFileSync(this.inputsTargetVisibilityFile)) : {};
-		const debug2 = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, read saved Inputs Target Visibility states: ${JSON.stringify(savedInputsTargetVisibility, null, 2)}`) : false;
+		const debug2 = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, read saved Inputs Target Visibility: ${JSON.stringify(savedInputsTargetVisibility, null, 2)}`) : false;
 
 		//check possible inputs and filter custom unnecessary inputs
 		const filteredInputsArr = [];
@@ -732,40 +759,39 @@ class XBOXDEVICE {
 			const isConfigured = 1;
 
 			//get input visibility state
-			const currentVisibility = savedInputsTargetVisibility[inputReference] || savedInputsTargetVisibility[inputOneStoreProductId];
-			const targetVisibility = currentVisibility;
+			const currentVisibility = savedInputsTargetVisibility[inputReference] || savedInputsTargetVisibility[inputOneStoreProductId] || 0;
 
 			if (inputReference && inputName) {
 				const inputService = new Service.InputSource(inputName, `Input ${i}`);
 				inputService
 					.setCharacteristic(Characteristic.Identifier, i)
 					.setCharacteristic(Characteristic.Name, inputName)
-					.setCharacteristic(Characteristic.IsConfigured, isConfigured)
 					.setCharacteristic(Characteristic.InputSourceType, inputType)
+					.setCharacteristic(Characteristic.IsConfigured, isConfigured)
 					.setCharacteristic(Characteristic.CurrentVisibilityState, currentVisibility)
 
 				inputService.getCharacteristic(Characteristic.ConfiguredName)
 					.onGet(async () => {
 						return inputName;
 					})
-					.onSet(async (name) => {
+					.onSet(async (value) => {
 						try {
 							const nameIdentifier = inputReference || inputOneStoreProductId;
-							savedInputsNames[nameIdentifier] = name;
+							savedInputsNames[nameIdentifier] = value;
 
 							const newCustomName = JSON.stringify(savedInputsNames, null, 2);
 							await fsPromises.writeFile(this.inputsNamesFile, newCustomName);
-							const logDebug = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, saved new Input name: ${name}, reference: ${nameIdentifier}.`) : false;
-							inputService.setCharacteristic(Characteristic.Name, inputName);
+							const logDebug = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, saved Input Name: ${value}, Reference: ${nameIdentifier}.`) : false;
+							inputService.setCharacteristic(Characteristic.Name, value);
 						} catch (error) {
-							this.log.error(`Device: ${this.host} ${accessoryName}, new Input name save error: ${error}`);
+							this.log.error(`Device: ${this.host} ${accessoryName}, save Input Name error: ${error}`);
 						}
 					});
 
 				inputService
 					.getCharacteristic(Characteristic.TargetVisibilityState)
 					.onGet(async () => {
-						return targetVisibility;
+						return currentVisibility;
 					})
 					.onSet(async (state) => {
 						try {
@@ -774,10 +800,10 @@ class XBOXDEVICE {
 
 							const newTargetVisibility = JSON.stringify(savedInputsTargetVisibility, null, 2);
 							await fsPromises.writeFile(this.inputsTargetVisibilityFile, newTargetVisibility);
-							const logDebug = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, saved new Input: ${inputName} target visibility state: ${state ? 'HIDEN' : 'SHOWN'}`) : false;
+							const logDebug = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, saved Input: ${inputName} Target Visibility: ${state ? 'HIDEN' : 'SHOWN'}`) : false;
 							inputService.setCharacteristic(Characteristic.CurrentVisibilityState, state);
 						} catch (error) {
-							this.log.error(`Device: ${this.host} ${accessoryName}, new target visibility state save error: ${error}`);
+							this.log.error(`Device: ${this.host} ${accessoryName}, save Target Visibility error: ${error}`);
 						}
 					});
 
@@ -788,13 +814,12 @@ class XBOXDEVICE {
 				this.televisionService.addLinkedService(inputService);
 				accessory.addService(inputService);
 			} else {
-				this.log(`Device: ${this.host} ${accessoryName}, Input name: ${inputName ? inputName : 'Missing'}, reference: ${inputReference ? inputReference : 'Missing'}.`);
+				this.log(`Device: ${this.host} ${accessoryName}, Input Name: ${inputName ? inputName : 'Missing'}, Reference: ${inputReference ? inputReference : 'Missing'}.`);
 
 			};
 		}
 
 		//prepare sonsor service
-		this.sensorInputsServices = [];
 		const sensorInputs = this.sensorInputs;
 		const sensorInputsCount = sensorInputs.length;
 		const possibleSensorInputsCount = 80 - this.inputsReference.length;
@@ -806,34 +831,37 @@ class XBOXDEVICE {
 				const sensorInput = sensorInputs[i];
 
 				//get sensor name		
-				const sensorInputName = sensorInput.name || 'Not set';
+				const sensorInputName = sensorInput.name;
 
 				//get sensor reference
-				const sensorInputReference = sensorInput.reference || 'Not set';
+				const sensorInputReference = sensorInput.reference;
 
 				//get sensor display type
 				const sensorInputDisplayType = sensorInput.displayType >= 0 ? sensorInput.displayType : -1;
 
 				if (sensorInputDisplayType >= 0) {
-					const serviceType = [Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][sensorInputDisplayType];
-					const characteristicType = [Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][sensorInputDisplayType];
-					const sensorInputService = new serviceType(`${accessoryName} ${sensorInputName}`, `Sensor ${i}`);
-					sensorInputService.getCharacteristic(characteristicType)
-						.onGet(async () => {
-							const state = this.power ? (this.reference === sensorInputReference) : false;
-							return state;
-						});
-
-					this.sensorInputsReference.push(sensorInputReference);
-					this.sensorInputsDisplayType.push(sensorInputDisplayType);
-					this.sensorInputsServices.push(sensorInputService);
-					accessory.addService(this.sensorInputsServices[i]);
+					if (sensorInputName && sensorInputReference) {
+						const serviceType = [Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][sensorInputDisplayType];
+						const characteristicType = [Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][sensorInputDisplayType];
+						const sensorInputService = new serviceType(`${accessoryName} ${sensorInputName}`, `Sensor ${i}`);
+						sensorInputService.getCharacteristic(characteristicType)
+							.onGet(async () => {
+								const state = this.power ? (this.reference === sensorInputReference) : false;
+								return state;
+							});
+
+						this.sensorInputsReference.push(sensorInputReference);
+						this.sensorInputsDisplayType.push(sensorInputDisplayType);
+						this.sensorInputsServices.push(sensorInputService);
+						accessory.addService(this.sensorInputsServices[i]);
+					} else {
+						this.log(`Device: ${this.host} ${accessoryName}, Sensor Name: ${sensorInputName ? sensorInputName : 'Missing'}, Reference: ${sensorInputReference ? sensorInputReference : 'Missing'}.`);
+					};
 				}
 			}
 		}
 
 		//Prepare buttons services
-		this.buttonsServices = [];
 		const buttons = this.buttons;
 		const buttonsCount = buttons.length;
 		const possibleButtonsCount = 80 - (this.inputsReference.length + this.sensorInputsServices.length);
@@ -845,85 +873,90 @@ class XBOXDEVICE {
 				const button = buttons[i];
 
 				//get button name
-				const buttonName = button.name || 'Not set';
+				const buttonName = button.name;
 
 				//get button command
-				const buttonCommand = button.command || 'Not set';
+				const buttonCommand = button.command;
+
+				//get button mode
+				let mode;
+				if (buttonCommand in CONSTANS.SystemMediaCommands) {
+					mode = 0;
+				} else if (buttonCommand in CONSTANS.SystemInputCommands) {
+					mode = 1;
+				} else if (buttonCommand in CONSTANS.TvRemoteCommands) {
+					mode = 2;
+				} else if (buttonCommand === 'recordGameDvr') {
+					mode = 3;
+				} else if (buttonCommand === 'reboot') {
+					mode = 4;
+				} else if (buttonCommand === 'switchAppGame') {
+					mode = 5;
+				};
+				const buttonMode = mode >= 0 ? mode : -1;
 
 				//get button inputOneStoreProductId
-				const buttonOneStoreProductId = button.oneStoreProductId || 'Not set';
+				const buttonOneStoreProductId = button.oneStoreProductId;
 
 				//get button display type
 				const buttonDisplayType = button.displayType >= 0 ? button.displayType : -1;
 
 				if (buttonDisplayType >= 0) {
-					const serviceType = [Service.Outlet, Service.Switch][buttonDisplayType];
-					const buttonService = new serviceType(`${accessoryName} ${buttonName}`, `Button ${i}`);
-					buttonService.getCharacteristic(Characteristic.On)
-						.onGet(async () => {
-							const state = false;
-							const logDebug = this.disableLogInfo ? this.log(`Device: ${this.host} ${accessoryName}, get Button state successful: ${state}`) : false;
-							return state;
-						})
-						.onSet(async (state) => {
-							try {
-								if (state) {
-									//get button mode
-									let buttonMode = -1;
-									if (buttonCommand in CONSTANS.SystemMediaCommands) {
-										buttonMode = 0;
-									} else if (buttonCommand in CONSTANS.SystemInputCommands) {
-										buttonMode = 1;
-									} else if (buttonCommand in CONSTANS.TvRemoteCommands) {
-										buttonMode = 2;
-									} else if (buttonCommand === 'recordGameDvr') {
-										buttonMode = 3;
-									} else if (buttonCommand === 'reboot') {
-										buttonMode = 4;
-									} else if (buttonCommand === 'switchAppGame') {
-										buttonMode = 5;
-									};
-
-									switch (buttonMode) {
-										case 0: case 1: case 2:
-											await this.xboxWebApi.sendButtonPress(buttonCommand);
-											break;
-										case 3:
-											await this.xboxLocalApi.recordGameDvr();
-											break;
-										case 4:
-											await this.xboxWebApi.reboot();
-											break;
-										case 5:
-											switch (buttonOneStoreProductId) {
-												case 'Dashboard': case 'Settings': case 'SettingsTv': case 'Accessory': case 'Screensaver': case 'NetworkTroubleshooter': case 'MicrosoftStore':
-													await this.xboxWebApi.launchDashboard();
-													break;
-												case 'Television':
-													await this.xboxWebApi.launchOneGuide();
-													break;
-												case 'XboxGuide':
-													await this.xboxWebApi.openGuideTab();
-													break;
-												case 'Not set': case 'Web api disabled':
-													this.log(`Device: ${this.host} ${accessoryName}, trying to launch app/game with one store product id: ${buttonOneStoreProductId}.`);
-													break;
-												default:
-													await this.xboxWebApi.launchApp(buttonOneStoreProductId);
-													break;
-											}
-											break;
+					if (buttonName && buttonCommand && buttonMode) {
+						const serviceType = [Service.Outlet, Service.Switch][buttonDisplayType];
+						const buttonService = new serviceType(`${accessoryName} ${buttonName}`, `Button ${i}`);
+						buttonService.getCharacteristic(Characteristic.On)
+							.onGet(async () => {
+								const state = false;
+								const logDebug = this.disableLogInfo ? this.log(`Device: ${this.host} ${accessoryName}, Button state: ${state}`) : false;
+								return state;
+							})
+							.onSet(async (state) => {
+								try {
+									if (state) {
+										switch (buttonMode) {
+											case 0: case 1: case 2:
+												await this.xboxWebApi.sendButtonPress(buttonCommand);
+												break;
+											case 3:
+												await this.xboxLocalApi.recordGameDvr();
+												break;
+											case 4:
+												await this.xboxWebApi.reboot();
+												break;
+											case 5:
+												switch (buttonOneStoreProductId) {
+													case 'Dashboard': case 'Settings': case 'SettingsTv': case 'Accessory': case 'Screensaver': case 'NetworkTroubleshooter': case 'MicrosoftStore':
+														await this.xboxWebApi.launchDashboard();
+														break;
+													case 'Television':
+														await this.xboxWebApi.launchOneGuide();
+														break;
+													case 'XboxGuide':
+														await this.xboxWebApi.openGuideTab();
+														break;
+													case 'Not set': case 'Web api disabled':
+														this.log(`Device: ${this.host} ${accessoryName}, trying to launch App/Game with one store product id: ${buttonOneStoreProductId}.`);
+														break;
+													default:
+														await this.xboxWebApi.launchApp(buttonOneStoreProductId);
+														break;
+												}
+												break;
+										}
+										const logDebug = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, set Button Name:  ${buttonName}, Command: ${buttonCommand}`) : false;
 									}
-									const logDebug = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, set button successful, name:  ${buttonName}, command: ${buttonCommand}`) : false;
-								}
-								await new Promise(resolve => setTimeout(resolve, 300));
-								const setChar = state ? buttonService.updateCharacteristic(Characteristic.On, false) : false;
-							} catch (error) {
-								this.log.error(`Device: ${this.host} ${accessoryName}, set button error, name: ${buttonName}, error: ${error}`);
-							};
-						});
-					this.buttonsServices.push(buttonService);
-					accessory.addService(this.buttonsServices[i]);
+									await new Promise(resolve => setTimeout(resolve, 300));
+									const setChar = state ? buttonService.updateCharacteristic(Characteristic.On, false) : false;
+								} catch (error) {
+									this.log.error(`Device: ${this.host} ${accessoryName}, set Button error: ${error}`);
+								};
+							});
+						this.buttonsServices.push(buttonService);
+						accessory.addService(this.buttonsServices[i]);
+					} else {
+						this.log(`Device: ${this.host} ${accessoryName}, Button Name: ${buttonName ? buttonName : 'Missing'}, Command: ${buttonCommand ? buttonCommand : 'Missing'}, Mode: ${buttonMode ? buttonMode : 'Missing'}.`);
+					};
 				}
 			}
 		}

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Xbox TV",
   "name": "homebridge-xbox-tv",
-  "version": "2.7.7-beta.9",
+  "version": "2.7.8",
   "description": "Homebridge plugin (https://github.com/homebridge/homebridge) to control Xbox game consoles.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/localApi/xboxlocalapi.js

@@ -348,9 +348,7 @@ class XBOXLOCALAPI extends EventEmitter {
     recordGameDvr() {
         return new Promise(async (resolve, reject) => {
             if (!this.isConnected || !this.isAuthorized) {
-                reject({
-                    status: `Send record game ignored, connection state: ${this.isConnected}, authorization state: ${this.isAuthorized}`
-                });
+                reject(`Send record game ignored, connection state: ${this.isConnected}, authorization state: ${this.isAuthorized}`);
                 return;
             };
 

package/src/webApi/xboxwebapi.js

@@ -67,7 +67,7 @@ class XBOXWEBAPI extends EventEmitter {
                 }
                 const debug = this.debugLog ? this.emit(`message', 'authorized and web Api enabled.`) : false;
                 const rmEnabled = await this.getWebApiConsoleStatus();
-                const debug1 = !rmEnabled ? this.emit('message', `remote management not enabled, please check your console settings!!!.`) : false;
+                const debug1 = !rmEnabled ? this.emit('message', `remote management not enabled, please check your console settings.`) : false;
                 //await this.getWebApiConsolesList();
                 await this.getWebApiInstalledApps();
                 //await this.getWebApiStorageDevices();