homebridge-xbox-tv 3.3.4-beta.1 → 3.3.4

package/CHANGELOG.md

@@ -10,6 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - After update to 2.x.x the plugin settings (xboxLiveId) need to be updated
 - After update to v3.0.0 RESTFull and MQTT config settings need to be updated
 
+## [3.3.4] - (05.02.2025)
+
+## Changes
+
+- Web Api improvements of authoriztion check and remote management
+- cleanup
+
 ## [3.3.3] - (04.02.2025)
 
 ## Changes

package/package.json

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

package/src/webApi/xboxwebapi.js

@@ -17,6 +17,7 @@ class XboxWebApi extends EventEmitter {
 
         //variables
         this.authorized = false;
+        this.rmEnabled = false;
 
         const authConfig = {
             webApiClientId: config.webApiClientId,
@@ -55,15 +56,27 @@ class XboxWebApi extends EventEmitter {
             this.tokens = data.tokens;
             this.authorized = true;
 
-            //create axios instance
-            this.axiosInstance = axios.create({
-                method: 'GET',
-                headers: headers
-            });
+            if (!this.authorized) {
+                this.emit('warn', `not authorized`);
+                return false;
+            };
 
             //check xbox live data
             try {
-                await this.xboxLiveData();
+                //create axios instance
+                this.axiosInstance = axios.create({
+                    method: 'GET',
+                    headers: headers
+                });
+
+                const rmEnabled = await this.consoleStatus();
+                const debug1 = rmEnabled ? false : this.emit('warn', `Remote management not enabled, please check your console settings`);
+                this.rmEnabled = rmEnabled;
+
+                //await this.consolesList();
+                await this.installedApps();
+                //await this.storageDevices();
+                //await this.userProfile();
             } catch (error) {
                 this.emit('error', `Check xbox live data error: ${error}`);
             };
@@ -74,21 +87,6 @@ class XboxWebApi extends EventEmitter {
         };
     }
 
-    async xboxLiveData() {
-        try {
-            const rmEnabled = await this.consoleStatus();
-            const debug1 = !rmEnabled ? this.emit('info', `Remote management not enabled, please check your console settings`) : false;
-            //await this.consolesList();
-            await this.installedApps();
-            //await this.storageDevices();
-            //await this.userProfile();
-
-            return true;
-        } catch (error) {
-            throw new Error(`Xbox live data error: ${error}`);
-        };
-    };
-
     async consoleStatus() {
         try {
             const url = `${WebApi.Url.Xccs}/consoles/${this.xboxLiveId}`;
@@ -399,8 +397,8 @@ class XboxWebApi extends EventEmitter {
     }
 
     async send(commandType, command, payload) {
-        if (!this.authorized) {
-            this.emit('warn', `not authorized`);
+        if (!this.authorized || !this.rmEnabled) {
+            this.emit('warn', `not authorized or remote management not enabled`);
             return;
         };
 

package/src/xboxdevice.js

@@ -973,7 +973,7 @@ class XboxDevice extends EventEmitter {
             }
 
             //sort inputs list
-            const sortInputsDisplayOrder = this.televisionService ? await this.displayOrder() : false;
+            await this.displayOrder();
 
             return accessory;
         } catch (error) {
@@ -1043,7 +1043,7 @@ class XboxDevice extends EventEmitter {
                     const timers = [{ name: 'checkAuthorization', sampling: 900000 }];
                     const startImpulseGenerator = checkAuthorization ? await this.xboxWebApi.impulseGenerator.start(timers) : false;
                 } catch (error) {
-                    this.emit('error', error);
+                    this.emit('error', `Start web api error: ${error}`);
                 };
             };
 
@@ -1166,11 +1166,11 @@ class XboxDevice extends EventEmitter {
                         this.emit('info', `Media State: ${['PLAY', 'PAUSE', 'STOPPED', 'LOADING', 'INTERRUPTED'][mediaState]}`);
                     };
                 })
-                .on('success', (message) => {
-                    this.emit('success', message);
+                .on('success', (success) => {
+                    this.emit('success', success);
                 })
-                .on('info', (message) => {
-                    this.emit('info', message);
+                .on('info', (info) => {
+                    this.emit('info', info);
                 })
                 .on('debug', (debug) => {
                     this.emit('debug', debug);
@@ -1181,8 +1181,8 @@ class XboxDevice extends EventEmitter {
                 .on('error', (error) => {
                     this.emit('error', error);
                 })
-                .on('disconnected', (message) => {
-                    this.emit('info', message);
+                .on('disconnected', (info) => {
+                    this.emit('info', info);
                 })
                 .on('restFul', (path, data) => {
                     const restFul = this.restFulConnected ? this.restFul1.update(path, data) : false;