Add files via upload

custom_components/saas/sensor.py

@@ -228,6 +228,7 @@ class SAASNextAlarmSensor(RestoreEntity):
         self.entry_id = entry_id
         self._state = None
         self._label = None
+        self._alarms = []
 
     @property
     def unique_id(self):
@@ -241,34 +242,78 @@ class SAASNextAlarmSensor(RestoreEntity):
     def state(self):
         return self._state
 
+    @property
+    def device_info(self):
+        """Return information about the device."""
+        return {
+            "identifiers": {(DOMAIN, self._name)},
+            "name": self._name,
+            "manufacturer": INTEGRATION_NAME,
+            "model": MODEL,
+        }
+
     @property
     def extra_state_attributes(self):
-        return {"Label": self._label} if self._label else {}
+        attrs = {}
+        if self._label:
+            attrs["Label"] = self._label
+        if self._alarms:
+            attrs["Alarms"] = self._alarms
+        return attrs
 
     async def async_added_to_hass(self):
         await super().async_added_to_hass()
 
         state = await self.async_get_last_state()
         if state:
-            self._state = state.state
+            self._state = state.state if state.state != "None" else None
             self._label = state.attributes.get("Label")
+            saved = state.attributes.get("Alarms")
+            if isinstance(saved, list):
+                self._alarms = saved
 
         async def message_received(msg):
             msg_json = json.loads(msg.payload)
             event = msg_json.get("event")
-            if event != "alarm_rescheduled":
-                return
-
             value1 = msg_json.get("value1")
             value2 = msg_json.get("value2")
-            if value1:
+
-                timestamp = int(value1) / 1000.0
+            if event == "alarm_rescheduled":
-                dt = dt_util.as_local(datetime.fromtimestamp(timestamp))
+                if value1:
+                    ts = int(value1) / 1000.0
+                    dt = dt_util.as_local(datetime.fromtimestamp(ts))
+                    epoch = dt.timestamp()
+                    found = False
+                    for alarm in self._alarms:
+                        if alarm["timestamp"] == epoch:
+                            alarm["label"] = value2
+                            found = True
+                            break
+                    if not found:
+                        self._alarms.append({"timestamp": epoch, "label": value2})
+                        self._alarms.sort(key=lambda x: x["timestamp"])
+                        self._alarms = self._alarms[:10]
+
+            elif event in ("alarm_alert_dismiss", "alarm_skip_next"):
+                if value1:
+                    ts = int(value1) / 1000.0
+                    dt = dt_util.as_local(datetime.fromtimestamp(ts))
+                    epoch = dt.timestamp()
+                    self._alarms = [a for a in self._alarms if a["timestamp"] != epoch]
+                elif self._alarms:
+                    self._alarms.pop(0)
+            else:
+                return
+
+            if self._alarms:
+                next_alarm = self._alarms[0]
+                dt = dt_util.as_local(datetime.fromtimestamp(next_alarm["timestamp"]))
                 self._state = dt.strftime("%Y-%m-%d %H:%M")
+                self._label = next_alarm.get("label")
             else:
                 self._state = None
+                self._label = None
 
-            self._label = value2
             self.async_schedule_update_ha_state()
 
         await async_subscribe(
@@ -277,6 +322,17 @@ class SAASNextAlarmSensor(RestoreEntity):
             message_received,
         )
 
+    async def async_will_remove_from_hass(self):
+        """Run when entity will be removed from hass."""
+        self.hass.states.async_set(
+            self.entity_id,
+            self._state,
+            {"Label": self._label, "Alarms": self._alarms},
+        )
+        _LOGGER.info(
+            f"{datetime.now().strftime('%H:%M:%S:%f')} (Line {inspect.currentframe().f_lineno}): Saved state: {self._state} for sensor {self.name}"
+        )
+
 class SAASSoundSensor(RestoreEntity):
     """Representation of a SAAS - Sleep As Android Stats sensor for Sound Events."""