bump 1.6.2

## [1.6.2] - 2021-08-05 ## Changes - added possibility reboot console - added possibility switch to Television input - code and config reconfigured
grzegorz914 · Aug 5, 2021 · 05c2e29 · 05c2e29
1 parent b5e2b72
commit 05c2e29
Show file tree

Hide file tree

Showing 6 changed files with 424 additions and 163 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [1.6.2] - 2021-08-05
+## Changes
+- added possibility reboot console
+- added possibility switch to Television input
+- code and config reconfigured
+
+## [1.6.0] - 2021-08-04
+## Changes
+- fixes
+
 ## [1.6.0] - 2021-08-04
 ## Changes
 - added possibility load inputs list direct from device

diff --git a/README.md b/README.md
@@ -77,13 +77,16 @@ Install and use [Homebridge Config UI X](https://github.com/oznu/homebridge-conf
 | `xboxliveid` | on your console select Profile & system > Settings > System > Console info, listed as **Xbox Live device ID**. *You can only find the Xbox Live device ID in Settings on your console, this is different from your console serial number* |
 | `clientID` | Optional free-form for future use |
 | `clientSecret` | Optional free-form for future use |
+| `userToken` | Optional alternate authentication method. |
+| `uhs` | Optional alternate authentication method. |
 | `xboxWebApiToken` | Required if `xboxWebApiEnabled` enabled.|
-| `xboxWebApiEnabled` | Optional, if enabled the console can be controlled using Web Api |
+| `webApiControl` | Optional, if `true` the console can be controlled using Web Api and additional functions are available in `Advanced Settings` section |
 | `refreshInterval` | Set the data refresh time in seconds, default is every 5 seconds |
 | `volumeControl`| Select what a additional volume control mode You want to use (None, Slider, Fan) |
 | `switchInfoMenu`| If `true` then the `I` button will toggle its behaviour in the Apple Remote in Control Center and `PowerModeSelection` in settings |
-| `getInputsFromDevice`| If `true` then the inputs and apps wil be get direct from device. |
 | `disableLogInfo`| If `true` then disable log info, all values and state will not be displayed in Homebridge log console |
+| `getInputsFromDevice`| If `true` then enable possibility get apps direct from device, only available if `webApiControl` is enabled |
+| `rebootControl`| If `true` then enable possibility reboot console, only available if `webApiControl` is enabled |
 | `inputs` | Configure apps/inputs which will be published and appear in HomeKit app in the device tile as inputs list |
 | `buttons` | same as inputs but appear in HomeKit.app as extra tile |
 | `reference` | Required to identify current running app, open homebridge console and look in the log or if web Api enabled then all available in `/var/lib/homebridge/xboxTv/inputs_xxxxxx` file. |
@@ -106,15 +109,18 @@ Install and use [Homebridge Config UI X](https://github.com/oznu/homebridge-conf
 			"name": "Xbox One",
 			"host": "192.168.1.6",
 			"xboxliveid": "FD0000000000",
-			"xboxWebApiToken": "M.R5_BAU.be1c3729-8ae5-d62b-5abd-4323c9c96383",
 			"clientID": "",
 			"clientSecret": "",
+			"userToken": "",
+			"uhs": "",
+			"xboxWebApiToken": "M.R5_BAU.be1c3729-8ae5-d62b-5abd-4323c9c96383",
 			"refreshInterval": 5,
-			"xboxWebApiEnabled": false,
+			"webApiControl": false,
 			"disableLogInfo": false,
 			"volumeControl": 0,
 			"switchInfoMenu": false,
 			"getInputsFromDevice": false,
+			"rebootControl": false,
 			"inputs": [
 						{
 							"name": "Dashboard",

diff --git a/config.schema.json b/config.schema.json
@@ -27,31 +27,45 @@
 							"required": true,
 							"format": "hostname"
 						},
+						"xboxliveid": {
+							"title": "Live ID",
+							"type": "string",
+							"placeholder": "FD00000000000000",
+							"description": "Xbox Live ID",
+							"required": true
+						},
 						"clientID": {
-							"title": "Web Api ID",
+							"title": "Web Api Client ID",
 							"type": "string",
 							"placeholder": "5e5ead27-ed60-482d-b3fc-702b28a97404",
-							"description": "Optional free-form for future use.",
+							"description": "Optional for future use.",
 							"required": false
 						},
 						"clientSecret": {
-							"title": "Web Api Secret",
+							"title": "Web Api Client Secret",
 							"type": "string",
-							"placeholder": "Web Api Secret",
-							"description": "Optional free-form for future use.",
+							"placeholder": "Client Secret",
+							"description": "Optional for future use.",
 							"required": false
 						},
-						"xboxliveid": {
-							"title": "Live ID",
+						"userToken": {
+							"title": "Web Api User Token",
 							"type": "string",
-							"placeholder": "FD00000000000000",
-							"description": "Here put the Xbox Live ID",
-							"required": true
+							"placeholder": "User Token",
+							"description": "Optional alternative authentication method.",
+							"required": false
+						},
+						"uhs": {
+							"title": "Web Api UHS",
+							"type": "string",
+							"placeholder": "UHS",
+							"description": "Optional alternative authentication method.",
+							"required": false
 						},
 						"xboxWebApiToken": {
 							"title": "Web Api Token",
 							"type": "string",
-							"placeholder": "",
+							"placeholder": "Web Api Token",
 							"description": "Here put the reponse Token (value after ?code=) from the authentication URL.",
 							"required": true
 						},
@@ -70,7 +84,7 @@
 							"required": false,
 							"description": "This disable log info, all values and state will not be displayed in Homebridge log console."
 						},
-						"xboxWebApiEnabled": {
+						"webApiControl": {
 							"title": "Enable Web Api",
 							"type": "boolean",
 							"default": false,
@@ -117,8 +131,21 @@
 							"type": "boolean",
 							"default": false,
 							"required": false,
-							"description": "This function get all available inputs direct from device, manually configured inputs will be skipped."
-						  },
+							"description": "This function get all available inputs direct from device, manually configured inputs will be skipped.",
+							"condition": {
+								"functionBody": "return model.devices[arrayIndices].webApiControl === true;"
+							}
+						},
+						"rebootControl": {
+							"title": "Enable reboot control",
+							"type": "boolean",
+							"default": false,
+							"required": false,
+							"description": "This enable possibility reboot console if web api is enabled.",
+							"condition": {
+								"functionBody": "return model.devices[arrayIndices].webApiControl === true;"
+							}
+						},
 						"inputs": {
 							"title": "Inputs",
 							"buttonText": "Add app/input",
@@ -135,13 +162,13 @@
 									"reference": {
 										"title": "Reference",
 										"type": "string",
-										"description": "Here set reference.",
+										"description": "Here set reference. If web api is enable all available in */var/lib/homebridge/xboxTv/inputs_xxxxxx* file.",
 										"required": true
 									},
 									"onStoreProductId": {
 										"title": "",
 										"type": "string",
-										"description": "Here set on store product Id. If web api is enable switch app will be possible, all available in `/var/lib/homebridge/xboxTv/inputs_xxxxxx` file.",
+										"description": "Here set the *oneStoreProductId*. If web api is enable switch app will be possible, all available in */var/lib/homebridge/xboxTv/inputs_xxxxxx* file.",
 										"required": false
 									},
 									"type": {
@@ -237,13 +264,13 @@
 									"reference": {
 										"title": "Reference",
 										"type": "string",
-										"description": "Here set the reference.",
+										"description": "Here set the reference.  If web api is enable all available in */var/lib/homebridge/xboxTv/inputs_xxxxxx* file.",
 										"required": true
 									},
 									"oneStoreProductId": {
 										"title": "",
 										"type": "string",
-										"description": "Here set on store product Id. If web api is enable switch app will be possible, all available in `/var/lib/homebridge/xboxTv/inputs_xxxxxx` file.",
+										"description": "Here set the *oneStoreProductId*. If web api is enable switch app will be possible, all available in */var/lib/homebridge/xboxTv/inputs_xxxxxx* file.",
 										"required": false
 									}
 								}
@@ -252,29 +279,29 @@
 						"manufacturer": {
 							"name": "Manufacturer",
 							"type": "string",
-							"placeholder": "Manufacturer",
-							"description": "Set the manufacturer name.",
+							"placeholder": "Microsoft",
+							"description": "Optional - Set the manufacturer.",
 							"required": false
 						},
 						"modelName": {
 							"name": "Model",
 							"type": "string",
 							"placeholder": "Xbox One",
-							"description": "Set the model name.",
+							"description": "Optional - Set the model name.",
 							"required": false
 						},
 						"serialNumber": {
 							"name": "Serial Number",
 							"type": "string",
 							"placeholder": "000000000000",
-							"description": "Set the serial number.",
+							"description": "Optionel - Set the serial number.",
 							"required": false
 						},
 						"firmwareRevision": {
 							"name": "Firmware Revision",
 							"type": "string",
 							"placeholder": "00.0.00000.0000",
-							"description": "Set the firmware revision.",
+							"description": "Optional - Set the firmware revision.",
 							"required": false
 						}
 					}
@@ -290,8 +317,7 @@
 			"items": [
 				"devices[].name",
 				"devices[].host",
-				"devices[].xboxWebApiEnabled",
-				"devices[].getInputsFromDevice",
+				"devices[].webApiControl",
 				{
 					"key": "devices[]",
 					"type": "section",
@@ -349,7 +375,9 @@
 						"devices[].xboxliveid",
 						"devices[].clientID",
 						"devices[].clientSecret",
-						"devices[].xboxWebApiToken"
+						"devices[].xboxWebApiToken",
+						"devices[].userToken",
+						"devices[].uhs"
 					],
 					"condition": {
 						"functionBody": "return model.devices[arrayIndices].xboxWebApiEnabled === true;"
@@ -364,6 +392,8 @@
 					"items": [
 						"devices[].disableLogInfo",
 						"devices[].switchInfoMenu",
+						"devices[].rebootControl",
+						"devices[].getInputsFromDevice",
 						"devices[].refreshInterval",
 						"devices[].volumeControl"
 					]