@annadata/capacitor-mqtt-quic 0.1.8 → 0.2.0

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

@@ -38,6 +38,8 @@ public final class MQTTClient {
     private var keepaliveTask: Task<Void, Never>?
     private var nextPacketId: UInt16 = 1
     private var subscribedTopics: [String: (Data) -> Void] = [:]
+    /// Optional global callback for every incoming PUBLISH (topic, payload). Used by plugin to forward to JS. Matches Android.
+    var onPublish: ((String, Data) -> Void)?
     /// Per-connection Topic Alias map (alias -> topic name) for MQTT 5.0 incoming PUBLISH.
     private var topicAliasMap: [Int: String] = [:]
     /// Handoff from message loop to subscribe() so SUBACK is not consumed by the loop (avoids race and "insufficientData(SUBACK packet ID)").
@@ -515,7 +517,9 @@ public final class MQTTClient {
 
                         self.lock.lock()
                         let cb = self.subscribedTopics[topic]
+                        let globalCb = self.onPublish
                         self.lock.unlock()
+                        globalCb?(topic, payload)
                         cb?(payload)
 
                         if qos >= 1, let pid = packetId {

package/ios/Sources/MqttQuicPlugin/MqttQuicPlugin.swift

@@ -117,6 +117,19 @@ public class MqttQuicPlugin: CAPPlugin, CAPBridgedPlugin {
                     break
                 }
                 client = MQTTClient(protocolVersion: protocolVersion)
+                // Forward every incoming PUBLISH to JS so addListener('message', ...) receives topic + payload (matches Android)
+                client.onPublish = { [weak self] topic, payload in
+                    guard let self = self else { return }
+                    let payloadStr: String
+                    if let str = String(data: payload, encoding: .utf8) {
+                        payloadStr = str
+                    } else {
+                        payloadStr = payload.base64EncodedString()
+                    }
+                    DispatchQueue.main.async {
+                        self.notifyListeners("message", data: ["topic": topic, "payload": payloadStr])
+                    }
+                }
                 try await client.connect(
                     host: host,
                     port: UInt16(port),
@@ -257,14 +270,7 @@ public class MqttQuicPlugin: CAPPlugin, CAPBridgedPlugin {
         Task {
             do {
                 try await client.subscribe(topic: topic, qos: UInt8(min(qos, 2)), subscriptionIdentifier: subscriptionIdentifier)
-                // Deliver incoming PUBLISH for this topic to JS (avoids message loop having no handler; prevents stuck state)
-                client.onMessage(topic) { [weak self] payload in
-                    guard let self = self else { return }
-                    let str = String(data: payload, encoding: .utf8) ?? ""
-                    DispatchQueue.main.async {
-                        self.notifyListeners("message", data: ["topic": topic, "payload": str])
-                    }
-                }
+                // Incoming PUBLISH delivered via onPublish set in connect(); no per-topic handler needed
                 DispatchQueue.main.async { call.resolve(["success": true]) }
             } catch {
                 DispatchQueue.main.async { call.reject("\(error)") }

package/ios/Sources/MqttQuicPlugin/Transport/QUICStreamAdapter.swift

@@ -19,21 +19,16 @@ public final class QUICStreamReader: MQTTStreamReaderProtocol {
         try await stream.read(maxBytes: maxBytes)
     }
 
+    /// Read exactly n bytes. Waits indefinitely for data (matches Android behavior).
+    /// Previously had a 300ms limit which caused message loop to throw and disconnect before PUBLISH packets arrived.
     public func readexactly(_ n: Int) async throws -> Data {
         var acc = Data()
-        var emptyCount = 0
-        let maxEmptyRetries = 60  // ~300ms total (60 * 5ms) so SUBACK can arrive
         while acc.count < n {
             let chunk = try await stream.read(maxBytes: n - acc.count)
             if chunk.isEmpty {
-                emptyCount += 1
-                if emptyCount >= maxEmptyRetries {
-                    throw MQTTProtocolError.insufficientData("readexactly")
-                }
                 try await Task.sleep(nanoseconds: 5_000_000)  // 5ms
                 continue
             }
-            emptyCount = 0
             acc.append(chunk)
         }
         return acc

package/ios/build-wolfssl.sh

@@ -56,10 +56,15 @@ IOS_SDK_PATH=$(xcrun --sdk "$SDK" --show-sdk-path)
 if [ ! -d "$WOLFSSL_SOURCE_DIR" ] && [ -d "$PROJECT_DIR/../wolfssl-5.8.4-stable" ]; then
     WOLFSSL_SOURCE_DIR="$PROJECT_DIR/../wolfssl-5.8.4-stable"
 fi
+# Clone WolfSSL if missing
 if [ ! -d "$WOLFSSL_SOURCE_DIR" ]; then
-    echo "Error: WolfSSL source not found at $WOLFSSL_SOURCE_DIR"
-    echo "Clone: git clone --depth 1 -b ${WOLFSSL_TAG:-v5.8.4-stable} ${WOLFSSL_REPO_URL:-https://github.com/wolfSSL/wolfssl.git} $DEPS_DIR/wolfssl"
-    exit 1
+    echo "WolfSSL source not found. Cloning into $DEPS_DIR/wolfssl ..."
+    mkdir -p "$DEPS_DIR"
+    git clone --depth 1 -b "${WOLFSSL_TAG:-v5.8.4-stable}" "${WOLFSSL_REPO_URL:-https://github.com/wolfSSL/wolfssl.git}" "$DEPS_DIR/wolfssl" || {
+        echo "Error: Failed to clone WolfSSL"
+        exit 1
+    }
+    WOLFSSL_SOURCE_DIR="$DEPS_DIR/wolfssl"
 fi
 
 echo "Building WolfSSL (TLS 1.3 + QUIC) for iOS"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@annadata/capacitor-mqtt-quic",
-  "version": "0.1.8",
+  "version": "0.2.0",
   "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",

package/ios/libs/MqttQuicLibs.xcframework/Info.plist

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>AvailableLibraries</key>
-	<array>
-		<dict>
-			<key>BinaryPath</key>
-			<string>libmqttquic_native_simulator.a</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
-			<key>LibraryPath</key>
-			<string>libmqttquic_native_simulator.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-				<string>x86_64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
-		</dict>
-		<dict>
-			<key>BinaryPath</key>
-			<string>libmqttquic_native_device.a</string>
-			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
-			<key>LibraryPath</key>
-			<string>libmqttquic_native_device.a</string>
-			<key>SupportedArchitectures</key>
-			<array>
-				<string>arm64</string>
-			</array>
-			<key>SupportedPlatform</key>
-			<string>ios</string>
-		</dict>
-	</array>
-	<key>CFBundlePackageType</key>
-	<string>XFWK</string>
-	<key>XCFrameworkFormatVersion</key>
-	<string>1.0</string>
-</dict>
-</plist>