homebridge-xbox-tv 3.7.5 → 3.7.6

package/index.js

@@ -47,7 +47,8 @@ class XboxPlatform {
 				const disableLogSuccess = device.disableLogSuccess || false;
 				const disableLogWarn = device.disableLogWarn || false;
 				const disableLogError = device.disableLogError || false;
-				const debug = !enableDebugMode ? false : log.info(`Device: ${host} ${deviceName}, did finish launching.`);
+				if (enableDebugMode) log.info(`Device: ${host} ${deviceName}, did finish launching.`);
+
 				const config = {
 					...device,
 					xboxLiveId: 'removed',
@@ -58,7 +59,7 @@ class XboxPlatform {
 						passwd: 'removed'
 					}
 				}
-				const debug1 = !enableDebugMode ? false : log.info(`Device: ${host} ${deviceName}, Config: ${JSON.stringify(config, null, 2)}.`);
+				if (enableDebugMode) log.info(`Device: ${host} ${deviceName}, Config: ${JSON.stringify(config, null, 2)}.`);
 
 				//check files exists, if not then create it
 				const postFix = host.split('.').join('');
@@ -84,58 +85,58 @@ class XboxPlatform {
 						}
 					});
 				} catch (error) {
-					const emitLog = disableLogError ? false : log.error(`Device: ${host} ${deviceName}, Prepare files error: ${error}.`);
+					if (!disableLogError) log.error(`Device: ${host} ${deviceName}, Prepare files error: ${error}.`);
 					return;
 				}
 
 				//xbox device
 				try {
 					const xboxDevice = new XboxDevice(api, device, authTokenFile, devInfoFile, inputsFile, inputsNamesFile, inputsTargetVisibilityFile)
-						.on('publishAccessory', (accessory) => {
-							api.publishExternalAccessories(PluginName, [accessory]);
-							const emitLog = disableLogSuccess ? false : log.success(`Device: ${host} ${deviceName}, Published as external accessory.`);
-						})
 						.on('devInfo', (devInfo) => {
-							const emitLog = disableLogDeviceInfo ? false : log.info(devInfo);
+							if (!disableLogDeviceInfo) log.info(devInfo);
 						})
 						.on('success', (success) => {
-							const emitLog = disableLogSuccess ? false : log.success(`Device: ${host} ${deviceName}, ${success}.`);
+							if (!disableLogSuccess) log.success(`Device: ${host} ${deviceName}, ${success}.`);
 						})
 						.on('info', (info) => {
-							const emitLog = disableLogInfo ? false : log.info(`Device: ${host} ${deviceName}, ${info}.`);
+							if (!disableLogInfo) log.info(`Device: ${host} ${deviceName}, ${info}.`);
 						})
 						.on('debug', (debug) => {
-							const emitLog = !enableDebugMode ? false : log.info(`Device: ${host} ${deviceName}, debug: ${debug}.`);
+							if (enableDebugMode) log.info(`Device: ${host} ${deviceName}, debug: ${debug}.`);
 						})
 						.on('warn', (warn) => {
-							const emitLog = disableLogWarn ? false : log.warn(`Device: ${host} ${deviceName}, ${warn}.`);
+							if (!disableLogWarn) log.warn(`Device: ${host} ${deviceName}, ${warn}.`);
 						})
 						.on('error', (error) => {
-							const emitLog = disableLogError ? false : log.error(`Device: ${host} ${deviceName}, ${error}.`);
+							if (!disableLogError) log.error(`Device: ${host} ${deviceName}, ${error}.`);
 						});
 
 					//create impulse generator
 					const impulseGenerator = new ImpulseGenerator();
 					impulseGenerator.on('start', async () => {
 						try {
-							const startDone = await xboxDevice.start();
-							const stopImpulseGenerator = startDone ? await impulseGenerator.stop() : false;
-
-							//start xbox device impulse generator 
-							const startImpulseGenerator = startDone ? await xboxDevice.startImpulseGenerator() : false;
+							const accessory = await xboxDevice.start();
+							if (accessory) {
+								api.publishExternalAccessories(PluginName, [accessory]);
+								if (!disableLogSuccess) log.success(`Device: ${host} ${deviceName}, Published as external accessory.`);
+
+								await impulseGenerator.stop();
+								await xboxDevice.startImpulseGenerator();
+							}
 						} catch (error) {
-							const emitLog = disableLogError ? false : log.error(`Device: ${host} ${deviceName}, ${error}, trying again.`);
+							if (!disableLogError) log.error(`Device: ${host} ${deviceName}, ${error}, trying again.`);
 						}
 					}).on('state', (state) => {
-						const emitLog = !enableDebugMode ? false : state ? log.info(`Device: ${host} ${deviceName}, Start impulse generator started.`) : log.info(`Device: ${host} ${deviceName}, Start impulse generator stopped.`);
+						if (enableDebugMode) state ? log.info(`Device: ${host} ${deviceName}, Start impulse generator started.`) : log.info(`Device: ${host} ${deviceName}, Start impulse generator stopped.`);
 					});
 
 					//start impulse generator
 					await impulseGenerator.start([{ name: 'start', sampling: 45000 }]);
 				} catch (error) {
-					const emitLog = disableLogError ? false : log.error(`Device: ${host} ${deviceName}, Did finish launching error: ${error}.`);
+					if (!disableLogError) log.error(`Device: ${host} ${deviceName}, Did finish launching error: ${error}.`);
 				}
-				await new Promise(resolve => setTimeout(resolve, 500));
+				
+				await new Promise(resolve => setTimeout(resolve, 300));
 			}
 		});
 	}

package/package.json

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

package/src/xboxdevice.js

@@ -107,7 +107,6 @@ class XboxDevice extends EventEmitter {
         this.sensorsInputsServices = [];
         this.buttonsServices = [];
         this.inputIdentifier = 1;
-        this.startPrepareAccessory = true;
         this.power = false;
         this.volume = 0;
         this.mute = false;
@@ -1075,10 +1074,10 @@ class XboxDevice extends EventEmitter {
                         this.emit('error', error);
                     })
                     .on('restFul', (path, data) => {
-                        const restFul = this.restFulConnected ? this.restFul1.update(path, data) : false;
+                        if (this.restFulConnected) this.restFul1.update(path, data);
                     })
                     .on('mqtt', (topic, message) => {
-                        const mqtt = this.mqttConnected ? this.mqtt1.emit('publish', topic, message) : false;
+                        if (this.mqttConnected) this.mqtt1.emit('publish', topic, message);
                     });
 
                 //check authorization
@@ -1228,10 +1227,10 @@ class XboxDevice extends EventEmitter {
                     this.emit('error', error);
                 })
                 .on('restFul', (path, data) => {
-                    const restFul = this.restFulConnected ? this.restFul1.update(path, data) : false;
+                    if (this.restFulConnected) this.restFul1.update(path, data);
                 })
                 .on('mqtt', (topic, message) => {
-                    const mqtt = this.mqttConnected ? this.mqtt1.emit('publish', topic, message) : false;
+                    if (this.mqttConnected) this.mqtt1.emit('publish', topic, message);
                 });
 
             //connect to local api
@@ -1241,19 +1240,14 @@ class XboxDevice extends EventEmitter {
             }
 
             //start external integrations
-            const startExternalIntegrations = this.mqtt.enable ? await this.externalIntegrations() : false;
+            if (this.restFul.enable || this.mqtt.enable) await this.externalIntegrations();
 
             //prepare data for accessory
             await this.prepareDataForAccessory();
 
             //prepare accessory
-            if (this.startPrepareAccessory) {
-                const accessory = await this.prepareAccessory();
-                this.emit('publishAccessory', accessory);
-                this.startPrepareAccessory = false;
-            }
-
-            return true;
+            const accessory = await this.prepareAccessory();
+            return accessory;
         } catch (error) {
             throw new Error(`Start error: ${error}`);
         }