homebridge-xbox-tv 2.11.0 → 2.11.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Xbox TV",
   "name": "homebridge-xbox-tv",
-  "version": "2.11.0",
+  "version": "2.11.2",
   "description": "Homebridge plugin to control Xbox game consoles.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/xboxdevice.js

@@ -274,7 +274,8 @@ class XboxDevice extends EventEmitter {
                 }
             })
             .on('stateChanged', (power, volume, mute, mediaState, titleId, reference) => {
-                const inputIdentifier = this.inputsConfigured.findIndex(index => index.reference === reference) + 1 ?? this.inputsConfigured.findIndex(index => index.titleId === titleId) + 1;
+                const inputIdentifierR = this.inputsConfigured.findIndex(index => index.reference === reference) + 1 ?? 0;
+                const inputIdentifier = inputIdentifierR > 0 ? inputIdentifierR : this.inputsConfigured.findIndex(index => index.titleId === titleId) + 1;
 
                 //update characteristics
                 if (this.televisionService) {
@@ -282,10 +283,9 @@ class XboxDevice extends EventEmitter {
                         .updateCharacteristic(Characteristic.Active, power)
                 };
 
-                if (this.televisionService && inputIdentifier !== 0) {
+                if (this.televisionService && inputIdentifier > 0) {
                     this.televisionService
                         .updateCharacteristic(Characteristic.ActiveIdentifier, inputIdentifier);
-                    this.inputIdentifier = inputIdentifier;
                 };
 
                 if (this.speakerService) {
@@ -309,37 +309,40 @@ class XboxDevice extends EventEmitter {
                         .updateCharacteristic(Characteristic.ContactSensorState, power)
                 }
 
-                if (this.sensorInputService && inputIdentifier !== 0) {
+                if (this.sensorInputService && inputIdentifier > 0) {
                     const state = power ? (this.inputIdentifier !== inputIdentifier) : false;
                     this.sensorInputService
                         .updateCharacteristic(Characteristic.ContactSensorState, state)
                     this.sensorInputState = state;
-                    this.inputIdentifier = inputIdentifier;
                 }
 
-                if (this.sensorScreenSaverService) {
-                    const state = power ? (reference === 'Xbox.IdleScreen_8wekyb3d8bbwe!Xbox.IdleScreen.Application') : false;
-                    this.sensorScreenSaverService
-                        .updateCharacteristic(Characteristic.ContactSensorState, state)
-                    this.sensorScreenSaverState = state;
-                }
+                if (reference !== undefined) {
+                    this.reference = reference;
 
-                if (this.sensorInputsServices) {
-                    const servicesCount = this.sensorInputsServices.length;
-                    for (let i = 0; i < servicesCount; i++) {
-                        const state = power ? (this.sensorInputs[i].reference === reference) : false;
-                        const displayType = this.sensorInputs[i].displayType;
-                        const characteristicType = [Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][displayType];
-                        this.sensorInputsServices[i]
-                            .updateCharacteristic(characteristicType, state);
+                    if (this.sensorScreenSaverService) {
+                        const state = power ? (reference === 'Xbox.IdleScreen_8wekyb3d8bbwe!Xbox.IdleScreen.Application') : false;
+                        this.sensorScreenSaverService
+                            .updateCharacteristic(Characteristic.ContactSensorState, state)
+                        this.sensorScreenSaverState = state;
+                    }
+
+                    if (this.sensorInputsServices) {
+                        const servicesCount = this.sensorInputsServices.length;
+                        for (let i = 0; i < servicesCount; i++) {
+                            const state = power ? (this.sensorInputs[i].reference === reference) : false;
+                            const displayType = this.sensorInputs[i].displayType;
+                            const characteristicType = [Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][displayType];
+                            this.sensorInputsServices[i]
+                                .updateCharacteristic(characteristicType, state);
+                        }
                     }
                 }
 
+                this.inputIdentifier = inputIdentifier > 0 ? inputIdentifier : this.inputIdentifier;
                 this.power = power;
                 this.volume = volume;
                 this.mute = mute;
                 this.mediaState = mediaState;
-                this.reference = reference;
 
                 const obj = {
                     'power': power,
@@ -500,9 +503,10 @@ class XboxDevice extends EventEmitter {
                     })
                     .onSet(async (inputIdentifier) => {
                         try {
-                            const inputOneStoreProductId = this.inputsConfigured[inputIdentifier].oneStoreProductId;
-                            const inputReference = this.inputsConfigured[inputIdentifier].reference;
-                            const inputName = this.inputsConfigured[inputIdentifier].name;
+                            const identifier = inputIdentifier - 1;
+                            const inputOneStoreProductId = this.inputsConfigured[identifier].oneStoreProductId;
+                            const inputReference = this.inputsConfigured[identifier].reference;
+                            const inputName = this.inputsConfigured[identifier].name;
 
                             let channelName;
                             let command;