From 14dbab5c9e7c52c29635ef5c1280b498395b9f4b Mon Sep 17 00:00:00 2001
From: Grzegorz <grzegorz914@icloud.com>
Date: Sat, 7 Sep 2024 15:26:55 +0200
Subject: [PATCH] cleanup

---
 homebridge-ui/public/index.html |  79 ++++++++--------
 homebridge-ui/server.js         |  99 ++++++++++----------
 package.json                    |   2 +-
 src/impulsegenerator.js         |  14 +--
 src/localApi/xboxlocalapi.js    |  17 ++--
 src/webApi/authentication.js    |  44 ++++-----
 src/webApi/xboxwebapi.js        |  30 +++----
 src/xboxdevice.js               | 155 +++++++++++++++++---------------
 8 files changed, 223 insertions(+), 217 deletions(-)

diff --git a/homebridge-ui/public/index.html b/homebridge-ui/public/index.html
index c1ea156..8613b2b 100644
--- a/homebridge-ui/public/index.html
+++ b/homebridge-ui/public/index.html
@@ -1,13 +1,14 @@
 <div style="text-align: center;">
-</divstyle>
-<img src="homebridge-xbox-tv.png" alt="Image" height="120" />
+  </divstyle>
+  <img src="homebridge-xbox-tv.png" alt="Image" height="120" />
 </div><br>
 
 <div id="authorizationManager" style="display: none;" class="card card-body">
   <form id="configForm">
     <div class="text-center">
       <label id="deviceName" style="font-size: 23px">Xbox</label><br>
-      <label id="info" style="text-align: center; font-size: 17px;">Authorization Manager</label><br><br>
+      <label id="info" style="text-align: center; font-size: 17px;"></label><br>
+      <label id="info1" style="text-align: center; font-size: 15px;"></label><br>
     </div>
     <div class="form-group">
       <label for="deviceHost">Host</label>
@@ -27,7 +28,7 @@
   </form>
 </div>
 
-<div id="consoles"></div>
+<div id="consoleButton"></div>
 </div>
 
 <script>
@@ -53,7 +54,7 @@
       button.setAttribute("class", "btn btn-primary");
       button.style.textTransform = 'none';
       button.innerText = pluginConfig[0].devices[i].name;
-      document.getElementById("consoles").appendChild(button);
+      document.getElementById("consoleButton").appendChild(button);
 
       //get actuall value on console select
       document.getElementById(`button${i}`).addEventListener('click', async () => {
@@ -72,6 +73,7 @@
         const setCheckboxState = tokenLength <= 10 ? document.getElementById('deviceWebApiControl').checked = false : false;
         const setCheckboxMode = tokenLength <= 10 ? document.getElementById('deviceWebApiControl').disabled = true : document.getElementById('deviceWebApiControl').disabled = false;
         const setWebApiControlMode = tokenLength <= 10 ? pluginConfig[0].devices[i].webApiControl = false : false;
+
         await homebridge.updatePluginConfig(pluginConfig)
         this.deviceIndex = i;
       });
