homebridge-xbox-tv 2.14.1 → 2.14.2

package/README.md

@@ -109,18 +109,20 @@ Homebridge plugin for Microsoft game Consoles. Tested with Xbox One X/S and Xbox
 | `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. |
-| `enableRestFul` | If enabled, RESTful server will start automatically and respond to any path request. |
-| `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. |
-| `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 `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. |
+| `restFul` | This is RSTful server. |
+| `enable` | If enabled, RESTful server will start automatically and respond to any path request. |
+| `port` | Here set the listening `Port` for RESTful server. |
+| `debug` | If enabled, deep log will be present in homebridge console for RESTFul server. |
+| `mqtt` | This is MQTT Broker. |
+| `enable` | If enabled, MQTT Broker will start automatically and publish all awailable PV data. |
+| `host` | Here set the `IP Address` or `Hostname` for MQTT Broker. |
+| `port` | Here set the `Port` for MQTT Broker, default 1883. |
+| `clientId` | Here optional set the `Client Id` of MQTT Broker. |
+| `prefix` | Here set the `Prefix` for `Topic` or leave empty. |
+| `auth` | If enabled, MQTT Broker will use authorization credentials. |
+| `user` | Here set the MQTT Broker user. |
+| `passwd` | Here set the MQTT Broker password. |
+| `debug` | 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. |
 
 ## Create App on Azure AD

package/config.schema.json

@@ -572,6 +572,7 @@
 							"type": "string",
 							"placeholder": "Web Api Token",
 							"description": "Here put the reponse Token (value after ?code=) from the authorization URL.",
+							"format": "password",
 							"condition": {
 								"functionBody": "return model.devices[arrayIndices].webApiControl === true;"
 							},
@@ -592,6 +593,7 @@
 							"type": "string",
 							"placeholder": "Client Secret",
 							"description": "Here set your Client Secret from Azure AD or leave empty if you do not have own account.",
+							"format": "password",
 							"condition": {
 								"functionBody": "return model.devices[arrayIndices].webApiControl === true;"
 							},
@@ -719,113 +721,131 @@
 							"description": "This enable RESTful server.",
 							"required": false
 						},
