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

package/package.json

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

package/src/localApi/xboxlocalapi.js

@@ -52,7 +52,7 @@ class XboxLocalApi extends EventEmitter {
                 if (this.isConnected) {
                     const debug = this.enableDebugMode ? this.emit('debug', `Socket send heartbeat`) : false;
                     const elapse = (Date.now() - this.heartBeatStartTime) / 1000;
-                    const debug1 = this.enableDebugMode && elapse >= 12 ? this.emit('debug', `Last message was: ${elapse} sec ago.`) : false;
+                    const debug1 = this.enableDebugMode && elapse >= 12 ? this.emit('debug', `Last message was: ${elapse} sec ago`) : false;
                     const disconnect = elapse >= 12 ? await this.disconnect() : false;
                 };
             } catch (error) {
@@ -110,7 +110,7 @@ class XboxLocalApi extends EventEmitter {
     }
 
     async channelOpen(channelRequestId, service) {
-        const debug = this.enableDebugMode ? this.emit('debug', `Received channel Id: ${channelRequestId}, request open.`) : false;
+        const debug = this.enableDebugMode ? this.emit('debug', `Received channel Id: ${channelRequestId}, request open`) : false;
         this.channelRequestId = channelRequestId;
 
         try {
@@ -131,6 +131,7 @@ class XboxLocalApi extends EventEmitter {
     async powerOn() {
         if (this.isConnected) {
             this.emit('warn', 'Console already On.');
+            return;
         };
 
         const info = this.disableLogInfo ? false : this.emit('info', 'Send power On.');
@@ -158,6 +159,7 @@ class XboxLocalApi extends EventEmitter {
     async powerOff() {
         if (!this.isConnected) {
             this.emit('warn', 'Console already Off.');
+            return;
         };
 
         const info = this.disableLogInfo ? false : this.emit('info', 'Send power Off.');
@@ -180,6 +182,7 @@ class XboxLocalApi extends EventEmitter {
     async recordGameDvr() {
         if (!this.isConnected || !this.isAuthorized) {
             this.emit('warn', `Send record game ignored, connection state: ${this.isConnected}, authorization state: ${this.isAuthorized}`);
+            return;
         };
 
         const info = this.disableLogInfo ? false : this.emit('info', 'Send record game.');
@@ -198,7 +201,8 @@ class XboxLocalApi extends EventEmitter {
 
     async sendButtonPress(channelName, command) {
         if (!this.isConnected) {
-            this.emit('waarn', `Send command ignored, connection state: ${this.isConnected ? 'Not Connected' : 'Connected'}.`);
+            this.emit('waarn', `Send command ignored, connection state: ${this.isConnected ? 'Not Connected' : 'Connected'}`);
+            return;
         };
 
         const channelRequestId = LocalApi.Channels.System[channelName].Id
@@ -206,11 +210,11 @@ class XboxLocalApi extends EventEmitter {
         const channelOpen = this.channels[requestId].open;
 
         if (channelCommunicationId === -1 || !channelOpen) {
-            this.emit('warn', `Channel Id: ${channelCommunicationId}, state: ${channelOpen ? 'Open' : 'Closed'}, trying to open it.`);
+            this.emit('warn', `Channel Id: ${channelCommunicationId}, state: ${channelOpen ? 'Open' : 'Closed'}, trying to open it`);
         };
 
         command = LocalApi.Channels.System[channelName][command];
-        const debug = this.enableDebugMode ? this.emit('debug', `Channel communication Id: ${channelCommunicationId}, name:  ${channelName} opened, send command; ${command}.`) : false;
+        const debug = this.enableDebugMode ? this.emit('debug', `Channel communication Id: ${channelCommunicationId}, name:  ${channelName} opened, send command; ${command}`) : false;
 
         switch (channelRequestId) {
             case 0:
@@ -317,7 +321,7 @@ class XboxLocalApi extends EventEmitter {
                     throw new Error(error);
                 }
 
-                const debug = this.enableDebugMode ? this.emit('debug', `Socket send: ${type}, ${bytes}B.`) : false;
+                const debug = this.enableDebugMode ? this.emit('debug', `Socket send: ${type}, ${bytes}B`) : false;
                 return true;
             });
         } catch (error) {
@@ -378,7 +382,7 @@ class XboxLocalApi extends EventEmitter {
                 const debug4 = this.enableDebugMode ? this.emit('debug', `Received packet: ${JSON.stringify(packet, null, 2)}`) : false;
 
                 if (messageType === 'message' && packet.targetParticipantId !== this.sourceParticipantId) {
-                    const debug = this.enableDebugMode ? this.emit('debug', `Participant Id: ${packet.targetParticipantId} !== ${this.sourceParticipantId}. Ignoring packet.`) : false;
+                    const debug = this.enableDebugMode ? this.emit('debug', `Participant Id: ${packet.targetParticipantId} !== ${this.sourceParticipantId}. Ignoring packet`) : false;
                     return;
                 };
 
@@ -449,7 +453,7 @@ class XboxLocalApi extends EventEmitter {
                                         connectRequest.set('jwt', parseTokenData.xsts.Token, true);
                                         this.isAuthorized = true;
                                     }
-                                    const debug = this.enableDebugMode ? this.emit('debug', `Client connecting using: ${this.isAuthorized ? 'XSTS token' : 'Anonymous'}.`) : false;
+                                    const debug = this.enableDebugMode ? this.emit('debug', `Client connecting using: ${this.isAuthorized ? 'XSTS token' : 'Anonymous'}`) : false;
 
                                     const message = connectRequest.pack(this.crypto);
                                     await this.sendSocketMessage(message, 'connectRequest');
@@ -483,8 +487,8 @@ class XboxLocalApi extends EventEmitter {
                         }
                         this.isConnected = true;
                         this.sourceParticipantId = sourceParticipantId;
-                        const debug1 = this.enableDebugMode ? this.emit('debug', `Client connect state: ${this.isConnected ? 'Connected' : 'Not Connected'}.`) : false;
-                        const debug2 = this.enableDebugMode ? this.emit('debug', `Client pairing state: ${LocalApi.Console.PairingState[pairingState]}.`) : false;
+                        const debug1 = this.enableDebugMode ? this.emit('debug', `Client connect state: ${this.isConnected ? 'Connected' : 'Not Connected'}`) : false;
+                        const debug2 = this.enableDebugMode ? this.emit('debug', `Client pairing state: ${LocalApi.Console.PairingState[pairingState]}`) : false;
 
                         try {
                             const localJoin = new MessagePacket('localJoin');
@@ -532,7 +536,7 @@ class XboxLocalApi extends EventEmitter {
 
                         if (this.emitDevInfo) {
                             //connect to deice success
-                            this.emit('success', `Connect Success.`)
+                            this.emit('success', `Connect Success`)
 
                             const majorVersion = packet.payloadProtected.majorVersion;
                             const minorVersion = packet.payloadProtected.minorVersion;
@@ -605,17 +609,17 @@ class XboxLocalApi extends EventEmitter {
                             open: channelState
                         }
                         const pushChannel = channelCommunicationId !== -1 ? this.channels.push(channel) : false;
-                        const debug3 = this.enableDebugMode ? this.emit('debug', `Channel communication Id: ${channelCommunicationId}, state: ${channelState ? 'Open' : 'Closed'}.`) : false;
+                        const debug3 = this.enableDebugMode ? this.emit('debug', `Channel communication Id: ${channelCommunicationId}, state: ${channelState ? 'Open' : 'Closed'}`) : false;
                         break;
                     case 'pairedIdentityStateChanged':
                         const pairingState1 = packet.payloadProtected.pairingState || 0;
-                        const debug4 = this.enableDebugMode ? this.emit('debug', `Client pairing state: ${LocalApi.Console.PairingState[pairingState1]}.`) : false;
+                        const debug4 = this.enableDebugMode ? this.emit('debug', `Client pairing state: ${LocalApi.Console.PairingState[pairingState1]}`) : false;
                         break;
                 };
             }).on('listening', async () => {
                 //socket.setBroadcast(true);
                 const address = socket.address();
-                const debug = this.enableDebugMode ? this.emit('debug', `Server start listening: ${address.address}:${address.port}.`) : false;
+                const debug = this.enableDebugMode ? this.emit('debug', `Server start listening: ${address.address}:${address.port}`) : false;
                 this.socket = socket;
                 this.emitDevInfo = true;
 

package/src/mqtt.js

@@ -21,7 +21,7 @@ class Mqtt extends EventEmitter {
 
                 //subscribe
                 await this.mqttClient.subscribe(subscribeTopic);
-                this.emit('subscribed', `MQTT Subscribe topic: ${subscribeTopic}.`);
+                this.emit('subscribed', `MQTT Subscribe topic: ${subscribeTopic}`);
 
                 //subscribed message
                 this.mqttClient.on('message', (topic, message) => {

package/src/webApi/authentication.js

@@ -77,7 +77,7 @@ class Authentication {
                 }
                 break;
             default:
-                throw new Error(`Unknow refresh token type: ${type}.`);
+                throw new Error(`Unknow refresh token type: ${type}`);
                 break;
         }
     }
@@ -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

@@ -25,15 +25,16 @@ 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);
             };
         }).on('state', (state) => {
-            const emitState = state ? this.emit('success', `Web Api monitoring started.`) : this.emit('warn', `Web Api monitoring stopped.`);
+            const emitState = state ? this.emit('success', `Web Api monitoring started`) : this.emit('warn', `Web Api monitoring stopped`);
         });
     }
 
@@ -59,18 +60,24 @@ class XboxWebApi extends EventEmitter {
                 method: 'GET',
                 headers: headers
             });
-            await this.xboxLiveData();
+
+            //check xbox live data
+            try {
+                await this.xboxLiveData();
+            } catch (error) {
+                this.emit('error', `Check xbox live data error: ${error}`);
+            };
 
             return true;
         } catch (error) {
-            throw new Error(`Check authorization error: ${error.message || error}`);
+            throw new Error(`Check authorization error: ${error}`);
         };
     }
 
     async xboxLiveData() {
         try {
             const rmEnabled = await this.consoleStatus();
-            const debug1 = !rmEnabled ? this.emit('info', `Remote management not enabled, please check your console settings.`) : false;
+            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();
@@ -78,7 +85,7 @@ class XboxWebApi extends EventEmitter {
 
             return true;
         } catch (error) {
-            throw new Error(`Xbox live data error: ${error.message || error}`);
+            throw new Error(`Xbox live data error: ${error}`);
         };
     };
 
@@ -113,7 +120,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 +200,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 +252,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 +295,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 +338,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,14 +349,14 @@ 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}`);
         };
     };
 
     async next() {
         try {
             await this.send('Media', 'Next');
-            return true;;
+            return true;
         } catch (error) {
             throw new Error(error);
         };
@@ -358,7 +365,7 @@ class XboxWebApi extends EventEmitter {
     async previous() {
         try {
             await this.send('Media', 'Previous');
-            return true;;
+            return true;
         } catch (error) {
             throw new Error(error);
         };
@@ -367,7 +374,7 @@ class XboxWebApi extends EventEmitter {
     async pause() {
         try {
             await this.send('Media', 'Pause');
-            return true;;
+            return true;
         } catch (error) {
             throw new Error(error);
         };
@@ -376,7 +383,7 @@ class XboxWebApi extends EventEmitter {
     async play() {
         try {
             await this.send('Media', 'Play');
-            return true;;
+            return true;
         } catch (error) {
             throw new Error(error);
         };
@@ -385,7 +392,7 @@ class XboxWebApi extends EventEmitter {
     async goBack() {
         try {
             await this.send('Shell', 'GoBack');
-            return true;;
+            return true;
         } catch (error) {
             throw new Error(error);
         };
@@ -393,7 +400,8 @@ class XboxWebApi extends EventEmitter {
 
     async send(commandType, command, payload) {
         if (!this.authorized) {
-            throw new Error('not authorized.');
+            this.emit('warn', `not authorized`);
+            return;
         };
 
         const sessionid = UuIdv4();
@@ -407,7 +415,7 @@ class XboxWebApi extends EventEmitter {
             "parameters": params,
             "linkedXboxId": this.xboxLiveId
         }
-        const debug = this.enableDebugMode ? this.emit('debug', `send, type: ${commandType}, command: ${command}, params: ${params}.`) : false;
+        const debug = this.enableDebugMode ? this.emit('debug', `send, type: ${commandType}, command: ${command}, params: ${params}`) : false;
 
         try {
             const stringifyPostParam = JSON.stringify(postParams);

package/src/xboxdevice.js

@@ -97,7 +97,7 @@ class XboxDevice extends EventEmitter {
                 sensor.state = false;
                 this.sensorsInputsConfigured.push(sensor);
             } else {
-                const log = sensorInputDisplayType === 0 ? false : this.emit('info', `Sensor Name: ${sensorInputName ? sensorInputName : 'Missing'}, Reference: ${sensorInputReference ? sensorInputReference : 'Missing'}.`);
+                const log = sensorInputDisplayType === 0 ? false : this.emit('info', `Sensor Name: ${sensorInputName ? sensorInputName : 'Missing'}, Reference: ${sensorInputReference ? sensorInputReference : 'Missing'}`);
             };
         }
         this.sensorsInputsConfiguredCount = this.sensorsInputsConfigured.length || 0;
@@ -116,7 +116,7 @@ class XboxDevice extends EventEmitter {
                 button.state = false;
                 this.buttonsConfigured.push(button);
             } else {
-                const log = buttonDisplayType === 0 ? false : this.emit('info', `Button Name: ${buttonName ? buttonName : 'Missing'}, Command: ${buttonCommand ? buttonCommand : 'Missing'}, Reference: ${buttonReference ? buttonReference : 'Missing'}.`);
+                const log = buttonDisplayType === 0 ? false : this.emit('info', `Button Name: ${buttonName ? buttonName : 'Missing'}, Command: ${buttonCommand ? buttonCommand : 'Missing'}, Reference: ${buttonReference ? buttonReference : 'Missing'}`);
             };
         }
         this.buttonsConfiguredCount = this.buttonsConfigured.length || 0;
@@ -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}`);
         };
     }
 
@@ -721,7 +721,7 @@ class XboxDevice extends EventEmitter {
                             input.name = value;
                             this.savedInputsNames[inputReference] = value;
                             await this.saveData(this.inputsNamesFile, this.savedInputsNames);
-                            const debug = !this.enableDebugMode ? false : this.emit('debug', `Saved Input Name: ${value}, Reference: ${inputReference}.`);
+                            const debug = !this.enableDebugMode ? false : this.emit('debug', `Saved Input Name: ${value}, Reference: ${inputReference}`);
 
                             //sort inputs
                             const index = this.inputsConfigured.findIndex(input => input.reference === inputReference);
@@ -954,7 +954,7 @@ class XboxDevice extends EventEmitter {
                                                 const send5 = this.power && state ? await this.xboxWebApi.send('Shell', 'ShowGuideTab', [{ 'tabName': 'Guide' }]) : false;
                                                 break;
                                             case 'Not set': case 'Web api disabled':
-                                                this.emit('info', `trying to launch App/Game with one store product id: ${buttonOneStoreProductId}.`);
+                                                this.emit('info', `trying to launch App/Game with one store product id: ${buttonOneStoreProductId}`);
                                                 break;
                                             default:
                                                 const send6 = this.power && state ? await this.xboxWebApi.send('Shell', 'ActivateApplicationWithOneStoreProductId', [{ 'oneStoreProductId': buttonOneStoreProductId }]) : false;
@@ -1037,11 +1037,11 @@ class XboxDevice extends EventEmitter {
                         });
 
                     //check authorization
-                    await this.xboxWebApi.checkAuthorization();
+                    const checkAuthorization = await this.xboxWebApi.checkAuthorization();
 
                     //start impulse generator
                     const timers = [{ name: 'checkAuthorization', sampling: 900000 }];
-                    await this.xboxWebApi.impulseGenerator.start(timers);
+                    const startImpulseGenerator = checkAuthorization ? await this.xboxWebApi.impulseGenerator.start(timers) : false;
                 } catch (error) {
                     this.emit('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}`);
         };
     }
 };