homebridge-xbox-tv 2.7.4 → 2.7.5

package/config.schema.json

@@ -757,7 +757,7 @@
 								{
 									"key": "devices[].sensorInputs",
 									"type": "tabarray",
-									"title": "{{ value.name || 'new input sensor' }}",
+									"title": "{{ value.name || 'new sensor' }}",
 									"items": [
 										"devices[].sensorInputs[].name",
 										"devices[].sensorInputs[].reference",

package/homebridge-ui/public/index.html

@@ -147,14 +147,13 @@
 
       try {
         const host = document.querySelector('#deviceHostInput').value;
-        const clientId = this.clientId !== undefined ? this.clientId : '5e5ead27-ed60-482d-b3fc-702b28a97404';
         const webApiToken = document.querySelector('#deviceTokenInput').value;
         const payload = {
           host: host,
-          clientId: clientId,
-          clientSecret: this.clientSecret,
-          userToken: this.userToken,
-          uhs: this.uhs,
+          clientId: this.clientId || '5e5ead27-ed60-482d-b3fc-702b28a97404',
+          clientSecret: this.clientSecret || '',
+          userToken: this.userToken || '',
+          uhs: this.uhs || '',
           webApiToken: webApiToken,
         };
 
@@ -213,4 +212,4 @@
       };
     });
   })();
-</script>
+</script>

package/homebridge-ui/server.js

