JSON parse

loon/mqtt/handlers/change_password_request.py

@@ -7,9 +7,7 @@ from loon.web.users.models import User
 from loon.web.utils.password import hash_password
 
 
-async def change_password_handler(client, userdata, msg):
-    data = json.loads(msg.payload.decode())
-
+async def change_password_handler(client, userdata, msg, data):
     if msg.topic != "loon/register/change_password":
         return
 

loon/mqtt/handlers/marquee.py

@@ -62,7 +62,7 @@ def get_random(templates, **kwargs):
     return random.choice(templates).format(**kwargs)
 
 
-async def marquee_handler(client, userdata, msg):
+async def marquee_handler(client, userdata, msg, data):
     prefix = "loon/player/"
 
     if not msg.topic.startswith(prefix):
@@ -74,11 +74,6 @@ async def marquee_handler(client, userdata, msg):
     if subtopic not in PLAYER_EVENT_SUFFIXES:
         return
 
-    try:
-        data = json.loads(msg.payload.decode())
-    except json.JSONDecodeError:
-        return
-
     player = data.get("player")
     if not isinstance(player, dict):
         return

loon/mqtt/handlers/player.py

@@ -3,9 +3,7 @@ import json
 from loon.web.users.state import user_threads
 
 
-async def player_handler(client, userdata, msg):
-    data = json.loads(msg.payload.decode())
-
+async def player_handler(client, userdata, msg, data):
     prefix = "loon/player/"
 
     if not msg.topic.startswith(prefix):

loon/mqtt/handlers/register_request.py

@@ -7,9 +7,7 @@ from loon.web.users.models import User
 from loon.web.utils.password import hash_password
 
 
-async def register_request_handler(client, userdata, msg):
-    data = json.loads(msg.payload.decode())
-
+async def register_request_handler(client, userdata, msg, data):
     if msg.topic != "loon/register/request":
         return
 

loon/mqtt/handlers/server.py

@@ -3,15 +3,10 @@ import json
 from loon.web.users.state import user_threads
 
 
-async def server_handler(client, userdata, msg):
+async def server_handler(client, userdata, msg, data):
     if msg.topic != "loon/server/info":
         return
 
-    try:
-        data = json.loads(msg.payload.decode())
-    except json.JSONDecodeError:
-        return
-
     envelope = json.dumps({"topic": "server/info", "payload": data})
 
     for queue in list(user_threads.values()):

loon/mqtt/handlers/world.py

@@ -8,7 +8,7 @@ from loon.redis.chunk import set_chunk_cache
 from loon.web.users.state import user_threads, user_world_requests
 
 
-async def world_handler(client, userdata, msg):
+async def world_handler(client, userdata, msg, data):
     chunk_topic = re.compile(r"^loon/world/chunk/(-?\d+)/(-?\d+)$")
 
     match = chunk_topic.match(msg.topic)
@@ -16,11 +16,6 @@ async def world_handler(client, userdata, msg):
     if not match:
         return
 
-    try:
-        data = json.loads(msg.payload.decode())
-    except json.JSONDecodeError:
-        return
-
     x, z = int(match.group(1)), int(match.group(2))
     envelope = json.dumps({"topic": f"world/chunk/{x}/{z}", "payload": data})
     coord = (x, z)

loon/mqtt/manager.py

@@ -63,11 +63,12 @@ class MQTTManager:
             except json.decoder.JSONDecodeError:
                 return
 
-            logger.info(f"[Received] {data}.")
+            if settings.mqtt.log_data:
+                logger.info(f"[Received] {data}.")
 
             for handler in self.handlers:
                 try:
-                    await handler(client, userdata, msg)
+                    await handler(client, userdata, msg, data)
                 except Exception as e:
                     logger.error(f'Got exception: {e}')
 

settings.toml

@@ -17,6 +17,7 @@ host = 'mqtt.host'
 port = 1883
 username = 'loon'
 password = 'pwd'
+log_data = false
 
 [jwt]
 secret = 'secret'