Merge pull request #7 from gaojiafamily/dev

Fix Websocket EEW issue
gaojiafamily · Aug 22, 2024 · 610e14e · 610e14e
2 parents 6a44ba0 + a7cfe71
commit 610e14e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/custom_components/trem/const.py b/custom_components/trem/const.py
@@ -18,7 +18,7 @@
 MIN_HA_MAJ_VER = 2024
 MIN_HA_MIN_VER = 3
 __min_ha_version__ = f"{MIN_HA_MAJ_VER}.{MIN_HA_MIN_VER}.0"
-__version__ = "1.3.5"
+__version__ = "1.3.6"
 
 # Earthquake Icon
 EARTHQUAKE_ICON = {

diff --git a/custom_components/trem/manifest.json b/custom_components/trem/manifest.json
@@ -2,7 +2,7 @@
   "codeowners": ["@J1A-T13N", "@watermelon1024"],
   "domain": "trem",
   "name": "Taiwan Real-time Earthquake Monitoring",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "config_flow": true,
   "documentation": "https://github.com/gaojiafamily/ha-trem/blob/master/README.md",
   "issue_tracker": "https://github.com/gaojiafamily/ha-trem/issues",

diff --git a/custom_components/trem/sensor.py b/custom_components/trem/sensor.py
@@ -125,25 +125,23 @@ def __init__(
     def update(self):
         """Schedule a custom update via the common entity update service."""
 
-        data: dict = {}
-        if isinstance(self._coordinator.earthquakeData, dict):
-            data = self._coordinator.earthquakeData
+        eew: EEW | None = None
+        data = self._coordinator.earthquakeData
 
-        if len(data) > 0:
+        if isinstance(data, list) and len(data) > 0:
             self.simulator = None
+
+            eew = EEW.from_dict(data[0])
         elif isinstance(self.simulator, dict):
-            data = self.simulator
             if self.simulatorTime is None:
                 self.simulatorTime = datetime.now()
 
+            eew = EEW.from_dict(self.simulator)
+
             time = datetime.now() - self.simulatorTime
             if time.total_seconds() >= 240:
                 self.simulator = None
 
-        eew: EEW | None = None
-        if "id" in data:
-            eew = EEW.from_dict(data)
-
         if isinstance(eew, EEW):
             earthquakeSerial = f"{eew.id} (Serial {eew.serial})"
             if self._eew is None:

diff --git a/custom_components/trem/session.py b/custom_components/trem/session.py
@@ -193,7 +193,10 @@ async def _recv(self):
 
                     if eventType == WebSocketEvent.EEW.value:
                         if data.get("author", None) == "cwa":
-                            self.earthquakeData = data
+                            msgTime = msg_data.get("time", 0)
+                            tmpData: dict = data
+                            tmpData["time"] = data.get("time", msgTime)
+                            self.earthquakeData = [tmpData]
 
                     if eventType == WebSocketEvent.TSUNAMI.value:
                         if data.get("author", None) == "cwa":