@@ -106,55 +108,50 @@
     //clear token file
     document.getElementById('clearTokenButton').addEventListener('click', async () => {
       homebridge.showSpinner();
+      document.getElementById('info').innerHTML = 'Start clearing token...';
+      document.getElementById('info').style.color = 'yellow';
+
       try {
         const host = pluginConfig[0].devices[this.deviceIndex].host;
-        const response = await homebridge.request('/clearToken', { mode: 'clearToken', host: host });
+        await homebridge.request('/clearToken', { host: host });
 
-        const info = response.info;
-        const status = response.status;
-        const error = response.error;
+        //update value
+        pluginConfig[0].devices[this.deviceIndex].webApiToken = '';
+        pluginConfig[0].devices[this.deviceIndex].webApiControl = false;
 
-        switch (status) {
-          case 0:
-            document.getElementById('deviceToken').value = '';
-            document.getElementById('startAuthorizationButton').removeAttribute("disabled");
-            document.getElementById('startAuthorizationButton').innerText = "Start authorization";
-            document.getElementById('deviceWebApiControl').checked = false;
-            document.getElementById('deviceWebApiControl').disabled = true;
-            document.getElementById('info').innerHTML = info;
-            pluginConfig[0].devices[this.deviceIndex].webApiToken = '';
-            pluginConfig[0].devices[this.deviceIndex].webApiControl = false;
+        document.getElementById('info').innerHTML = 'Web api token cleared, now You can start new authorization process.';
+        document.getElementById('info').style.color = 'green';
+        document.getElementById('deviceToken').value = '';
+        document.getElementById('startAuthorizationButton').removeAttribute("disabled");
+        document.getElementById('startAuthorizationButton').innerText = "Start authorization";
+        document.getElementById('deviceWebApiControl').checked = false;
+        document.getElementById('deviceWebApiControl').disabled = true;
 
-            await homebridge.updatePluginConfig(pluginConfig);
-            await homebridge.savePluginConfig(pluginConfig);
-            break;
-          case 3:
-            document.getElementById('info').innerHTML = JSON.stringify(error, null, 2);
-            document.getElementById('info').style.color = 'red';
-            break;
-        };
+        await homebridge.updatePluginConfig(pluginConfig);
+        await homebridge.savePluginConfig(pluginConfig);
 
         homebridge.hideSpinner();
-      } catch (e) {
-        homebridge.toast.error(`Clear Web Api Token error: ${e.message}`);
+      } catch (error) {
+        document.getElementById('info').innerHTML = 'Clear web api token error.';
+        document.getElementById('info').style.color = 'yellow';
+        document.getElementById('info1').innerHTML = `Error: ${error}`;
+        document.getElementById('info1').style.color = 'red';
       }
     });
 
     //watch for click on the Start authorization button
     document.getElementById('startAuthorizationButton').addEventListener('click', async () => {
       homebridge.showSpinner();
+      document.getElementById('info').innerHTML = 'Starting authorization...';
+      document.getElementById('info').style.color = 'yellow';
 
       try {
-        await homebridge.updatePluginConfig(pluginConfig)
-        document.getElementById('info').innerHTML = '';
-
         const host = pluginConfig[0].devices[this.deviceIndex].host;
         const webApiClientId = pluginConfig[0].devices[this.deviceIndex].webApiClientId;
         const webApiClientSecret = pluginConfig[0].devices[this.deviceIndex].webApiClientSecret;
         const webApiToken = pluginConfig[0].devices[this.deviceIndex].webApiToken;
 
         const payload = {
-          mode: 'authorization',
           host: host,
           webApiClientId: webApiClientId,
           webApiClientSecret: webApiClientSecret,
@@ -163,11 +160,11 @@
         const response = await homebridge.request('/startAuthorization', payload);
         const info = response.info;
         const status = response.status;
-        const error = response.error;
 
         switch (status) {
           case 0:
             document.getElementById('info').innerHTML = info;
+            document.getElementById('info').style.color = 'green';
             document.getElementById('startAuthorizationButton').innerText = "Check state";
             document.getElementById('deviceWebApiControl').disabled = false;
             break;
@@ -183,14 +180,17 @@
                 open(info);
                 clearInterval(timerId);
                 document.getElementById('info').innerHTML = `Now paste the *code* to the *Web Api Token* and press *Activate Console*.`;
+                document.getElementById('info').style.color = 'yellow';
               } else {
                 document.getElementById('info').innerHTML = `After ${timeLeft} sec. on the opened page, sign in to your Xbox Live account and give permission for Xbox TV. Next from the response URI copy the part after *?code=* and return to Authorization Manager.`;
                 timeLeft--;
+                document.getElementById('info').style.color = 'yellow';
               }
             }, 1000);
             break;
           case 2:
             document.getElementById('info').innerHTML = info;
+            document.getElementById('info').style.color = 'green';
             document.getElementById('startAuthorizationButton').innerText = "Check state";
             document.getElementById('deviceWebApiControl').disabled = false;
             document.getElementById('deviceWebApiControl').checked = true;
@@ -199,15 +199,14 @@
             await homebridge.updatePluginConfig(pluginConfig)
             await homebridge.savePluginConfig(pluginConfig);
             break;
-          case 3:
-            document.getElementById('info').innerHTML = `Authorization error: ${JSON.stringify(error, null, 2)}`;
-            document.getElementById('info').style.color = 'red';
-            break;
         };
 
         homebridge.hideSpinner();
-      } catch (e) {
-        homebridge.toast.error(`Data error: ${e.message}`);
+      } catch (error) {
+        document.getElementById('info').innerHTML = 'Check Your credentials data and try again.';
+        document.getElementById('info').style.color = 'yellow';
+        document.getElementById('info1').innerHTML = `Error: ${error}`;
+        document.getElementById('info1').style.color = 'red';
       } finally {
         homebridge.hideSpinner();
       };
