update to brewblox-service 2

BrewBlox · May 30, 2023 · 0a561a8 · 0a561a8
1 parent b3fdf6a
commit 0a561a8
Show file tree

Hide file tree

Showing 4 changed files with 775 additions and 644 deletions.
diff --git a/brewblox_tilt/broadcaster.py b/brewblox_tilt/broadcaster.py
@@ -1,4 +1,5 @@
 import asyncio
+import json
 import time
 from os import getenv
 from pathlib import Path
@@ -51,8 +52,8 @@ async def on_event(self, mac: str, rssi: int, packet: IBeaconAdvertisement, info
                                             txpower=packet.tx_power,
                                             rssi=rssi)
 
-    async def on_names_change(self, topic: str, data: dict):
-        self.parser.apply_custom_names(data)
+    async def on_names_change(self, topic: str, payload: str):
+        self.parser.apply_custom_names(json.loads(payload))
 
     async def detect_device_id(self) -> int:
         bt_dir = Path('/sys/class/bluetooth')
@@ -142,11 +143,11 @@ async def run(self):
         # This will make the service show up in the UI even without active Tilts
         await mqtt.publish(self.app,
                            self.state_topic,
-                           {
+                           json.dumps({
                                'key': self.name,
                                'type': 'Tilt.state.service',
                                'timestamp': time_ms(),
-                           },
+                           }),
                            err=False,
                            retain=True)
 
@@ -159,13 +160,13 @@ async def run(self):
         # Devices can share an event
         await mqtt.publish(self.app,
                            self.history_topic,
-                           {
+                           json.dumps({
                                'key': self.name,
                                'data': {
                                    msg.name: msg.data
                                    for msg in messages
                                },
-                           },
+                           }),
                            err=False)
 
         # Publish state
@@ -175,30 +176,30 @@ async def run(self):
         for msg in messages:
             await mqtt.publish(self.app,
                                f'{self.state_topic}/{msg.color}/{msg.mac}',
-                               {
+                               json.dumps({
                                    'key': self.name,
                                    'type': 'Tilt.state',
                                    'timestamp': timestamp,
                                    'color': msg.color,
                                    'mac': msg.mac,
                                    'name': msg.name,
                                    'data': msg.data,
-                               },
+                               }),
                                err=False,
                                retain=True)
 
             for sync in msg.sync:
                 if sync.type == 'TempSensorExternal':
                     await mqtt.publish(self.app,
                                        'brewcast/spark/blocks/patch',
-                                       {
+                                       json.dumps({
                                            'id': sync.block,
                                            'serviceId': sync.service,
                                            'type': 'TempSensorExternal',
                                            'data': {
                                                'setting[degC]': msg.data['temperature[degC]'],
                                            },
-                                       },
+                                       }),
                                        err=False)
 
 

diff --git a/brewblox_tilt/broadcaster_sim.py b/brewblox_tilt/broadcaster_sim.py
@@ -1,4 +1,5 @@
 import asyncio
+import json
 import time
 from random import uniform
 
@@ -61,8 +62,8 @@ def __init__(self, app: web.Application):
 
         LOGGER.info(f'Started simulation for {config["simulate"]}')
 
-    async def on_names_change(self, topic: str, data: dict):
-        self.parser.apply_custom_names(data)
+    async def on_names_change(self, topic: str, payload: str):
+        self.parser.apply_custom_names(json.loads(payload))
 
     async def prepare(self):
         await mqtt.listen(self.app, self.names_topic, self.on_names_change)
@@ -81,11 +82,11 @@ async def run(self):
 
         await mqtt.publish(self.app,
                            self.state_topic,
-                           {
+                           json.dumps({
                                'key': self.name,
                                'type': 'Tilt.state.service',
                                'timestamp': time_ms(),
-                           },
+                           }),
                            err=False,
                            retain=True)
 
@@ -98,13 +99,13 @@ async def run(self):
         # Devices can share an event
         await mqtt.publish(self.app,
                            self.history_topic,
-                           {
+                           json.dumps({
                                'key': self.name,
                                'data': {
                                    msg.name: msg.data
                                    for msg in messages
                                },
-                           },
+                           }),
                            err=False)
 
         # Publish state
@@ -114,30 +115,30 @@ async def run(self):
         for msg in messages:
             await mqtt.publish(self.app,
                                f'{self.state_topic}/{msg.color}/{msg.mac}',
-                               {
+                               json.dumps({
                                    'key': self.name,
                                    'type': 'Tilt.state',
                                    'timestamp': timestamp,
                                    'color': msg.color,
                                    'mac': msg.mac,
                                    'name': msg.name,
                                    'data': msg.data,
-                               },
+                               }),
                                err=False,
                                retain=True)
 
             for sync in msg.sync:
                 if sync.type == 'Spark.Temperature':
                     await mqtt.publish(self.app,
                                        'brewcast/spark/blocks/patch',
-                                       {
+                                       json.dumps({
                                            'id': sync.block,
                                            'serviceId': sync.service,
                                            'type': 'TempSensorExternal',
                                            'data': {
                                                'setting[degC]': msg.data['temperature[degC]'],
                                            },
-                                       },
+                                       }),
                                        err=False)