homebridge-xbox-tv 2.7.6 → 2.7.7-beta.0

package/index.js

@@ -107,7 +107,6 @@ class XBOXDEVICE {
 		this.firmwareRevision = 'Firmware Revision';
 
 		//setup variables
-		this.webApiEnabled = false;
 		this.firstRun = true;
 
 		this.inputsReference = [];
@@ -130,7 +129,6 @@ class XBOXDEVICE {
 
 		this.prefDir = path.join(api.user.storagePath(), 'xboxTv');
 		this.authTokenFile = `${this.prefDir}/authToken_${this.host.split('.').join('')}`;
-		this.inputsFile = `${this.prefDir}/inputs_${this.host.split('.').join('')}`;
 		this.inputsNamesFile = `${this.prefDir}/inputsNames_${this.host.split('.').join('')}`;
 		this.inputsTargetVisibilityFile = `${this.prefDir}/inputsTargetVisibility_${this.host.split('.').join('')}`;
 
@@ -315,35 +313,24 @@ class XBOXDEVICE {
 				debugLog: this.enableDebugMode
 			});
 
-			this.xboxWebApi.on('authenticated', (status) => {
-				this.webApiEnabled = status;
-			})
-				.on('consoleStatus', (consoleStatusData, consoleType) => {
-					if (this.informationService) {
-						this.informationService
-							.setCharacteristic(Characteristic.Model, consoleType)
-					};
+			this.xboxWebApi.on('consoleStatus', (consoleStatusData, consoleType) => {
+				if (this.informationService) {
+					this.informationService
+						.setCharacteristic(Characteristic.Model, consoleType)
+				};
 
-					//this.serialNumber = id;
-					this.modelName = consoleType;
-					//this.power = powerState;
-					//this.mediaState = playbackState;
+				//this.serialNumber = id;
+				this.modelName = consoleType;
+				//this.power = powerState;
+				//this.mediaState = playbackState;
 
-					const mqtt = this.mqttEnabled ? this.mqtt.send('Status', JSON.stringify(consoleStatusData, null, 2)) : false;
-				})
+				const mqtt = this.mqttEnabled ? this.mqtt.send('Status', JSON.stringify(consoleStatusData, null, 2)) : false;
+			})
 				.on('consolesList', (consolesList) => {
 					const mqtt = this.mqttEnabled ? this.mqtt.send('Consoles List', JSON.stringify(consolesList, null, 2)) : false;
 				})
 				.on('appsList', async (appsArray) => {
-					try {
-						const apps = JSON.stringify([...CONSTANS.DefaultInputs, ...appsArray], null, 2);
-						await fsPromises.writeFile(this.inputsFile, apps);
-						const debug = this.enableDebugMode ? this.log(`Device: ${this.host} ${this.name}, saved apps: ${apps}`) : false;
-
-						const mqtt = this.mqttEnabled ? this.mqtt.send('Apps', JSON.stringify(apps, null, 2)) : false;
-					} catch (error) {
-						this.log.error(`Device: ${this.host} ${this.name}, save apps error: ${error}`);
-					};
+					this.inputs = [...CONSTANS.DefaultInputs, ...appsArray];
 				})
 				.on('storageDevices', (storageDevices) => {
 					const mqtt = this.mqttEnabled ? this.mqtt.send('Storages', JSON.stringify(storageDevices, null, 2)) : false;
@@ -430,7 +417,7 @@ class XBOXDEVICE {
 					const inputReference = this.inputsReference[inputIdentifier];
 					const inputOneStoreProductId = this.inputsOneStoreProductId[inputIdentifier];
 
-					switch (this.webApiEnabled && inputOneStoreProductId) {
+					switch (inputOneStoreProductId) {
 						case 'Dashboard': case 'Settings': case 'SettingsTv': case 'Accessory': case 'Screensaver': case 'NetworkTroubleshooter': case 'MicrosoftStore':
 							await this.xboxWebApi.launchDashboard();
 							break;
@@ -495,7 +482,7 @@ class XBOXDEVICE {
 							break;
 					};
 
-					const sendCommand = this.power && this.webApiEnabled ? await this.xboxWebApi.sendButtonPress(command) : false;
+					await this.xboxWebApi.sendButtonPress(command);
 					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, Remote Key command successful: ${command}`);
 				} catch (error) {
 					this.log.error(`Device: ${this.host} ${accessoryName}, set Remote Key command error: ${JSON.stringify(error, null, 2)}`);
@@ -541,7 +528,7 @@ class XBOXDEVICE {
 					};
 
 					const channelName = 'systemInput';
-					const setPowerModeSelection = this.power && this.webApiEnabled ? await this.xboxWebApi.sendButtonPress(command) : false;
+					await this.xboxWebApi.sendButtonPress(command);
 					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Power Mode Selection command successful: ${command}`);
 				} catch (error) {
 					this.log.error(`Device: ${this.host} ${accessoryName}, set Power Mode Selection command error: ${error}`);
@@ -568,7 +555,7 @@ class XBOXDEVICE {
 							break;
 					};
 
-					const setVolume = this.power && this.webApiEnabled ? await this.xboxWebApi.sendButtonPress(command) : false;
+					await this.xboxWebApi.sendButtonPress(command);
 					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Volume command successful: ${command}`);
 				} catch (error) {
 					this.log.error(`Device: ${this.host} ${accessoryName}, set Volume command error: ${error}`);
@@ -596,7 +583,7 @@ class XBOXDEVICE {
 			})
 			.onSet(async (state) => {
 				try {
-					const toggleMute = this.power && this.webApiEnabled ? (state ? await this.xboxWebApi.mute() : await this.xboxWebApi.unmute()) : false;
+					const toggleMute = state ? await this.xboxWebApi.mute() : await this.xboxWebApi.unmute();
 					const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, set Mute successful: ${state ? 'ON' : 'OFF'}`);
 				} catch (error) {
 					this.log.error(`Device: ${this.host} ${accessoryName}, set Mute error: ${error}`);
@@ -616,7 +603,7 @@ class XBOXDEVICE {
 						return volume;
 					})
 					.onSet(async (volume) => {
-						const setVolume = this.power ? this.speakerService.setCharacteristic(Characteristic.Volume, volume) : false;
+						this.speakerService.setCharacteristic(Characteristic.Volume, volume);
 					});
 				this.volumeService.getCharacteristic(Characteristic.On)
 					.onGet(async () => {
@@ -624,7 +611,7 @@ class XBOXDEVICE {
 						return state;
 					})
 					.onSet(async (state) => {
-						const setMute = this.power ? this.speakerService.setCharacteristic(Characteristic.Mute, !state) : false;
+						this.speakerService.setCharacteristic(Characteristic.Mute, !state);
 					});
 
 				accessory.addService(this.volumeService);
@@ -638,7 +625,7 @@ class XBOXDEVICE {
 						return volume;
 					})
 					.onSet(async (volume) => {
-						const setVolume = this.power ? this.speakerService.setCharacteristic(Characteristic.Volume, volume) : false;
+						this.speakerService.setCharacteristic(Characteristic.Volume, volume);
 					});
 				this.volumeServiceFan.getCharacteristic(Characteristic.On)
 					.onGet(async () => {
@@ -646,7 +633,7 @@ class XBOXDEVICE {
 						return state;
 					})
 					.onSet(async (state) => {
-						const setMute = this.power ? this.speakerService.setCharacteristic(Characteristic.Mute, !state) : false;
+						this.speakerService.setCharacteristic(Characteristic.Mute, !state);
 					});
 
 				accessory.addService(this.volumeServiceFan);
@@ -689,10 +676,6 @@ class XBOXDEVICE {
 
 		//Prepare inputs services
 		this.log.debug('prepareInputServices');
-
-		const savedInputs = this.getInputsFromDevice ? fs.readFileSync(this.inputsFile).length > 2 ? JSON.parse(fs.readFileSync(this.inputsFile)) : this.inputs : this.inputs;
-		const debug = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, read saved Inputs: ${JSON.stringify(savedInputs, null, 2)}`) : false;
-
 		const savedInputsNames = fs.readFileSync(this.inputsNamesFile).length > 2 ? JSON.parse(fs.readFileSync(this.inputsNamesFile)) : {};
 		const debug1 = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, read saved Inputs names: ${JSON.stringify(savedInputsNames, null, 2)}`) : false;
 
@@ -701,7 +684,7 @@ class XBOXDEVICE {
 
 		//check possible inputs and filter custom unnecessary inputs
 		const filteredInputsArr = [];
-		for (const input of savedInputs) {
+		for (const input of this.inputs) {
 			const contentType = input.contentType;
 			const filterGames = this.filterGames ? (contentType === 'Game') : false;
 			const filterApps = this.filterApps ? (contentType === 'App') : false;
@@ -719,13 +702,13 @@ class XBOXDEVICE {
 			const input = inputs[i];
 
 			//get title Id
-			const inputTitleId = input.titleId || 'Not set';
+			const inputTitleId = input.titleId;
 
 			//get input reference
-			const inputReference = input.reference || 'Not set';
+			const inputReference = input.reference;
 
 			//get input oneStoreProductId
-			const inputOneStoreProductId = this.webApiEnabled ? input.oneStoreProductId || 'Not set' : 'Not set';
+			const inputOneStoreProductId = input.oneStoreProductId;
 
 			//get input name
 			const inputName = savedInputsNames[inputTitleId] ? savedInputsNames[inputTitleId] : savedInputsNames[inputReference] ? savedInputsNames[inputReference] : savedInputsNames[inputOneStoreProductId] ? savedInputsNames[inputOneStoreProductId] : input.name;
@@ -740,58 +723,63 @@ class XBOXDEVICE {
 			const currentVisibility = savedInputsTargetVisibility[inputTitleId] ? savedInputsTargetVisibility[inputTitleId] : savedInputsTargetVisibility[inputReference] ? savedInputsTargetVisibility[inputReference] : savedInputsTargetVisibility[inputOneStoreProductId] ? savedInputsTargetVisibility[inputOneStoreProductId] : 0;
 			const targetVisibility = currentVisibility;
 
-			const inputService = new Service.InputSource(inputName, `Input ${i}`);
-			inputService
-				.setCharacteristic(Characteristic.Identifier, i)
-				.setCharacteristic(Characteristic.Name, inputName)
-				.setCharacteristic(Characteristic.IsConfigured, isConfigured)
-				.setCharacteristic(Characteristic.InputSourceType, inputType)
-				.setCharacteristic(Characteristic.CurrentVisibilityState, currentVisibility)
+			if (inputReference && inputName) {
+				const inputService = new Service.InputSource(inputName, `Input ${i}`);
+				inputService
+					.setCharacteristic(Characteristic.Identifier, i)
+					.setCharacteristic(Characteristic.Name, inputName)
+					.setCharacteristic(Characteristic.IsConfigured, isConfigured)
+					.setCharacteristic(Characteristic.InputSourceType, inputType)
+					.setCharacteristic(Characteristic.CurrentVisibilityState, currentVisibility)
 
-			inputService.getCharacteristic(Characteristic.ConfiguredName)
-				.onGet(async () => {
-					return inputName;
-				})
-				.onSet(async (name) => {
-					try {
-						const nameIdentifier = inputTitleId ? inputTitleId : inputReference ? inputReference : inputOneStoreProductId ? inputOneStoreProductId : false;
-						savedInputsNames[nameIdentifier] = name;
-
-						const newCustomName = JSON.stringify(savedInputsNames, null, 2);
-						await fsPromises.writeFile(this.inputsNamesFile, newCustomName);
-						const logDebug = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, saved new Input name: ${name}, one store product id: ${inputOneStoreProductId}`) : false;
-						inputService.setCharacteristic(Characteristic.Name, inputName);
-					} catch (error) {
-						this.log.error(`Device: ${this.host} ${accessoryName}, new Input name save error: ${error}`);
-					}
-				});
+				inputService.getCharacteristic(Characteristic.ConfiguredName)
+					.onGet(async () => {
+						return inputName;
+					})
+					.onSet(async (name) => {
+						try {
+							const nameIdentifier = inputTitleId ? inputTitleId : inputReference ? inputReference : inputOneStoreProductId ? inputOneStoreProductId : false;
+							savedInputsNames[nameIdentifier] = name;
+
+							const newCustomName = JSON.stringify(savedInputsNames, null, 2);
+							await fsPromises.writeFile(this.inputsNamesFile, newCustomName);
+							const logDebug = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, saved new Input name: ${name}, one store product id: ${inputOneStoreProductId}`) : false;
+							inputService.setCharacteristic(Characteristic.Name, inputName);
+						} catch (error) {
+							this.log.error(`Device: ${this.host} ${accessoryName}, new Input name save error: ${error}`);
+						}
+					});
 
-			inputService
-				.getCharacteristic(Characteristic.TargetVisibilityState)
-				.onGet(async () => {
-					return targetVisibility;
-				})
-				.onSet(async (state) => {
-					try {
-						const targetVisibilityIdentifier = inputTitleId ? inputTitleId : inputReference ? inputReference : inputOneStoreProductId ? inputOneStoreProductId : false;
-						savedInputsTargetVisibility[targetVisibilityIdentifier] = state;
-
-						const newTargetVisibility = JSON.stringify(savedInputsTargetVisibility, null, 2);
-						await fsPromises.writeFile(this.inputsTargetVisibilityFile, newTargetVisibility);
-						const logDebug = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, saved new Input: ${inputName} target visibility state: ${state ? 'HIDEN' : 'SHOWN'}`) : false;
-						inputService.setCharacteristic(Characteristic.CurrentVisibilityState, state);
-					} catch (error) {
-						this.log.error(`Device: ${this.host} ${accessoryName}, new target visibility state save error: ${error}`);
-					}
-				});
+				inputService
+					.getCharacteristic(Characteristic.TargetVisibilityState)
+					.onGet(async () => {
+						return targetVisibility;
+					})
+					.onSet(async (state) => {
+						try {
+							const targetVisibilityIdentifier = inputTitleId ? inputTitleId : inputReference ? inputReference : inputOneStoreProductId ? inputOneStoreProductId : false;
+							savedInputsTargetVisibility[targetVisibilityIdentifier] = state;
+
+							const newTargetVisibility = JSON.stringify(savedInputsTargetVisibility, null, 2);
+							await fsPromises.writeFile(this.inputsTargetVisibilityFile, newTargetVisibility);
+							const logDebug = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, saved new Input: ${inputName} target visibility state: ${state ? 'HIDEN' : 'SHOWN'}`) : false;
+							inputService.setCharacteristic(Characteristic.CurrentVisibilityState, state);
+						} catch (error) {
+							this.log.error(`Device: ${this.host} ${accessoryName}, new target visibility state save error: ${error}`);
+						}
+					});
+
+				this.inputsTitleId.push(inputTitleId);
+				this.inputsReference.push(inputReference);
+				this.inputsOneStoreProductId.push(inputOneStoreProductId);
+				this.inputsName.push(inputName);
 
-			this.inputsTitleId.push(inputTitleId);
-			this.inputsReference.push(inputReference);
-			this.inputsOneStoreProductId.push(inputOneStoreProductId);
-			this.inputsName.push(inputName);
+				this.televisionService.addLinkedService(inputService);
+				accessory.addService(inputService);
+			} else {
+				this.log(`Device: ${this.host} ${accessoryName}, ${!inputName ? 'name: Missing' : 'name: OK'}, ${!inputReference ? 'reference: Missing' : 'reference: OK'}, check your Inputs config!!!`);
 
-			this.televisionService.addLinkedService(inputService);
-			accessory.addService(inputService);
+			};
 		}
 
 		//prepare sonsor service
@@ -852,7 +840,7 @@ class XBOXDEVICE {
 				const buttonCommand = button.command || 'Not set';
 
 				//get button inputOneStoreProductId
-				const buttonOneStoreProductId = this.webApiEnabled ? button.oneStoreProductId || 'Not set' : 'Web api disabled';
+				const buttonOneStoreProductId = button.oneStoreProductId || 'Not set';
 
 				//get button display type
 				const buttonDisplayType = button.displayType >= 0 ? button.displayType : -1;
@@ -868,7 +856,7 @@ class XBOXDEVICE {
 						})
 						.onSet(async (state) => {
 							try {
-								if (this.power && state && this.webApiEnabled) {
+								if (state) {
 									//get button mode
 									let buttonMode = -1;
 									if (buttonCommand in CONSTANS.SystemMediaCommands) {
@@ -918,7 +906,7 @@ class XBOXDEVICE {
 									const logDebug = this.enableDebugMode ? this.log(`Device: ${this.host} ${accessoryName}, set button successful, name:  ${buttonName}, command: ${buttonCommand}`) : false;
 								}
 								await new Promise(resolve => setTimeout(resolve, 300));
-								const setChar = this.power && state ? buttonService.updateCharacteristic(Characteristic.On, false) : false;
+								const setChar = state ? buttonService.updateCharacteristic(Characteristic.On, false) : false;
 							} catch (error) {
 								this.log.error(`Device: ${this.host} ${accessoryName}, set button error, name: ${buttonName}, error: ${error}`);
 							};

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Xbox TV",
   "name": "homebridge-xbox-tv",
-  "version": "2.7.6",
+  "version": "2.7.7-beta.0",
   "description": "Homebridge plugin (https://github.com/homebridge/homebridge) to control Xbox game consoles.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/webApi/xboxwebapi.js

@@ -50,12 +50,13 @@ class XBOXWEBAPI extends EventEmitter {
         try {
             const authorized = await this.authentication.isAuthenticated();
             if (!authorized) {
-                this.emit(`message', 'not authorized, please use authorization manager first!!!`)
+                this.emit(`message', 'not authorized, please use authorization manager first.`)
+                this.auhorized = false;
                 return;
             }
 
             try {
-                this.emit('authenticated', true);
+                this.auhorized = true;
                 this.headers = {
                     'Authorization': (this.userToken !== '' && this.uhs !== '') ? `XBL3.0 x=${this.uhs};${this.userToken}` : `XBL3.0 x=${this.authentication.user.uhs};${this.authentication.tokens.xsts.Token}`,
                     'Accept-Language': 'en-US',
@@ -478,6 +479,11 @@ class XBOXWEBAPI extends EventEmitter {
     send(commandType, command, params) {
         return new Promise(async (resolve, reject) => {
             try {
+                if (!this.auhorized) {
+                    reject('not authorized.');
+                    return;
+                };
+
                 const sessionid = Uuid4();
                 const postParams = {
                     "destination": "Xbox",