From 44e289ebe9f447ce4d941119b27ce9b7be7886b5 Mon Sep 17 00:00:00 2001
From: FallenPhoenix8 <136991524+FallenPhoenix8@users.noreply.github.com>
Date: Tue, 10 Dec 2024 17:52:22 +0100
Subject: [PATCH] Update simple.py

Signed-off-by: FallenPhoenix8 <136991524+FallenPhoenix8@users.noreply.github.com>
---
 micropython/umqtt.simple/umqtt/simple.py | 44 +++++++++++++++---------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/micropython/umqtt.simple/umqtt/simple.py b/micropython/umqtt.simple/umqtt/simple.py
index 2a5b91655..1cb783d92 100644
--- a/micropython/umqtt.simple/umqtt/simple.py
+++ b/micropython/umqtt.simple/umqtt/simple.py
@@ -115,39 +115,51 @@ def ping(self):
         self.sock.write(b"\xc0\0")
 
     def publish(self, topic, msg, retain=False, qos=0):
-        pkt = bytearray(b"\x30\0\0\0")
-        pkt[0] |= qos << 1 | retain
+        print(
+            f"Preparing to publish: topic={topic}, msg={msg}, retain={retain}, qos={qos}"
+        )
+
+        # Encode the topic and message in UTF-8
+        topic = topic.encode("utf-8")
+        msg = msg.encode("utf-8")
+
+        # Calculate the size of the message
         sz = 2 + len(topic) + len(msg)
         if qos > 0:
             sz += 2
-        assert sz < 2097152
+
+        assert sz < 2097152  # MQTT supports a maximum of 2MB messages
+        print(f"Calculated message size: {sz}")
+
+        # Create the packet header
+        pkt = bytearray(5)  # Header can be up to 5 bytes
+        pkt[0] = 0x30 | (qos << 1) | retain  # Message type (PUBLISH)
         i = 1
-        while sz > 0x7F:
+        while sz > 0x7F:  # Multi-byte length encoding
             pkt[i] = (sz & 0x7F) | 0x80
             sz >>= 7
             i += 1
         pkt[i] = sz
-        # print(hex(len(pkt)), hexlify(pkt, ":"))
-        self.sock.write(pkt, i + 1)
-        self._send_str(topic)
-        if qos > 0:
-            self.pid += 1
-            pid = self.pid
-            struct.pack_into("!H", pkt, 0, pid)
-            self.sock.write(pkt, 2)
-        self.sock.write(msg)
+
+        # Send the header and data
+        self.sock.write(pkt[: i + 1])  # Header
+        self._send_str(topic)  # Topic
+        self.sock.write(msg)  # Message
+        print(f"Message sent: {msg.decode('utf-8')}")
+
+        # QoS handling
         if qos == 1:
-            while 1:
+            while True:
                 op = self.wait_msg()
                 if op == 0x40:
                     sz = self.sock.read(1)
                     assert sz == b"\x02"
                     rcv_pid = self.sock.read(2)
                     rcv_pid = rcv_pid[0] << 8 | rcv_pid[1]
-                    if pid == rcv_pid:
+                    if self.pid == rcv_pid:
                         return
         elif qos == 2:
-            assert 0
+            raise NotImplementedError("QoS level 2 not implemented")
 
     def subscribe(self, topic, qos=0):
         assert self.cb is not None, "Subscribe callback is not set"