@@ -48,13 +48,14 @@ class PluginUiServer extends HomebridgePluginUiServer {
       const webApiToken = payload.webApiToken;
       const authTokenFile = `${this.homebridgeStoragePath}/xboxTv/authToken_${host.split('.').join('')}`;
 
-      const authentication = new Authentication({
+      const authenticationConfig = {
         clientId: payload.clientId,
         clientSecret: payload.clientSecret,
         userToken: payload.userToken,
         uhs: payload.uhs,
         tokensFile: authTokenFile
-      });
+      }
+      const authentication = new Authentication(authenticationConfig);
 
       try {
         await authentication.isAuthenticated();

package/index.js

@@ -67,16 +67,6 @@ class XBOXDEVICE {
 		this.host = config.host;
 		this.xboxLiveId = config.xboxLiveId;
 		this.webApiControl = config.webApiControl || false;
-		this.clientId = config.clientId || '5e5ead27-ed60-482d-b3fc-702b28a97404';
-		this.clientSecret = config.clientSecret;
-		this.userToken = config.userToken || '';
-		this.uhs = config.uhs || '';
-		this.xboxWebApiToken = config.xboxWebApiToken || '';
-		this.disableLogInfo = config.disableLogInfo || false;
-		this.disableLogDeviceInfo = config.disableLogDeviceInfo || false;
-		this.enableDebugMode = config.enableDebugMode || false;
-		this.volumeControl = config.volumeControl || -1;
-		this.infoButtonCommand = config.infoButtonCommand || 'nexus';
 		this.getInputsFromDevice = config.getInputsFromDevice || false;
 		this.filterGames = config.filterGames || false;
 		this.filterApps = config.filterApps || false;
@@ -88,14 +78,24 @@ class XBOXDEVICE {
 		this.sensorInput = config.sensorInput || false;
 		this.sensorScreenSaver = config.sensorScreenSaver || false;
 		this.sensorInputs = config.sensorInputs || [];
+		this.xboxWebApiToken = config.xboxWebApiToken || '';
+		this.clientId = config.clientId || '5e5ead27-ed60-482d-b3fc-702b28a97404';
+		this.clientSecret = config.clientSecret || '';
+		this.userToken = config.userToken || '';
+		this.uhs = config.uhs || '';
+		this.enableDebugMode = config.enableDebugMode || false;
+		this.disableLogInfo = config.disableLogInfo || false;
+		this.disableLogDeviceInfo = config.disableLogDeviceInfo || false;
+		this.infoButtonCommand = config.infoButtonCommand || 'nexus';
+		this.volumeControl = config.volumeControl >= 0 ? config.volumeControl : -1;
 		this.mqttEnabled = config.enableMqtt || false;
+		this.mqttDebug = config.mqttDebug || false;
 		this.mqttHost = config.mqttHost;
 		this.mqttPort = config.mqttPort || 1883;
 		this.mqttPrefix = config.mqttPrefix;
 		this.mqttAuth = config.mqttAuth || false;
 		this.mqttUser = config.mqttUser;
 		this.mqttPasswd = config.mqttPasswd;
-		this.mqttDebug = config.mqttDebug || false;
 
 		//add configured inputs to the default inputs
 		this.inputs = [...CONSTANS.DefaultInputs, ...this.inputs];
@@ -312,12 +312,10 @@ class XBOXDEVICE {
 				userToken: this.userToken,
 				uhs: this.uhs,
 				tokensFile: this.authTokenFile,
-				infoLog: this.disableLogInfo,
 				debugLog: this.enableDebugMode
 			});
 
 			this.xboxWebApi.on('authenticated', (status) => {
-
 				this.webApiEnabled = status;
 			})
 				.on('consoleStatus', (consoleStatusData, consoleType) => {
@@ -331,12 +329,9 @@ class XBOXDEVICE {
 					//this.power = powerState;
 					//this.mediaState = playbackState;
 
-					//mqtt
 					const mqtt = this.mqttEnabled ? this.mqtt.send('Status', JSON.stringify(consoleStatusData, null, 2)) : false;
 				})
 				.on('consolesList', (consolesList) => {
-
-					//mqtt
 					const mqtt = this.mqttEnabled ? this.mqtt.send('Consoles List', JSON.stringify(consolesList, null, 2)) : false;
 				})
 				.on('appsList', async (appsArray) => {
@@ -345,20 +340,15 @@ class XBOXDEVICE {
 						await fsPromises.writeFile(this.inputsFile, apps);
 						const debug = this.enableDebugMode ? this.log(`Device: ${this.host} ${this.name}, saved apps: ${apps}`) : false;
 
-						//mqtt
 						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}`);
 					};
 				})
 				.on('storageDevices', (storageDevices) => {
-
-					//mqtt
 					const mqtt = this.mqttEnabled ? this.mqtt.send('Storages', JSON.stringify(storageDevices, null, 2)) : false;
 				})
 				.on('userProfile', (profileUsers) => {
-
-					//mqtt
 					const mqtt = this.mqttEnabled ? this.mqtt.send('Profile', JSON.stringify(profileUsers, null, 2)) : false;
 				})
 				.on('error', (error) => {
@@ -418,7 +408,7 @@ class XBOXDEVICE {
 			})
 			.onSet(async (state) => {
 				try {
-					const setPower = !this.power && state ? await this.xboxLocalApi.powerOn() : this.power && !state ? await this.xboxLocalApi.powerOff() : false;
+					const setPower = state ? await this.xboxLocalApi.powerOn() : await this.xboxLocalApi.powerOff();
 					const logInfo = this.disableLogInfo ? false : this.log(`Device: ${this.host} ${accessoryName}, set Power successful: ${state ? 'ON' : 'OFF'}`);
 				} catch (error) {
 					this.log.error(`Device: ${this.host} ${accessoryName}, set Power, error: ${error}`);
@@ -551,7 +541,7 @@ class XBOXDEVICE {
 					};
 
 					const channelName = 'systemInput';
-					const setPowerModeSelection = this.power ? this.webApiEnabled ? await this.xboxWebApi.sendButtonPress(command) : await this.xboxWebApi.sendButtonPress(command) : false;
+					const setPowerModeSelection = this.power && this.webApiEnabled ? await this.xboxWebApi.sendButtonPress(command) : false;
 					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}`);
@@ -766,8 +756,8 @@ class XBOXDEVICE {
 						const nameIdentifier = inputTitleId ? inputTitleId : inputReference ? inputReference : inputOneStoreProductId ? inputOneStoreProductId : false;
 						savedInputsNames[nameIdentifier] = name;
 						const newCustomName = JSON.stringify(savedInputsNames, null, 2);
-						const writeNewCustomName = nameIdentifier ? await fsPromises.writeFile(this.inputsNamesFile, newCustomName) : false;
-						const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, saved new Input name: ${name}, one store product id: ${inputOneStoreProductId}`);
+						fs.writeFileSync(this.inputsNamesFile, newCustomName);
+						const logInfo = this.enableDebugMode || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, saved new Input name: ${name}, one store product id: ${inputOneStoreProductId}`);
 					} catch (error) {
 						this.log.error(`Device: ${this.host} ${accessoryName}, new Input name save error: ${error}`);
 					}
@@ -780,8 +770,8 @@ class XBOXDEVICE {
 						const targetVisibilityIdentifier = inputTitleId ? inputTitleId : inputReference ? inputReference : inputOneStoreProductId ? inputOneStoreProductId : false;
 						savedInputsTargetVisibility[targetVisibilityIdentifier] = state;
 						const newTargetVisibility = JSON.stringify(savedInputsTargetVisibility, null, 2);
-						const writeNewTargetVisibility = targetVisibilityIdentifier ? await fsPromises.writeFile(this.inputsTargetVisibilityFile, newTargetVisibility) : false;
-						const logInfo = this.disableLogInfo || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, saved new Input: ${inputName} target visibility state: ${state ? 'HIDEN' : 'SHOWN'}`);
+						fs.writeFileSync(this.inputsTargetVisibilityFile, newTargetVisibility);
+						const logInfo = this.enableDebugMode || this.firstRun ? false : this.log(`Device: ${this.host} ${accessoryName}, saved new Input: ${inputName} target visibility state: ${state ? 'HIDEN' : 'SHOWN'}`);
 						inputService.setCharacteristic(Characteristic.CurrentVisibilityState, state);
 					} catch (error) {
 						this.log.error(`Device: ${this.host} ${accessoryName}, new target visibility state save error: ${error}`);
@@ -918,7 +908,7 @@ class XBOXDEVICE {
 											}
 											break;
 									}
-									const logInfo = this.disableLogInfo || this.firstRun || buttonMode === -1 ? false : this.log(`Device: ${this.host} ${accessoryName}, set button successful, name:  ${buttonName}, command: ${buttonCommand}`);
+									const logInfo = this.enableDebugMode || this.firstRun || buttonMode === -1 ? false : this.log(`Device: ${this.host} ${accessoryName}, set button successful, name:  ${buttonName}, command: ${buttonCommand}`);
 								}
 								await new Promise(resolve => setTimeout(resolve, 300));
 								const setChar = this.power && state ? buttonService.updateCharacteristic(Characteristic.On, false) : false;

package/package.json

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

package/src/constans.json

@@ -19,7 +19,8 @@
         "Paused": 2,
         "Unknown": 3
     },
-    "DefaultInputs": [{
+    "DefaultInputs": [
+        {
             "name": "Screensaver",
             "titleId": "851275400",
             "reference": "Xbox.IdleScreen_8wekyb3d8bbwe!Xbox.IdleScreen.Application",
@@ -83,7 +84,19 @@
             "contentType": "systemApp"
         }
     ],
-    "InputSourceTypes": ["OTHER", "HOME_SCREEN", "TUNER", "HDMI", "COMPOSITE_VIDEO", "S_VIDEO", "COMPONENT_VIDEO", "DVI", "AIRPLAY", "USB", "APPLICATION"],
+    "InputSourceTypes": [
+        "OTHER",
+        "HOME_SCREEN",
+        "TUNER",
+        "HDMI",
+        "COMPOSITE_VIDEO",
+        "S_VIDEO",
+        "COMPONENT_VIDEO",
+        "DVI",
+        "AIRPLAY",
+        "USB",
+        "APPLICATION"
+    ],
     "SystemMediaCommands": {
         "play": 2,
         "pause": 4,
@@ -132,8 +145,19 @@
         "tvRemote": "d451e3b360bb4c71b3dbf994b1aca3a7",
         "sysConfig": "d451e3b360bb4c71b3dbf994b1aca3a7"
     },
-    "ChannelNames": ["systemMedia", "systemInput", "tvRemote", "sysConfig"],
-    "ConfigNames": ["GetConfiguration", "GetHeadendInfo", "GetLiveTVInfo", "GetTunerLineups", "GetAppChannelLineups"],
+    "ChannelNames": [
+        "systemMedia",
+        "systemInput",
+        "tvRemote",
+        "sysConfig"
+    ],
+    "ConfigNames": [
+        "GetConfiguration",
+        "GetHeadendInfo",
+        "GetLiveTVInfo",
+        "GetTunerLineups",
+        "GetAppChannelLineups"
+    ],
     "PlaybackStatus": {
         "0": "Closed",
         "1": "Changing",
@@ -161,5 +185,9 @@
         "dd00": "simple.discoveryRequest",
         "dd01": "simple.discoveryResponse",
         "dd02": "simple.powerOn"
-    }
+    },
+    "Scopes": [
+        "XboxLive.signin",
+        "XboxLive.offline_access"
+    ]
 }

package/src/localApi/xboxlocalapi.js

@@ -289,8 +289,7 @@ class XBOXLOCALAPI extends EventEmitter {
     powerOn() {
         return new Promise(async (resolve, reject) => {
             if (this.isConnected) {
-                this.emit('message', 'Console already On.');
-                resolve(true);
+                reject('Console already On.');
                 return;
             };
 
@@ -326,9 +325,7 @@ class XBOXLOCALAPI extends EventEmitter {
     powerOff() {
         return new Promise(async (resolve, reject) => {
             if (!this.isConnected) {
-                reject({
-                    status: 'Console already Off.'
-                });
+                reject('Console already Off.');
                 return;
             };
 

package/src/webApi/authentication.js

@@ -3,6 +3,7 @@ const QueryString = require('querystring');
 const fs = require('fs');
 const fsPromises = fs.promises;
 const HttpClient = require('./httpclient.js');
+const CONSTANS = require('../constans.json');
 
 class AUTHENTICATION {
     constructor(config) {
@@ -12,7 +13,6 @@ class AUTHENTICATION {
         this.userToken = config.userToken;
         this.uhs = config.uhs;
         this.tokensFile = config.tokensFile;
-        this.scopes = ['XboxLive.signin', 'XboxLive.offline_access'];
 
         this.user = {
             gtg: {},
@@ -142,7 +142,7 @@ class AUTHENTICATION {
                 const tokenParams = {
                     "client_id": this.clientId,
                     "grant_type": "refresh_token",
-                    "scope": this.scopes.join(' '),
+                    "scope": CONSTANS.Scopes.join(' '),
                     "refresh_token": refreshToken,
                 }
 
@@ -240,7 +240,7 @@ class AUTHENTICATION {
                 const tokenParams = {
                     "client_id": this.clientId,
                     "grant_type": 'authorization_code',
-                    "scope": this.scopes.join(' '),
+                    "scope": CONSTANS.Scopes.join(' '),
                     "code": webApiToken,
                     "redirect_uri": 'http://localhost:8581/auth/callback'
                 }
@@ -271,7 +271,7 @@ class AUTHENTICATION {
                     "client_id": this.clientId,
                     "response_type": 'code',
                     "approval_prompt": 'auto',
-                    "scope": this.scopes.join(' '),
+                    "scope": CONSTANS.Scopes.join(' '),
                     "redirect_uri": 'http://localhost:8581/auth/callback'
                 }
                 const params = QueryString.stringify(paramsObject);

package/src/webApi/xboxwebapi.js

@@ -22,14 +22,17 @@ class XBOXWEBAPI extends EventEmitter {
         super();
 
         this.xboxLiveId = config.xboxLiveId;
-        this.infoLog = config.infoLog;
+        this.clientId = config.clientId;
+        this.clientSecret = config.clientSecret;
+        this.userToken = config.userToken;
+        this.uhs = config.uhs;
         this.debugLog = config.debugLog;
 
         const authenticationConfig = {
-            clientId: config.clientId || '',
-            clientSecret: config.clientSecret || '',
-            userToken: config.userToken || '',
-            uhs: config.uhs || '',
+            clientId: config.clientId,
+            clientSecret: config.clientSecret,
+            userToken: config.userToken,
+            uhs: config.uhs,
             tokensFile: config.tokensFile
         }
         this.authentication = new Authentication(authenticationConfig);
@@ -51,18 +54,16 @@ class XBOXWEBAPI extends EventEmitter {
                 return;
             }
 
-            this.emit('authenticated', true);
-            this.headers = {
-                'Authorization': (this.authentication.userToken !== '' && this.authentication.uhs !== '') ? `XBL3.0 x=${this.authentication.uhs};${this.authentication.userToken}` : `XBL3.0 x=${this.authentication.user.uhs};${this.authentication.tokens.xsts.Token}`,
-                'Accept-Language': 'en-US',
-                'x-xbl-contract-version': '4',
-                'x-xbl-client-name': 'XboxApp',
-                'x-xbl-client-type': 'UWA',
-                'x-xbl-client-version': '39.39.22001.0'
-            }
-            this.achievements = new Achievements(this, this.headers);
-
             try {
+                this.emit('authenticated', 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',
+                    'x-xbl-contract-version': '4',
+                    'x-xbl-client-name': 'XboxApp',
+                    'x-xbl-client-type': 'UWA',
+                    'x-xbl-client-version': '39.39.22001.0'
+                }
                 const debug = this.debugLog ? this.emit(`message', 'authorized and web Api enabled.`) : false;
                 const rmEnabled = await this.getWebApiConsoleStatus();
                 const debug1 = !rmEnabled ? this.emit('message', `remote management not enabled, please check your console settings!!!.`) : false;
@@ -361,7 +362,7 @@ class XBOXWEBAPI extends EventEmitter {
     powerOn() {
         return new Promise(async (resolve, reject) => {
             try {
-                await this.sendCommand('Power', 'WakeUp')
+                await this.send('Power', 'WakeUp')
                 resolve(true);
             } catch (error) {
                 reject(`power on error: ${error}`);
@@ -372,7 +373,7 @@ class XBOXWEBAPI extends EventEmitter {
     powerOff() {
         return new Promise(async (resolve, reject) => {
             try {
-                await this.sendCommand('Power', 'TurnOff')
+                await this.send('Power', 'TurnOff')
                 resolve(true);
             } catch (error) {
                 reject(`power off error: ${error}`);
@@ -383,7 +384,7 @@ class XBOXWEBAPI extends EventEmitter {
     reboot() {
         return new Promise(async (resolve, reject) => {
             try {
-                await this.sendCommand('Power', 'Reboot')
+                await this.send('Power', 'Reboot')
                 resolve(true);
             } catch (error) {
                 reject(`reboot error: ${error}`);
@@ -394,7 +395,7 @@ class XBOXWEBAPI extends EventEmitter {
     mute() {
         return new Promise(async (resolve, reject) => {
             try {
-                await this.sendCommand('Audio', 'Mute')
+                await this.send('Audio', 'Mute')
                 resolve(true);
             } catch (error) {
                 reject(`mute error: ${error}`);
@@ -405,7 +406,7 @@ class XBOXWEBAPI extends EventEmitter {
     unmute() {
         return new Promise(async (resolve, reject) => {
             try {
-                await this.sendCommand('Audio', 'Unmute')
+                await this.send('Audio', 'Unmute')
                 resolve(true);
             } catch (error) {
                 reject(`unmute error: ${error}`);
@@ -416,7 +417,7 @@ class XBOXWEBAPI extends EventEmitter {
     launchApp(oneStoreProductId) {
         return new Promise(async (resolve, reject) => {
             try {
-                await this.sendCommand('Shell', 'ActivateApplicationWithOneStoreProductId', [{
+                await this.send('Shell', 'ActivateApplicationWithOneStoreProductId', [{
                     'oneStoreProductId': oneStoreProductId
                 }])
                 resolve(true);
@@ -429,7 +430,7 @@ class XBOXWEBAPI extends EventEmitter {
     launchDashboard() {
         return new Promise(async (resolve, reject) => {
             try {
-                await this.sendCommand('Shell', 'GoHome')
+                await this.send('Shell', 'GoHome')
                 resolve(true);
             } catch (error) {
                 reject(`launch dashboard error: ${error}`);
@@ -440,7 +441,7 @@ class XBOXWEBAPI extends EventEmitter {
     openGuideTab() {
         return new Promise(async (resolve, reject) => {
             try {
-                await this.sendCommand('Shell', 'ShowGuideTab', [{
+                await this.send('Shell', 'ShowGuideTab', [{
                     'tabName': 'Guide'
                 }])
                 resolve(true);
@@ -453,7 +454,7 @@ class XBOXWEBAPI extends EventEmitter {
     launchOneGuide() {
         return new Promise(async (resolve, reject) => {
             try {
-                await this.sendCommand('TV', 'ShowGuide')
+                await this.send('TV', 'ShowGuide')
                 resolve(true);
             } catch (error) {
                 reject(`launch one guide error: ${error}`);
@@ -464,7 +465,7 @@ class XBOXWEBAPI extends EventEmitter {
     sendButtonPress(button) {
         return new Promise(async (resolve, reject) => {
             try {
-                await this.sendCommand('Shell', 'InjectKey', [{
+                await this.send('Shell', 'InjectKey', [{
                     'keyType': button
                 }])
                 resolve(true);
@@ -474,7 +475,7 @@ class XBOXWEBAPI extends EventEmitter {
         });
     }
 
-    sendCommand(commandType, command, params) {
+    send(commandType, command, params) {
         return new Promise(async (resolve, reject) => {
             try {
                 const sessionid = Uuid4();