homebridge-xbox-tv 3.6.5 → 3.6.7

package/README.md

@@ -149,6 +149,7 @@ Homebridge plugin for Microsoft game Consoles. Tested with Xbox One X/S and Xbox
 ### RESTFul Integration
 
 * POST data as a JSON Object `{Power: true}`, content type must be `application/json`
+* Path `status` response all available paths.
 
 | Method | URL | Path | Response | Type |
 | --- | --- | --- | --- | --- |

package/package.json

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

package/src/restful.js

@@ -1,6 +1,8 @@
 import express, { json } from 'express';
 import EventEmitter from 'events';
 
+const DEFAULT_MESSAGE = 'This data is not available at this time.';
+
 class RestFul extends EventEmitter {
     constructor(config) {
         super();
@@ -8,45 +10,57 @@ class RestFul extends EventEmitter {
         this.restFulDebug = config.debug;
 
         this.restFulData = {
-            info: 'This data is not available in your system.',
-            state: 'This data is not available in your system.',
-            consoleslist: 'This data is not available in your system.',
-            profile: 'This data is not available in your system.',
-            apps: 'This data is not available in your system.',
-            storages: 'This data is not available in your system.',
-            status: 'This data is not available in your system.'
+            info: DEFAULT_MESSAGE,
+            state: DEFAULT_MESSAGE,
+            consoleslist: DEFAULT_MESSAGE,
+            profile: DEFAULT_MESSAGE,
+            apps: DEFAULT_MESSAGE,
+            storages: DEFAULT_MESSAGE,
+            status: DEFAULT_MESSAGE
         }
         this.connect();
     }
 
     connect() {
         try {
-            const restFul = express();
-            restFul.set('json spaces', 2);
-            restFul.use(json());
+            const app = express();
+            app.set('json spaces', 2);
+            app.use(json());
+
+            // Register GET routes for all keys
+            for (const key of Object.keys(this.restFulData)) {
+                app.get(`/${key}`, (req, res) => {
+                    res.json(this.restFulData[key]);
+                });
+            }
 
-            // GET Routes
-            restFul.get('/info', (req, res) => { res.json(this.restFulData.info) });
-            restFul.get('/state', (req, res) => { res.json(this.restFulData.state) });
-            restFul.get('/consoleslist', (req, res) => { res.json(this.restFulData.consoleslist) });
-            restFul.get('/profile', (req, res) => { res.json(this.restFulData.profile) });
-            restFul.get('/apps', (req, res) => { res.json(this.restFulData.apps) });
-            restFul.get('/storages', (req, res) => { res.json(this.restFulData.storages) });
-            restFul.get('/status', (req, res) => { res.json(this.restFulData.status) });
+            // Health check route
+            app.get('/status', (req, res) => {
+                res.json({
+                    status: 'online',
+                    uptime: process.uptime(),
+                    available_paths: Object.keys(this.restFulData).map(k => `/${k}`)
+                });
+            });
 
-            // POST Route
-            restFul.post('/', (req, res) => {
+            // POST route to update values
+            app.post('/', (req, res) => {
                 try {
                     const obj = req.body;
                     if (!obj || typeof obj !== 'object' || Object.keys(obj).length === 0) {
-                        this.emit('warn', `RESTFul Invalid JSON payload`);
+                        this.emit('warn', 'RESTFul Invalid JSON payload');
                         return res.status(400).json({ error: 'RESTFul Invalid JSON payload' });
                     }
+
                     const key = Object.keys(obj)[0];
                     const value = obj[key];
                     this.emit('set', key, value);
+                    this.update(key, value);
+
+                    if (this.restFulDebug) {
+                        this.emit('debug', `RESTFul post data: ${JSON.stringify(obj, null, 2)}`);
+                    }
 
-                    const emitDebug = this.restFulDebug ? this.emit('debug', `RESTFul post data: ${JSON.stringify(obj, null, 2)}`) : false;
                     res.json({ success: true, received: obj });
                 } catch (error) {
                     this.emit('warn', `RESTFul Parse error: ${error}`);
@@ -54,43 +68,26 @@ class RestFul extends EventEmitter {
                 }
             });
 
-            // Start server
-            restFul.listen(this.restFulPort, () => {
+            // Start the server
+            app.listen(this.restFulPort, () => {
                 this.emit('connected', `RESTful started on port: ${this.restFulPort}`);
             });
         } catch (error) {
-            this.emit('warn', `RESTful Connect error: ${error}`)
+            this.emit('warn', `RESTful Connect error: ${error}`);
         }
-    };
+    }
 
     update(path, data) {
-        switch (path) {
-            case 'info':
-                this.restFulData.info = data;
-                break;
-            case 'state':
-                this.restFulData.state = data;
-                break;
-            case 'consoleslist':
-                this.restFulData.consoleslist = data;
-                break;
-            case 'profile':
-                this.restFulData.profile = data;
-                break;
-            case 'apps':
-                this.restFulData.apps = data;
-                break;
-            case 'storages':
-                this.restFulData.storages = data;
-                break;
-            case 'status':
-                this.restFulData.status = data;
-                break;
-            default:
-                this.emit('warn', `RESTFul update unknown path: ${path}, data: ${data}`)
-                break;
+        if (this.restFulData.hasOwnProperty(path)) {
+            this.restFulData[path] = data;
+        } else {
+            this.emit('warn', `Unknown RESTFul update path: ${path}, data: ${JSON.stringify(data)}`);
+            return;
+        }
+
+        if (this.restFulDebug) {
+            this.emit('debug', `RESTFul update path: ${path}, data: ${JSON.stringify(data)}`);
         }
-        const emitDebug = this.restFulDebug ? this.emit('debug', `RESTFul update path: ${path}, data: ${JSON.stringify(data, null, 2)}`) : false;
     }
 }
 export default RestFul;

package/src/webApi/xboxwebapi.js

@@ -26,14 +26,20 @@ class XboxWebApi extends EventEmitter {
         }
         this.authentication = new Authentication(authConfig);
 
-        //create impulse generator
+        //impulse generator
+        this.call = false;
         this.impulseGenerator = new ImpulseGenerator();
         this.impulseGenerator.on('checkAuthorization', async () => {
+            if (this.call) return;
+
             try {
+                this.call = true;
                 await this.checkAuthorization();
+                this.call = false;
             } catch (error) {
-                this.emit('error', error);
-            }
+                this.call = false;
+                this.emit('error', `Inpulse generator error: ${error}`);
+            };
         }).on('state', (state) => {
             const emitState = state ? this.emit('success', `Web Api monitoring started`) : this.emit('warn', `Web Api monitoring stopped`);
         });

package/src/xboxdevice.js

@@ -257,8 +257,8 @@ class XboxDevice extends EventEmitter {
                 this.mqtt1 = new Mqtt({
                     host: this.mqtt.host,
                     port: this.mqtt.port || 1883,
-                    clientId: this.mqtt.clientId || `microsoft_${Math.random().toString(16).slice(3)}`,
-                    prefix: this.mqtt.prefix || `microsoft/${this.name}`,
+                    clientId: this.mqtt.clientId ? `microsoft_${this.mqtt.clientId}_${Math.random().toString(16).slice(3)}` : `microsoft_${Math.random().toString(16).slice(3)}`,
+                    prefix: this.mqtt.prefix ? `microsoft/${this.mqtt.prefix}/${this.name}` : `microsoft/${this.name}`,
                     user: this.mqtt.user,
                     passwd: this.mqtt.passwd,
                     debug: this.mqtt.debug || false