homebridge-xbox-tv 2.8.21 → 2.8.22-beta.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Xbox TV",
   "name": "homebridge-xbox-tv",
-  "version": "2.8.21",
+  "version": "2.8.22-beta.1",
   "description": "Homebridge plugin (https://github.com/homebridge/homebridge) to control Xbox game consoles.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/webApi/xboxwebapi.js

@@ -42,20 +42,15 @@ class XBOXWEBAPI extends EventEmitter {
         //variables
         this.authorized = false;
 
-        this.on('disconnected', async () => {
-            await new Promise(resolve => setTimeout(resolve, 5000));
-            this.emit('stateChanged', false);
-        });
-
-        this.getAuthorizationState();
+        this.checkAuthorization();
     }
 
     async updateAuthorization() {
         await new Promise(resolve => setTimeout(resolve, 900000));
-        this.getAuthorizationState();
+        this.checkAuthorization();
     };
 
-    async getAuthorizationState() {
+    async checkAuthorization() {
         try {
             const tokens = this.userToken && this.userHash ? false : await this.authentication.checkAuthorization();
             const debug = this.debugLog ? this.emit('debug', `authorization tokens: ${JSON.stringify(tokens, null, 2)}`) : false;
@@ -72,6 +67,21 @@ class XBOXWEBAPI extends EventEmitter {
             this.tokens = tokens;
             this.authorized = true;
 
+            try {
+                await this.xboxLiveData();
+            } catch (error) {
+                this.emit('error', `xbox live data error: ${JSON.stringify(error, null, 2)}.`);
+            };
+
+            this.updateAuthorization();
+        } catch (error) {
+            this.emit('error', `check authorization state error: ${JSON.stringify(error, null, 2)}, recheck in 15min.`);
+            this.updateAuthorization();
+        };
+    };
+
+    xboxLiveData() {
+        return new Promise(async (resolve, reject) => {
             try {
                 const rmEnabled = await this.consoleStatus();
                 const debug1 = !rmEnabled ? this.emit('message', `remote management not enabled, please check your console settings.`) : false;
@@ -79,15 +89,11 @@ class XBOXWEBAPI extends EventEmitter {
                 await this.installedApps();
                 //await this.storageDevices();
                 //await this.userProfile();
-                this.updateAuthorization();
+                resolve();
             } catch (error) {
-                this.emit('error', `web Api data error: ${JSON.stringify(error, null, 2)}, recheck in 15min.`)
-                this.updateAuthorization();
+                reject(`Console: ${this.xboxLiveId}, get data error: ${JSON.stringify(error, null, 2)}`);
             };
-        } catch (error) {
-            this.emit('error', `check authorization state error: ${JSON.stringify(error, null, 2)}, recheck in 15min.`);
-            this.updateAuthorization();
-        };
+        });
     };
 
     consoleStatus() {