homebridge-xbox-tv 2.12.13 → 2.12.15

package/package.json

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

package/src/xboxdevice.js

@@ -274,8 +274,6 @@ class XboxDevice extends EventEmitter {
                 }
 
                 if (reference !== undefined) {
-                    this.reference = reference;
-
                     if (this.sensorScreenSaverService) {
                         const state = power ? (reference === 'Xbox.IdleScreen_8wekyb3d8bbwe!Xbox.IdleScreen.Application') : false;
                         this.sensorScreenSaverService
@@ -293,6 +291,7 @@ class XboxDevice extends EventEmitter {
                                 .updateCharacteristic(characteristicType, state);
                         }
                     }
+                    this.reference = reference;
                 }
 
                 this.inputIdentifier = inputIdentifier;
@@ -320,7 +319,7 @@ class XboxDevice extends EventEmitter {
                     //read dev info from file
                     try {
                         const data = await fsPromises.readFile(this.devInfoFile);
-                        this.savedInfo = data.length > 0 ? JSON.parse(data) : {};
+                        this.savedInfo = data.toString().trim() !== '' ? JSON.parse(data) : {};
                         const debug = !this.enableDebugMode ? false : this.emit('debug', `Read saved Info: ${JSON.stringify(this.savedInfo, null, 2)}`);
                     } catch (error) {
                         this.emit('error', `read saved Info error: ${error}`);
@@ -329,7 +328,7 @@ class XboxDevice extends EventEmitter {
                     //read inputs file
                     try {
                         const data = await fsPromises.readFile(this.inputsFile);
-                        this.savedInputs = data.length > 0 ? JSON.parse(data) : this.inputs;
+                        this.savedInputs = data.toString().trim() !== '' ? JSON.parse(data) : this.inputs;
                         const debug = !this.enableDebugMode ? false : this.emit('debug', `Read saved Inputs: ${JSON.stringify(this.savedInputs, null, 2)}`);
                     } catch (error) {
                         this.emit('error', `read saved Inputs error: ${error}`);
@@ -338,7 +337,7 @@ class XboxDevice extends EventEmitter {
                     //read inputs names from file
                     try {
                         const data = await fsPromises.readFile(this.inputsNamesFile);
-                        this.savedInputsNames = data.length > 0 ? JSON.parse(data) : {};
+                        this.savedInputsNames = data.toString().trim() !== '' ? JSON.parse(data) : {};
                         const debug = !this.enableDebugMode ? false : this.emit('debug', `Read saved Inputs Names: ${JSON.stringify(this.savedInputsNames, null, 2)}`);
                     } catch (error) {
                         this.emit('error', `read saved Inputs Names error: ${error}`);
@@ -347,7 +346,7 @@ class XboxDevice extends EventEmitter {
                     //read inputs visibility from file
                     try {
                         const data = await fsPromises.readFile(this.inputsTargetVisibilityFile);
-                        this.savedInputsTargetVisibility = data.length > 0 ? JSON.parse(data) : {};
+                        this.savedInputsTargetVisibility = data.toString().trim() !== '' ? JSON.parse(data) : {};
                         const debug = !this.enableDebugMode ? false : this.emit('debug', `Read saved Inputs Target Visibility: ${JSON.stringify(this.savedInputsTargetVisibility, null, 2)}`);
                     } catch (error) {
                         this.emit('error', `read saved Inputs Target Visibility error: ${error}`);
@@ -977,12 +976,12 @@ class XboxDevice extends EventEmitter {
 
                         if (sensorInputDisplayType >= 0) {
                             if (sensorInputName && sensorInputReference) {
+                                const serviceName = namePrefix ? `${accessoryName} ${sensorInputName}` : sensorInputName;
                                 const serviceType = [Service.MotionSensor, Service.OccupancySensor, Service.ContactSensor][sensorInputDisplayType];
-                                const name = namePrefix ? `${accessoryName} ${sensorInputName}` : sensorInputName;
                                 const characteristicType = [Characteristic.MotionDetected, Characteristic.OccupancyDetected, Characteristic.ContactSensorState][sensorInputDisplayType];
-                                const sensorInputService = new serviceType(`${accessoryName} ${sensorInputName}`, `Sensor ${i}`);
+                                const sensorInputService = new serviceType(serviceName, `Sensor ${i}`);
                                 sensorInputService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-                                sensorInputService.setCharacteristic(Characteristic.ConfiguredName, name);
+                                sensorInputService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                                 sensorInputService.getCharacteristic(characteristicType)
                                     .onGet(async () => {
                                         const state = this.power ? (this.reference === sensorInputReference) : false;
@@ -1045,11 +1044,11 @@ class XboxDevice extends EventEmitter {
 
                         if (buttonDisplayType >= 0) {
                             if (buttonName && buttonCommand && buttonMode) {
+                                const serviceName = namePrefix ? `${accessoryName} ${buttonName}` : buttonName;
                                 const serviceType = [Service.Outlet, Service.Switch][buttonDisplayType];
-                                const name = namePrefix ? `${accessoryName} ${buttonName}` : buttonName;
-                                const buttonService = new serviceType(`${accessoryName} ${buttonName}`, `Button ${i}`);
+                                const buttonService = new serviceType(serviceName, `Button ${i}`);
                                 buttonService.addOptionalCharacteristic(Characteristic.ConfiguredName);
-                                buttonService.setCharacteristic(Characteristic.ConfiguredName, name);
+                                buttonService.setCharacteristic(Characteristic.ConfiguredName, serviceName);
                                 buttonService.getCharacteristic(Characteristic.On)
                                     .onGet(async () => {
                                         const state = false;