-						"restFulDebug": {
-							"title": "Debug",
-							"type": "boolean",
-							"default": false,
-							"description": "This enable debug mode for RESTFul.",
-							"condition": {
-								"functionBody": "return model.devices[arrayIndices].enableRestFul === true;"
-							},
-							"required": false
-						},
-						"restFulPort": {
-							"title": "Port",
-							"type": "integer",
-							"placeholder": 3000,
-							"description": "Here set the listening Port for RESTful server.",
-							"condition": {
-								"functionBody": "return model.devices[arrayIndices].enableRestFul === true;"
-							},
-							"required": false
-						},
-						"enableMqtt": {
-							"title": "Enable",
-							"type": "boolean",
-							"default": false,
-							"description": "This enable MQTT client.",
-							"required": false
-						},
-						"mqttDebug": {
-							"title": "Debug",
-							"type": "boolean",
-							"default": false,
-							"description": "This enable debug mode for MQTT.",
-							"condition": {
-								"functionBody": "return model.devices[arrayIndices].enableMqtt === true;"
-							},
-							"required": false
-						},
-						"mqttHost": {
-							"title": "IP/Hostname",
-							"type": "string",
-							"placeholder": "ip or hostname",
-							"format": "hostname",
-							"description": "Here set the IP/Hostname of MQTT Broker.",
-							"condition": {
-								"functionBody": "return model.devices[arrayIndices].enableMqtt === true;"
-							},
-							"required": false
-						},
-						"mqttPort": {
-							"title": "Port",
-							"type": "integer",
-							"placeholder": 1883,
-							"description": "Here set the port of MQTT Broker.",
-							"condition": {
-								"functionBody": "return model.devices[arrayIndices].enableMqtt === true;"
-							},
-							"required": false
-						},
-						"mqttPrefix": {
-							"title": "Prefix",
-							"type": "string",
-							"placeholder": "home/xbox",
-							"description": "Here set the prefix.",
-							"condition": {
-								"functionBody": "return model.devices[arrayIndices].enableMqtt === true;"
-							},
-							"required": false
-						},
-						"mqttClientId": {
-							"title": "Client ID",
-							"type": "string",
-							"placeholder": "client id",
-							"description": "Here optional set the Client ID of MQTT Broker.",
-							"condition": {
-								"functionBody": "return model.devices[arrayIndices].enableMqtt === true"
-							},
-							"required": false
-						},
-						"mqttAuth": {
-							"title": "Authorization",
-							"type": "boolean",
-							"default": false,
-							"description": "This enable authorization for MQTT Broker.",
-							"condition": {
-								"functionBody": "return model.devices[arrayIndices].enableMqtt === true;"
-							},
-							"required": false
-						},
-						"mqttUser": {
-							"title": "User",
-							"type": "string",
-							"placeholder": "user",
-							"description": "Here set the user of MQTT Broker.",
-							"condition": {
-								"functionBody": "return model.devices[arrayIndices].enableMqtt === true && model.devices[arrayIndices].mqttAuth === true;"
-							},
-							"required": false
+						"restFul": {
+							"title": "RESTFul",
+							"type": "object",
+							"properties": {
+								"enable": {
+									"title": "Enable",
+									"type": "boolean",
+									"default": false,
+									"description": "This enable RESTful server."
+								},
+								"debug": {
+									"title": "Debug",
+									"type": "boolean",
+									"default": false,
+									"description": "This enable debug mode for RESTFul.",
+									"condition": {
+										"functionBody": "return model.devices[arrayIndices].restFul.enable === true;"
+									},
+									"required": false
+								},
+								"port": {
+									"title": "Port",
+									"type": "integer",
+									"placeholder": 3000,
+									"description": "Here set the listening Port for RESTful server.",
+									"condition": {
+										"functionBody": "return model.devices[arrayIndices].restFul.enable === true;"
+									},
+									"required": false
+								}
+							}
 						},
-						"mqttPasswd": {
-							"title": "Password",
-							"type": "string",
-							"placeholder": "password",
-							"description": "Here set the password of MQTT Broker.",
-							"condition": {
-								"functionBody": "return model.devices[arrayIndices].enableMqtt === true && model.devices[arrayIndices].mqttAuth === true;"
-							},
-							"required": false
+						"mqtt": {
+							"title": "MQTT",
+							"type": "object",
+							"properties": {
+								"enable": {
+									"title": "Enable",
+									"type": "boolean",
+									"default": false,
+									"description": "This enable MQTT client."
+								},
+								"debug": {
+									"title": "Debug",
+									"type": "boolean",
+									"default": false,
+									"description": "This enable debug mode for MQTT.",
+									"condition": {
+										"functionBody": "return model.devices[arrayIndices].mqtt.enable === true;"
+									},
+									"required": false
+								},
+								"host": {
+									"title": "IP/Hostname",
+									"type": "string",
+									"placeholder": "ip or hostname",
+									"format": "hostname",
+									"description": "Here set the IP/Hostname of MQTT Broker.",
+									"condition": {
+										"functionBody": "return model.devices[arrayIndices].mqtt.enable === true;"
+									},
+									"required": false
+								},
+								"port": {
+									"title": "Port",
+									"type": "integer",
+									"placeholder": 1883,
+									"description": "Here set the port of MQTT Broker.",
+									"condition": {
+										"functionBody": "return model.devices[arrayIndices].mqtt.enable === true;"
+									},
+									"required": false
+								},
+								"clientId": {
+									"title": "Client ID",
+									"type": "string",
+									"placeholder": "client id",
+									"description": "Here optional set the Client ID of MQTT Broker.",
+									"condition": {
+										"functionBody": "return model.devices[arrayIndices].mqtt.enable === true"
+									},
+									"required": false
+								},
+								"prefix": {
+									"title": "Prefix",
+									"type": "string",
+									"placeholder": "home/envoy",
+									"description": "Here set the prefix.",
+									"condition": {
+										"functionBody": "return model.devices[arrayIndices].mqtt.enable === true;"
+									},
+									"required": false
+								},
+								"auth": {
+									"title": "Authorization",
+									"type": "boolean",
+									"default": false,
+									"description": "This enable authorization for MQTT Broker.",
+									"condition": {
+										"functionBody": "return model.devices[arrayIndices].mqtt.enable === true;"
+									},
+									"required": false
+								},
+								"user": {
+									"title": "User",
+									"type": "string",
+									"placeholder": "user",
+									"description": "Here set the user of MQTT Broker.",
+									"condition": {
+										"functionBody": "return model.devices[arrayIndices].mqtt.enable === true && model.devices[arrayIndices].mqtt.auth === true;"
+									},
+									"required": false
+								},
+								"passwd": {
+									"title": "Password",
+									"type": "string",
+									"placeholder": "password",
+									"description": "Here set the password of MQTT Broker.",
+									"format": "password",
+									"condition": {
+										"functionBody": "return model.devices[arrayIndices].mqtt.enable === true && model.devices[arrayIndices].mqtt.auth === true;"
+									},
+									"required": false
+								}
+							}
 						}
 					}
 				}
