homebridge-xbox-tv 2.7.7 → 2.7.9

package/index.js

@@ -109,6 +109,7 @@ class XBOXDEVICE {
 		//setup variables
 		this.firstRun = true;
 
+		this.services = [];
 		this.inputsName = [];
 		this.inputsReference = [];
 		this.inputsOneStoreProductId = [];
@@ -246,20 +247,20 @@ class XBOXDEVICE {
 
 				if (this.sensorPowerService) {
 					this.sensorPowerService
-						.updateCharacteristic(Characteristic.MotionDetected, power)
+						.updateCharacteristic(Characteristic.ContactSensorState, power)
 				}
 
 				if (this.sensorInputService) {
 					const state = power ? (this.inputIdentifier !== inputIdentifier) : false;
 					this.sensorInputService
-						.updateCharacteristic(Characteristic.MotionDetected, state)
+						.updateCharacteristic(Characteristic.ContactSensorState, state)
 					this.sensorInputState = state;
 				}
 
 				if (this.sensorScreenSaverService) {
 					const state = power ? (reference === 'Xbox.IdleScreen_8wekyb3d8bbwe!Xbox.IdleScreen.Application') : false;
 					this.sensorScreenSaverService
-						.updateCharacteristic(Characteristic.MotionDetected, state)
+						.updateCharacteristic(Characteristic.ContactSensorState, state)
 					this.sensorScreenSaverState = state;
 				}
 
@@ -384,6 +385,7 @@ class XBOXDEVICE {
 			.setCharacteristic(Characteristic.Model, this.modelName)
 			.setCharacteristic(Characteristic.SerialNumber, this.serialNumber)
 			.setCharacteristic(Characteristic.FirmwareRevision, this.firmwareRevision);
+		this.services.push(this.informationService);
 
 		//Prepare television service
 		this.log.debug('prepareTelevisionService');
@@ -563,6 +565,7 @@ class XBOXDEVICE {
 				};
 			});
 
+		this.services.push(this.televisionService);
 		accessory.addService(this.televisionService);
 
 		//Prepare speaker service
@@ -629,6 +632,7 @@ class XBOXDEVICE {
 				};
 			});
 
+		this.services.push(this.speakerService);
 		accessory.addService(this.speakerService);
 
 		//Prepare volume service
@@ -653,6 +657,7 @@ class XBOXDEVICE {
 						this.speakerService.setCharacteristic(Characteristic.Mute, !state);
 					});
 
+				this.services.push(this.volumeService);
 				accessory.addService(this.volumeService);
 			}
 
@@ -675,6 +680,7 @@ class XBOXDEVICE {
 						this.speakerService.setCharacteristic(Characteristic.Mute, !state);
 					});
 
+				this.services.push(this.volumeServiceFan);
 				accessory.addService(this.volumeServiceFan);
 			}
 		}
