homebridge-xbox-tv 3.0.2 → 3.0.3

package/index.js

@@ -32,7 +32,7 @@ class XboxPlatform {
 
 				//debug config
 				const debugMode = device.enableDebugMode;
-				const debug = debugMode ? log(`Device: ${deviceHost} ${deviceName}, did finish launching.`) : false;
+				const debug = debugMode ? log.info(`Device: ${deviceHost} ${deviceName}, did finish launching.`) : false;
 				const config = {
 					...device,
 					xboxLiveId: 'removed',
@@ -41,24 +41,27 @@ class XboxPlatform {
 					mqtt: {
 						...device.mqtt,
 						passwd: 'removed'
-					  }
+					}
 				};
-				const debug1 = debugMode ? log(`Device: ${deviceHost} ${deviceName}, Config: ${JSON.stringify(config, null, 2)}`) : false;
+				const debug1 = debugMode ? log.info(`Device: ${deviceHost} ${deviceName}, Config: ${JSON.stringify(config, null, 2)}`) : false;
 
 				//xbox device
 				const xboxDevice = new XboxDevice(api, prefDir, device);
 				xboxDevice.on('publishAccessory', (accessory) => {
 					api.publishExternalAccessories(CONSTANTS.PluginName, [accessory]);
-					const debug = debugMode ? log(`Device: ${deviceHost} ${deviceName}, published as external accessory.`) : false;
+					log.success(`Device: ${deviceHost} ${deviceName}, published as external accessory.`);
 				})
 					.on('devInfo', (devInfo) => {
-						log(devInfo);
+						log.info(devInfo);
 					})
 					.on('message', (message) => {
-						log(`Device: ${deviceHost} ${deviceName}, ${message}`);
+						log.info(`Device: ${deviceHost} ${deviceName}, ${message}`);
 					})
 					.on('debug', (debug) => {
-						log(`Device: ${deviceHost} ${deviceName}, debug: ${debug}`);
+						log.info(`Device: ${deviceHost} ${deviceName}, debug: ${debug}`);
+					})
+					.on('warn', (warn) => {
+						log.warn(`warn: ${deviceHost} ${deviceName}, ${warn}`);
 					})
 					.on('error', (error) => {
 						log.error(`Device: ${deviceHost} ${deviceName}, ${error}`);

package/package.json

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

package/src/localApi/xboxlocalapi.js

@@ -430,7 +430,7 @@ class XBOXLOCALAPI extends EventEmitter {
 
     async powerOn() {
         if (this.isConnected) {
-            this.emit('error', 'Console already On.');
+            this.emit('warn', 'Console already On.');
         };
 
         const info = this.infoLog ? false : this.emit('message', 'Send power On.');
@@ -457,7 +457,7 @@ class XBOXLOCALAPI extends EventEmitter {
 
     async powerOff() {
         if (!this.isConnected) {
-            this.emit('error', 'Console already Off.');
+            this.emit('warn', 'Console already Off.');
         };
 
         const info = this.infoLog ? false : this.emit('message', 'Send power Off.');
@@ -479,7 +479,7 @@ class XBOXLOCALAPI extends EventEmitter {
 
     async recordGameDvr() {
         if (!this.isConnected || !this.isAuthorized) {
-            this.emit('error', `Send record game ignored, connection state: ${this.isConnected}, authorization state: ${this.isAuthorized}`);
+            this.emit('warn', `Send record game ignored, connection state: ${this.isConnected}, authorization state: ${this.isAuthorized}`);
         };
 
         const info = this.infoLog ? false : this.emit('message', 'Send record game.');
@@ -498,7 +498,7 @@ class XBOXLOCALAPI extends EventEmitter {
 
     async sendButtonPress(channelName, command) {
         if (!this.isConnected) {
-            this.emit('error', `Send command ignored, connection state: ${this.isConnected ? 'Not Connected' : 'Connected'}.`);
+            this.emit('waarn', `Send command ignored, connection state: ${this.isConnected ? 'Not Connected' : 'Connected'}.`);
         };
 
         const channelRequestId = CONSTANTS.LocalApi.Channels.System[channelName].Id
@@ -506,7 +506,7 @@ class XBOXLOCALAPI extends EventEmitter {
         const channelOpen = this.channels[requestId].open;
 
         if (channelCommunicationId === -1 || !channelOpen) {
-           this.emit('error', `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 = CONSTANTS.LocalApi.Channels.System[channelName][command];
@@ -531,7 +531,7 @@ class XBOXLOCALAPI extends EventEmitter {
                         await this.sendSocketMessage(message, 'gamepadUnpress');
                     }, 150)
                 } catch (error) {
-                   this.emit('error', `Send system input command error: ${error}`)
+                   this.emit('warn', `Send system input command error: ${error}`)
                 };
                 break;
             case 1:
@@ -551,7 +551,7 @@ class XBOXLOCALAPI extends EventEmitter {
                     const message = json.pack(this.crypto, sequenceNumber1, this.sourceParticipantId, channelCommunicationId);
                     this.sendSocketMessage(message, 'json');
                 } catch (error) {
-                   this.emit('error', `Send tv remote command error: ${error}`)
+                   this.emit('warn', `Send tv remote command error: ${error}`)
                 };
                 break;
             case 2:
@@ -568,7 +568,7 @@ class XBOXLOCALAPI extends EventEmitter {
                     this.sendSocketMessage(message, 'mediaCommand');
                     this.mediaRequestId++;
                 } catch (error) {
-                   this.emit('error', `Send system media command error: ${error}`)
+                   this.emit('warn', `Send system media command error: ${error}`)
                 };
                 break;
         }

package/src/webApi/xboxwebapi.js

@@ -69,7 +69,7 @@ class XBOXWEBAPI extends EventEmitter {
                 this.emit('error', JSON.stringify(error, null, 2));
             };
         } catch (error) {
-            this.emit('error', error);
+            throw new Error(error);
         };
 
         await new Promise(resolve => setTimeout(resolve, 900000));

package/src/xboxdevice.js

@@ -57,7 +57,7 @@ class XboxDevice extends EventEmitter {
         this.restFulConnected = false;
 
         //mqtt
-        const mqtt = device.restFul ?? {};
+        const mqtt = device.mqtt ?? {};
         const mqttEnabled = mqtt.enable || false;
         this.mqttConnected = false;
 
@@ -148,6 +148,7 @@ class XboxDevice extends EventEmitter {
             });
         } catch (error) {
             this.emit('error', `prepare files error: ${error}`);
+            return;
         }
 
         //web api client
@@ -185,6 +186,9 @@ class XboxDevice extends EventEmitter {
                 .on('debug', (debug) => {
                     this.emit('debug', debug);
                 })
+                .on('warn', (warn) => {
+                    this.emit('waen', warn);
+                })
                 .on('error', (error) => {
                     this.emit('error', error);
                 })
@@ -415,7 +419,7 @@ class XboxDevice extends EventEmitter {
                                         break;
                                 };
                             } catch (error) {
-                                this.emit('error', `MQTT send error: ${error}.`);
+                                this.emit('warn', `MQTT send error: ${error}.`);
                             };
                         })
                         .on('debug', (debug) => {
@@ -464,6 +468,9 @@ class XboxDevice extends EventEmitter {
             .on('debug', (debug) => {
                 this.emit('debug', debug);
             })
+            .on('warn', (warn) => {
+                this.emit('waen', warn);
+            })
             .on('error', (error) => {
                 this.emit('error', error);
             })
@@ -504,7 +511,7 @@ class XboxDevice extends EventEmitter {
             this.televisionService.setCharacteristic(Characteristic.DisplayOrder, Encode(1, displayOrder).toString('base64'));
             return true;
         } catch (error) {
-            this.emit('error', error);
+            throw new Error(error);
         };
     }
 
@@ -514,7 +521,7 @@ class XboxDevice extends EventEmitter {
             const debug = !this.enableDebugMode ? false : this.emit('debug', `Saved data: ${JSON.stringify(data, null, 2)}`);
             return true;
         } catch (error) {
-            this.emit('error', error);
+            throw new Error(error);
         };
     }
 
@@ -524,7 +531,7 @@ class XboxDevice extends EventEmitter {
             const debug = !this.enableDebugMode ? false : this.emit('debug', `Read data: ${JSON.stringify(data, null, 2)}`);
             return data;
         } catch (error) {
-            this.emit('error', `Read saved data error: ${error}`);
+            throw new Error(`Read saved data error: ${error}`);
         };
     }
 
@@ -595,7 +602,7 @@ class XboxDevice extends EventEmitter {
 
                         const logInfo = this.disableLogInfo ? false : this.emit('message', `set Power: ${state ? 'ON' : 'OFF'}`);
                     } catch (error) {
-                        this.emit('error', `set Power, error: ${error}`);
+                        this.emit('warn', `set Power, error: ${error}`);
                     };
                 });
 
@@ -646,7 +653,7 @@ class XboxDevice extends EventEmitter {
                                 break;
                         }
                     } catch (error) {
-                        this.emit('error', `set Input error: ${JSON.stringify(error, null, 2)}`);
+                        this.emit('warn', `set Input error: ${JSON.stringify(error, null, 2)}`);
                     };
                 });
 
@@ -714,7 +721,7 @@ class XboxDevice extends EventEmitter {
                         await this.xboxWebApi.send(channelName, 'InjectKey', [{ 'keyType': command }]);
                         const logInfo = this.disableLogInfo ? false : this.emit('message', `Remote Key: ${command}`);
                     } catch (error) {
-                        this.emit('error', `set Remote Key error: ${JSON.stringify(error, null, 2)}`);
+                        this.emit('warn', `set Remote Key error: ${JSON.stringify(error, null, 2)}`);
                     };
                 });
 
@@ -738,7 +745,7 @@ class XboxDevice extends EventEmitter {
                         const setMediaState = this.power ? false : false;
                         const logInfo = this.disableLogInfo ? false : this.emit('message', `set Target Media: ${['PLAY', 'PAUSE', 'STOP', 'LOADING', 'INTERRUPTED'][value]}`);
                     } catch (error) {
-                        this.emit('error', `set Target Media error: ${error}`);
+                        this.emit('warn', `set Target Media error: ${error}`);
                     };
                 });
 
@@ -761,7 +768,7 @@ class XboxDevice extends EventEmitter {
                         await this.xboxWebApi.send(channelName, 'InjectKey', [{ 'keyType': command }]);
                         const logInfo = this.disableLogInfo ? false : this.emit('message', `set Power Mode Selection: ${powerModeSelection === 0 ? 'SHOW' : 'HIDE'}`);
                     } catch (error) {
-                        this.emit('error', `set Power Mode Selection error: ${error}`);
+                        this.emit('warn', `set Power Mode Selection error: ${error}`);
                     };
                 });
             this.allServices.push(this.televisionService);
@@ -802,7 +809,7 @@ class XboxDevice extends EventEmitter {
                         await this.xboxWebApi.send(channelName, command);
                         const logInfo = this.disableLogInfo ? false : this.emit('message', `set Volume Selector: ${volumeSelector ? 'Down' : 'UP'}`);
                     } catch (error) {
-                        this.emit('error', `set Volume Selector error: ${error}`);
+                        this.emit('warn', `set Volume Selector error: ${error}`);
                     };
                 })
 
@@ -838,7 +845,7 @@ class XboxDevice extends EventEmitter {
                         await this.xboxWebApi.send(channelName, command);
                         const logInfo = this.disableLogInfo ? false : this.emit('message', `set Mute: ${state ? 'ON' : 'OFF'}`);
                     } catch (error) {
-                        this.emit('error', `set Mute error: ${error}`);
+                        this.emit('warn', `set Mute error: ${error}`);
                     };
                 });
             this.allServices.push(this.speakerService);
@@ -919,7 +926,7 @@ class XboxDevice extends EventEmitter {
                             this.inputsConfigured[index].name = value;
                             await this.displayOrder();
                         } catch (error) {
-                            this.emit('error', `save Input Name error: ${error}`);
+                            this.emit('warn', `save Input Name error: ${error}`);
                         }
                     });
 
@@ -938,7 +945,7 @@ class XboxDevice extends EventEmitter {
                             await this.saveData(this.inputsTargetVisibilityFile, this.savedInputsTargetVisibility);
                             const debug = !this.enableDebugMode ? false : this.emit('debug', `Saved Input: ${input.name} Target Visibility: ${state ? 'HIDEN' : 'SHOWN'}`);
                         } catch (error) {
-                            this.emit('error', `save Target Visibility error: ${error}`);
+                            this.emit('warn', `save Target Visibility error: ${error}`);
                         }
                     });
                 this.inputsConfigured.push(input);
@@ -1158,7 +1165,7 @@ class XboxDevice extends EventEmitter {
                                         break;
                                 }
                             } catch (error) {
-                                this.emit('error', `set Button error: ${error}`);
+                                this.emit('warn', `set Button error: ${error}`);
                             };
                         });
                     this.buttonsServices.push(buttonService);
@@ -1168,7 +1175,7 @@ class XboxDevice extends EventEmitter {
             }
             return accessory;
         } catch (error) {
-            this.emit('error', error)
+            throw new Error(error)
         };
     }
 };