Move bytes and json decoding from server to webhook_push_callback

Author: starkillerOG

reolink_aio/baichuan/baichuan.py

@@ -12,6 +12,8 @@
 from xml.etree import ElementTree as XML
 
 from Cryptodome.Cipher import AES
+from orjson import JSONDecodeError  # pylint: disable=no-name-in-module
+from orjson import loads as json_loads  # pylint: disable=no-name-in-module
 
 from ..const import (
     AI_DETECT_CONVERSION,
@@ -517,15 +519,27 @@ def _push_callback(self, cmd_id: int, data: bytes, len_header: int, payload: byt
 
         self._parse_xml(cmd_id, rec_body, payload, mess_id)
 
-    def _webhook_push_callback(self, data: dict[str, Any]) -> None:
+    def webhook_push_callback(self, data: bytes) -> None:
         """Callback to parse a received message that was pushed through the webhook"""
-        uid: str = data.get("uid", "")
-        cmd_id: int | None = data.get("cmd")
-        xml: str | None = data.get("xml")
-        ext_xml: str = data.get("ext_xml", "")
+        try:
+            text = data.decode("utf-8")
+        except Exception as err:
+            _LOGGER.debug("Baichuan host %s: error during decoding webhook data: %s", self._host, err)
+            return
+
+        try:
+            mess: dict[str, Any] = json_loads(text)
+        except JSONDecodeError as err:
+            _LOGGER.debug("Baichuan host %s: error during decoding webhook json data:\n%s\n%s", self._host, text, err)
+            return
+
+        uid: str = mess.get("uid", "")
+        cmd_id: int | None = mess.get("cmd")
+        xml: str | None = mess.get("xml")
+        ext_xml: str = mess.get("ext_xml", "")
 
         if cmd_id is None or xml is None:
-            _LOGGER.debug("Baichuan host %s: received webhook push with malformed data:\n%s", self._host, data)
+            _LOGGER.debug("Baichuan host %s: received webhook push with malformed data:\n%s", self._host, mess)
             return
 
         if uid != self.http_api.uid:
@@ -1218,7 +1232,7 @@ async def _subscribe_webhook(self, url: str = "") -> None:
         if not url:
             # start a internall webhook server and use that
             if self._webhook_server is None:
-                self._webhook_server = WebhookServer(host=self._host, push_callback=self._webhook_push_callback)
+                self._webhook_server = WebhookServer(host=self._host, push_callback=self.webhook_push_callback)
             await self._webhook_server.start()
             url = self._webhook_server.adress
 

reolink_aio/baichuan/webhook_server.py

@@ -3,19 +3,16 @@
 import asyncio
 import logging
 from collections.abc import Callable
-from typing import Any
 
 from aiohttp import web
-from orjson import JSONDecodeError  # pylint: disable=no-name-in-module
-from orjson import loads as json_loads  # pylint: disable=no-name-in-module
 
 _LOGGER = logging.getLogger(__name__)
 
 
 class WebhookServer:
     """Reolink webhook server to receive Baichuan push callbacks."""
 
-    def __init__(self, host: str, port: int = 0, push_callback: Callable[[dict[str, Any]], None] | None = None) -> None:
+    def __init__(self, host: str, port: int = 0, push_callback: Callable[[bytes], None] | None = None) -> None:
         self.port: int = port
         self.adress: str = ""
         self.local_ip: str = "127.0.0.1"
@@ -27,15 +24,10 @@ def __init__(self, host: str, port: int = 0, push_callback: Callable[[dict[str,
 
     async def handle_webhook(self, request: web.Request) -> web.Response:
         """Handle a incomming message on the webhook."""
-        text = ""
         try:
-            text = await request.text()
-            data = json_loads(text)
-        except JSONDecodeError as err:
-            _LOGGER.debug("Baichuan server %s: error during decoding json data:\n%s\n%s", self.port, text, err)
-            return web.Response(text="JSONDecodeError", status=400)
+            data = await request.read()
         except Exception as err:
-            _LOGGER.debug("Baichuan server %s: error during receiving data:\n%s\n%s", self.port, text, err)
+            _LOGGER.debug("Baichuan server %s: error during receiving data: %s", self.port, err)
             return web.Response(text="Error", status=400)
 
         if self._push_callback is not None:
@@ -44,7 +36,7 @@ async def handle_webhook(self, request: web.Request) -> web.Response:
             except Exception as err:
                 _LOGGER.debug("Baichuan server %s: Error during push callback with data:\n%s\n%s", self.port, data, err)
         else:
-            _LOGGER.debug("Baichuan server %s: Received:\n%s", self.port, data)
+            _LOGGER.debug("Baichuan server %s: Received:\n%s", self.port, data.decode("utf-8"))
 
         return web.Response(text="OK", status=200)