@@ -682,34 +688,40 @@ class XBOXDEVICE {
 		//prepare sensor service
 		if (this.sensorPower) {
 			this.log.debug('prepareSensorPowerService')
-			this.sensorPowerService = new Service.MotionSensor(`${accessoryName} Power Sensor`, `Power Sensor`);
-			this.sensorPowerService.getCharacteristic(Characteristic.MotionDetected)
+			this.sensorPowerService = new Service.ContactSensor(`${accessoryName} Power Sensor`, `Power Sensor`);
+			this.sensorPowerService.getCharacteristic(Characteristic.ContactSensorState)
 				.onGet(async () => {
 					const state = this.power;
 					return state;
 				});
+
+			this.services.push(this.sensorPowerService);
 			accessory.addService(this.sensorPowerService);
 		};
 
 		if (this.sensorInput) {
 			this.log.debug('prepareSensorInputService')
-			this.sensorInputService = new Service.MotionSensor(`${accessoryName} Input Sensor`, `Input Sensor`);
-			this.sensorInputService.getCharacteristic(Characteristic.MotionDetected)
+			this.sensorInputService = new Service.ContactSensor(`${accessoryName} Input Sensor`, `Input Sensor`);
+			this.sensorInputService.getCharacteristic(Characteristic.ContactSensorState)
 				.onGet(async () => {
 					const state = this.power ? this.sensorInputState : false;
 					return state;
 				});
+
+			this.services.push(this.sensorInputService);
 			accessory.addService(this.sensorInputService);
 		};
 
 		if (this.sensorScreenSaver) {
 			this.log.debug('prepareSensorScreenSaverService')
-			this.sensorScreenSaverService = new Service.MotionSensor(`${accessoryName} Screen Saver Sensor`, `Screen Saver Sensor`);
-			this.sensorScreenSaverService.getCharacteristic(Characteristic.MotionDetected)
+			this.sensorScreenSaverService = new Service.ContactSensor(`${accessoryName} Screen Saver Sensor`, `Screen Saver Sensor`);
+			this.sensorScreenSaverService.getCharacteristic(Characteristic.ContactSensorState)
 				.onGet(async () => {
 					const state = this.power ? this.sensorScreenSaverState : false;
 					return state;
 				});
+
+			this.services.push(this.sensorScreenSaverService);
 			accessory.addService(this.sensorScreenSaverService);
 		};
 
@@ -738,7 +750,8 @@ class XBOXDEVICE {
 		//check possible inputs and possible inputs count (max 80)
 		const inputs = filteredInputsArr;
 		const inputsCount = inputs.length;
-		const maxInputsCount = inputsCount < 80 ? inputsCount : 80;
+		const possibleInputsCount = 90 - this.services.length;
+		const maxInputsCount = inputsCount >= possibleInputsCount ? possibleInputsCount : inputsCount;
 		for (let i = 0; i < maxInputsCount; i++) {
 			//get input 
 			const input = inputs[i];
@@ -782,7 +795,7 @@ class XBOXDEVICE {
 							const newCustomName = JSON.stringify(savedInputsNames, null, 2);
 							await fsPromises.writeFile(this.inputsNamesFile, newCustomName);
 							const logDebug = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, saved Input Name: ${value}, Reference: ${nameIdentifier}.`) : false;
-							inputService.setCharacteristic(Characteristic.Name, inputName);
+							inputService.setCharacteristic(Characteristic.Name, value);
 						} catch (error) {
 							this.log.error(`Device: ${this.host} ${accessoryName}, save Input Name error: ${error}`);
 						}
@@ -812,6 +825,7 @@ class XBOXDEVICE {
 				this.inputsName.push(inputName);
 
 				this.televisionService.addLinkedService(inputService);
+				this.services.push(inputService);
 				accessory.addService(inputService);
 			} else {
 				this.log(`Device: ${this.host} ${accessoryName}, Input Name: ${inputName ? inputName : 'Missing'}, Reference: ${inputReference ? inputReference : 'Missing'}.`);
@@ -822,8 +836,8 @@ class XBOXDEVICE {
 		//prepare sonsor service
 		const sensorInputs = this.sensorInputs;
 		const sensorInputsCount = sensorInputs.length;
-		const possibleSensorInputsCount = 80 - this.inputsReference.length;
-		const maxSensorInputsCount = possibleSensorInputsCount > sensorInputsCount ? sensorInputsCount : possibleSensorInputsCount;
+		const possibleSensorInputsCount = 90 - this.services.length;
+		const maxSensorInputsCount = sensorInputsCount >= possibleSensorInputsCount ? possibleSensorInputsCount : sensorInputsCount;
 		if (maxSensorInputsCount > 0) {
 			this.log.debug('prepareInputSensorServices');
 			for (let i = 0; i < maxSensorInputsCount; i++) {
@@ -831,28 +845,33 @@ 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);
+						this.services.push(sensorInputService);
+						accessory.addService(this.sensorInputsServices[i]);
+					} else {
+						this.log(`Device: ${this.host} ${accessoryName}, Sensor Name: ${sensorInputName ? sensorInputName : 'Missing'}, Reference: ${sensorInputReference ? sensorInputReference : 'Missing'}.`);
+					};
 				}
 			}
 		}
@@ -860,8 +879,8 @@ class XBOXDEVICE {
 		//Prepare buttons services
 		const buttons = this.buttons;
 		const buttonsCount = buttons.length;
-		const possibleButtonsCount = 80 - (this.inputsReference.length + this.sensorInputsServices.length);
-		const maxButtonsCount = possibleButtonsCount >= buttonsCount ? buttonsCount : possibleButtonsCount;
+		const possibleButtonsCount = 90 - this.services.length;
+		const maxButtonsCount = buttonsCount >= possibleButtonsCount ? possibleButtonsCount : buttonsCount;
 		if (maxButtonsCount > 0) {
 			this.log.debug('prepareInputsButtonService');
 			for (let i = 0; i < maxButtonsCount; i++) {
@@ -869,85 +888,91 @@ 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}, Button state: ${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 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: ${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);
+						this.services.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",
+  "version": "2.7.9",
   "description": "Homebridge plugin (https://github.com/homebridge/homebridge) to control Xbox game consoles.",
   "license": "MIT",
   "author": "grzegorz914",