homebridge-xbox-tv 2.12.8 → 2.12.9

package/package.json

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

package/src/localApi/xboxlocalapi.js

@@ -18,8 +18,9 @@ class XBOXLOCALAPI extends EventEmitter {
         this.crypto = new SGCrypto();
         this.host = config.host;
         this.xboxLiveId = config.xboxLiveId;
-        this.infoLog = config.infoLog;
         this.tokensFile = config.tokensFile;
+        this.devInfoFile = config.devInfoFile;
+        this.infoLog = config.infoLog;
         this.debugLog = config.debugLog;
 
         this.isConnected = false;
@@ -236,7 +237,10 @@ class XBOXLOCALAPI extends EventEmitter {
                             const buildNumber = packet.payloadProtected.buildNumber;
                             const locale = packet.payloadProtected.locale;
                             const firmwareRevision = `${majorVersion}.${minorVersion}.${buildNumber}`;
-                            this.emit('connected', 'Connected.');
+
+                            //save device info to the file
+                            await this.saveDevInfo(this.tokensFile, firmwareRevision, locale)
+
                             this.emit('deviceInfo', firmwareRevision, locale);
                             this.emitDevInfo = false;
                         };
@@ -257,6 +261,18 @@ class XBOXLOCALAPI extends EventEmitter {
 
                             this.emit('stateChanged', power, volume, mute, mediaState, titleId, reference);
                             const debug = this.debugLog ? this.emit('debug', `Status changed, app Id: ${titleId}, reference: ${reference}`) : false;
+
+                            //emit restFul and mqtt
+                            const obj = {
+                                'power': power,
+                                'titleId': titleId,
+                                'app': reference,
+                                'volume': volume,
+                                'mute': mute,
+                                'mediaState': mediaState,
+                            };
+                            this.emit('restFul', 'state', obj);
+                            this.emit('mqtt', 'State', obj);
                         };
 
                         //acknowledge
@@ -357,6 +373,27 @@ class XBOXLOCALAPI extends EventEmitter {
         });
     }
 
