@annadata/capacitor-mqtt-quic 0.2.1 → 0.2.4

package/ios/Sources/MqttQuicPlugin/Client/MQTTClient.swift

@@ -555,42 +555,48 @@ public final class MQTTClient {
                         pingCont?.resume()
                     case MQTTMessageType.PUBLISH.rawValue:
                         let qos = (msgType >> 1) & 0x03
-                        let topic: String
-                        let packetId: UInt16?
-                        let payload: Data
-                        self.lock.lock()
-                        let version = self.activeProtocolVersion
-                        if version == MQTTProtocolLevel.v5 {
-                            var map = self.topicAliasMap
-                            self.lock.unlock()
-                            (topic, packetId, payload) = try MQTT5Protocol.parsePublishV5(Data(rest), offset: 0, qos: UInt8(qos), topicAliasMap: &map)
+                        do {
+                            let topic: String
+                            let packetId: UInt16?
+                            let payload: Data
                             self.lock.lock()
-                            self.topicAliasMap = map
-                            self.lock.unlock()
-                        } else {
-                            self.lock.unlock()
-                            let (t, pid, pl, _) = try MQTTProtocol.parsePublish(Data(rest), offset: 0, qos: UInt8(qos))
-                            topic = t
-                            packetId = pid
-                            payload = pl
-                        }
-
-                        self.lock.lock()
-                        let cb = self.subscribedTopics[topic]
-                        let globalCb = self.onPublish
-                        self.lock.unlock()
-                        globalCb?(topic, payload)
-                        cb?(payload)
+                            let version = self.activeProtocolVersion
+                            if version == MQTTProtocolLevel.v5 {
+                                var map = self.topicAliasMap
+                                self.lock.unlock()
+                                (topic, packetId, payload) = try MQTT5Protocol.parsePublishV5(Data(rest), offset: 0, qos: UInt8(qos), topicAliasMap: &map)
+                                self.lock.lock()
+                                self.topicAliasMap = map
+                                self.lock.unlock()
+                            } else {
+                                self.lock.unlock()
+                                let (t, pid, pl, _) = try MQTTProtocol.parsePublish(Data(rest), offset: 0, qos: UInt8(qos))
+                                topic = t
+                                packetId = pid
+                                payload = pl
+                            }
 
-                        if qos >= 1, let pid = packetId {
                             self.lock.lock()
-                            let wPuback = self.writer
+                            let cb = self.subscribedTopics[topic]
+                            let globalCb = self.onPublish
                             self.lock.unlock()
-                            if let wPuback = wPuback {
-                                let puback = MQTTProtocol.buildPuback(packetId: pid)
-                                try await wPuback.write(Data(puback))
-                                try await wPuback.drain()
+                            globalCb?(topic, payload)
+                            cb?(payload)
+
+                            if qos >= 1, let pid = packetId {
+                                self.lock.lock()
+                                let wPuback = self.writer
+                                self.lock.unlock()
+                                if let wPuback = wPuback {
+                                    let puback = MQTTProtocol.buildPuback(packetId: pid)
+                                    try await wPuback.write(Data(puback))
+                                    try await wPuback.drain()
+                                }
                             }
+                        } catch {
+                            // PUBLISH parse failed: log and skip this message (don't disconnect)
+                            let hex = rest.prefix(64).map { String(format: "%02x", $0) }.joined()
+                            print("[MqttQuic] PUBLISH parse failed: \(error) restLen=\(rest.count) hex=\(hex)")
                         }
                     default:
                         break

package/ios/Sources/MqttQuicPlugin/MqttQuicPlugin.swift

@@ -139,7 +139,7 @@ public class MqttQuicPlugin: CAPPlugin, CAPBridgedPlugin {
                         return payload.base64EncodedString()
                     }()
                     DispatchQueue.main.async {
-                        self.notifyListeners("message", data: ["topic": topic as String, "payload": payloadStr as String])
+                        self.notifyListeners("message", data: ["topic": topic, "payload": payloadStr])
                     }
                 }
                 try await client.connect(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@annadata/capacitor-mqtt-quic",
-  "version": "0.2.1",
+  "version": "0.2.4",
   "type": "module",
   "description": "MQTT-over-QUIC client for Capacitor (iOS, Android, Web). Native: ngtcp2+WolfSSL; Web: MQTT over WebSocket (WSS), same API.",
   "main": "dist/plugin.cjs.js",
@@ -66,8 +66,7 @@
     "typescript": "~5.6.0"
   },
   "dependencies": {
-    "mqtt": "^5.3.0",
-    "mqtt-packet": "^9.0.2"
+    "mqtt": "^5.3.0"
   },
   "peerDependencies": {
     "@capacitor/android": "^8.0.0",