espark-core 0.5.5__py3-none-any.whl → 0.5.7__py3-none-any.whl

{espark_core-0.5.5.dist-info → espark_core-0.5.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: espark-core
-Version: 0.5.5
+Version: 0.5.7
 Summary: The core module of the Espark ESP32-based IoT device management framework.
 License: MIT
 Requires-Python: >=3.10

{espark_core-0.5.5.dist-info → espark_core-0.5.7.dist-info}/RECORD

@@ -1,4 +1,4 @@
-espark_core-0.5.5.dist-info/licenses/LICENSE,sha256=wkIXJHYIspOGVvn_ajKyLucpIyw9_pO3QExFcNTCY78,1065
+espark_core-0.5.7.dist-info/licenses/LICENSE,sha256=wkIXJHYIspOGVvn_ajKyLucpIyw9_pO3QExFcNTCY78,1065
 esparkcore/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 esparkcore/constants.py,sha256=2Bmx62j4kykkPhcQ9ygEJ08uyVlykXMNFhpO26-Czlg,417
 esparkcore/data/__init__.py,sha256=abMOPq6jC5qOQCl9j7iPDv8iyjzDF-oVd_gW0la5kL4,45
@@ -32,10 +32,10 @@ esparkcore/schedules/__init__.py,sha256=v5Wy3Cbt2AnudGMGXv_Cyaa10s6NAmP66rDjcMSv
 esparkcore/schedules/outbox.py,sha256=GGANvjkI7w1BdmmVRgKog498ASD_xRN0g8bG6yC_SN4,811
 esparkcore/schedules/scheduler.py,sha256=aYQXImLZ4tW-hRavn3ObuV3lYjmOZD813YkeG1NsYfY,170
 esparkcore/services/__init__.py,sha256=RIZOHBfkWn3HsApdA5rH9EZbbXGq0NfiGoOWDO_JX1k,30
-esparkcore/services/mqtt.py,sha256=8Fd_JEGl-4LT4Hx433LRgzDqnlHnjc0JPSKFggGGs_E,8905
+esparkcore/services/mqtt.py,sha256=13-CXIclJ8eAG1jT1Gs4tBVnlguInSh45IM5_CG4f04,9068
 esparkcore/utils/__init__.py,sha256=rzuCJUAaQl-yPhM1vcWB_1zVXqtA71ChYP2aM_3UfKk,42
 esparkcore/utils/logging.py,sha256=sRO8uOcPkFH-DwepqLOTS2qGaopXpMdVOjzZL6RpGs4,257
-espark_core-0.5.5.dist-info/METADATA,sha256=eZPsdAcCIDiGyH65mbJ7C_H36NRZwNZmg4icRzxdQmw,6330
-espark_core-0.5.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-espark_core-0.5.5.dist-info/top_level.txt,sha256=hXVyhIPB4aGskFm5queWALxDPhcDkrN7_8vcjwA1iE4,11
-espark_core-0.5.5.dist-info/RECORD,,
+espark_core-0.5.7.dist-info/METADATA,sha256=nUXFAob-zoVWj8ew1SnCcnwWsad10RiowmocsEKX9zc,6330
+espark_core-0.5.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+espark_core-0.5.7.dist-info/top_level.txt,sha256=hXVyhIPB4aGskFm5queWALxDPhcDkrN7_8vcjwA1iE4,11
+espark_core-0.5.7.dist-info/RECORD,,

esparkcore/services/mqtt.py

@@ -117,7 +117,7 @@ class MQTTManager:
 
                         notifications = await self.notification_repo.list(session)
                         for notification in notifications:
-                            if trigger.notification_ids.index(str(notification.id)) != -1:
+                            if str(notification.id) in trigger.notification_ids:
                                 log_debug(f'Sending notification {notification.name} for trigger {trigger.name}')
 
                                 if notification.provider == 'Slack':
@@ -125,34 +125,37 @@ class MQTTManager:
 
     async def _process_queue(self) -> None:
         while True:
-            topic, payload = await self.queue.get()
-
-            topic_parts: list[str] = str(topic).split('/')
-            if len(topic_parts) != 3:
-                log_error(Exception('Invalid topic format, skipping message'))
-                continue
-
-            app_type, message_type, device_id = topic_parts
-            if app_type != 'espark':
-                log_debug('Invalid app type, skipping message')
-                continue
-
             try:
-                payload = loads(payload.decode())
-            except JSONDecodeError as e:
+                topic, payload = await self.queue.get()
+
+                topic_parts: list[str] = str(topic).split('/')
+                if len(topic_parts) != 3:
+                    log_error(Exception('Invalid topic format, skipping message'))
+                    continue
+
+                app_type, message_type, device_id = topic_parts
+                if app_type != 'espark':
+                    log_debug('Invalid app type, skipping message')
+                    continue
+
+                try:
+                    payload = loads(payload.decode())
+                except JSONDecodeError as e:
+                    log_error(e)
+                    continue
+
+                if message_type == TOPIC_REGISTRATION.split('/')[1]:
+                    await self._handle_registration(device_id, payload)
+                elif message_type == TOPIC_TELEMETRY.split('/')[1]:
+                    await self._handle_telemetry(device_id, payload)
+                elif message_type == TOPIC_CRASH.split('/')[1]:
+                    log_debug(f'Received crash report from device {device_id}: {payload}')
+                else:
+                    log_debug(f'Unknown message type "{message_type}", skipping message')
+
+                self.queue.task_done()
+            except Exception as e:
                 log_error(e)
-                continue
-
-            if message_type == TOPIC_REGISTRATION.split('/')[1]:
-                await self._handle_registration(device_id, payload)
-            elif message_type == TOPIC_TELEMETRY.split('/')[1]:
-                await self._handle_telemetry(device_id, payload)
-            elif message_type == TOPIC_CRASH.split('/')[1]:
-                log_debug(f'Received crash report from device {device_id}: {payload}')
-            else:
-                log_debug(f'Unknown message type "{message_type}", skipping message')
-
-            self.queue.task_done()
 
     async def _process_messages(self) -> None:
         while True: