homebridge-xbox-tv 3.3.4-beta.0 → 3.3.4-beta.2

package/package.json

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

package/src/webApi/authentication.js

@@ -100,7 +100,7 @@ class Authentication {
             this.tokens.oauth = refreshToken;
             return true;
         } catch (error) {
-            throw new Error(`Refresh token error: ${error.message || error}`);
+            throw new Error(`Refresh token error: ${error}`);
         };
     }
 
@@ -124,7 +124,7 @@ class Authentication {
             this.tokens.xsts = {};
             return true;
         } catch (error) {
-            throw new Error(`User token error: ${error.message || error}`);
+            throw new Error(`User token error: ${error}`);
         };
     }
 
@@ -146,7 +146,7 @@ class Authentication {
             this.tokens.xsts = xstsToken;
             return true;
         } catch (error) {
-            throw new Error(`Xsts token error: ${error.message || error}`);
+            throw new Error(`Xsts token error: ${error}`);
         };
     }
 
@@ -170,7 +170,7 @@ class Authentication {
             await this.saveData(this.tokensFile, this.tokens);
             return true;
         } catch (error) {
-            throw new Error(`Access token error: ${error.message || error}`);
+            throw new Error(`Access token error: ${error}`);
         };
     }
 
@@ -209,7 +209,7 @@ class Authentication {
             const oauth2URI = `${WebApi.Url.oauth2}?${params}`;
             return oauth2URI;
         } catch (error) {
-            throw new Error(`Authorization URL error: ${error.message || error}`);
+            throw new Error(`Authorization URL error: ${error}`);
         };
     }
 
@@ -219,7 +219,7 @@ class Authentication {
             const tokens = data.length > 0 ? JSON.parse(data) : false;
             return tokens;
         } catch (error) {
-            throw new Error(`Read data error: ${error.message || error}`);
+            throw new Error(`Read data error: ${error}`);
         };
     }
 
@@ -229,7 +229,7 @@ class Authentication {
             await fsPromises.writeFile(path, data);
             return true;
         } catch (error) {
-            throw new Error(`Save data error: ${error.message || error}`);
+            throw new Error(`Save data error: ${error}`);
         };
     }
 }

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,
@@ -25,10 +26,11 @@ class XboxWebApi extends EventEmitter {
         }
         this.authentication = new Authentication(authConfig);
 
+        //create impulse generator
         this.impulseGenerator = new ImpulseGenerator();
         this.impulseGenerator.on('checkAuthorization', async () => {
             try {
-                await this.checkAuthorization(this.contextKey);
+                await this.checkAuthorization();
             } catch (error) {
                 this.emit('error', error);
             };
@@ -54,33 +56,36 @@ class XboxWebApi extends EventEmitter {
             this.tokens = data.tokens;
             this.authorized = true;
 
-            //create axios instance
-            this.axiosInstance = axios.create({
-                method: 'GET',
-                headers: headers
-            });
-            await this.xboxLiveData();
-
-            return true;
-        } catch (error) {
-            throw new Error(`Check authorization error: ${error.message || error}`);
-        };
-    }
+            if (!this.authorized) {
+                this.emit('warn', `not authorized`);
+                return false;
+            };
 
-    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();
+            //check xbox live data
+            try {
+                //create axios instance
+                this.axiosInstance = axios.create({
+                    method: 'GET',
+                    headers: headers
+                });
+
+                const rmEnabled = await this.consoleStatus();
+                const debug1 = rmEnabled ? false : this.emit('info', `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}`);
+            };
 
             return true;
         } catch (error) {
-            throw new Error(`Xbox live data error: ${error.message || error}`);
+            throw new Error(`Check authorization error: ${error}`);
         };
-    };
+    }
 
     async consoleStatus() {
         try {
@@ -113,7 +118,7 @@ class XboxWebApi extends EventEmitter {
 
             return remoteManagementEnabled;
         } catch (error) {
-            throw new Error(`Status error: ${error.message || error}`);
+            throw new Error(`Status error: ${error}`);
         };
     }
 
@@ -193,7 +198,7 @@ class XboxWebApi extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`Consoles list error: ${error.message || error}`);
+            throw new Error(`Consoles list error: ${error}`);
         };
     }
 
@@ -245,7 +250,7 @@ class XboxWebApi extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`Installed apps error: ${error.message || error}`);
+            throw new Error(`Installed apps error: ${error}`);
         };
     }
 
@@ -288,7 +293,7 @@ class XboxWebApi extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`storage devices error: ${error.message || error}`);
+            throw new Error(`storage devices error: ${error}`);
         };
     }
 
@@ -331,7 +336,7 @@ class XboxWebApi extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`User profile error: ${error.message || error}`);
+            throw new Error(`User profile error: ${error}`);
         };
     }
 
@@ -342,7 +347,7 @@ class XboxWebApi extends EventEmitter {
             const debug = this.enableDebugMode ? this.emit('debug', `Saved data: ${data}`) : false;
             return true;
         } catch (error) {
-            throw new Error(`Save data error: ${error.message || error}`);
+            throw new Error(`Save data error: ${error}`);
         };
     };
 
@@ -392,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

@@ -129,7 +129,7 @@ class XboxDevice extends EventEmitter {
             const debug = this.enableDebugMode ? this.emit('debug', `Saved data: ${data}`) : false;
             return true;
         } catch (error) {
-            throw new Error(`Save data error: ${error.message || error}`);
+            throw new Error(`Save data error: ${error}`);
         };
     }
 
@@ -139,7 +139,7 @@ class XboxDevice extends EventEmitter {
             const debug = !this.enableDebugMode ? false : this.emit('debug', `Read data: ${JSON.stringify(data, null, 2)}`);
             return data;
         } catch (error) {
-            throw new Error(`Read data error: ${error.message || error}`);
+            throw new Error(`Read data error: ${error}`);
         };
     }
 
@@ -203,7 +203,7 @@ class XboxDevice extends EventEmitter {
             };
             return set;
         } catch (error) {
-            throw new Error(`${integration} set key: ${key}, value: ${value}, error: ${error.message || error}`);
+            throw new Error(`${integration} set key: ${key}, value: ${value}, error: ${error}`);
         };
     }
 
@@ -308,7 +308,7 @@ class XboxDevice extends EventEmitter {
             this.televisionService.setCharacteristic(Characteristic.DisplayOrder, Encode(1, displayOrder).toString('base64'));
             return true;
         } catch (error) {
-            throw new Error(`Display order error: ${error.message || error}`);
+            throw new Error(`Display order error: ${error}`);
         };
     }
 
@@ -1215,7 +1215,7 @@ class XboxDevice extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`Start error: ${error.message || error}`);
+            throw new Error(`Start error: ${error}`);
         };
     }
 };