Conf

.secrets.toml.example

@@ -1,10 +0,0 @@
-[mqtt]
-host = 'mqtt.host'
-username = 'loon'
-password = 'pwd'
-
-[redis]
-password = 'pwd'
-
-[jwt]
-secret = 'secret'

loon/mqtt/handlers/marquee.py

@@ -3,7 +3,7 @@ import random
 
 from loon.web.users.state import user_threads
 
-PLAYER_EVENT_SUFFIXES = ("died", "joined", "left")
+PLAYER_EVENT_SUFFIXES = ("died", "joined", "left", "kicked")
 
 DEATH_BY_DAMAGE = {
     "fall": (
@@ -79,7 +79,12 @@ async def marquee_handler(client, userdata, msg):
     except json.JSONDecodeError:
         return
 
-    username = data["player"]["username"]
+    player = data.get("player")
+    if not isinstance(player, dict):
+        return
+    username = player.get("username")
+    if not username:
+        return
 
     if subtopic == "died":
         killer = data.get("killer")
@@ -96,6 +101,9 @@ async def marquee_handler(client, userdata, msg):
             message = f"{username} died"
     elif subtopic == "joined":
         message = f"{username} joined the game"
+    elif subtopic == "kicked":
+        reason = data.get("reason")
+        message = f"{username} was kicked: {reason}" if reason else f"{username} was kicked"
     else:
         message = f"{username} left the game"
 

loon/mqtt/manager.py

@@ -66,7 +66,10 @@ class MQTTManager:
             logger.info(f"[Received] {data}.")
 
             for handler in self.handlers:
-                await handler(client, userdata, msg)
+                try:
+                    await handler(client, userdata, msg)
+                except Exception as e:
+                    logger.error(f'Got exception: {e}')
 
         asyncio.run_coroutine_threadsafe(handle_message(), self.loop)
 

loon/web/db/__init__.py

@@ -20,4 +20,4 @@ kwargs: dict = {}
 if url.startswith("sqlite"):
     kwargs["connect_args"] = {"check_same_thread": False}
 
-engine = create_engine(url, echo=True, **kwargs)
+engine = create_engine(url, echo=settings.database.echo, **kwargs)

settings.toml

@@ -4,11 +4,19 @@ allowed_origins = ["http://localhost:5173"]
 [redis]
 enabled = false
 host = 'localhost'
+password = 'pwd'
 port = 6379
 expire_time = 600 # 10 minutes
 
 [database]
 url = 'sqlite:///db.sqlite3'
+echo = false
 
 [mqtt]
+host = 'mqtt.host'
 port = 1883
+username = 'loon'
+password = 'pwd'
+
+[jwt]
+secret = 'secret'