+    saveDevInfo(path, firmwareRevision, locale) {
+        return new Promise(async (resolve, reject) => {
+            try {
+                const obj = {
+                    manufacturer: 'Microsoft',
+                    modelName: 'Xbox',
+                    serialNumber: this.xboxLiveId,
+                    firmwareRevision: firmwareRevision,
+                    locale: locale
+                };
+                const devInfo = JSON.stringify(obj, null, 2);
+                await fsPromises.writeFile(path, devInfo);
+                const debug = this.debugLog ? this.emit('debug', `Saved device info: ${devInfo}`) : false;
+
+                resolve();
+            } catch (error) {
+                reject(error);
+            };
+        });
+    };
+
     acknowledge(sequenceNumber) {
         return new Promise(async (resolve, reject) => {
             try {

package/src/webApi/xboxwebapi.js

@@ -1,4 +1,6 @@
 'use strict';
+const fs = require('fs');
+const fsPromises = fs.promises;
 const QueryString = require('querystring');
 const EventEmitter = require('events');
 const { v4: UuIdv4 } = require('uuid');
@@ -23,6 +25,7 @@ class XBOXWEBAPI extends EventEmitter {
         this.xboxLiveId = config.xboxLiveId;
         this.webApiClientId = config.webApiClientId;
         this.webApiClientSecret = config.webApiClientSecret;
+        this.inputsFile = config.inputsFile;
         this.debugLog = config.debugLog;
 
         //variables
@@ -112,7 +115,13 @@ class XBOXWEBAPI extends EventEmitter {
                 const consoleStreamingEnabled = consoleStatusData.consoleStreamingEnabled;
                 const remoteManagementEnabled = consoleStatusData.remoteManagementEnabled;
 
-                this.emit('consoleStatus', consoleStatusData, consoleType);
+                //emit console type
+                this.emit('consoleStatus', consoleType);
+
+                //emit restFul and mqtt
+                this.emit('restFul', 'status', consoleStatusData);
+                this.emit('mqtt', 'status', consoleStatusData);
+
                 resolve(remoteManagementEnabled);
             } catch (error) {
                 reject(`get status error: ${error}`);
@@ -191,7 +200,10 @@ class XBOXWEBAPI extends EventEmitter {
                     }
                 }
 
-                this.emit('consolesList', consolesList);
+                //emit restFul and mqtt
+                this.emit('restFul', 'consoleslist', consolesList);
+                this.emit('mqtt', 'Consoles List', consolesList);
+
                 resolve();
             } catch (error) {
                 reject(`Consoles list error: ${error}`);
@@ -238,7 +250,13 @@ class XBOXWEBAPI extends EventEmitter {
                     appsArray.push(inputsObj);
                 };
 
-                this.emit('appsList', appsArray);
+                //save apps to the file
+                await this.saveInputs(this.inputsFile, appsArray);
+
+                //emit restFul and mqtt
+                this.emit('restFul', 'apps', apps);
+                this.emit('mqtt', 'Apps', apps);
+
                 resolve();
             } catch (error) {
                 reject(`get installed apps error: ${error}`);
@@ -280,7 +298,10 @@ class XBOXWEBAPI extends EventEmitter {
                     this.isGen9Compatible.push(isGen9Compatible);
                 };
 
-                this.emit('storageDevices', storageDevices);
+                //emit restFul and mqtt
+                this.emit('restFul', 'storages', storageDevices);
+                this.emit('mqtt', 'Storages', storageDevices);
+
                 resolve();
             } catch (error) {
                 reject(`get storage devices error: ${error}`);
@@ -322,7 +343,10 @@ class XBOXWEBAPI extends EventEmitter {
                     };
                 };
 
-                this.emit('userProfile', profileUsers);
+                //emit restFul and mqtt
+                this.emit('restFul', 'profile', profileUsers);
+                this.emit('mqtt', 'Profile', profileUsers);
+
                 resolve();
             } catch (error) {
                 reject(`User profile error: ${error}`);
@@ -330,6 +354,21 @@ class XBOXWEBAPI extends EventEmitter {
         });
     }
 
+    saveInputs(path, appsArray) {
+        return new Promise(async (resolve, reject) => {
+            try {
+                const allApps = [...CONSTANTS.DefaultInputs, ...appsArray];
+                const apps = JSON.stringify(allApps, null, 2)
+                await fsPromises.writeFile(path, apps);
+                const debug = this.debugLog ? this.emit('debug', `Saved apps: ${apps}`) : false;
+
+                resolve()
+            } catch (error) {
+                reject(error);
+            }
+        });
+    };
+
     next() {
         return new Promise(async (resolve, reject) => {
             try {

package/src/xboxdevice.js

@@ -72,13 +72,13 @@ class XboxDevice extends EventEmitter {
         //add configured inputs to the default inputs
         this.inputs = [...CONSTANTS.DefaultInputs, ...this.inputs];
         this.inputsConfigured = [];
+        this.inputIdentifier = 1;
 
         //state variable
         this.power = false;
         this.volume = 0;
         this.mute = true;
         this.mediaState = 0;
-        this.inputIdentifier = 1;
         this.reference = '';
 
         //sensors variable
@@ -166,43 +166,16 @@ class XboxDevice extends EventEmitter {
                 webApiClientId: this.webApiClientId,
                 webApiClientSecret: this.webApiClientSecret,
                 tokensFile: this.authTokenFile,
+                inputsFile: this.inputsFile,
                 debugLog: this.enableDebugMode
             });
 
-            this.xboxWebApi.on('consoleStatus', (consoleStatusData, consoleType) => {
+            this.xboxWebApi.on('consoleStatus', (consoleType) => {
                 //this.serialNumber = id;
                 this.modelName = consoleType;
                 //this.power = powerState;
                 //this.mediaState = playbackState;
-
-                const restFul = this.restFulConnected ? this.restFul.update('status', consoleStatusData) : false;
-                const mqtt = this.mqttConnected ? this.mqtt.send('Status', consoleStatusData) : false;
             })
-                .on('consolesList', (consolesList) => {
-                    const restFul = this.restFulConnected ? this.restFul.update('consoleslist', consolesList) : false;
-                    const mqtt = this.mqttConnected ? this.mqtt.send('Consoles List', consolesList) : false;
-                })
-                .on('appsList', async (appsArray) => {
-                    try {
-                        const apps = [...CONSTANTS.DefaultInputs, ...appsArray];
-                        const stringifyApps = JSON.stringify(apps, null, 2)
-                        await fsPromises.writeFile(this.inputsFile, stringifyApps);
-                        const debug = this.enableDebugMode ? this.emit('debug', `Saved apps: ${stringifyApps}`) : false;
-
-                        const restFul = this.restFulConnected ? this.restFul.update('apps', apps) : false;
-                        const mqtt = this.mqttConnected ? this.mqtt.send('Apps', apps) : false;
-                    } catch (error) {
-                        this.emit('error', `save apps error: ${error}`);
-                    };
-                })
-                .on('storageDevices', (storageDevices) => {
-                    const restFul = this.restFulConnected ? this.restFul.update('storages', storageDevices) : false;
-                    const mqtt = this.mqttConnected ? this.mqtt.send('Storages', storageDevices) : false;
-                })
-                .on('userProfile', (profileUsers) => {
-                    const restFul = this.restFulConnected ? this.restFul.update('profile', profileUsers) : false;
-                    const mqtt = this.mqttConnected ? this.mqtt.send('Profile', profileUsers) : false;
-                })
                 .on('powerOnError', (power) => {
                     if (this.televisionService) {
                         this.televisionService
@@ -210,6 +183,12 @@ class XboxDevice extends EventEmitter {
                     };
                     this.power = power;
                 })
+                .on('restFul', (path, data) => {
+                    const restFul = this.restFulConnected ? this.restFul.update(path, data) : false;
+                })
+                .on('mqtt', (topic, data) => {
+                    const mqtt = this.mqttConnected ? this.mqtt.send(topic, data) : false;
+                })
                 .on('message', (message) => {
                     this.emit('message', message);
                 })
@@ -225,60 +204,32 @@ class XboxDevice extends EventEmitter {
         this.xboxLocalApi = new XboxLocalApi({
             host: this.host,
             xboxLiveId: this.xboxLiveId,
-            infoLog: this.disableLogInfo,
             tokensFile: this.authTokenFile,
+            devInfoFile: this.devInfoFile,
+            infoLog: this.disableLogInfo,
             debugLog: this.enableDebugMode
         });
 
-        this.xboxLocalApi.on('connected', (message) => {
-            this.emit('message', message);
+        this.xboxLocalApi.on('deviceInfo', (firmwareRevision, locale) => {
+            this.emit('message', 'Connected.');
+            if (!this.disableLogDeviceInfo) {
+                this.emit('devInfo', `-------- ${this.name} --------'`);
+                this.emit('devInfo', `Manufacturer: Microsoft`);
+                this.emit('devInfo', `Model: ${this.modelName ?? 'Xbox'}`);
+                this.emit('devInfo', `Serialnr: ${this.xboxLiveId}`);
+                this.emit('devInfo', `Firmware: ${firmwareRevision}`);
+                this.emit('devInfo', `Locale: ${locale}`);
+                this.emit('devInfo', `----------------------------------`);
+            }
+
+            if (this.informationService) {
+                this.informationService
+                    .setCharacteristic(Characteristic.Manufacturer, 'Microsoft')
+                    .setCharacteristic(Characteristic.Model, this.modelName ?? 'Xbox')
+                    .setCharacteristic(Characteristic.SerialNumber, this.xboxLiveId)
+                    .setCharacteristic(Characteristic.FirmwareRevision, firmwareRevision);
+            };
         })
-            .on('deviceInfo', async (firmwareRevision, locale) => {
-                try {
-                    if (!this.disableLogDeviceInfo) {
-                        this.emit('devInfo', `-------- ${this.name} --------'`);
-                        this.emit('devInfo', `Manufacturer: Microsoft`);
-                        this.emit('devInfo', `Model: ${this.modelName ?? 'Xbox'}`);
-                        this.emit('devInfo', `Serialnr: ${this.xboxLiveId}`);
-                        this.emit('devInfo', `Firmware: ${firmwareRevision}`);
-                        this.emit('devInfo', `Locale: ${locale}`);
-                        this.emit('devInfo', `----------------------------------`);
-                    }
-
-                    const data = await fsPromises.readFile(this.devInfoFile);
-                    const savedInfo = data.length > 5 ? JSON.parse(data) : {};
-                    const infoHasNotchanged =
-                        'Microsoft' === savedInfo.manufacturer
-                        && this.modelName === savedInfo.modelName
-                        && firmwareRevision === savedInfo.firmwareRevision
-                        && locale === savedInfo.locale;
-
-                    if (infoHasNotchanged) {
-                        return;
-                    };
-
-                    if (this.informationService) {
-                        this.informationService
-                            .setCharacteristic(Characteristic.Manufacturer, 'Microsoft')
-                            .setCharacteristic(Characteristic.Model, this.modelName ?? 'Xbox')
-                            .setCharacteristic(Characteristic.SerialNumber, this.xboxLiveId)
-                            .setCharacteristic(Characteristic.FirmwareRevision, firmwareRevision);
-                    };
-
-                    const obj = {
-                        manufacturer: 'Microsoft',
-                        modelName: this.modelName,
-                        serialNumber: this.xboxLiveId,
-                        firmwareRevision: firmwareRevision,
-                        locale: locale
-                    };
-                    const devInfo = JSON.stringify(obj, null, 2);
-                    await fsPromises.writeFile(this.devInfoFile, devInfo);
-                    const debug = this.enableDebugMode ? this.emit('debug', `Saved device info: ${devInfo}`) : false;
-                } catch (error) {
-                    this.emit('error', `save device info error: ${error}`);
-                }
-            })
             .on('stateChanged', (power, volume, mute, mediaState, titleId, reference) => {
                 const index = this.inputsConfigured.findIndex(input => input.reference === reference || input.titleId === titleId) ?? -1;
                 const inputIdentifier = index !== -1 ? this.inputsConfigured[index].identifier : this.inputIdentifier;
@@ -289,7 +240,7 @@ class XboxDevice extends EventEmitter {
                         .updateCharacteristic(Characteristic.Active, power)
                 };
 
-                if (this.televisionService && inputIdentifier) {
+                if (this.televisionService) {
                     this.televisionService
                         .updateCharacteristic(Characteristic.ActiveIdentifier, inputIdentifier);
                 };
@@ -315,7 +266,7 @@ class XboxDevice extends EventEmitter {
                         .updateCharacteristic(Characteristic.ContactSensorState, power)
                 }
 
-                if (this.sensorInputService && inputIdentifier) {
+                if (this.sensorInputService) {
                     const state = power ? (this.inputIdentifier !== inputIdentifier) : false;
                     this.sensorInputService
                         .updateCharacteristic(Characteristic.ContactSensorState, state)
@@ -350,17 +301,6 @@ class XboxDevice extends EventEmitter {
                 this.mute = mute;
                 this.mediaState = mediaState;
 
-                const obj = {
-                    'power': power,
-                    'titleId': titleId,
-                    'app': reference,
-                    'volume': volume,
-                    'mute': mute,
-                    'mediaState': mediaState,
-                };
-                const restFul = this.restFulConnected ? this.restFul.update('state', obj) : false;
-                const mqtt = this.mqttConnected ? this.mqtt.send('State', obj) : false;
-
                 if (!this.disableLogInfo) {
                     const name = index !== -1 ? this.inputsConfigured[index].name : reference;
                     const productId = index !== -1 ? this.inputsConfigured[index].oneStoreProductId : reference;
@@ -423,6 +363,12 @@ class XboxDevice extends EventEmitter {
                     this.emit('error', `prepare accessory error: ${error}`);
                 };
             })
+            .on('restFul', (path, data) => {
+                const restFul = this.restFulConnected ? this.restFul.update(path, data) : false;
+            })
+            .on('mqtt', (topic, data) => {
+                const mqtt = this.mqttConnected ? this.mqtt.send(topic, data) : false;
+            })
             .on('message', (message) => {
                 this.emit('message', message);
             })