diff --git a/homebridge-ui/server.js b/homebridge-ui/server.js
index e0d6491..cc3015d 100644
--- a/homebridge-ui/server.js
+++ b/homebridge-ui/server.js
@@ -8,7 +8,7 @@ class PluginUiServer extends HomebridgePluginUiServer {
     super();
 
     //clear web api token
-    this.onRequest('/clearToken', this.startAuthorization.bind(this));
+    this.onRequest('/clearToken', this.clearToken.bind(this));
 
     //start console authorization
     this.onRequest('/startAuthorization', this.startAuthorization.bind(this));
@@ -17,9 +17,31 @@ class PluginUiServer extends HomebridgePluginUiServer {
     this.ready();
   };
 
-  async startAuthorization(payload) {
+  async clearToken(payload) {
+    const host = payload.host;
+    const tokensFile = `${this.homebridgeStoragePath}/xboxTv/authToken_${host.split('.').join('')}`;
+
+    const authConfig = {
+      webApiClientId: payload.webApiClientId,
+      webApiClientSecret: payload.webApiClientSecret,
+      tokensFile: tokensFile
+    }
+    const authentication = new Authentication(authConfig);
 
-    const mode = payload.mode;
+    try {
+      const tokens = {
+        oauth: {},
+        user: {},
+        xsts: {}
+      };
+      await authentication.saveData(tokensFile, tokens);
+      return true;
+    } catch (error) {
+      throw new Error(`Clear token error: ${error.message ?? error}.`);
+    };
+  };
+
+  async startAuthorization(payload) {
     const host = payload.host;
     const webApiToken = payload.webApiToken;
     const tokensFile = `${this.homebridgeStoragePath}/xboxTv/authToken_${host.split('.').join('')}`;
@@ -30,58 +52,39 @@ class PluginUiServer extends HomebridgePluginUiServer {
       tokensFile: tokensFile
     }
     const authentication = new Authentication(authConfig);
-
     let data = {};
-    switch (mode) {
-      case 'clearToken':
-        try {
-          await authentication.clearTokens();
-          data = {
-            info: 'Web Api Token cleared, now You can start new authorization process.',
-            status: 0
-          };
-        } catch (error) {
-          data = {
-            info: 'Clear token error:',
-            status: 3,
-            error: error
-          };
+
+    try {
+      try {
+        await authentication.checkAuthorization();
+        data = {
+          info: 'Console authorized and activated. To start new process please clear Web API Token first.',
+          status: 0
         };
-        break;
-      case 'authorization':
-        try {
-          await authentication.checkAuthorization();
-          data = {
-            info: 'Console authorized and activated. To start new process please clear Web API Token first.',
-            status: 0
-          };
-        } catch (error) {
-          if (webApiToken) {
-            try {
-              await authentication.accessToken(webApiToken);
-              data = {
-                info: 'Activation successfull, now restart plugin and have fun!!!',
-                status: 2
-              };
-            } catch (error) {
-              data = {
-                info: 'Error',
-                status: 3,
-                error: error
-              };
-            };
-          } else {
-            const oauth2URI = await authentication.generateAuthorizationUrl();
+      } catch (error) {
+        if (webApiToken) {
+          try {
+            await authentication.accessToken(webApiToken);
             data = {
-              info: oauth2URI,
-              status: 1
+              info: 'Activation console successfull, now restart plugin and have fun!!!',
+              status: 2
             };
+          } catch (error) {
+            throw new Error(`Activation console error: ${error.message ?? error}.`);
+          };
+        } else {
+          const oauth2URI = await authentication.generateAuthorizationUrl();
+          data = {
+            info: oauth2URI,
+            status: 1
           };
         };
-        break;
-    };
+      };
 
-    return data;
+      return data;
+    } catch (error) {
+      throw new Error(`Authorization manager error: ${error.message ?? error}.`);
+    };
   };
 };
 
diff --git a/package.json b/package.json
index 46708fb..5234d1a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "displayName": "Xbox TV",
   "name": "homebridge-xbox-tv",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "description": "Homebridge plugin to control Xbox game consoles.",
   "license": "MIT",
   "author": "grzegorz914",
diff --git a/src/impulsegenerator.js b/src/impulsegenerator.js
index e6512d2..8b710f0 100644
--- a/src/impulsegenerator.js
+++ b/src/impulsegenerator.js
@@ -7,9 +7,9 @@ class ImpulseGenerator extends EventEmitter {
         this.timersState = false;
     }
 
-    start(timers) {
+    async start(timers) {
         if (this.timersState) {
-            this.stop();
+            await this.stop();
         }
 
         this.timers = [];
@@ -22,10 +22,12 @@ class ImpulseGenerator extends EventEmitter {
 
         //update state
         this.timersState = true;
-        this.emit('state', true);
+        this.state();
+
+        return true;
     }
 
-    stop() {
+    async stop() {
         if (this.timersState) {
             this.timers.forEach(timer => clearInterval(timer));
         }
@@ -33,7 +35,9 @@ class ImpulseGenerator extends EventEmitter {
         //update state
         this.timers = [];
         this.timersState = false;
-        this.emit('state', false);
+        this.state();
+
+        return true;
     }
 
     state() {
diff --git a/src/localApi/xboxlocalapi.js b/src/localApi/xboxlocalapi.js
index 3d9b4a2..ace797c 100644
--- a/src/localApi/xboxlocalapi.js
+++ b/src/localApi/xboxlocalapi.js
@@ -265,10 +265,11 @@ class XBOXLOCALAPI extends EventEmitter {
                             this.emitDevInfo = false;
                         };
 
-                        //Start prepare accessory
-                        const prepareAccessory = this.startPrepareAccessory ? this.emit('prepareAccessory') : false;
-                        const awaitToPrepareAccesory = this.startPrepareAccessory ? await new Promise(resolve => setTimeout(resolve, 1000)) : false;
-                        this.startPrepareAccessory = false;
+                        //start external integration
+                        this.emit('externalIntegration');
+
+                        //prepare accessory
+                        this.emit('prepareAccessory');
 
                         const appsCount = Array.isArray(packet.payloadProtected.activeTitles) ? packet.payloadProtected.activeTitles.length : 0;
                         if (appsCount > 0) {
@@ -374,7 +375,7 @@ class XBOXLOCALAPI extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`Connect error: ${error}`);
+            throw new Error(`Connect error: ${error.message || error}`);
         };
     };
 
@@ -383,7 +384,7 @@ class XBOXLOCALAPI extends EventEmitter {
         try {
             await this.connect();
         } catch (error) {
-            throw new Error(`Reconnect error: ${error}`);
+            throw new Error(`Reconnect error: ${error.message || error}`);
         }
     };
 
@@ -392,7 +393,7 @@ class XBOXLOCALAPI extends EventEmitter {
             const data = await fsPromises.readFile(path);
             return data;
         } catch (error) {
-            throw new Error(`Read token error: ${error}`);
+            throw new Error(`Read data error: ${error.message || error}`);
         }
     }
 
@@ -403,7 +404,7 @@ class XBOXLOCALAPI extends EventEmitter {
             const debug = this.debugLog ? this.emit('debug', `Saved data: ${data}`) : false;
             return true;
         } catch (error) {
-            throw new Error(error);
+            throw new Error(`Save data error: ${error.message || error}`);
         };
     };
 
diff --git a/src/webApi/authentication.js b/src/webApi/authentication.js
index ea02888..f36ed77 100644
--- a/src/webApi/authentication.js
+++ b/src/webApi/authentication.js
@@ -102,7 +102,7 @@ class Authentication {
             this.tokens.oauth = refreshToken;
             return true;
         } catch (error) {
-            throw new Error(error);
+            throw new Error(`Refresh token error: ${error.message || error}`);
         };
     }
 
@@ -126,7 +126,7 @@ class Authentication {
             this.tokens.xsts = {};
             return true;
         } catch (error) {
-            throw new Error(error);
+            throw new Error(`User token error: ${error.message || error}`);
         };
     }
 
@@ -148,7 +148,7 @@ class Authentication {
             this.tokens.xsts = xstsToken;
             return true;
         } catch (error) {
-            throw new Error(error);
+            throw new Error(`Xsts token error: ${error.message || error}`);
         };
     }
 
@@ -169,23 +169,23 @@ class Authentication {
             const accessToken = response.data;
             accessToken.issued = new Date().toISOString();
             this.tokens.oauth = accessToken;
-            await this.saveTokens(this.tokens);
+            await this.saveData(this.tokensFile, this.tokens);
             return true;
         } catch (error) {
-            throw new Error(error);
+            throw new Error(`Access token error: ${error.message || error}`);
         };
     }
 
     async checkAuthorization() {
         if (this.webApiClientId) {
             try {
-                const tokens = await this.readTokens();
+                const tokens = await this.readData(this.tokensFile);
                 this.tokens = !tokens ? this.tokens : tokens;
                 const refreshToken = this.tokens.oauth.refresh_token ?? false;
 
                 if (refreshToken) {
                     await this.refreshTokens('user');
-                    await this.saveTokens(this.tokens);
+                    await this.saveData(this.tokensFile, this.tokens);
                     return { headers: `XBL3.0 x=${this.tokens.xsts.DisplayClaims.xui[0].uhs};${this.tokens.xsts.Token}`, tokens: this.tokens };
                 } else {
                     throw new Error('No oauth token found. Use authorization manager first.')
@@ -211,41 +211,27 @@ class Authentication {
             const oauth2URI = `${CONSTANTS.WebApi.Url.oauth2}?${params}`;
             return oauth2URI;
         } catch (error) {
-            throw new Error(error);
+            throw new Error(`Authorization URL error: ${error.message || error}`);
         };
     }
 
-    async readTokens() {
+    async readData(path) {
         try {
-            const data = await fsPromises.readFile(this.tokensFile);
+            const data = await fsPromises.readFile(path);
             const tokens = data.length > 0 ? JSON.parse(data) : false;
             return tokens;
         } catch (error) {
-            throw new Error(error);
+            throw new Error(`Read data error: ${error.message || error}`);
         };
     }
 
-    async saveTokens(tokens) {
+    async saveData(path, data) {
         try {
-            tokens = JSON.stringify(tokens, null, 2);
-            await fsPromises.writeFile(this.tokensFile, tokens);
+            data = JSON.stringify(data, null, 2);
+            await fsPromises.writeFile(path, data);
             return true;
         } catch (error) {
-            throw new Error(error);
-        };
-    }
-
-    async clearTokens() {
-        try {
-            const tokens = JSON.stringify({
-                oauth: {},
-                user: {},
-                xsts: {}
-            }, null, 2);
-            await fsPromises.writeFile(this.tokensFile, tokens);
-            return true;
-        } catch (error) {
-            throw new Error(error);
+            throw new Error(`Save data error: ${error.message || error}`);
         };
     }
 }
diff --git a/src/webApi/xboxwebapi.js b/src/webApi/xboxwebapi.js
index 85906fa..2660f05 100644
--- a/src/webApi/xboxwebapi.js
+++ b/src/webApi/xboxwebapi.js
@@ -52,7 +52,7 @@ class XBOXWEBAPI extends EventEmitter {
     async checkAuthorization() {
         try {
             const data = await this.authentication.checkAuthorization();
-            const debug = this.debugLog ? this.emit('debug', `authorization headers: ${JSON.stringify(data.headers, null, 2)}, tokens: ${JSON.stringify(data.tokens, null, 2)}`) : false;
+            const debug = this.debugLog ? this.emit('debug', `Authorization headers: ${JSON.stringify(data.headers, null, 2)}, tokens: ${JSON.stringify(data.tokens, null, 2)}`) : false;
             const headers = {
                 'Authorization': data.headers,
                 'Accept-Language': 'en-US',
@@ -75,14 +75,14 @@ class XBOXWEBAPI extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`check authorization error: ${error}`);
+            throw new Error(`Check authorization error: ${error.message || error}`);
         };
     }
 
     async xboxLiveData() {
         try {
             const rmEnabled = await this.consoleStatus();
-            const debug1 = !rmEnabled ? this.emit('message', `remote management not enabled, please check your console settings.`) : false;
+            const debug1 = !rmEnabled ? this.emit('message', `Remote management not enabled, please check your console settings.`) : false;
             //await this.consolesList();
             await this.installedApps();
             //await this.storageDevices();
@@ -90,7 +90,7 @@ class XBOXWEBAPI extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`xbox live data error: ${error}`);
+            throw new Error(`Xbox live data error: ${error.message || error}`);
         };
     };
 
@@ -98,7 +98,7 @@ class XBOXWEBAPI extends EventEmitter {
         try {
             const url = `${CONSTANTS.WebApi.Url.Xccs}/consoles/${this.xboxLiveId}`;
             const getConsoleStatusData = await this.axiosInstance(url);
-            const debug = this.debugLog ? this.emit('debug', `console status data: ${JSON.stringify(getConsoleStatusData.data, null, 2)}`) : false;
+            const debug = this.debugLog ? this.emit('debug', `Console status data: ${JSON.stringify(getConsoleStatusData.data, null, 2)}`) : false;
 
             //get console status
             const consoleStatusData = getConsoleStatusData.data;
@@ -125,7 +125,7 @@ class XBOXWEBAPI extends EventEmitter {
 
             return remoteManagementEnabled;
         } catch (error) {
-            throw new Error(`status error: ${error}`);
+            throw new Error(`Status error: ${error.message || error}`);
         };
     }
 
@@ -133,7 +133,7 @@ class XBOXWEBAPI extends EventEmitter {
         try {
             const url = `${CONSTANTS.WebApi.Url.Xccs}/lists/devices?queryCurrentDevice=false&includeStorageDevices=true`;
             const getConsolesListData = await this.axiosInstance(url);
-            const debug = this.debugLog ? this.emit('debug', `consoles list data: ${getConsolesListData.data.result[0]}, ${getConsolesListData.data.result[0].storageDevices[0]}`) : false;
+            const debug = this.debugLog ? this.emit('debug', `Consoles list data: ${getConsolesListData.data.result[0]}, ${getConsolesListData.data.result[0].storageDevices[0]}`) : false;
 
             //get consoles list
             this.consolesId = [];
@@ -205,7 +205,7 @@ class XBOXWEBAPI extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`consoles list error: ${error}`);
+            throw new Error(`Consoles list error: ${error.message || error}`);
         };
     }
 
@@ -213,7 +213,7 @@ class XBOXWEBAPI extends EventEmitter {
         try {
             const url = `${CONSTANTS.WebApi.Url.Xccs}/lists/installedApps?deviceId=${this.xboxLiveId}`;
             const getInstalledAppsData = await this.axiosInstance(url);
-            const debug = this.debugLog ? this.emit('debug', `getInstalledAppsData: ${JSON.stringify(getInstalledAppsData.data.result, null, 2)}`) : false;
+            const debug = this.debugLog ? this.emit('debug', `Get installed apps data: ${JSON.stringify(getInstalledAppsData.data.result, null, 2)}`) : false;
 
             //get installed apps
             const appsArray = [];
@@ -257,7 +257,7 @@ class XBOXWEBAPI extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`installed apps error: ${error}`);
+            throw new Error(`Installed apps error: ${error.message || error}`);
         };
     }
 
@@ -265,7 +265,7 @@ class XBOXWEBAPI extends EventEmitter {
         try {
             const url = `${CONSTANTS.WebApi.Url.Xccs}/lists/storageDevices?deviceId=${this.xboxLiveId}`;
             const getStorageDevicesData = await this.axiosInstance(url);
-            const debug = this.debugLog ? this.emit('debug', `getStorageDevicesData, result: ${JSON.stringify(getStorageDevicesData.data, null, 2)}`) : false;
+            const debug = this.debugLog ? this.emit('debug', `Get storage devices data: ${JSON.stringify(getStorageDevicesData.data, null, 2)}`) : false;
 
             //get console storages
             this.storageDeviceId = [];
@@ -300,7 +300,7 @@ class XBOXWEBAPI extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`storage devices error: ${error}`);
+            throw new Error(`storage devices error: ${error.message || error}`);
         };
     }
 
@@ -308,7 +308,7 @@ class XBOXWEBAPI extends EventEmitter {
         try {
             const url = `https://profile.xboxlive.com/users/xuid(${this.tokens.xsts.DisplayClaims.xui[0].xid})/profile/settings?settings=GameDisplayName,GameDisplayPicRaw,Gamerscore,Gamertag`;
             const getUserProfileData = await this.axiosInstance(url);
-            const debug = this.debugLog ? this.emit('debug', `getUserProfileData, result: ${JSON.stringify(getUserProfileData.data.profileUsers[0], null, 2)}, ${JSON.stringify(getUserProfileData.data.profileUsers[0].settings[0], null, 2)}`) : false
+            const debug = this.debugLog ? this.emit('debug', `Get user profile data: ${JSON.stringify(getUserProfileData.data.profileUsers[0], null, 2)}, ${JSON.stringify(getUserProfileData.data.profileUsers[0].settings[0], null, 2)}`) : false
 
             //get user profiles
             this.userProfileId = [];
@@ -343,7 +343,7 @@ class XBOXWEBAPI extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`user profile error: ${error}`);
+            throw new Error(`User profile error: ${error.message || error}`);
         };
     }
 
@@ -354,7 +354,7 @@ class XBOXWEBAPI extends EventEmitter {
             const debug = this.debugLog ? this.emit('debug', `Saved data: ${data}`) : false;
             return true;
         } catch (error) {
-            throw new Error(error);
+            throw new Error(`Save data error: ${error.message || error}`);
         };
     };
 
diff --git a/src/xboxdevice.js b/src/xboxdevice.js
index 0aba94a..b00c2dd 100644
--- a/src/xboxdevice.js
+++ b/src/xboxdevice.js
@@ -54,6 +54,7 @@ class XboxDevice extends EventEmitter {
         this.inputsFile = inputsFile;
         this.inputsNamesFile = inputsNamesFile;
         this.inputsTargetVisibilityFile = inputsTargetVisibilityFile;
+        this.startPrepareAccessory = true;
 
         //external integrations
         this.restFul = device.restFul ?? {};
@@ -180,7 +181,7 @@ class XboxDevice extends EventEmitter {
 
                     //start impulse generator
                     const timers = [{ name: 'checkAuthorization', sampling: 900000 }];
-                    this.xboxWebApi.impulseGenerator.start(timers);
+                    await this.xboxWebApi.impulseGenerator.start(timers);
                 } catch (error) {
                     this.emit('error', error);
                 };
@@ -214,8 +215,8 @@ class XboxDevice extends EventEmitter {
                 };
             })
                 .on('stateChanged', (power, volume, mute, mediaState, titleId, reference) => {
-                    const index = this.inputsConfigured.findIndex(input => input.reference === reference || input.titleId === titleId) ?? -1;
-                    const inputIdentifier = index !== -1 ? this.inputsConfigured[index].identifier : this.inputIdentifier;
+                    const input = this.inputsConfigured.find(input => input.reference === reference || input.titleId === titleId) ?? false;
+                    const inputIdentifier = input ? input.identifier : this.inputIdentifier;
 
                     //update characteristics
                     if (this.televisionService) {
@@ -307,68 +308,77 @@ class XboxDevice extends EventEmitter {
                         this.emit('message', `Media State: ${['PLAY', 'PAUSE', 'STOPPED', 'LOADING', 'INTERRUPTED'][mediaState]}`);
                     };
                 })
-                .on('prepareAccessory', async () => {
-                    //RESTFul server
-                    const restFulEnabled = this.restFul.enable || false;
-                    if (restFulEnabled) {
-                        this.restFul = new RestFul({
-                            port: this.restFul.port || 3000,
-                            debug: this.restFul.debug || false
-                        });
+                .on('externalIntegrations', (message) => {
+                    try {
+                        //RESTFul server
+                        const restFulEnabled = this.restFul.enable || false;
+                        if (restFulEnabled) {
+                            this.restFul = new RestFul({
+                                port: this.restFul.port || 3000,
+                                debug: this.restFul.debug || false
+                            });
 
-                        this.restFul.on('connected', (message) => {
-                            this.restFulConnected = true;
-                            this.emit('success', message);
-                        })
-                            .on('set', async (key, value) => {
-                                try {
-                                    await this.setOverExternalIntegration('RESTFul', key, value);
-                                } catch (error) {
-                                    this.emit('warn', `RESTFul set error: ${error}`);
-                                };
-                            })
-                            .on('debug', (debug) => {
-                                this.emit('debug', debug);
+                            this.restFul.on('connected', (message) => {
+                                this.restFulConnected = true;
+                                this.emit('success', message);
                             })
-                            .on('error', (error) => {
-                                this.emit('warn', error);
-                            });
-                    }
+                                .on('set', async (key, value) => {
+                                    try {
+                                        await this.setOverExternalIntegration('RESTFul', key, value);
+                                    } catch (error) {
+                                        this.emit('warn', `RESTFul set error: ${error}`);
+                                    };
+                                })
+                                .on('debug', (debug) => {
+                                    this.emit('debug', debug);
+                                })
+                                .on('error', (error) => {
+                                    this.emit('warn', error);
+                                });
+                        }
 
-                    //mqtt client
-                    const mqttEnabled = this.mqtt.enable || false;
-                    if (mqttEnabled) {
-                        this.mqtt = new Mqtt({
-                            host: this.mqtt.host,
-                            port: this.mqtt.port || 1883,
-                            clientId: this.mqtt.clientId || `xbox_${Math.random().toString(16).slice(3)}`,
-                            prefix: `${this.mqtt.prefix}/${device.name}`,
-                            user: this.mqtt.user,
-                            passwd: this.mqtt.passwd,
-                            debug: this.mqtt.debug || false
-                        });
+                        //mqtt client
+                        const mqttEnabled = this.mqtt.enable || false;
+                        if (mqttEnabled) {
+                            this.mqtt = new Mqtt({
+                                host: this.mqtt.host,
+                                port: this.mqtt.port || 1883,
+                                clientId: this.mqtt.clientId || `xbox_${Math.random().toString(16).slice(3)}`,
+                                prefix: `${this.mqtt.prefix}/${device.name}`,
+                                user: this.mqtt.user,
+                                passwd: this.mqtt.passwd,
+                                debug: this.mqtt.debug || false
+                            });
 
-                        this.mqtt.on('connected', (message) => {
-                            this.mqttConnected = true;
-                            this.emit('success', message);
-                        })
-                            .on('subscribed', (message) => {
+                            this.mqtt.on('connected', (message) => {
+                                this.mqttConnected = true;
                                 this.emit('success', message);
                             })
-                            .on('set', async (key, value) => {
-                                try {
-                                    await this.setOverExternalIntegration('MQTT', key, value);
-                                } catch (error) {
-                                    this.emit('warn', `MQTT set error: ${error}.`);
-                                };
-                            })
-                            .on('debug', (debug) => {
-                                this.emit('debug', debug);
-                            })
-                            .on('error', (error) => {
-                                this.emit('warn', error);
-                            });
+                                .on('subscribed', (message) => {
+                                    this.emit('success', message);
+                                })
+                                .on('set', async (key, value) => {
+                                    try {
+                                        await this.setOverExternalIntegration('MQTT', key, value);
+                                    } catch (error) {
+                                        this.emit('warn', `MQTT set error: ${error}.`);
+                                    };
+                                })
+                                .on('debug', (debug) => {
+                                    this.emit('debug', debug);
+                                })
+                                .on('error', (error) => {
+                                    this.emit('warn', error);
+                                });
+                        };
+                    } catch (error) {
+                        this.emit('warn', `External integration start error: ${error.message || error}.`);
                     };
+                })
+                .on('prepareAccessory', async () => {
+                    if (!this.startPrepareAccessory) {
+                        return;
+                    }
 
                     try {
                         //read dev info from file
@@ -392,14 +402,16 @@ class XboxDevice extends EventEmitter {
                         const debug4 = !this.enableDebugMode ? false : this.emit('debug', `Read saved Inputs Target Visibility: ${JSON.stringify(this.savedInputsTargetVisibility, null, 2)}`);
 
                         //prepare accessory
-                        await new Promise(resolve => setTimeout(resolve, 2500));
                         const accessory = await this.prepareAccessory();
                         this.emit('publishAccessory', accessory)
 
                         //sort inputs list
                         const sortInputsDisplayOrder = this.televisionService ? await this.displayOrder() : false;
+
+                        this.startPrepareAccessory = false;
                     } catch (error) {
-                        throw new Error(`prepare accessory error: ${error}`);
+                        throw new Error(`
+                            Prepare accessory error: ${error.message || error}`);
                     };
                 })
                 .on('success', (message) => {
@@ -432,7 +444,7 @@ class XboxDevice extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`start error: ${error}`);
+            throw new Error(`Start error: ${error.message || error}`);
         };
     }
 
@@ -462,17 +474,18 @@ class XboxDevice extends EventEmitter {
             this.televisionService.setCharacteristic(Characteristic.DisplayOrder, Encode(1, displayOrder).toString('base64'));
             return true;
         } catch (error) {
-            throw new Error(error);
+            throw new Error(`Display order error: ${error.message || error}`);
         };
     }
 
     async saveData(path, data) {
         try {
-            await fsPromises.writeFile(path, JSON.stringify(data, null, 2));
-            const debug = !this.enableDebugMode ? false : this.emit('debug', `Saved data: ${JSON.stringify(data, null, 2)}`);
+            data = JSON.stringify(data, null, 2);
+            await fsPromises.writeFile(path, data);
+            const debug = this.debugLog ? this.emit('debug', `Saved data: ${data}`) : false;
             return true;
         } catch (error) {
-            throw new Error(error);
+            throw new Error(`Save data error: ${error.message || error}`);
         };
     }
 
@@ -482,7 +495,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 saved data error: ${error}`);
+            throw new Error(`Read data error: ${error.message || error}`);
         };
     }
 
@@ -546,7 +559,7 @@ class XboxDevice extends EventEmitter {
             };
             return set;
         } catch (error) {
-            throw new Error(`${integration} set key: ${key}, value: ${value}, error: ${error}`);
+            throw new Error(`${integration} set key: ${key}, value: ${value}, error: ${error.message || error}`);
         };
     }
 
@@ -628,10 +641,10 @@ class XboxDevice extends EventEmitter {
                 })
                 .onSet(async (activeIdentifier) => {
                     try {
-                        const index = this.inputsConfigured.findIndex(input => input.identifier === activeIdentifier);
-                        const inputOneStoreProductId = this.inputsConfigured[index].oneStoreProductId;
-                        const inputReference = this.inputsConfigured[index].reference;
-                        const inputName = this.inputsConfigured[index].name;
+                        const input = this.inputsConfigured.find(input => input.identifier === activeIdentifier);
+                        const inputOneStoreProductId = input.oneStoreProductId;
+                        const inputReference = input.reference;
+                        const inputName = input.name;
 
                         let channelName;
                         let command;