homebridge-xbox-tv 2.11.2 → 2.11.3

package/package.json

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

package/src/xboxdevice.js

@@ -63,15 +63,14 @@ class XboxDevice extends EventEmitter {
         //add configured inputs to the default inputs
         this.inputs = [...CONSTANTS.DefaultInputs, ...this.inputs];
         this.inputsConfigured = [];
-        this.displayOrder = [];
+        this.sensorInputs = [];
 
         //setup variables
         this.restFulConnected = false;
         this.mqttConnected = false;
 
         this.allServices = [];
-        this.sensorInputsServices = [];
-        this.sensorInputs = [];
+        this.sensorsInputsServices = [];
         this.buttonsServices = [];
 
         this.power = false;
@@ -103,7 +102,7 @@ class XboxDevice extends EventEmitter {
 
             files.forEach((file) => {
                 if (!fs.existsSync(file)) {
-                    fs.writeFileSync(file, ' ');
+                    fs.writeFileSync(file, '');
                 }
             });
         } catch (error) {
@@ -274,7 +273,7 @@ class XboxDevice extends EventEmitter {
                 }
             })
             .on('stateChanged', (power, volume, mute, mediaState, titleId, reference) => {
-                const inputIdentifierR = this.inputsConfigured.findIndex(index => index.reference === reference) + 1 ?? 0;
+                const inputIdentifierR = this.inputsConfigured.findIndex(index => index.reference === reference) ?? 0;
                 const inputIdentifier = inputIdentifierR > 0 ? inputIdentifierR : this.inputsConfigured.findIndex(index => index.titleId === titleId) + 1;
 
                 //update characteristics
@@ -283,9 +282,9 @@ class XboxDevice extends EventEmitter {
                         .updateCharacteristic(Characteristic.Active, power)
                 };
 
-                if (this.televisionService && inputIdentifier > 0) {
+                if (this.televisionService && inputIdentifier !== -1) {
                     this.televisionService
-                        .updateCharacteristic(Characteristic.ActiveIdentifier, inputIdentifier);
+                        .updateCharacteristic(Characteristic.ActiveIdentifier, inputIdentifier + 1);
                 };
 
                 if (this.speakerService) {
@@ -309,7 +308,7 @@ class XboxDevice extends EventEmitter {
                         .updateCharacteristic(Characteristic.ContactSensorState, power)
                 }
 
-                if (this.sensorInputService && inputIdentifier > 0) {
+                if (this.sensorInputService && inputIdentifier !== -1) {
                     const state = power ? (this.inputIdentifier !== inputIdentifier) : false;
                     this.sensorInputService
                         .updateCharacteristic(Characteristic.ContactSensorState, state)
@@ -326,19 +325,19 @@ class XboxDevice extends EventEmitter {
                         this.sensorScreenSaverState = state;
                     }
 
-                    if (this.sensorInputsServices) {
-                        const servicesCount = this.sensorInputsServices.length;
+                    if (this.sensorsInputsServices) {
+                        const servicesCount = this.sensorsInputsServices.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]
+                            this.sensorsInputsServices[i]
                                 .updateCharacteristic(characteristicType, state);
                         }
                     }
                 }
 
-                this.inputIdentifier = inputIdentifier > 0 ? inputIdentifier : this.inputIdentifier;
+                this.inputIdentifier = inputIdentifier !== -1 ? inputIdentifier : this.inputIdentifier;
                 this.power = power;
                 this.volume = volume;
                 this.mute = mute;
@@ -361,7 +360,7 @@ class XboxDevice extends EventEmitter {
                     //read dev info from file
                     try {
                         const data = await fsPromises.readFile(this.devInfoFile);
-                        this.savedInfo = data.length > 5 ? JSON.parse(data) : {};
+                        this.savedInfo = data.length > 0 ? JSON.parse(data) : {};
                         const debug = this.enableDebugMode ? this.emit('debug', `Read saved Info: ${JSON.stringify(this.savedInfo, null, 2)}`) : false;
                     } catch (error) {
                         this.emit('error', `read saved Info error: ${error}`);
@@ -370,7 +369,7 @@ class XboxDevice extends EventEmitter {
                     //read inputs file
                     try {
                         const data = await fsPromises.readFile(this.inputsFile);
-                        this.savedInputs = data.length > 5 ? JSON.parse(data) : this.inputs;
+                        this.savedInputs = data.length > 0 ? JSON.parse(data) : this.inputs;
                         const debug = this.enableDebugMode ? this.emit('debug', `Read saved Inputs: ${JSON.stringify(this.savedInputs, null, 2)}`) : false;
                     } catch (error) {
                         this.emit('error', `read saved Inputs error: ${error}`);
@@ -379,7 +378,7 @@ class XboxDevice extends EventEmitter {
                     //read inputs names from file
                     try {
                         const data = await fsPromises.readFile(this.inputsNamesFile);
-                        this.savedInputsNames = data.length > 5 ? JSON.parse(data) : {};
+                        this.savedInputsNames = data.length > 0 ? JSON.parse(data) : {};
                         const debug = this.enableDebugMode ? this.emit('debug', `Read saved Inputs Names: ${JSON.stringify(this.savedInputsNames, null, 2)}`) : false;
                     } catch (error) {
                         this.emit('error', `read saved Inputs/Channels Names error: ${error}`);
@@ -388,7 +387,7 @@ class XboxDevice extends EventEmitter {
                     //read inputs visibility from file
                     try {
                         const data = await fsPromises.readFile(this.inputsTargetVisibilityFile);
-                        this.savedInputsTargetVisibility = data.length > 5 ? JSON.parse(data) : {};
+                        this.savedInputsTargetVisibility = data.length > 0 ? JSON.parse(data) : {};
                         const debug = this.enableDebugMode ? this.emit('debug', `Read saved Inputs Target Visibility: ${JSON.stringify(this.savedInputsTargetVisibility, null, 2)}`) : false;
                     } catch (error) {
                         this.emit('error', `read saved Inputs/Channels Target Visibility error: ${error}`);
@@ -442,8 +441,8 @@ class XboxDevice extends EventEmitter {
                 //Prepare television service
                 const debug1 = !this.enableDebugMode ? false : this.emit('debug', `Prepare television service`);
                 this.televisionService = new Service.Television(`${accessoryName} Television`, 'Television');
-                this.televisionService.setCharacteristic(Characteristic.ConfiguredName, accessoryName)
-                    .setCharacteristic(Characteristic.SleepDiscoveryMode, 1);
+                this.televisionService.setCharacteristic(Characteristic.ConfiguredName, accessoryName);
+                this.televisionService.setCharacteristic(Characteristic.SleepDiscoveryMode, 1);
 
                 this.televisionService.getCharacteristic(Characteristic.Active)
                     .onGet(async () => {
@@ -499,7 +498,7 @@ class XboxDevice extends EventEmitter {
                         const inputReference = this.inputsConfigured[inputIdentifier].reference;
                         const inputName = this.inputsConfigured[inputIdentifier].name;
                         const logInfo = this.disableLogInfo ? false : this.emit('message', `Input: ${inputName}, Reference: ${inputReference}, Product Id: ${inputOneStoreProductId}`);
-                        return inputIdentifier;
+                        return inputIdentifier + 1;
                     })
                     .onSet(async (inputIdentifier) => {
                         try {
@@ -786,6 +785,9 @@ class XboxDevice extends EventEmitter {
                     //get input 
                     const input = inputs[i];
 
+                    //get index
+                    const index = i + 1;
+
                     //get input oneStoreProductId
                     const inputOneStoreProductId = input.oneStoreProductId;
 
@@ -807,9 +809,9 @@ class XboxDevice extends EventEmitter {
                     const targetVisibility = currentVisibility;
 
                     if (inputReference && inputName) {
-                        const inputService = new Service.InputSource(`${inputName} ${i}`, `Input ${i}`);
+                        const inputService = new Service.InputSource(`${inputName} ${index}`, `Input ${index}`);
                         inputService
-                            .setCharacteristic(Characteristic.Identifier, i + 1)
+                            .setCharacteristic(Characteristic.Identifier, index)
                             .setCharacteristic(Characteristic.Name, inputName)
                             .setCharacteristic(Characteristic.InputSourceType, inputType)
                             .setCharacteristic(Characteristic.IsConfigured, isConfigured)
@@ -820,19 +822,11 @@ class XboxDevice extends EventEmitter {
                                 return inputName;
                             })
                             .onSet(async (value) => {
-                                const valueExist = inputName;
-                                if (valueExist) {
-                                    return;
-                                }
-
                                 try {
                                     this.savedInputsNames[inputReference] = value;
-                                    const newCustomName = JSON.stringify(this.savedInputsNames, null, 2);
-
-                                    await fsPromises.writeFile(this.inputsNamesFile, newCustomName);
+                                    await fsPromises.writeFile(this.inputsNamesFile, JSON.stringify(this.savedInputsNames, null, 2));
                                     const debug = this.enableDebugMode ? this.emit('debug', `Saved Input Name: ${value}, Reference: ${nameIdentifier}.`) : false;
                                     inputService.updateCharacteristic(Characteristic.Name, value);
-                                    inputService.updateCharacteristic(Characteristic.ConfiguredName, value);
                                 } catch (error) {
                                     this.emit('error', `save Input Name error: ${error}`);
                                 }
@@ -844,25 +838,17 @@ class XboxDevice extends EventEmitter {
                                 return targetVisibility;
                             })
                             .onSet(async (state) => {
-                                const stateExist = state === currentVisibility;
-                                if (stateExist) {
-                                    return;
-                                };
-
                                 try {
                                     this.savedInputsTargetVisibility[inputReference] = state;
-                                    const newTargetVisibility = JSON.stringify(this.savedInputsTargetVisibility, null, 2);
-
-                                    await fsPromises.writeFile(this.inputsTargetVisibilityFile, newTargetVisibility);
+                                    await fsPromises.writeFile(this.inputsTargetVisibilityFile, JSON.stringify(this.savedInputsTargetVisibility, null, 2));
                                     const debug = this.enableDebugMode ? this.emit('debug', `Saved Input: ${inputName} Target Visibility: ${state ? 'HIDEN' : 'SHOWN'}`) : false;
                                     inputService.updateCharacteristic(Characteristic.CurrentVisibilityState, state);
-                                    inputService.updateCharacteristic(Characteristic.TargetVisibilityState, state);
                                 } catch (error) {
                                     this.emit('error', `save Target Visibility error: ${error}`);
                                 }
                             });
 
-                        this.displayOrder.push(i + 1);
+                        input.identifier = index;
                         this.inputsConfigured.push(input);
 
                         this.televisionService.addLinkedService(inputService);
@@ -873,7 +859,8 @@ class XboxDevice extends EventEmitter {
 
                     };
                 }
-                this.televisionService.setCharacteristic(Characteristic.DisplayOrder, Encode(1, this.displayOrder).toString('base64'));
+                const displayOrder = this.inputsConfigured.map(input => input.identifier);
+                this.televisionService.setCharacteristic(Characteristic.DisplayOrder, Encode(1, displayOrder).toString('base64'));
 
                 //Prepare volume service
                 if (this.volumeControl >= 0) {
@@ -1009,9 +996,9 @@ class XboxDevice extends EventEmitter {
                                     });
 
                                 this.sensorInputs.push(sensorInput);
-                                this.sensorInputsServices.push(sensorInputService);
+                                this.sensorsInputsServices.push(sensorInputService);
                                 this.allServices.push(sensorInputService);
-                                accessory.addService(this.sensorInputsServices[i]);
+                                accessory.addService(this.sensorsInputsServices[i]);
                             } else {
                                 this.emit('message', `Sensor Name: ${sensorInputName ? sensorInputName : 'Missing'}, Reference: ${sensorInputReference ? sensorInputReference : 'Missing'}.`);
                             };