Address comments

custom_components/bermuda/sensor.py

@@ -9,6 +9,7 @@
 from homeassistant.const import (
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     STATE_UNAVAILABLE,
+    EntityCategory,
     UnitOfLength,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -77,7 +78,14 @@ def device_new(address: str, scanners: list[str]) -> None:
     # Connect device_new to a signal so the coordinator can call it
     _LOGGER.debug("Registering device_new callback.")
     entry.async_on_unload(async_dispatcher_connect(hass, SIGNAL_DEVICE_NEW, device_new))
-    async_add_devices([BermudaProxyCount(coordinator, entry), BermudaDeviceCount(coordinator, entry)])
+    async_add_devices(
+        (
+            BermudaTotalProxyCount(coordinator, entry),
+            BermudaActiveProxyCount(coordinator, entry),
+            BermudaTotalDeviceCount(coordinator, entry),
+            BermudaVisibleDeviceCount(coordinator, entry),
+        )
+    )
     # Now we must tell the co-ord to do initial refresh, so that it will call our callback.
     # This runs inside the event loop so should be fine as-is.
     # Disabling as it seems to work ok without, and it might be cause of async race.
@@ -328,8 +336,10 @@ def device_class(self):
         return "bermuda__custom_device_class"
 
 
-class BermudaProxyCount(BermudaGlobalSensor):
-    """Counts the number of proxies we have access to."""
+class BermudaTotalProxyCount(BermudaGlobalSensor):
+    """Counts the total number of proxies we have access to."""
+
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
 
     @property
     def unique_id(self):
@@ -347,11 +357,37 @@ def native_value(self) -> int:
     @property
     def name(self):
         """Gets the name of the sensor."""
-        return "Proxy count"
+        return "Total proxy count"
+
 
+class BermudaActiveProxyCount(BermudaGlobalSensor):
+    """Counts the number of proxies that are active."""
 
-class BermudaDeviceCount(BermudaGlobalSensor):
-    """Counts the number of devices we can see."""
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
+
+    @property
+    def unique_id(self):
+        """
+        "Uniquely identify this sensor so that it gets stored in the entity_registry,
+        and can be maintained / renamed etc by the user.
+        """
+        return "BERMUDA_GLOBAL_ACTIVE_PROXY_COUNT"
+
+    @property
+    def native_value(self) -> int:
+        """Gets the number of proxies we have access to."""
+        return self.coordinator.count_active_scanners()
+
+    @property
+    def name(self):
+        """Gets the name of the sensor."""
+        return "Active proxy count"
+
+
+class BermudaTotalDeviceCount(BermudaGlobalSensor):
+    """Counts the total number of devices we can see."""
+
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
 
     @property
     def unique_id(self):
@@ -363,10 +399,34 @@ def unique_id(self):
 
     @property
     def native_value(self) -> int:
-        """Gets the amount of devices we can see."""
+        """Gets the amount of devices we have seen."""
         return len(self.coordinator.devices)
 
     @property
     def name(self):
         """Gets the name of the sensor."""
-        return "Device count"
+        return "Total device count"
+
+
+class BermudaVisibleDeviceCount(BermudaGlobalSensor):
+    """Counts the number of devices that are active."""
+
+    _attr_entity_category = EntityCategory.DIAGNOSTIC
+
+    @property
+    def unique_id(self):
+        """
+        "Uniquely identify this sensor so that it gets stored in the entity_registry,
+        and can be maintained / renamed etc by the user.
+        """
+        return "BERMUDA_GLOBAL_VISIBLE_DEVICE_COUNT"
+
+    @property
+    def native_value(self) -> int:
+        """Gets the amount of devices that are active."""
+        return self.coordinator.count_active_devices()
+
+    @property
+    def name(self):
+        """Gets the name of the sensor."""
+        return "Visible device count"