catch UnicodeException (#100)

* catch UnicodeException

* add tests

Author: MP91

.devcontainer/Dockerfile

@@ -12,7 +12,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/python:v0.1.2
+FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/python:v0.1
 
 # Force dapr to use localhost traffic
 ENV DAPR_HOST_IP="127.0.0.1"

examples/seat-adjuster/requirements-links.txt

@@ -1 +1 @@
-git+https://github.com/eclipse-velocitas/[email protected].1
+git+https://github.com/eclipse-velocitas/[email protected].2

sdv/native/mqtt.py

@@ -75,7 +75,11 @@ async def subscribe_topic(self, topic, coro):
 
         @self._sub_client.topic_callback(topic)
         def handle(client, userdata, msg):
-            message = str(msg.payload.decode("utf-8"))
+            try:
+                message = str(msg.payload.decode("utf-8"))
+            except UnicodeDecodeError as err:
+                logger.error(err)
+                return
             if asyncio.iscoroutinefunction(coro):
                 # run the async callbacks on the main event loop
                 asyncio.run_coroutine_threadsafe(coro(message), loop)

setup.py

@@ -70,7 +70,7 @@
 
 setup(
     name="sdv",
-    version="0.10.1",
+    version="0.10.2",
     description="A Python SDK for Vehicle app",
     long_description=long_description,
     long_description_content_type="text/markdown",

tests/unit/native_pusbub_client_test.py

@@ -14,6 +14,7 @@
 
 """ Tests for methods in PubSubClient """
 import os
+import time
 
 os.environ["SDV_MIDDLEWARE_TYPE"] = "native"
 
@@ -61,5 +62,43 @@ async def test_for_get_publish_event():
         mocked_client.assert_called_once_with("/test/native", "message")
 
 
+@pytest.mark.asyncio
+async def test_for_subscribe_mqtt_event():
+    middleware = get_middleware_instance()
+    mqtt_client = middleware.pubsub_client
+    callback = CallbackClass()
+    await middleware.start()
+    await mqtt_client.run()
+    await mqtt_client.subscribe_topic("test/test_subscribe", callback)
+    # wait a moment to really subscribe
+    time.sleep(0.5)
+    await mqtt_client.publish_event("test/test_subscribe", "test")
+
+    time.sleep(1)
+    assert callback.executed
+
+
+@pytest.mark.asyncio
+async def test_for_error_message():
+    middleware = get_middleware_instance()
+    mqtt_client = middleware.pubsub_client
+    callback = CallbackClass()
+    await middleware.start()
+    await mqtt_client.run()
+    await mqtt_client.subscribe_topic("test/test_error", callback)
+    # wait a moment to really subscribe
+    time.sleep(0.5)
+    await mqtt_client.publish_event("test/test_error", b"\xc3")
+    assert not callback.executed
+
+
 def get_middleware_instance() -> Middleware:
     return config.middleware
+
+
+class CallbackClass:
+    def __init__(self):
+        self.executed = False
+
+    def __call__(self, message):
+        self.executed = True