homebridge-xbox-tv 3.0.2-beta.2 → 3.0.2-beta.4

package/package.json

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

package/src/webApi/authentication.js

@@ -3,10 +3,9 @@ const QueryString = require('querystring');
 const fs = require('fs');
 const fsPromises = fs.promises;
 const axios = require('axios');
-const EventEmitter = require('events');
 const CONSTANTS = require('../constants.json');
 
-class Authentication extends EventEmitter{
+class Authentication{
     constructor(config) {
         super();
         this.webApiClientId = config.webApiClientId || CONSTANTS.WebApi.ClientId;
@@ -32,7 +31,7 @@ class Authentication extends EventEmitter{
                                 await this.refreshTokens('xsts');
                                 return true;
                             } catch (error) {
-                                this.emit('error', error);
+                                throw new Error(error);
                             };
                             break;
                         case false:
@@ -40,7 +39,7 @@ class Authentication extends EventEmitter{
                                 await this.refreshTokens('xsts');
                                 return true;
                             } catch (error) {
-                                this.emit('error', error);
+                                throw new Error(error);
                             };
                             break;
                     }
@@ -50,7 +49,7 @@ class Authentication extends EventEmitter{
                         await this.refreshTokens('xsts');
                         return true;
                     } catch (error) {
-                        this.emit('error', error);
+                        throw new Error(error);
                     };
                 }
                 break;
@@ -64,7 +63,7 @@ class Authentication extends EventEmitter{
                                 await this.refreshTokens('xsts');
                                 return true;
                             } catch (error) {
-                                this.emit('error', error);
+                                throw new Error(error);
                             };
                             break;
                         case false:
@@ -76,12 +75,12 @@ class Authentication extends EventEmitter{
                         await this.getXstsToken(this.tokens.user.Token);
                         return true;
                     } catch (error) {
-                        this.emit('error', error);
+                        throw new Error(error);
                     };
                 }
                 break;
             default:
-                this.emit('error', `Unknow refresh token type: ${type}.`);
+                throw new Error(`Unknow refresh token type: ${type}.`);
                 break;
         }
     }
@@ -104,7 +103,7 @@ class Authentication extends EventEmitter{
             this.tokens.oauth = refreshToken;
             return true;
         } catch (error) {
-            this.emit('error', error);
+            throw new Error(error);
         };
     }
 
@@ -128,7 +127,7 @@ class Authentication extends EventEmitter{
             this.tokens.xsts = {};
             return true;
         } catch (error) {
-            this.emit('error', error);
+            throw new Error(error);
         };
     }
 
@@ -150,7 +149,7 @@ class Authentication extends EventEmitter{
             this.tokens.xsts = xstsToken;
             return true;
         } catch (error) {
-            this.emit('error', error);
+            throw new Error(error);
         };
     }
 
@@ -174,7 +173,7 @@ class Authentication extends EventEmitter{
             await this.saveTokens(this.tokens);
             return true;
         } catch (error) {
-            this.emit('error', error);
+            throw new Error(error);
         };
     }
 
@@ -190,13 +189,13 @@ class Authentication extends EventEmitter{
                     await this.saveTokens(this.tokens);
                     return { headers: `XBL3.0 x=${this.tokens.xsts.DisplayClaims.xui[0].uhs};${this.tokens.xsts.Token}`, tokens: this.tokens };
                 } else {
-                    this.emit('error', 'No oauth token found. Use authorization manager first.')
+                    throw new Error('No oauth token found. Use authorization manager first.')
                 }
             } catch (error) {
                 throw new Error(error);
             };
         } else {
-            this.emit('error', `Authorization not possible, check plugin settings - Client Id: ${this.webApiClientId}`);
+            throw new Error(`Authorization not possible, check plugin settings - Client Id: ${this.webApiClientId}`);
         }
     }
 
@@ -213,7 +212,7 @@ class Authentication extends EventEmitter{
             const oauth2URI = `${CONSTANTS.WebApi.Url.oauth2}?${params}`;
             return oauth2URI;
         } catch (error) {
-            this.emit('error', error);
+            throw new Error(error);
         };
     }
 
@@ -223,7 +222,7 @@ class Authentication extends EventEmitter{
             const tokens = data.length > 0 ? JSON.parse(data) : false;
             return tokens;
         } catch (error) {
-            this.emit('error', error);
+            throw new Error(error);
         };
     }
 
@@ -233,7 +232,7 @@ class Authentication extends EventEmitter{
             await fsPromises.writeFile(this.tokensFile, tokens);
             return true;
         } catch (error) {
-            this.emit('error', error);
+            throw new Error(error);
         };
     }
 
@@ -247,7 +246,7 @@ class Authentication extends EventEmitter{
             await fsPromises.writeFile(this.tokensFile, tokens);
             return true;
         } catch (error) {
-            this.emit('error', error);
+            throw new Error(error);
         };
     }
 }