homebridge-xbox-tv 2.10.0-beta.21 → 2.10.0-beta.211

package/CHANGELOG.md

@@ -8,13 +8,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## After update to 2.x.x the plugin settings (xboxLiveId) need to be updated.
 
 ## [2.10.0] - (xx.09.2023)
+## After update to this version the plugin properties are changed and console must be authorized and settings need to be corrected.
 ## Changes
 - full code refactor
-- added possibility to enable/disable power, rc and volume control over web api
-- fixed RC control over local api (only if disabled over web api)
-- fixed Volume control over local api (only if disabled over web api)
+- added possibility toggle Power control between local/web api
+- added possibility toggle RC control between local/web api
+- added possibility toggle Volume control between local/web api
+- fixed laggy remote control [#140](https://github.com/grzegorz914/homebridge-xbox-tv/issues/140)
 - fixed disconnect problem on first run
+- performance and stability improvements
 - config.schema updated
+- readme updated
 - cleanup
 
 ## [2.9.0] - (29.07.2023)

package/README.md

@@ -25,14 +25,14 @@ Homebridge plugin for Microsoft game Consoles. Tested with Xbox One X/S and Xbox
 
 ## About The Plugin
 * Power ON/OFF short press tile in HomeKit app.
-* Reboot Console with additional button, rquired `webApiControl` enabled.
-* RC/Media control is possible after you go to the RC app on iPhone/iPad.
-* Speaker control is possible after you go to RC app on iPhone/iPad `Speaker Service`.
-* Legacy Volume and Mute control is possible throught extra `lightbulb`/`fan` (slider).
+* Reboot Console with button, rquired `webApiControl` enabled.
+* Record Game DVR with button, rquired `webApiControl` enabled.
+* RC/Media/Volume control from RC app on iPhone/iPad and possible over web/local api.
+* Speaker control from RC app on iPhone/iPad `Speaker Service`.
+* Legacy Volume/Mute control is possible throught extra `lightbulb`/`fan` (slider).
 * Apps, Inputs, Games can be switched if `webApiControl` is enabled and console is authorized.
-* Siri can be used for all functions, some times need create legacy buttons/switches/sensors.
-* Automations can be used for all functions, some times need create legacy buttons/switches/sensors.
-* Record Game DVR with additional button.
+* Siri can be used for all functions, some times need to be created legacy buttons/switches/sensors.
+* Automations can be used for all functions, some times need to be created legacy buttons/switches/sensors.
 * RESTful server:
   * Request: `http//homebridge_ip_address:port/path`.
   * Path: `info`, `state`, `consoleslist`, `profile`, `apps`, `storages`, `status`.
@@ -41,7 +41,7 @@ Homebridge plugin for Microsoft game Consoles. Tested with Xbox One X/S and Xbox
   * Topic: `Info`, `State`, `Consoles List`, `Profile`, `Apps`, `Storages`, `Status`.
   * Publish as JSON data.
 
-<p align="left">
+<p align="center">
 	<a href="https://github.com/grzegorz914/homebridge-xbox-tv"><img alt="Accessory tile in the HomeKit app" src="https://raw.githubusercontent.com/grzegorz914/homebridge-xbox-tv/master/graphics/homekit.png" width="382" /></a> 
 	<a href="https://github.com/grzegorz914/homebridge-xbox-tv"><img alt="Changing the accessory input" src="https://raw.githubusercontent.com/grzegorz914/homebridge-xbox-tv/master/graphics/inputs.png" width="135" /></a>
 	<a href="https://github.com/grzegorz914/homebridge-xbox-tv"><img alt="Arrow pointing to the remote control icon in the control center" src="https://raw.githubusercontent.com/grzegorz914/homebridge-xbox-tv/master/graphics/rc1.png" width="135" /></a>
@@ -53,7 +53,7 @@ Homebridge plugin for Microsoft game Consoles. Tested with Xbox One X/S and Xbox
   * Start new authorization need remove old token first, to clear token use Authorization Manager GUI.
   * Make sure Your web browser do not block pop-up window, if Yes allow pop-up window for this app.
 
-<p align="left">
+<p align="center">
   <a href="https://github.com/grzegorz914/homebridge-xbox-tv"><img alt="Authentication Manager" src="https://raw.githubusercontent.com/grzegorz914/homebridge-xbox-tv/master/graphics/config manager.png" width="540"></a>
 </p>
 
@@ -64,11 +64,10 @@ Homebridge plugin for Microsoft game Consoles. Tested with Xbox One X/S and Xbox
   * Profile & System > Settings > Devices & Connections > Remote features > Xbox app preferences.
 * Run this plugin as a [Child Bridge](https://github.com/homebridge/homebridge/wiki/Child-Bridges) (Highly Recommended), this prevent crash Homebridge if plugin crashes.
 * Install and use [Homebridge Config UI X](https://github.com/oznu/homebridge-config-ui-x/wiki) to configure this plugin. 
-* The `sample-config.json` can be edited and used as an alternative. 
-* Be sure to always make a backup copy of your config.json file before making any changes to it.
+* The `sample-config.json` can be edited and used as an alternative (advanced users). 
 
-<p align="left">
-	<a href="https://github.com/grzegorz914/homebridge-xbox-tv"><img src="https://raw.githubusercontent.com/grzegorz914/homebridge-xbox-tv/master/graphics/plugin settings.png" width="840"></a>
+<p align="center">
+	<a href="https://github.com/grzegorz914/homebridge-xbox-tv"><img src="https://raw.githubusercontent.com/grzegorz914/homebridge-xbox-tv/master/graphics/settings.png" width="840"></a>
 </p>
 
 | Key | Description |
@@ -96,12 +95,12 @@ Homebridge plugin for Microsoft game Consoles. Tested with Xbox One X/S and Xbox
 | `sensorInputs.reference` | Here set *Reference* like `Xbox.Dashboard_8wekyb3d8bbwe!Xbox.Dashboard.Application` to be exposed as sensor (active on switch to this Input). | 
 | `sensorInputs.displayType` | Here select sensor type to be exposed in HomeKit app, possible `None/Disabled`, `Motion Sensor`, `Occupancy Sensor`, `Contact Sensor`. |
 | `webApiControl` | This enable console control over Web Api. Additional functions are available in `Advanced Settings` section. |
-| `webApiPowerOnOff` | This enable power control over Web Api. |
-| `webApiRcControl` | This enable remote control over Web Api. |
-| `webApiVolumeControl` | This enable volume/mute control over Web Api. |
-| `xboxWebApiToken` | Required if `webApiControl` enabled. |
-| `clientId` | If You create app on Azure AD then You can use your own Client Id. |
-| `clientSecret` | If You create app on Azure AD then You can use own Client Secret. |
+| `webApiPowerOnOff` | This enable `Power` control over Web Api. |
+| `webApiRcControl` | This enable `Remote` control over Web Api. |
+| `webApiVolumeControl` | This enable `Volume/Mute` control over Web Api. |
+| `webApiToken` | Required if `webApiControl` enabled, use Authorization Manager to get it. |
+| `webApiClientId` | If You are created App on Azure AD then You can use your own Client Id. |
+| `webApiClientSecret` | If You are created App on Azure AD then You can use own Client Secret. |
 | `enableDebugMode` | If enabled, deep log will be present in homebridge console. |
 | `disableLogInfo` | If enabled, disable log info, all values and state will not be displayed in Homebridge log console. |
 | `disableLogDeviceInfo` | If enabled, add ability to disable log device info by every connections device to the network. |
@@ -111,26 +110,27 @@ Homebridge plugin for Microsoft game Consoles. Tested with Xbox One X/S and Xbox
 | `restFulPort` | Here set the listening `Port` for RESTful server. |
 | `restFulDebug` | If enabled, deep log will be present in homebridge console for RESTFul server. |
 | `enableMqtt` | If enabled, MQTT Broker will start automatically and publish all awailable PV installation data. |
-| `mqttHost` | Here set the *IP Address* or *Hostname* for MQTT Broker. |
-| `mqttPort` | Here set the *Port* for MQTT Broker, default 1883. |
-| `mqttPrefix` | Here set the *Prefix* for *Topic* or leave empty. |
+| `mqttHost` | Here set the `IP Address` or `Hostname` for MQTT Broker. |
+| `mqttPort` | Here set the `Port` for MQTT Broker, default 1883. |
+| `mqttClientId` | Here optional set the `Client Id` of MQTT Broker. |
+| `mqttPrefix` | Here set the`Prefix` for `Topic` or leave empty. |
 | `mqttAuth` | If enabled, MQTT Broker will use authorization credentials. |
-| `mqttUser` | Here set the MQTT Broker user. |
-| `mqttPasswd` | Here set the MQTT Broker password. |
+| `mqttUser` | Here set the `User` for MQTT Broker. |
+| `mqttPasswd` | Here set the `Password` for MQTT Broker. |
 | `mqttDebug` | If enabled, deep log will be present in homebridge console for MQTT. |
 | `reference`, `oneStoreProductId` | If web Api enabled then all available in `./homebridge/xboxTv/inputs_xxxxxx` file. |
 | `Volume Control` | -1 - `None/Disabled`, 0 - `Slider`, 1 - `Fan`. |
 | `Display Type Inputs/Buttons` | -1 - `None/Disabled`, 0 - `Outlet`, 1 - `Switch`. |
 | `Display Type Sensors` | -1 - `None/Disabled`, 0 - `Motion Sensor`, 1 - `Occupancy Sensor`, 2 - `Contact Sensor`. |
 
-## Create app on Azure AD
+## Create App on Azure AD
 * Go to [Azure Portal](https://portal.azure.com/#blade/Microsoft_AAD_RegisteredApps/ApplicationsListBlade)
-* Register new app *+ New registration*
+* Register new *App* + *New registration*
   * Enter a name for your app
   * Set *Supported account types* to *Personal Microsoft accounts only*
   * Click register
   * Choose *Redirect URIs* -> *Add a Redirect URI*
-  * Click "Add a platform" -> "Mobile and desktop applications"
+  * Click *Add a platform* -> *Mobile and desktop applications*
   * Enter custom redirect URI *http://localhost:8888/auth/callback*
-* From the overview of your app page, copy *Application (client) ID* to `clientId`
+* From the overview of your app page, copy *Application (client) ID* to `webApiClientId`
 * Save restart plugin and authorize console again and have fun.

package/config.schema.json

@@ -511,27 +511,27 @@
 								"functionBody": "return model.devices[arrayIndices].webApiControl === true;"
 							}
 						},
-						"xboxWebApiToken": {
+						"webApiToken": {
 							"title": "Web Api Token",
 							"type": "string",
 							"placeholder": "Web Api Token",
 							"description": "Here put the reponse Token (value after ?code=) from the authorization URL.",
-							"required": false,
+							"required": true,
 							"condition": {
 								"functionBody": "return model.devices[arrayIndices].webApiControl === true;"
 							}
 						},
-						"clientId": {
-							"title": "Client ID",
+						"webApiClientId": {
+							"title": "Client Id",
 							"type": "string",
 							"placeholder": "a34ac209-edab-4b08-91e7-a4558d8da1bd",
-							"description": "Here set your own Client ID from Azure AD or leave empty if you do not have own account.",
+							"description": "Here set your own Client Id from Azure AD or leave empty if you do not have own account.",
 							"required": false,
 							"condition": {
 								"functionBody": "return model.devices[arrayIndices].webApiControl === true;"
 							}
 						},
-						"clientSecret": {
+						"webApiClientSecret": {
 							"title": "Client Secret",
 							"type": "string",
 							"placeholder": "Client Secret",
@@ -713,6 +713,16 @@
 								"functionBody": "return model.devices[arrayIndices].enableMqtt === true;"
 							}
 						},
+						"mqttClientId": {
+							"title": "Client ID",
+							"type": "string",
+							"placeholder": "client id",
+							"required": false,
+							"description": "Here optional set the Client ID of MQTT Broker.",
+							"condition": {
+							  "functionBody": "return model.devices[arrayIndices].enableMqtt === true"
+							}
+						  },
 						"mqttAuth": {
 							"title": "Authorization",
 							"type": "boolean",
@@ -853,9 +863,9 @@
 										"devices[].webApiPowerOnOff",
 										"devices[].webApiRcControl",
 										"devices[].webApiVolumeControl",
-										"devices[].xboxWebApiToken",
-										"devices[].clientId",
-										"devices[].clientSecret"
+										"devices[].webApiToken",
+										"devices[].webApiClientId",
+										"devices[].webApiClientSecret"
 									]
 								},
 								{
@@ -895,6 +905,7 @@
 														"devices[].mqttDebug",
 														"devices[].mqttHost",
 														"devices[].mqttPort",
+														"devices[].mqttClientId",
 														"devices[].mqttPrefix",
 														"devices[].mqttAuth",
 														"devices[].mqttUser",

package/homebridge-ui/public/index.html

@@ -60,10 +60,10 @@
         document.getElementById('deviceName').innerHTML = pluginConfig[0].devices[i].name || '';
         document.getElementById('deviceHost').value = pluginConfig[0].devices[i].host || '';
         document.getElementById('deviceLiveId').value = pluginConfig[0].devices[i].xboxLiveId || '';
-        document.getElementById('deviceToken').value = pluginConfig[0].devices[i].xboxWebApiToken || '';
+        document.getElementById('deviceToken').value = pluginConfig[0].devices[i].webApiToken || '';
         document.getElementById('deviceWebApiControl').checked = pluginConfig[0].devices[i].webApiControl || false;
 
-        const tokenLength = (pluginConfig[0].devices[i].xboxWebApiToken).length || 0;
+        const tokenLength = (pluginConfig[0].devices[i].webApiToken).length || 0;
         const setButtonName = tokenLength <= 10 ? document.getElementById('startAuthorizationButton').innerText = "Start authorization" : document.getElementById('startAuthorizationButton').innerText = "Check state";
         const setCheckboxState = tokenLength <= 10 ? document.getElementById('deviceWebApiControl').checked = false : false;
         const setCheckboxMode = tokenLength <= 10 ? document.getElementById('deviceWebApiControl').disabled = true : document.getElementById('deviceWebApiControl').disabled = false;
@@ -88,7 +88,7 @@
     document.getElementById('configForm').addEventListener('input', async () => {
       pluginConfig[0].devices[this.deviceIndex].host = document.querySelector('#deviceHost').value;
       pluginConfig[0].devices[this.deviceIndex].xboxLiveId = document.querySelector('#deviceLiveId').value;
-      pluginConfig[0].devices[this.deviceIndex].xboxWebApiToken = document.querySelector('#deviceToken').value;
+      pluginConfig[0].devices[this.deviceIndex].webApiToken = document.querySelector('#deviceToken').value;
       pluginConfig[0].devices[this.deviceIndex].webApiControl = document.querySelector('#deviceWebApiControl').checked;
 
       const tokenLength1 = (document.querySelector('#deviceToken').value).length || 0;
@@ -118,7 +118,7 @@
             document.getElementById('deviceWebApiControl').checked = false;
             document.getElementById('deviceWebApiControl').disabled = true;
             document.getElementById('info').innerHTML = info;
-            pluginConfig[0].devices[this.deviceIndex].xboxWebApiToken = '';
+            pluginConfig[0].devices[this.deviceIndex].webApiToken = '';
             pluginConfig[0].devices[this.deviceIndex].webApiControl = false;
 
             await homebridge.updatePluginConfig(pluginConfig);
@@ -145,16 +145,16 @@
         document.getElementById('info').innerHTML = '';
 
         const host = pluginConfig[0].devices[this.deviceIndex].host;
-        const clientId = pluginConfig[0].devices[this.deviceIndex].clientId;
-        const clientSecret = pluginConfig[0].devices[this.deviceIndex].clientSecret;
-        const xboxWebApiToken = pluginConfig[0].devices[this.deviceIndex].xboxWebApiToken;
+        const webApiClientId = pluginConfig[0].devices[this.deviceIndex].webApiClientId;
+        const webApiClientSecret = pluginConfig[0].devices[this.deviceIndex].webApiClientSecret;
+        const webApiToken = pluginConfig[0].devices[this.deviceIndex].webApiToken;
 
         const payload = {
           mode: 'authorization',
           host: host,
-          clientId: clientId,
-          clientSecret: clientSecret,
-          webApiToken: xboxWebApiToken
+          webApiClientId: webApiClientId,
+          webApiClientSecret: webApiClientSecret,
+          webApiToken: webApiToken
         };
         const response = await homebridge.request('/startAuthorization', payload);
         const info = response.info;

package/homebridge-ui/server.js

@@ -25,8 +25,8 @@ class PluginUiServer extends HomebridgePluginUiServer {
     const tokensFile = `${this.homebridgeStoragePath}/xboxTv/authToken_${host.split('.').join('')}`;
 
     const authConfig = {
-      clientId: payload.clientId,
-      clientSecret: payload.clientSecret,
+      webApiClientId: payload.webApiClientId,
+      webApiClientSecret: payload.webApiClientSecret,
       tokensFile: tokensFile
     }
     const authentication = new Authentication(authConfig);

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Xbox TV",
   "name": "homebridge-xbox-tv",
-  "version": "2.10.0-beta.21",
+  "version": "2.10.0-beta.211",
   "description": "Homebridge plugin (https://github.com/homebridge/homebridge) to control Xbox game consoles.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -25,8 +25,8 @@
     "LICENSE"
   ],
   "engines": {
-    "node": ">=16.0.0",
-    "homebridge": ">=1.5.0"
+    "node": ">=18.0.0",
+    "homebridge": ">=1.6.0"
   },
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^0.1.0",
@@ -34,9 +34,10 @@
     "elliptic": "^6.5.4",
     "hex-to-binary": "^1.0.1",
     "jsrsasign": "^10.8.6",
-    "uuid": "^9.0.0",
+    "uuid": "^9.0.1",
     "ping": "^0.4.4",
-    "express": "^4.18.2"
+    "express": "^4.18.2",
+    "axios": "^1.5.1"
   },
   "keywords": [
     "homebridge",

package/src/constans.json

@@ -3,66 +3,75 @@
     "PluginName": "homebridge-xbox-tv",
     "DefaultInputs": [
         {
-            "name": "Screensaver",
+            "oneStoreProductId": "Screensaver",
             "titleId": "851275400",
             "reference": "Xbox.IdleScreen_8wekyb3d8bbwe!Xbox.IdleScreen.Application",
-            "oneStoreProductId": "Screensaver",
+            "isGame": false,
+            "name": "Screensaver",
             "contentType": "Dashboard"
         },
         {
-            "name": "Dashboard",
+            "oneStoreProductId": "Dashboard",
             "titleId": "750323071",
             "reference": "Xbox.Dashboard_8wekyb3d8bbwe!Xbox.Dashboard.Application",
-            "oneStoreProductId": "Dashboard",
+            "isGame": false,
+            "name": "Dashboard",
             "contentType": "Dashboard"
         },
         {
-            "name": "Settings",
+            "oneStoreProductId": "Settings",
             "titleId": "1837352387",
             "reference": "Microsoft.Xbox.Settings_8wekyb3d8bbwe!Xbox.Settings.Application",
-            "oneStoreProductId": "Settings",
+            "isGame": false,
+            "name": "Settings",
             "contentType": "Dashboard"
         },
         {
-            "name": "Television",
+            "oneStoreProductId": "Television",
             "titleId": "371594669",
             "reference": "Microsoft.Xbox.LiveTV_8wekyb3d8bbwe!Microsoft.Xbox.LiveTV.Application",
-            "oneStoreProductId": "Television",
+            "isGame": false,
+            "name": "Television",
             "contentType": "systemApp"
         },
         {
-            "name": "Settings TV",
+            "oneStoreProductId": "SettingsTv",
             "titleId": "2019308066",
             "reference": "Microsoft.Xbox.TvSettings_8wekyb3d8bbwe!Microsoft.Xbox.TvSettings.Application",
-            "oneStoreProductId": "SettingsTv",
+            "isGame": false,
+            "name": "Settings TV",
             "contentType": "Dashboard"
         },
         {
-            "name": "Accessory",
+            "oneStoreProductId": "Accessory",
             "titleId": "758407307",
             "reference": "Microsoft.XboxDevices_8wekyb3d8bbwe!App",
-            "oneStoreProductId": "Accessory",
+            "isGame": false,
+            "name": "Accessory",
             "contentType": "systemApp"
         },
         {
-            "name": "Network Troubleshooter",
+            "oneStoreProductId": "NetworkTroubleshooter",
             "titleId": "1614319806",
             "reference": "Xbox.NetworkTroubleshooter_8wekyb3d8bbwe!Xbox.NetworkTroubleshooter.Application",
-            "oneStoreProductId": "NetworkTroubleshooter",
+            "isGame": false,
+            "name": "Network Troubleshooter",
             "contentType": "systemApp"
         },
         {
-            "name": "Microsoft Store",
+            "oneStoreProductId": "MicrosoftStore",
             "titleId": "1864271209",
             "reference": "Microsoft.storify_8wekyb3d8bbwe!App",
-            "oneStoreProductId": "MicrosoftStore",
+            "isGame": false,
+            "name": "Microsoft Store",
             "contentType": "Dashboard"
         },
         {
-            "name": "Xbox Guide",
+            "oneStoreProductId": "XboxGuide",
             "titleId": "1052052983",
             "reference": "Xbox.Guide_8wekyb3d8bbwe!Xbox.Guide.Application",
-            "oneStoreProductId": "XboxGuide",
+            "isGame": false,
+            "name": "Xbox Guide",
             "contentType": "systemApp"
         }
     ],
@@ -118,75 +127,102 @@
         "ParticipantId": {
             "Target": 0
         },
-        "Channels": {
-            "SystemMedia": {
-                "ChannelId": 0,
-                "ChannelName": "SystemMedia",
-                "ChannelUuid": "48a9ca24eb6d4e128c43d57469edd3cd"
-            },
-            "SystemInput": {
-                "ChannelId": 1,
-                "ChannelName": "SystemInput",
-                "ChannelUuid": "fa20b8ca66fb46e0adb60b978a59d35f"
-            },
-            "TvRemote": {
-                "ChannelId": 2,
-                "ChannelName": "TvRemote",
-                "ChannelUuid": "d451e3b360bb4c71b3dbf994b1aca3a7"
-            },
-            "SystemConfig": {
-                "ChannelId": 3,
-                "ChannelName": "SystemConfig",
-                "ChannelUuid": "d451e3b360bb4c71b3dbf994b1aca3a7",
-                "ChannelsConfigNames": [
-                    "GetConfiguration",
-                    "GetHeadendInfo",
-                    "GetLiveTVInfo",
-                    "GetTunerLineups",
-                    "GetAppChannelLineups"
-                ]
+        "Console": {
+            "Name": {
+                "1": "Xbox One",
+                "2": "Xbox 360",
+                "3": "Windows Desktop",
+                "4": "Windows Store",
+                "5": "Windows Phone",
+                "6": "iPhone",
+                "7": "iPad",
+                "8": "Android"
             },
-            "Commands": {
-                "SystemMedia": {
-                    "play": 2,
-                    "pause": 4,
-                    "playPause": 8,
-                    "stop": 16,
-                    "record": 32,
-                    "nextTrack": 64,
-                    "prevTrack": 128,
-                    "fastForward": 256,
-                    "rewind": 512,
-                    "channelUp": 1024,
-                    "channelDown": 2048,
-                    "back": 4096,
-                    "view": 8192,
-                    "menu": 16384,
-                    "seek": 32786
-                },
-                "SystemInput": {
-                    "unpress": 0,
-                    "enroll": 1,
-                    "nexus": 2,
-                    "view": 4,
-                    "menu": 8,
-                    "a": 16,
-                    "b": 32,
-                    "x": 64,
-                    "y": 128,
-                    "up": 256,
-                    "down": 512,
-                    "left": 1024,
-                    "right": 2048,
-                    "leftShoulder": 4096,
-                    "rightShoulder": 8192,
-                    "leftThumbstick": 16384,
-                    "rightThumbstick": 32768
+            "PairingState": {
+                "0": "Not Paired",
+                "1": "Paired"
+            }
+        },
+        "Channels": {
+            "System": {
+                "Input": {
+                    "Id": 0,
+                    "Uuid": "fa20b8ca66fb46e0adb60b978a59d35f",
+                    "Commands": {
+                        "unpress": 0,
+                        "enroll": 1,
+                        "nexus": 2,
+                        "view": 4,
+                        "menu": 8,
+                        "a": 16,
+                        "b": 32,
+                        "x": 64,
+                        "y": 128,
+                        "up": 256,
+                        "down": 512,
+                        "left": 1024,
+                        "right": 2048,
+                        "leftShoulder": 4096,
+                        "rightShoulder": 8192,
+                        "leftThumbstick": 16384,
+                        "rightThumbstick": 32768
+                    }
                 },
                 "TvRemote": {
-                    "volUp": "btn.vol_up",
-                    "volDown": "btn.vol_down",
-                    "volMute": "btn.vol_mute"
+                    "Id": 1,
+                    "Uuid": "d451e3b360bb4c71b3dbf994b1aca3a7",
+                    "Commands": {
+                        "volUp": "btn.vol_up",
+                        "volDown": "btn.vol_down",
+                        "volMute": "btn.vol_mute"
+                    },
+                    "MessageType": {
+                        "Error": "Error",
+                        "GetConfiguration": "GetConfiguration",
+                        "GetHeadendInfo": "GetHeadendInfo",
+                        "GetLiveTVInfo": "GetLiveTVInfo",
+                        "GetProgramInfo": "GetProgramInfo",
+                        "GetRecentChannels": "GetRecentChannels",
+                        "GetTunerLineups": "GetTunerLineups",
+                        "GetAppChannelData": "GetAppChannelData",
+                        "GetAppChannelLineups": "GetAppChannelLineups",
+                        "GetAppChannelProgramData": "GetAppChannelProgramData",
+                        "SendKey": "SendKey",
+                        "SetChannel": "SetChannel"
+                    }
+                },
+                "Media": {
+                    "Id": 2,
+                    "Uuid": "48a9ca24eb6d4e128c43d57469edd3cd",
+                    "Commands": {
+                        "play": 2,
+                        "pause": 4,
+                        "playPause": 8,
+                        "stop": 16,
+                        "record": 32,
+                        "nextTrack": 64,
+                        "previousTrack": 128,
+                        "fastForward": 256,
+                        "rewind": 512,
+                        "channelUp": 1024,
+                        "channelDown": 2048,
+                        "back": 4096,
+                        "view": 8192,
+                        "menu": 16384,
+                        "seek": 32786
+                    }
+                },
+                "Text": {
+                    "Id": 3,
+                    "Uuid": "7af3e6a2488b40cba93179c04b7da3a0"
+                },
+                "Broadcast": {
+                    "Id": 4,
+                    "Uuid": "b6a117d8f5e245d7862e8fd8e3156476"
+                },
+                "Title": {
+                    "Id": 5,
+                    "Uuid": "00000000000000000000000000000000"
                 }
             }
         },

package/src/localApi/message.js

@@ -1,7 +1,7 @@
 "use strict";
 const HexToBin = require('hex-to-binary');
-const Structure = require('./structure');
 const Packets = require('./packets.js');
+const Structure = require('./structure');
 const CONSTANTS = require('../constans.json');
 
 class MESSAGE {
@@ -98,7 +98,7 @@ class MESSAGE {
             0x23: "titleLaunch",
             channelStartRequest: Buffer.from('a026', 'hex'),
             channelStartResponse: Buffer.from('a027', 'hex'),
-            channelStop: Buffer.from('a028', 'hex'),
+            0x28: "channelStop",
             0x29: "system",
             disconnect: Buffer.from('802a', 'hex'),
             0x2E: "titleTouch",
@@ -127,12 +127,12 @@ class MESSAGE {
 
     set(key, value, subkey = false) {
         switch (subkey) {
-            case true:
-                this.packet[subkey][key].value = value;
-                break;
             case false:
                 this.packet[key].value = value;
                 break;
+            default:
+                this.packet[subkey][key].value = value;
+                break;
         };
     };
 
@@ -179,9 +179,10 @@ class MESSAGE {
 
     unpack(crypto = undefined, data = false) {
         const structure = new Structure(data);
+        const type = structure.readBytes(2).toString('hex');
 
         let packet = {
-            type: structure.readBytes(2).toString('hex'),
+            type: type,
             payloadLength: structure.readUInt16(),
             sequenceNumber: structure.readUInt32(),
             targetParticipantId: structure.readUInt32(),
@@ -196,15 +197,16 @@ class MESSAGE {
         this.channelId = packet.channelId;
 
         // Lets decrypt the data when the payload is encrypted
-        if (packet.payloadProtected) {
-            const payloadDecrypted = crypto.decrypt(packet.payloadProtected, crypto.encrypt(data.slice(0, 16), crypto.getIv()));
+        const payloadProtectedExist = packet.payloadProtected !== undefined;
+        if (payloadProtectedExist) {
+            let payloadDecrypted = crypto.decrypt(packet.payloadProtected, crypto.encrypt(data.slice(0, 16), crypto.getIv()));
             packet.payloadDecrypted = new Structure(payloadDecrypted).toBuffer();
-            packet.payloadProtected = {};
+            packet['payloadProtected'] = {};
 
             const packetProtected = this.packets[packet.type];
-            const structureDecrypted = new Structure(payloadDecrypted);
+            const structurePayloadDecrypted = new Structure(payloadDecrypted);
             for (const name in packetProtected) {
-                packet.payloadProtected[name] = packetProtected[name].unpack(structureDecrypted);
+                packet.payloadProtected[name] = packetProtected[name].unpack(structurePayloadDecrypted);
             };
         };