From ccb3f899cec7ebd00c50a815b7fc0c95f1f67e53 Mon Sep 17 00:00:00 2001
From: iranl <iranl@users.noreply.github.com>
Date: Sun, 4 Feb 2024 21:48:06 +0100
Subject: [PATCH] Add Home Assistant configuration URL

---
 Network.cpp                         | 12 ++++++++++++
 PreferencesKeys.h                   |  3 ++-
 WebCfgServer.cpp                    |  6 ++++++
 networkDevices/EthLan8720Device.cpp |  5 +++++
 networkDevices/W5500Device.cpp      |  5 +++++
 networkDevices/WifiDevice.cpp       |  5 +++++
 6 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/Network.cpp b/Network.cpp
index fe48b7c..f19fefb 100644
--- a/Network.cpp
+++ b/Network.cpp
@@ -719,6 +719,18 @@ void Network::publishHASSConfig(char* deviceType, const char* baseTopic, char* n
         json["dev"]["mf"] = "Nuki";
         json["dev"]["mdl"] = deviceType;
         json["dev"]["name"] = name;
+        
+        String cuUrl = _preferences->getString(preference_mqtt_hass_cu_url);
+
+        if (cuUrl != "")
+        {
+            json["dev"]["cu"] = cuUrl;
+        }
+        else
+        {
+            json["dev"]["cu"] = "http://" + _device->localIP();
+        }
+        
         json["~"] = baseTopic;
         json["name"] = nullptr;
         json["unique_id"] = String(uidString) + "_lock";
diff --git a/PreferencesKeys.h b/PreferencesKeys.h
index b658772..13757d5 100644
--- a/PreferencesKeys.h
+++ b/PreferencesKeys.h
@@ -20,6 +20,7 @@
 #define preference_mqtt_crt "mqttcrt"
 #define preference_mqtt_key "mqttkey"
 #define preference_mqtt_hass_discovery "hassdiscovery"
+#define preference_mqtt_hass_cu_url "hassConfigUrl"
 #define preference_ip_dhcp_enabled "dhcpena"
 #define preference_ip_address "ipaddr"
 #define preference_ip_subnet "ipsub"
@@ -64,7 +65,7 @@ private:
             preference_mqtt_user, preference_mqtt_password, preference_mqtt_log_enabled, preference_lock_enabled,
             preference_mqtt_lock_path, preference_opener_enabled, preference_mqtt_opener_path,
             preference_lock_max_keypad_code_count, preference_opener_max_keypad_code_count, preference_mqtt_ca,
-            preference_mqtt_crt, preference_mqtt_key, preference_mqtt_hass_discovery,
+            preference_mqtt_crt, preference_mqtt_key, preference_mqtt_hass_discovery, preference_mqtt_hass_cu_url,
             preference_ip_dhcp_enabled, preference_ip_address, preference_ip_subnet, preference_ip_gateway, preference_ip_dns_server,
             preference_network_hardware, preference_network_wifi_fallback_disabled, preference_rssi_publish_interval,
             preference_hostname, preference_network_timeout, preference_restart_on_disconnect,
diff --git a/WebCfgServer.cpp b/WebCfgServer.cpp
index 07f1446..d6a1372 100644
--- a/WebCfgServer.cpp
+++ b/WebCfgServer.cpp
@@ -352,6 +352,11 @@ bool WebCfgServer::processArgs(String& message)
                 configChanged = true;
             }
         }
+        else if(key == "HASSCUURL")
+        {
+            _preferences->putString(preference_mqtt_hass_cu_url, value);
+            configChanged = true;
+        }        
         else if(key == "HOSTNAME")
         {
             _preferences->putString(preference_hostname, value);
@@ -764,6 +769,7 @@ void WebCfgServer::buildMqttConfigHtml(String &response)
     response.concat("<h3>Advanced MQTT and Network Configuration</h3>");
     response.concat("<table>");
     printInputField(response, "HASSDISCOVERY", "Home Assistant discovery topic (empty to disable; usually homeassistant)", _preferences->getString(preference_mqtt_hass_discovery).c_str(), 30);
+    printInputField(response, "HASSCUURL", "Home Assistant device configuration URL (empty to use http://LOCALIP; fill when using a reverse proxy for example)", _preferences->getString(preference_mqtt_hass_cu_url).c_str(), 261);
     printTextarea(response, "MQTTCA", "MQTT SSL CA Certificate (*, optional)", _preferences->getString(preference_mqtt_ca).c_str(), TLS_CA_MAX_SIZE, _network->encryptionSupported(), true);
     printTextarea(response, "MQTTCRT", "MQTT SSL Client Certificate (*, optional)", _preferences->getString(preference_mqtt_crt).c_str(), TLS_CERT_MAX_SIZE, _network->encryptionSupported(), true);
     printTextarea(response, "MQTTKEY", "MQTT SSL Client Key (*, optional)", _preferences->getString(preference_mqtt_key).c_str(), TLS_KEY_MAX_SIZE, _network->encryptionSupported(), true);
diff --git a/networkDevices/EthLan8720Device.cpp b/networkDevices/EthLan8720Device.cpp
index def7bc6..95ea554 100644
--- a/networkDevices/EthLan8720Device.cpp
+++ b/networkDevices/EthLan8720Device.cpp
@@ -159,6 +159,11 @@ int8_t EthLan8720Device::signalStrength()
     return -1;
 }
 
+String EthLan8720Device::localIP()
+{
+    return Ethernet.localIP().toString();
+}
+
 void EthLan8720Device::mqttSetClientId(const char *clientId)
 {
     if(_useEncryption)
diff --git a/networkDevices/W5500Device.cpp b/networkDevices/W5500Device.cpp
index e66b6bd..0b3045d 100644
--- a/networkDevices/W5500Device.cpp
+++ b/networkDevices/W5500Device.cpp
@@ -229,6 +229,11 @@ int8_t W5500Device::signalStrength()
     return 127;
 }
 
+String W5500Device::localIP()
+{
+    return Ethernet.localIP().toString();
+}
+
 void W5500Device::mqttSetClientId(const char *clientId)
 {
     _mqttClient.setClientId(clientId);
diff --git a/networkDevices/WifiDevice.cpp b/networkDevices/WifiDevice.cpp
index a90ff82..b36606d 100644
--- a/networkDevices/WifiDevice.cpp
+++ b/networkDevices/WifiDevice.cpp
@@ -180,6 +180,11 @@ int8_t WifiDevice::signalStrength()
     return WiFi.RSSI();
 }
 
+String WifiDevice::localIP()
+{
+    return WiFi.localIP().toString();
+}
+
 void WifiDevice::clearRtcInitVar(WiFiManager *)
 {
     memset(WiFiDevice_reconfdetect, 0, sizeof WiFiDevice_reconfdetect);