Handle zeroconf object payloads and format Docker container list; update changelog

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.2.25
+- Handle zeroconf discovery payloads delivered as objects to avoid setup errors when reconfiguring.
+- Format container list strings with spaces after commas for readability.
+
 ## v1.2.24
 - Added a number box input for configuring the update interval during setup and in the options flow.
 - Parallelized initial coordinator refreshes to speed up startup when multiple servers are configured.

custom_components/vserver_ssh_stats/config_flow.py

@@ -155,16 +155,24 @@ async def async_step_user(self, user_input: dict[str, Any] | None = None):
             errors=errors,
         )
 
-    async def async_step_zeroconf(self, discovery_info: dict[str, Any]):
+    async def async_step_zeroconf(self, discovery_info: Any):
         """Handle zeroconf discovery."""
-
-        host = discovery_info.get("host")
+        if isinstance(discovery_info, dict):
+            host = discovery_info.get("host")
+            name = discovery_info.get("hostname", host)
+        else:
+            host = getattr(discovery_info, "host", None)
+            name = (
+                getattr(discovery_info, "hostname", None)
+                or getattr(discovery_info, "name", None)
+                or host
+            )
         if not host:
             return self.async_abort(reason="unknown")
         if self._host_already_configured(host):
             return self.async_abort(reason="already_configured")
         self._discovered_host = host
-        self._discovered_name = discovery_info.get("hostname", host)
+        self._discovered_name = name
         self.context["title_placeholders"] = {"name": self._discovered_name}
         return await self.async_step_user()
 

custom_components/vserver_ssh_stats/remote_script.py

@@ -178,6 +178,7 @@
     docker=1
     containers=$(docker ps --format '{{.Names}}' 2>/dev/null | tr '\n' ',' )
     containers=$(trim_comma "$containers")
+    containers=${containers//,/, }
     stats=$(docker stats --no-stream --format '{{.Name}}:{{.CPUPerc}}:{{.MemPerc}}' 2>/dev/null | sed 's/%//g' |
 awk -F: '{cpu=$2+0; mem=$3+0; printf "{\"name\":\"%s\",\"cpu\":%.2f,\"mem\":%.2f},", $1, cpu, mem}')
     if [ -n "$stats" ]; then