homebridge-xbox-tv 3.7.1 → 3.7.2

package/homebridge-ui/public/index.html

@@ -235,7 +235,7 @@
               $("deviceWebApiControl").disabled = true;
               device.webApiControl = false;
 
-              let timeLeft = 15;
+              let timeLeft = 10;
               const timerId = setInterval(() => {
                 if (timeLeft <= 0) {
                   open(info);

package/package.json

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

package/src/webApi/xboxwebapi.js

@@ -250,12 +250,14 @@ class XboxWebApi extends EventEmitter {
                     'contentType': contentType
                 }
                 appsArray.push(input);
-                this.emit('addRemoveOrUpdateInput', input, false);
             }
 
             //save inputs
             await this.saveData(this.inputsFile, appsArray);
 
+            //emit apps
+            this.emit('addRemoveOrUpdateInput', appsArray, false);
+
             //emit restFul and mqtt
             this.emit('restFul', 'apps', apps);
             this.emit('mqtt', 'Apps', apps);

package/src/xboxdevice.js

@@ -104,7 +104,6 @@ class XboxDevice extends EventEmitter {
         this.buttonsConfiguredCount = this.buttonsConfigured.length || 0;
 
         //variable
-        this.allServices = [];
         this.sensorsInputsServices = [];
         this.buttonsServices = [];
         this.inputIdentifier = 1;
@@ -348,16 +347,6 @@ class XboxDevice extends EventEmitter {
             // Sort inputs in memory
             this.inputsServices.sort(sortFn);
 
-            // Reassign identifiers (start at 1)
-            this.inputsServices.forEach((svc, index) => {
-                const newIdentifier = index + 1;
-                svc.identifier = newIdentifier;
-
-                if (svc.testCharacteristic(Characteristic.Identifier)) {
-                    svc.updateCharacteristic(Characteristic.Identifier, newIdentifier);
-                }
-            });
-
             // Debug dump
             if (this.enableDebugMode) {
                 const orderDump = this.inputsServices.map(svc => ({ name: svc.name, reference: svc.reference, identifier: svc.identifier, }));
@@ -373,122 +362,118 @@ class XboxDevice extends EventEmitter {
         }
     }
 
-    async addRemoveOrUpdateInput(input, remove = false) {
+    async addRemoveOrUpdateInput(inputs, remove = false) {
         try {
-            // Safety: no services
             if (!this.inputsServices) return;
 
-            // Filter unnecessary inputs (only when adding, not removing)
-            if (!remove) {
+            for (const input of inputs) {
                 const contentType = input.contentType;
                 const filterGames = this.filterGames && contentType === 'Game';
                 const filterApps = this.filterApps && contentType === 'App';
                 const filterSystemApps = this.filterSystemApps && contentType === 'systemApp';
                 const filterDlc = this.filterDlc && contentType === 'Dlc';
 
-                if (filterGames || filterApps || filterSystemApps || filterDlc || this.inputsServices.length >= 85) {
-                    return;
-                }
-            }
-
-            // Input reference
-            const inputReference = input.reference;
-
-            // --- REMOVE ---
-            if (remove) {
-                const svc = this.inputsServices.find(s => s.reference === inputReference);
-                if (svc) {
-                    if (this.enableDebugMode) this.emit('debug', `Removing input: ${input.name} (${inputReference})`);
-                    this.accessory.removeService(svc);
-                    this.inputsServices = this.inputsServices.filter(s => s.reference !== inputReference);
-                    await this.displayOrder();
-                    return true;
-                }
-                if (this.enableDebugMode) this.emit('debug', `Remove failed (not found): ${input.name} (${inputReference})`);
-                return false;
-            }
-
-            // --- ADD OR UPDATE ---
-            let inputService = this.inputsServices.find(s => s.reference === inputReference);
+                if ((this.inputsServices.length >= 85 && !remove) || filterGames || filterApps || filterSystemApps || filterDlc) continue;
 
-            const savedName = this.savedInputsNames[inputReference] ?? input.name;
-            const sanitizedName = await this.sanitizeString(savedName);
-            const inputVisibility = this.savedInputsTargetVisibility[inputReference] ?? 0;
+                const inputReference = input.reference;
 
-            if (inputService) {
-                // === UPDATE EXISTING ===
-                inputService.name = sanitizedName;
-                inputService.visibility = inputVisibility;
+                // --- REMOVE ---
+                if (remove) {
+                    const svc = this.inputsServices.find(s => s.reference === inputReference);
+                    if (svc) {
+                        if (this.enableDebugMode) this.emit('debug', `Removing input: ${input.name} (${inputReference})`);
+                        this.accessory.removeService(svc);
+                        this.inputsServices = this.inputsServices.filter(s => s.reference !== inputReference);
+                        await this.displayOrder();
+                        return true;
+                    }
+                    if (this.enableDebugMode) this.emit('debug', `Remove failed (not found): ${input.name} (${inputReference})`);
+                    return false;
+                }
 
-                inputService
-                    .updateCharacteristic(Characteristic.Name, sanitizedName)
-                    .updateCharacteristic(Characteristic.ConfiguredName, sanitizedName)
-                    .updateCharacteristic(Characteristic.TargetVisibilityState, inputVisibility)
-                    .updateCharacteristic(Characteristic.CurrentVisibilityState, inputVisibility);
+                // --- ADD OR UPDATE ---
+                let inputService = this.inputsServices.find(s => s.reference === inputReference);
+
+                const savedName = this.savedInputsNames[inputReference] ?? input.name;
+                const sanitizedName = await this.sanitizeString(savedName);
+                const inputMode = input.mode ?? 0;
+                const inputVisibility = this.savedInputsTargetVisibility[inputReference] ?? 0;
+
+                if (inputService) {
+                    // === UPDATE EXISTING ===
+                    inputService.name = sanitizedName;
+                    inputService.visibility = inputVisibility;
+
+                    inputService
+                        .updateCharacteristic(Characteristic.Name, sanitizedName)
+                        .updateCharacteristic(Characteristic.ConfiguredName, sanitizedName)
+                        .updateCharacteristic(Characteristic.TargetVisibilityState, inputVisibility)
+                        .updateCharacteristic(Characteristic.CurrentVisibilityState, inputVisibility);
+
+                    if (this.enableDebugMode) this.emit('debug', `Updated input: ${input.name} (${inputReference})`);
+                } else {
+                    // === CREATE NEW ===
+                    const identifier = this.inputsServices.length + 1;
+                    inputService = this.accessory.addService(Service.InputSource, sanitizedName, `Input ${identifier}`);
+
+                    // Custom props
+                    Object.assign(inputService, {
+                        identifier,
+                        reference: inputReference,
+                        name: sanitizedName,
+                        mode: inputMode,
+                        visibility: inputVisibility,
+                    });
 
-                if (this.enableDebugMode) this.emit('debug', `Updated input: ${input.name} (${inputReference})`);
-            } else {
-                // === CREATE NEW ===
-                const identifier = this.inputsServices.length + 1;
-                inputService = this.accessory.addService(Service.InputSource, sanitizedName, `Input ${identifier}`);
-
-                // Custom props
-                inputService.identifier = identifier;
-                inputService.reference = inputReference;
-                inputService.name = sanitizedName;
-                inputService.visibility = inputVisibility;
-
-                inputService
-                    .setCharacteristic(Characteristic.Identifier, identifier)
-                    .setCharacteristic(Characteristic.Name, sanitizedName)
-                    .setCharacteristic(Characteristic.ConfiguredName, sanitizedName)
-                    .setCharacteristic(Characteristic.IsConfigured, 1)
-                    .setCharacteristic(Characteristic.InputSourceType, 0) // 0=HDMI-like Input, 1=Tuner/Channel
-                    .setCharacteristic(Characteristic.CurrentVisibilityState, inputVisibility)
-                    .setCharacteristic(Characteristic.TargetVisibilityState, inputVisibility);
-
-                // --- ConfiguredName rename persistence ---
-                inputService.getCharacteristic(Characteristic.ConfiguredName)
-                    .onSet(async (value) => {
-                        try {
-                            inputService.name = value;
-                            this.savedInputsNames[inputReference] = value;
-                            await this.saveData(this.inputsNamesFile, this.savedInputsNames);
+                    inputService
+                        .setCharacteristic(Characteristic.Identifier, identifier)
+                        .setCharacteristic(Characteristic.Name, sanitizedName)
+                        .setCharacteristic(Characteristic.ConfiguredName, sanitizedName)
+                        .setCharacteristic(Characteristic.IsConfigured, 0)
+                        .setCharacteristic(Characteristic.InputSourceType, inputMode) // 0=HDMI-like Input, 1=Tuner/Channel
+                        .setCharacteristic(Characteristic.CurrentVisibilityState, inputVisibility)
+                        .setCharacteristic(Characteristic.TargetVisibilityState, inputVisibility);
+
+                    // --- ConfiguredName rename persistence ---
+                    inputService.getCharacteristic(Characteristic.ConfiguredName)
+                        .onSet(async (value) => {
+                            try {
+                                inputService.name = value;
+                                this.savedInputsNames[inputReference] = value;
+                                await this.saveData(this.inputsNamesFile, this.savedInputsNames);
 
-                            if (this.enableDebugMode) this.emit('debug', `Saved Input: ${inputService.name}, Reference: ${inputReference}`);
+                                if (this.enableDebugMode) this.emit('debug', `Saved Input: ${inputService.name}, Reference: ${inputReference}`);
 
-                            // keep in sync
-                            const index = this.inputsServices.findIndex(s => s.reference === inputReference);
-                            if (index !== -1) this.inputsServices[index].name = value;
+                                const index = this.inputsServices.findIndex(s => s.reference === inputReference);
+                                if (index !== -1) this.inputsServices[index].name = value;
 
-                            await this.displayOrder();
-                        } catch (error) {
-                            this.emit('warn', `Save Input Name error: ${error}`);
-                        }
-                    });
+                                await this.displayOrder();
+                            } catch (error) {
+                                this.emit('warn', `Save Input Name error: ${error}`);
+                            }
+                        });
 
-                // --- TargetVisibility persistence ---
-                inputService.getCharacteristic(Characteristic.TargetVisibilityState)
-                    .onSet(async (state) => {
-                        try {
-                            inputService.visibility = state;
-                            this.savedInputsTargetVisibility[inputReference] = state;
-                            await this.saveData(this.inputsTargetVisibilityFile, this.savedInputsTargetVisibility);
+                    // --- TargetVisibility persistence ---
+                    inputService.getCharacteristic(Characteristic.TargetVisibilityState)
+                        .onSet(async (state) => {
+                            try {
+                                inputService.visibility = state;
+                                this.savedInputsTargetVisibility[inputReference] = state;
+                                await this.saveData(this.inputsTargetVisibilityFile, this.savedInputsTargetVisibility);
 
-                            if (this.enableDebugMode) this.emit('debug', `Saved Input: ${inputService.name}, Target Visibility: ${state ? 'HIDDEN' : 'SHOWN'}`);
-                        } catch (error) {
-                            this.emit('warn', `Save Target Visibility error: ${error}`);
-                        }
-                    });
+                                if (this.enableDebugMode) this.emit('debug', `Saved Input: ${inputService.name}, Target Visibility: ${state ? 'HIDDEN' : 'SHOWN'}`);
+                            } catch (error) {
+                                this.emit('warn', `Save Target Visibility error: ${error}`);
+                            }
+                        });
 
-                this.inputsServices.push(inputService);
-                this.televisionService.addLinkedService(inputService);
-                this.allServices.push(inputService);
+                    this.inputsServices.push(inputService);
+                    this.televisionService.addLinkedService(inputService);
 
-                if (this.enableDebugMode) this.emit('debug', `Added new input: ${input.name} (${inputReference})`);
+                    if (this.enableDebugMode) this.emit('debug', `Added new input: ${input.name} (${inputReference})`);
+                }
             }
 
-            // Normalize identifiers and order
             await this.displayOrder();
             return true;
         } catch (error) {
@@ -514,7 +499,6 @@ class XboxDevice extends EventEmitter {
                 .setCharacteristic(Characteristic.SerialNumber, this.savedInfo.serialNumber ?? this.xboxLiveId)
                 .setCharacteristic(Characteristic.FirmwareRevision, this.savedInfo.firmwareRevision ?? 'Firmware Revision')
                 .setCharacteristic(Characteristic.ConfiguredName, accessoryName);
-            this.allServices.push(this.informationService);
 
             //Prepare television service
             if (this.enableDebugMode) this.emit('debug', `Prepare television service`);
@@ -734,7 +718,12 @@ class XboxDevice extends EventEmitter {
                         this.emit('warn', `set Power Mode Selection error: ${error}`);
                     }
                 });
-            this.allServices.push(this.televisionService);
+
+            //prepare inputs service
+            if (this.enableDebugMode) this.emit('debug', `Prepare inputs service`);
+            this.inputsServices = [];
+            const inputs = this.getInputsFromDevice ? [...DefaultInputs, ...this.savedInputs] : this.inputs;
+            await this.addRemoveOrUpdateInput(inputs, false);
 
             //Prepare volume service
             if (this.volumeControl > 0) {
@@ -803,7 +792,6 @@ class XboxDevice extends EventEmitter {
                             this.emit('warn', `set Mute error: ${error}`);
                         }
                     });
-                this.allServices.push(this.volumeServiceTvSpeaker);
 
                 //legacy control
                 switch (this.volumeControl) {
@@ -828,7 +816,6 @@ class XboxDevice extends EventEmitter {
                             .onSet(async (state) => {
                                 this.volumeServiceTvSpeaker.setCharacteristic(Characteristic.Mute, !state);
                             });
-                        this.allServices.push(this.volumeServiceLightbulb);
                         break;
                     case 2: //fan
                         const debug1 = this.enableDebugMode ? this.emit('debug', `Prepare volume service fan`) : false;
@@ -851,7 +838,6 @@ class XboxDevice extends EventEmitter {
                             .onSet(async (state) => {
                                 this.volumeServiceTvSpeaker.setCharacteristic(Characteristic.Mute, !state);
                             });
-                        this.allServices.push(this.volumeServiceFan);
                         break;
                     case 3: // speaker
                         const debug2 = this.enableDebugMode ? this.emit('debug', `Prepare volume service speaker`) : false;
@@ -881,21 +867,10 @@ class XboxDevice extends EventEmitter {
                             .onSet(async (value) => {
                                 this.volumeServiceTvSpeaker.setCharacteristic(Characteristic.Volume, value);
                             });
-                        this.allServices.push(this.volumeServiceSpeaker);
                         break;
                 }
             }
 
-            //prepare inputs service
-            if (this.enableDebugMode) this.emit('debug', `Prepare inputs service`);
-
-            //check possible inputs count (max 85)
-            this.inputsServices = [];
-            const inputs = this.getInputsFromDevice ? [...DefaultInputs, ...this.savedInputs] : this.inputs;
-            for (const input of inputs) {
-                await this.addRemoveOrUpdateInput(input, false);
-            }
-
             //prepare sensor service
             if (this.sensorPower) {
                 if (this.enableDebugMode) this.emit('debug', `Prepare power sensor service`);
@@ -907,7 +882,6 @@ class XboxDevice extends EventEmitter {
                         const state = this.power;
                         return state;
                     });
-                this.allServices.push(this.sensorPowerService);
             }
 
             if (this.sensorInput) {
@@ -920,7 +894,6 @@ class XboxDevice extends EventEmitter {
                         const state = this.power ? this.sensorInputState : false;
                         return state;
                     });
-                this.allServices.push(this.sensorInputService);
             }
 
             if (this.sensorScreenSaver) {
@@ -933,11 +906,10 @@ class XboxDevice extends EventEmitter {
                         const state = this.power ? this.sensorScreenSaverState : false;
                         return state;
                     });
-                this.allServices.push(this.sensorScreenSaverService);
             }
 
             //prepare sonsor service
-            const possibleSensorInputsCount = 99 - this.allServices.length;
+            const possibleSensorInputsCount = 99 - this.accessory.services.length.length;
             const maxSensorInputsCount = this.sensorsInputsConfiguredCount >= possibleSensorInputsCount ? possibleSensorInputsCount : this.sensorsInputsConfiguredCount;
             if (maxSensorInputsCount > 0) {
                 if (this.enableDebugMode) this.emit('debug', `Prepare inputs sensors services`);
@@ -967,13 +939,12 @@ class XboxDevice extends EventEmitter {
                             return state;
                         });
                     this.sensorsInputsServices.push(sensorInputService);
-                    this.allServices.push(sensorInputService);
                     accessory.addService(sensorInputService);
                 }
             }
 
             //Prepare buttons services
-            const possibleButtonsCount = 99 - this.allServices.length;
+            const possibleButtonsCount = 99 - this.accessory.services.length.length;
             const maxButtonsCount = this.buttonsConfiguredCount >= possibleButtonsCount ? possibleButtonsCount : this.buttonsConfiguredCount;
             if (maxButtonsCount > 0) {
                 if (this.enableDebugMode) this.emit('debug', `Prepare buttons services`);
@@ -1048,7 +1019,6 @@ class XboxDevice extends EventEmitter {
                             }
                         });
                     this.buttonsServices.push(buttonService);
-                    this.allServices.push(buttonService);
                     accessory.addService(buttonService);
                 }
             }
@@ -1080,8 +1050,8 @@ class XboxDevice extends EventEmitter {
                         //this.power = powerState;
                         //this.mediaState = playbackState;
                     })
-                    .on('addRemoveOrUpdateInput', async (input, remove) => {
-                        await this.addRemoveOrUpdateInput(input, remove);
+                    .on('addRemoveOrUpdateInput', async (inputs, remove) => {
+                        await this.addRemoveOrUpdateInput(inputs, remove);
                     })
                     .on('success', (success) => {
                         this.emit('success', success);