homebridge-denon-tv 4.3.7-beta.2 → 4.3.7

package/README.md

@@ -101,11 +101,12 @@ Tested with Denon AVR-X6300H, Denon AVR-X2700H, Denon AVR-3311CI, Marantz SR8012
 | `restFulPort` | Here set the listening `Port` for RESTful server, every zone need own port. |
 | `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. |
-| `mqttDebug` | If enabled, deep log will be present in homebridge console for MQTT. |
-| `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. |
+| `mqttDebug` | If enabled, deep log will be present in homebridge console for MQTT. |
 | `AV Surround Mode` | This extra Accessory will control all functions of Main Zone except (Inputs). |

package/config.schema.json

@@ -4669,6 +4669,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"
+              }
+            },
             "mqttPrefix": {
               "title": "Prefix",
               "type": "string",
@@ -4852,44 +4862,41 @@
                     "devices[].disableLogDeviceInfo",
                     "devices[].disableLogConnectError"
                   ]
-                }
-              ]
-            }
-          ]
-        },
-        {
-          "key": "devices[]",
-          "type": "section",
-          "title": "External Integrations",
-          "expandable": true,
-          "expanded": false,
-          "items": [
-            {
-              "key": "devices[]",
-              "type": "tabarray",
-              "title": "{{ value.title }}",
-              "items": [
-                {
-                  "key": "devices[]",
-                  "title": "RESTFul",
-                  "items": [
-                    "devices[].enableRestFul",
-                    "devices[].restFulDebug",
-                    "devices[].restFulPort"
-                  ]
                 },
                 {
                   "key": "devices[]",
-                  "title": "MQTT",
+                  "title": "External Integrations",
                   "items": [
-                    "devices[].enableMqtt",
-                    "devices[].mqttDebug",
-                    "devices[].mqttHost",
-                    "devices[].mqttPort",
-                    "devices[].mqttPrefix",
-                    "devices[].mqttAuth",
-                    "devices[].mqttUser",
-                    "devices[].mqttPasswd"
+                    {
+                      "key": "devices[]",
+                      "type": "tabarray",
+                      "title": "{{ value.title }}",
+                      "items": [
+                        {
+                          "key": "devices[]",
+                          "title": "RESTFul",
+                          "items": [
+                            "devices[].enableRestFul",
+                            "devices[].restFulDebug",
+                            "devices[].restFulPort"
+                          ]
+                        },
+                        {
+                          "key": "devices[]",
+                          "title": "MQTT",
+                          "items": [
+                            "devices[].enableMqtt",
+                            "devices[].mqttDebug",
+                            "devices[].mqttHost",
+                            "devices[].mqttPort",
+                            "devices[].mqttPrefix",
+                            "devices[].mqttAuth",
+                            "devices[].mqttUser",
+                            "devices[].mqttPasswd"
+                          ]
+                        }
+                      ]
+                    }
                   ]
                 }
               ]

package/package.json

@@ -1,7 +1,7 @@
 {
   "displayName": "Denon TV",
   "name": "homebridge-denon-tv",
-  "version": "4.3.7-beta.2",
+  "version": "4.3.7",
   "description": "Homebridge plugin (https://github.com/homebridge/homebridge) to control Denon/Marantz AV Receivers.",
   "license": "MIT",
   "author": "grzegorz914",

package/src/denondevice.js

@@ -49,13 +49,14 @@ class DenonDevice extends EventEmitter {
         this.restFulPort = config.restFulPort || 3000;
         this.restFulDebug = config.restFulDebug || false;
         this.mqttEnabled = config.enableMqtt || false;
-        this.mqttDebug = config.mqttDebug || false;
         this.mqttHost = config.mqttHost;
         this.mqttPort = config.mqttPort || 1883;
+        this.mqttClientId = config.mqttClientId || `mqtt_${Math.random().toString(16).slice(3)}`;
         this.mqttPrefix = config.mqttPrefix;
         this.mqttAuth = config.mqttAuth || false;
         this.mqttUser = config.mqttUser;
         this.mqttPasswd = config.mqttPasswd;
+        this.mqttDebug = config.mqttDebug || false;
 
         //zones
         this.zoneName = CONSTANS.ZoneName[this.zoneControl];
@@ -118,10 +119,10 @@ class DenonDevice extends EventEmitter {
             this.mqtt = new Mqtt({
                 host: this.mqttHost,
                 port: this.mqttPort,
-                prefix: `${this.mqttPrefix}/${this.name}`,
-                auth: this.mqttAuth,
+                clientId: this.mqttClientId,
                 user: this.mqttUser,
                 passwd: this.mqttPasswd,
+                prefix: `${this.mqttPrefix}/${this.name}`,
                 debug: this.mqttDebug
             });
 

package/src/mqtt.js

@@ -7,10 +7,10 @@ class MQTTCLIENT extends EventEmitter {
         super();
         this.mqttHost = config.host;
         this.mqttPort = config.port;
-        this.mqttPrefix = config.prefix;
-        this.mqttAuth = config.auth;
+        this.mqttClientId = config.clientId;
         this.mqttUser = config.user;
         this.mqttPasswd = config.passwd;
+        this.mqttPrefix = config.prefix;
         this.mqttDebug = config.debug;
         this.isConnected = false;
 
@@ -20,6 +20,7 @@ class MQTTCLIENT extends EventEmitter {
     async connect() {
         try {
             const options = {
+                clientId: this.mqttClientId,
                 username: this.mqttUser,
                 password: this.mqttPasswd
             }