@@ -955,8 +975,15 @@
 										"devices[].webApiControl",
 										"devices[].webApiPowerOnOff",
 										"devices[].webApiToken",
+										{
+											"key": "devices[].webApiToken",
+											"type": "password"
+										},
 										"devices[].webApiClientId",
-										"devices[].webApiClientSecret"
+										{
+											"key": "devices[].webApiClientSecret",
+											"type": "password"
+										}
 									]
 								},
 								{
@@ -978,27 +1005,30 @@
 											"title": "{{ value.title }}",
 											"items": [
 												{
-													"key": "devices[]",
+													"key": "devices[].restFul",
 													"title": "RESTFul",
 													"items": [
-														"devices[].enableRestFul",
-														"devices[].restFulDebug",
-														"devices[].restFulPort"
+														"devices[].restFul.enable",
+														"devices[].restFul.debug",
+														"devices[].restFul.port"
 													]
 												},
 												{
-													"key": "devices[]",
+													"key": "devices[].mqtt",
 													"title": "MQTT",
 													"items": [
-														"devices[].enableMqtt",
-														"devices[].mqttDebug",
-														"devices[].mqttHost",
-														"devices[].mqttPort",
-														"devices[].mqttClientId",
-														"devices[].mqttPrefix",
-														"devices[].mqttAuth",
-														"devices[].mqttUser",
-														"devices[].mqttPasswd"
+														"devices[].mqtt.enable",
+														"devices[].mqtt.debug",
+														"devices[].mqtt.host",
+														"devices[].mqtt.port",
+														"devices[].mqtt.clientId",
+														"devices[].mqtt.prefix",
+														"devices[].mqtt.auth",
+														"devices[].mqtt.user",
+														{
+															"key": "devices[].mqtt.passwd",
+															"type": "password"
+														}
 													]
 												}
 											]

package/homebridge-ui/server.js

@@ -30,6 +30,9 @@ class PluginUiServer extends HomebridgePluginUiServer {
       tokensFile: tokensFile
     }
     const authentication = new Authentication(authConfig);
+    authentication.on('error', (error) => {
+;
+    })
 
     let data = {};
     switch (mode) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Xbox TV",
   "name": "homebridge-xbox-tv",
-  "version": "2.14.1",
+  "version": "2.14.2",
   "description": "Homebridge plugin to control Xbox game consoles.",
   "license": "MIT",
   "author": "grzegorz914",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@homebridge/plugin-ui-utils": "^1.0.3",
     "async-mqtt": "^2.6.3",
-    "elliptic": "^6.5.6",
+    "elliptic": "^6.5.7",
     "hex-to-binary": "^1.0.1",
     "jsrsasign": "^11.1.0",
     "uuid": "^10.0.0",

package/src/localApi/sgcrypto.js

@@ -4,65 +4,65 @@ const Crypto = require('crypto');
 const EOL = require('os').EOL;
 const EC = require('elliptic').ec;
 const IV = Buffer.from('\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00');
+const EventEmitter = require('events');
 
-class SGCRYPTO {
+class SGCRYPTO extends EventEmitter {
     constructor() {
+        super();
         this.key = false;
         this.iv = false;
         this.hashKey = false;
 
     };
 
-    getPublicKey(certificate) {
-        return new Promise(async (resolve, reject) => {
-            try {
-                // Set certyficate
-                certificate = certificate.toString('base64').match(/.{0,64}/g).join('\n');
+    async getPublicKey(certificate) {
+        try {
+            // Set certyficate
+            certificate = certificate.toString('base64').match(/.{0,64}/g).join('\n');
 
-                // Set pem
-                const pem = `-----BEGIN CERTIFICATE-----${EOL}${certificate}-----END CERTIFICATE-----`;
+            // Set pem
+            const pem = `-----BEGIN CERTIFICATE-----${EOL}${certificate}-----END CERTIFICATE-----`;
 
-                // Create public key
-                const ecKey = JsRsaSign.X509.getPublicKeyFromCertPEM(pem);
+            // Create public key
+            const ecKey = JsRsaSign.X509.getPublicKeyFromCertPEM(pem);
 
-                const ec = new EC('p256');
-                const sha512 = Crypto.createHash('sha512');
+            const ec = new EC('p256');
+            const sha512 = Crypto.createHash('sha512');
 
-                // Generate keys
-                const key1 = ec.genKeyPair();
-                const key2 = ec.keyFromPublic(ecKey.pubKeyHex, 'hex');
+            // Generate keys
+            const key1 = ec.genKeyPair();
+            const key2 = ec.keyFromPublic(ecKey.pubKeyHex, 'hex');
 
-                const shared1 = key1.derive(key2.getPublic());
-                const derivedSecret = Buffer.from(shared1.toString(16), 'hex');
-                const publicKeyClient = key1.getPublic('hex');
+            const shared1 = key1.derive(key2.getPublic());
+            const derivedSecret = Buffer.from(shared1.toString(16), 'hex');
+            const publicKeyClient = key1.getPublic('hex');
 
-                const preSalt = Buffer.from('d637f1aae2f0418c', 'hex');
-                const postSalt = Buffer.from('a8f81a574e228ab7', 'hex');
-                const prePostSalt = Buffer.concat([preSalt, derivedSecret, postSalt]);
+            const preSalt = Buffer.from('d637f1aae2f0418c', 'hex');
+            const postSalt = Buffer.from('a8f81a574e228ab7', 'hex');
+            const prePostSalt = Buffer.concat([preSalt, derivedSecret, postSalt]);
 
-                // Hash shared secret
-                const sha = sha512.update(prePostSalt);
-                const shaSecret = sha.digest();
+            // Hash shared secret
+            const sha = sha512.update(prePostSalt);
+            const shaSecret = sha.digest();
 
-                const publicKeyHex = publicKeyClient.toString('hex');
-                const publicKey = Buffer.from(publicKeyHex.substring(2), 'hex');
-                const shaSecretHex = shaSecret.toString('hex');
-                const secret = Buffer.from(shaSecretHex, 'hex');
+            const publicKeyHex = publicKeyClient.toString('hex');
+            const publicKey = Buffer.from(publicKeyHex.substring(2), 'hex');
+            const shaSecretHex = shaSecret.toString('hex');
+            const secret = Buffer.from(shaSecretHex, 'hex');
 
-                this.key = secret.subarray(0, 16);
-                this.iv = secret.subarray(16, 32);
-                this.hashKey = secret.subarray(32, 64);
+            this.key = secret.subarray(0, 16);
+            this.iv = secret.subarray(16, 32);
+            this.hashKey = secret.subarray(32, 64);
 
-                const data = {
-                    publicKey: publicKey,
-                    iv: this.iv
-                };
-
-                resolve(data);
-            } catch (error) {
-                reject(`sign public key error: ${error}`);
+            const data = {
+                publicKey: publicKey,
+                iv: this.iv
             };
-        });
+
+            return data;
+        } catch (error) {
+            this.emit('error', `sign public key error: ${error}`);
+        };
     };
 
     getKey() {