@annadata/capacitor-mqtt-quic 0.1.7 → 0.1.9

package/android/src/main/kotlin/ai/annadata/mqttquic/client/MQTTClient.kt

@@ -1,5 +1,6 @@
 package ai.annadata.mqttquic.client
 
+import android.util.Log
 import ai.annadata.mqttquic.mqtt.MQTT5PropertyType
 import ai.annadata.mqttquic.mqtt.MQTTConnAckCode
 import ai.annadata.mqttquic.mqtt.MQTTMessageType
@@ -15,6 +16,7 @@ import ai.annadata.mqttquic.transport.MQTTStreamReader
 import ai.annadata.mqttquic.transport.MQTTStreamWriter
 import ai.annadata.mqttquic.transport.QUICStreamReader
 import ai.annadata.mqttquic.transport.QUICStreamWriter
+import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -24,6 +26,9 @@ import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.TimeoutCancellationException
+import kotlinx.coroutines.withTimeout
 
 /**
  * High-level MQTT client: connect, publish, subscribe, disconnect.
@@ -62,6 +67,10 @@ class MQTTClient {
     var onPublish: ((String, ByteArray) -> Unit)? = null
     /** Per-connection Topic Alias map (alias -> topic name) for MQTT 5.0 incoming PUBLISH. */
     private val topicAliasMap = mutableMapOf<Int, String>()
+    /** Pending SUBACK by packet ID. Message loop completes with (fullPacket, hdrLen). Single reader: only message loop reads stream. */
+    private val pendingSubacks = mutableMapOf<Int, CompletableDeferred<Pair<ByteArray, Int>>>()
+    /** Pending UNSUBACK by packet ID. Message loop completes when UNSUBACK is read. */
+    private val pendingUnsubacks = mutableMapOf<Int, CompletableDeferred<Unit>>()
     private val lock = Mutex()
     private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
 
@@ -77,6 +86,29 @@ class MQTTClient {
     /** Assigned Client Identifier from CONNACK when client sent empty ClientID; null otherwise. */
     fun getAssignedClientIdentifier(): String? = runBlocking { lock.withLock { assignedClientIdentifier } }
 
+    /** Resolved IP used for the current/last QUIC connection (from native getaddrinfo). Used by plugin to cache for reconnect when Java DNS fails. */
+    fun getLastResolvedAddress(): String? = (quicClient as? NGTCP2Client)?.getLastResolvedAddress()
+
+    /** Read full MQTT fixed header (1 byte type + 1–4 bytes remaining length per MQTT v5.0 §2.1.4). Returns (msgType, remLen, fixedHeaderBytes). */
+    private suspend fun readFixedHeader(r: MQTTStreamReader): Triple<Byte, Int, ByteArray> {
+        Log.i("MQTTClient", "readFixedHeader: requesting first byte")
+        var fixed = r.readexactly(1).toMutableList()
+        val firstByte = fixed[0].toInt() and 0xFF
+        Log.i("MQTTClient", "readFixedHeader: got type byte 0x${Integer.toHexString(firstByte)} ($firstByte)")
+        repeat(5) { // 1 type + up to 4 remaining-length bytes (Variable Byte Integer)
+            try {
+                val (rem, _) = MQTTProtocol.decodeRemainingLength(fixed.toByteArray(), 1)
+                Log.i("MQTTClient", "readFixedHeader: decoded remLen=$rem fixedSize=${fixed.size}")
+                return Triple(fixed[0], rem, fixed.toByteArray())
+            } catch (_: IllegalArgumentException) {
+                if (fixed.size > 5) throw IllegalArgumentException("Invalid remaining length")
+                fixed.addAll(r.readexactly(1).toList())
+                Log.i("MQTTClient", "readFixedHeader: added byte, fixedSize=${fixed.size}")
+            }
+        }
+        throw IllegalArgumentException("Invalid remaining length")
+    }
+
     suspend fun connect(
         host: String,
         port: Int,
@@ -85,7 +117,8 @@ class MQTTClient {
         password: String?,
         cleanSession: Boolean,
         keepalive: Int,
-        sessionExpiryInterval: Int? = null
+        sessionExpiryInterval: Int? = null,
+        connectAddress: String? = null
     ) {
         lock.withLock {
             if (state == State.CONNECTING) {
@@ -109,7 +142,7 @@ class MQTTClient {
             } else {
                 QuicClientStub(connack.toList())
             }
-            quic.connect(host, port)
+            quic.connect(host, port, connectAddress)
             val s = quic.openStream()
             val r = QUICStreamReader(s)
             val w = QUICStreamWriter(s)
@@ -146,50 +179,118 @@ class MQTTClient {
             w.write(connectData)
             w.drain()
 
-            // MQTT 5.0: server may send AUTH before CONNACK; loop until CONNACK
+            // MQTT 5.0: server may send AUTH before CONNACK; loop until CONNACK. Timeout so we don't block 30s until ERR_IDLE_CLOSE.
+            // Efficient path: drain stream (read until empty), then parse first complete packet; repeat until CONNACK or timeout.
             var full: ByteArray
             var hdrLen: Int
-            if (activeProtocolVersion == MQTTProtocolLevel.V5) {
-                while (true) {
-                    val fixed = r.readexactly(2)
-                    val (msgType, remLen, hLen) = MQTTProtocol.parseFixedHeader(fixed)
-                    val rest = r.readexactly(remLen)
-                    full = fixed + rest
-                    hdrLen = hLen
-                    when (msgType) {
-                        MQTTMessageType.CONNACK -> break
-                        MQTTMessageType.AUTH -> {
-                            lock.withLock { state = State.ERROR }
-                            try {
-                                w.write(MQTT5Protocol.buildDisconnectV5(MQTT5ReasonCode.BAD_AUTHENTICATION_METHOD_DISC))
-                                w.drain()
-                                w.close()
-                            } catch (_: Exception) { /* ignore */ }
-                            throw IllegalArgumentException("Enhanced authentication not supported")
-                        }
-                        MQTTMessageType.DISCONNECT -> {
-                            lock.withLock { state = State.ERROR }
-                            throw IllegalArgumentException("Server sent DISCONNECT before CONNACK")
+            val connackTimeoutMs = 15_000L
+            try {
+                if (activeProtocolVersion == MQTTProtocolLevel.V5) {
+                    Log.i("MQTTClient", "reading CONNACK (MQTT5) timeout=${connackTimeoutMs}ms (drain then parse)")
+                    withTimeout(connackTimeoutMs) {
+                        while (true) {
+                            if (r is QUICStreamReader) {
+                                r.drain()
+                                val avail = r.available()
+                                Log.i("MQTTClient", "CONNACK loop: after drain available=$avail")
+                                val packet = r.tryConsumeNextPacket()
+                                if (packet != null) {
+                                    val (msgType, _, fixedLen) = MQTTProtocol.parseFixedHeader(packet.copyOf(minOf(5, packet.size)))
+                                    val typeByte = msgType.toInt() and 0xFF
+                                    Log.i("MQTTClient", "CONNACK loop: packet type=0x${Integer.toHexString(typeByte)} len=${packet.size} hdrLen=$fixedLen")
+                                    when (typeByte) {
+                                        0x20 -> {
+                                            full = packet
+                                            hdrLen = fixedLen
+                                            return@withTimeout
+                                        }
+                                        0xF0 -> {
+                                            lock.withLock { state = State.ERROR }
+                                            try {
+                                                w.write(MQTT5Protocol.buildDisconnectV5(MQTT5ReasonCode.BAD_AUTHENTICATION_METHOD_DISC))
+                                                w.drain()
+                                                w.close()
+                                            } catch (_: Exception) { /* ignore */ }
+                                            throw IllegalArgumentException("Enhanced authentication not supported")
+                                        }
+                                        0xE0 -> {
+                                            lock.withLock { state = State.ERROR }
+                                            throw IllegalArgumentException("Server sent DISCONNECT before CONNACK")
+                                        }
+                                        else -> Log.i("MQTTClient", "CONNACK loop: skipping non-CONNACK packet type=0x${Integer.toHexString(typeByte)}")
+                                    }
+                                } else {
+                                    // Only delay when no data; if we have data but no packet, retry soon (avoid suspend then timeout before next iteration)
+                                    if (avail == 0) delay(50) else delay(10)
+                                }
+                            } else {
+                                // Fallback for non-QUIC reader (e.g. mock)
+                                val (msgType, remLen, fixed) = readFixedHeader(r)
+                                val typeByte = fixed[0].toInt() and 0xFF
+                                val rest = r.readexactly(remLen)
+                                full = fixed + rest
+                                hdrLen = fixed.size
+                                when (typeByte) {
+                                    0x20 -> return@withTimeout
+                                    0xF0 -> {
+                                        lock.withLock { state = State.ERROR }
+                                        try {
+                                            w.write(MQTT5Protocol.buildDisconnectV5(MQTT5ReasonCode.BAD_AUTHENTICATION_METHOD_DISC))
+                                            w.drain()
+                                            w.close()
+                                        } catch (_: Exception) { /* ignore */ }
+                                        throw IllegalArgumentException("Enhanced authentication not supported")
+                                    }
+                                    0xE0 -> {
+                                        lock.withLock { state = State.ERROR }
+                                        throw IllegalArgumentException("Server sent DISCONNECT before CONNACK")
+                                    }
+                                    else -> { /* skip; continue */ }
+                                }
+                            }
                         }
-                        else -> {
-                            lock.withLock { state = State.ERROR }
-                            throw IllegalArgumentException("Expected CONNACK or AUTH, got $msgType")
+                    }
+                    Log.i("MQTTClient", "got CONNACK (MQTT5) (fullLen=${full.size} hdrLen=$hdrLen)")
+                } else {
+                    Log.i("MQTTClient", "reading CONNACK (3.1.1) timeout=${connackTimeoutMs}ms")
+                    withTimeout(connackTimeoutMs) {
+                        if (r is QUICStreamReader) {
+                            while (true) {
+                                r.drain()
+                                val packet = r.tryConsumeNextPacket()
+                                if (packet != null) {
+                                    val (msgType, _, fixedLen) = MQTTProtocol.parseFixedHeader(packet.copyOf(minOf(5, packet.size)))
+                                    if (msgType == MQTTMessageType.CONNACK) {
+                                        full = packet
+                                        hdrLen = fixedLen
+                                        break
+                                    }
+                                    lock.withLock { state = State.ERROR }
+                                    throw IllegalArgumentException("expected CONNACK, got $msgType")
+                                }
+                                delay(50)
+                            }
+                        } else {
+                            val (msgType, remLen, fixed) = readFixedHeader(r)
+                            val rest = r.readexactly(remLen)
+                            full = fixed + rest
+                            hdrLen = fixed.size
+                            if (msgType != MQTTMessageType.CONNACK) {
+                                lock.withLock { state = State.ERROR }
+                                throw IllegalArgumentException("expected CONNACK, got $msgType")
+                            }
                         }
+                        Log.i("MQTTClient", "got CONNACK (3.1.1)")
                     }
                 }
-            } else {
-                val fixed = r.readexactly(2)
-                val (msgType, remLen, hLen) = MQTTProtocol.parseFixedHeader(fixed)
-                val rest = r.readexactly(remLen)
-                full = fixed + rest
-                hdrLen = hLen
-                if (msgType != MQTTMessageType.CONNACK) {
-                    lock.withLock { state = State.ERROR }
-                    throw IllegalArgumentException("expected CONNACK, got $msgType")
-                }
+            } catch (e: TimeoutCancellationException) {
+                lock.withLock { state = State.ERROR }
+                Log.w("MQTTClient", "CONNACK read timed out after ${connackTimeoutMs}ms", e)
+                throw IllegalStateException("CONNACK read timed out. Drain+parse did not receive a complete CONNACK in time. Ask server to send full CONNACK (loop writev_stream until all bytes sent); or check network.", e)
             }
 
             if (activeProtocolVersion == MQTTProtocolLevel.V5) {
+                Log.i("MQTTClient", "parsing CONNACK v5 (offset=$hdrLen)")
                 val (_, reasonCode, props) = MQTT5Protocol.parseConnackV5(full, hdrLen)
                 if (reasonCode != MQTT5ReasonCode.SUCCESS) {
                     lock.withLock { state = State.ERROR }
@@ -210,21 +311,37 @@ class MQTTClient {
             }
 
             lock.withLock { state = State.CONNECTED }
+            Log.i("MQTTClient", "state=CONNECTED, starting message and keepalive loops")
             startMessageLoop()
             startKeepaliveLoop()
         } catch (e: Exception) {
-            val wr = lock.withLock {
+            val (wr, quic) = lock.withLock {
                 val w = writer
+                val q = quicClient
                 quicClient = null
                 stream = null
                 reader = null
                 writer = null
                 state = State.ERROR
-                w
+                Pair(w, q)
             }
             try {
                 wr?.close()
             } catch (_: Exception) { /* ignore */ }
+            // Skip quic.close() on timeout/cancellation: server may have already sent idle close, and native close() can crash. Prefer leak over crash.
+            val isTimeoutOrCancel = e is TimeoutCancellationException ||
+                e is CancellationException ||
+                e.cause is TimeoutCancellationException ||
+                (e.message?.contains("Timed out", ignoreCase = true) == true)
+            if (!isTimeoutOrCancel) {
+                try {
+                    quic?.close()
+                } catch (ex: Exception) {
+                    Log.w("MQTTClient", "Error closing QUIC connection on connect failure", ex)
+                }
+            } else {
+                Log.i("MQTTClient", "Skipping quic.close() on timeout/cancellation to avoid native crash")
+            }
             throw e
         }
     }
@@ -260,59 +377,66 @@ class MQTTClient {
 
     suspend fun subscribe(topic: String, qos: Int, subscriptionIdentifier: Int? = null) {
         if (getState() != State.CONNECTED) throw IllegalStateException("not connected")
-        val (r, w, version) = lock.withLock { Triple(reader, writer, activeProtocolVersion) }
-        if (r == null || w == null) throw IllegalStateException("no reader/writer")
+        val (w, version) = lock.withLock { writer to activeProtocolVersion }
+        if (w == null) throw IllegalStateException("no writer")
 
         val pid = nextPacketIdUsed()
-        val data: ByteArray
-        if (version == MQTTProtocolLevel.V5) {
-            data = MQTT5Protocol.buildSubscribeV5(pid, topic, qos, subscriptionIdentifier)
-        } else {
-            data = MQTTProtocol.buildSubscribe(pid, topic, qos)
-        }
-        w.write(data)
-        w.drain()
-
-        val fixed = r.readexactly(2)
-        val (_, remLen, hdrLen) = MQTTProtocol.parseFixedHeader(fixed)
-        val rest = r.readexactly(remLen)
-        val full = fixed + rest
-        
-        if (version == MQTTProtocolLevel.V5) {
-            val (_, reasonCodes, _) = MQTT5Protocol.parseSubackV5(full, hdrLen)
-            if (reasonCodes.isNotEmpty()) {
-                val firstRC = reasonCodes[0]
-                if (firstRC != MQTT5ReasonCode.GRANTED_QOS_0 && firstRC != MQTT5ReasonCode.GRANTED_QOS_1 && firstRC != MQTT5ReasonCode.GRANTED_QOS_2) {
-                    throw IllegalArgumentException("SUBACK error $firstRC")
+        val deferred = CompletableDeferred<Pair<ByteArray, Int>>()
+        lock.withLock { pendingSubacks[pid] = deferred }
+        try {
+            val data: ByteArray
+            if (version == MQTTProtocolLevel.V5) {
+                data = MQTT5Protocol.buildSubscribeV5(pid, topic, qos, subscriptionIdentifier)
+            } else {
+                data = MQTTProtocol.buildSubscribe(pid, topic, qos)
+            }
+            w.write(data)
+            w.drain()
+
+            val (full, hdrLen) = withTimeout(15_000L) { deferred.await() }
+
+            if (version == MQTTProtocolLevel.V5) {
+                val (_, reasonCodes, _) = MQTT5Protocol.parseSubackV5(full, hdrLen)
+                if (reasonCodes.isNotEmpty()) {
+                    val firstRC = reasonCodes[0]
+                    if (firstRC != MQTT5ReasonCode.GRANTED_QOS_0 && firstRC != MQTT5ReasonCode.GRANTED_QOS_1 && firstRC != MQTT5ReasonCode.GRANTED_QOS_2) {
+                        throw IllegalArgumentException("SUBACK error $firstRC")
+                    }
                 }
+            } else {
+                val (_, rc, _) = MQTTProtocol.parseSuback(full, hdrLen)
+                if (rc > 0x02) throw IllegalArgumentException("SUBACK error $rc")
             }
-        } else {
-            val (_, rc, _) = MQTTProtocol.parseSuback(full, hdrLen)
-            if (rc > 0x02) throw IllegalArgumentException("SUBACK error $rc")
+        } finally {
+            lock.withLock { pendingSubacks.remove(pid) }
         }
     }
 
     suspend fun unsubscribe(topic: String) {
         if (getState() != State.CONNECTED) throw IllegalStateException("not connected")
-        val (r, w, version) = lock.withLock {
+        val (w, version) = lock.withLock {
             subscribedTopics.remove(topic)
-            Triple(reader, writer, activeProtocolVersion)
+            writer to activeProtocolVersion
         }
-        if (r == null || w == null) throw IllegalStateException("no reader/writer")
+        if (w == null) throw IllegalStateException("no writer")
 
         val pid = nextPacketIdUsed()
-        val data: ByteArray
-        if (version == MQTTProtocolLevel.V5) {
-            data = MQTT5Protocol.buildUnsubscribeV5(pid, listOf(topic))
-        } else {
-            data = MQTTProtocol.buildUnsubscribe(pid, listOf(topic))
-        }
-        w.write(data)
-        w.drain()
+        val deferred = CompletableDeferred<Unit>()
+        lock.withLock { pendingUnsubacks[pid] = deferred }
+        try {
+            val data: ByteArray
+            if (version == MQTTProtocolLevel.V5) {
+                data = MQTT5Protocol.buildUnsubscribeV5(pid, listOf(topic))
+            } else {
+                data = MQTTProtocol.buildUnsubscribe(pid, listOf(topic))
+            }
+            w.write(data)
+            w.drain()
 
-        val fixed = r.readexactly(2)
-        val (_, remLen, _) = MQTTProtocol.parseFixedHeader(fixed)
-        r.readexactly(remLen)
+            withTimeout(15_000L) { deferred.await() }
+        } finally {
+            lock.withLock { pendingUnsubacks.remove(pid) }
+        }
     }
 
     suspend fun disconnect() {
@@ -323,6 +447,8 @@ class MQTTClient {
         job?.cancel()
         job?.join()
 
+        failPendingSubacksUnsubacks(IllegalStateException("Disconnected"))
+
         val (w, version) = lock.withLock {
             val wr = writer
             val v = activeProtocolVersion
@@ -369,12 +495,21 @@ class MQTTClient {
         pid
     }
 
+    private suspend fun failPendingSubacksUnsubacks(cause: Throwable) {
+        lock.withLock {
+            pendingSubacks.values.forEach { it.completeExceptionally(cause) }
+            pendingSubacks.clear()
+            pendingUnsubacks.values.forEach { it.completeExceptionally(cause) }
+            pendingUnsubacks.clear()
+        }
+    }
+
     /** Send PINGREQ at effectiveKeepalive interval so server sees activity and does not close (idle/keepalive). [MQTT-3.1.2-20] */
     private fun startKeepaliveLoop() {
         keepaliveJob?.cancel()
-        val ka = lock.withLock { effectiveKeepalive }
-        if (ka <= 0) return
         keepaliveJob = scope.launch {
+            val ka = lock.withLock { effectiveKeepalive }
+            if (ka <= 0) return@launch
             while (isActive) {
                 delay(ka * 1000L) // seconds to ms
                 val (w, stillConnected) = lock.withLock {
@@ -394,11 +529,24 @@ class MQTTClient {
             while (isActive) {
                 val r = lock.withLock { reader } ?: break
                 try {
-                    val fixed = r.readexactly(2)
-                    val (msgType, remLen, _) = MQTTProtocol.parseFixedHeader(fixed)
+                    val (msgType, remLen, fixed) = readFixedHeader(r)
                     val rest = r.readexactly(remLen)
                     val type = (msgType.toInt() and 0xF0).toByte()
                     when (type) {
+                        MQTTMessageType.SUBACK -> {
+                            if (rest.size >= 2) {
+                                val pid = ((rest[0].toInt() and 0xFF) shl 8) or (rest[1].toInt() and 0xFF)
+                                val full = fixed + rest
+                                val hdrLen = fixed.size
+                                lock.withLock { pendingSubacks.remove(pid)?.complete(Pair(full, hdrLen)) }
+                            }
+                        }
+                        MQTTMessageType.UNSUBACK -> {
+                            if (rest.size >= 2) {
+                                val pid = ((rest[0].toInt() and 0xFF) shl 8) or (rest[1].toInt() and 0xFF)
+                                lock.withLock { pendingUnsubacks.remove(pid)?.complete(Unit) }
+                            }
+                        }
                         MQTTMessageType.DISCONNECT -> {
                             val reasonCode = if (rest.isNotEmpty()) rest[0].toInt() and 0xFF else 0x00
                             lock.withLock {
@@ -412,6 +560,7 @@ class MQTTClient {
                                 topicAliasMap.clear()
                                 state = if (reasonCode >= 0x80) State.ERROR else State.DISCONNECTED
                             }
+                            failPendingSubacksUnsubacks(IllegalStateException("Server sent DISCONNECT"))
                             break
                         }
                         MQTTMessageType.PINGREQ -> {
@@ -428,8 +577,7 @@ class MQTTClient {
                                 if (activeProtocolVersion == MQTTProtocolLevel.V5) {
                                     MQTT5Protocol.parsePublishV5(rest, 0, qos, topicAliasMap)
                                 } else {
-                                    val t = MQTTProtocol.parsePublish(rest, 0, qos)
-                                    Triple(t.first, t.second, t.third)
+                                    MQTTProtocol.parsePublish(rest, 0, qos)
                                 }
                             }
 
@@ -474,6 +622,7 @@ class MQTTClient {
                             topicAliasMap.clear()
                             state = State.DISCONNECTED
                         }
+                        failPendingSubacksUnsubacks(e)
                     }
                     break
                 }

package/android/src/main/kotlin/ai/annadata/mqttquic/mqtt/MQTTProtocol.kt

@@ -40,10 +40,10 @@ object MQTTProtocol {
             val b = data[i].toInt() and 0xFF
             len += (b and 0x7F) * mul
             i++
-            if ((b and 0x80) == 0) return@repeat
+            if ((b and 0x80) == 0) return len to (i - offset)
             mul *= 128
         }
-        return len to (i - offset)
+        throw IllegalArgumentException("Invalid remaining length (max 4 bytes)")
     }
 
     fun encodeString(s: String): ByteArray {
@@ -75,6 +75,37 @@ object MQTTProtocol {
         return Triple(msgType, rem, 1 + consumed)
     }
 
+    /**
+     * Returns total MQTT packet length (fixed header + payload) if buffer has at least a decodable fixed header, else null.
+     * Use when draining stream: accumulate bytes, then call this; when buffer.size >= length, you have a complete packet.
+     */
+    fun getNextPacketLength(buffer: ByteArray): Int? {
+        if (buffer.size < 2) return null
+        // CONNACK (0x20): often single-byte remaining length (e.g. 0x20 = 32 → total 34). Handle that first.
+        if (buffer[0].toInt() and 0xFF == 0x20) {
+            val b1 = buffer[1].toInt() and 0xFF
+            if ((b1 and 0x80) == 0) {
+                val rem = b1
+                val total = 1 + 1 + rem
+                if (total <= buffer.size) return total
+            } else {
+                try {
+                    val (rem, consumed) = decodeRemainingLength(buffer, 1)
+                    val total = 1 + consumed + rem
+                    if (total <= buffer.size) return total
+                } catch (_: IllegalArgumentException) { /* fall through */ }
+            }
+        }
+        for (len in minOf(5, buffer.size) downTo 2) {
+            try {
+                val (_, rem, fixedLen) = parseFixedHeader(buffer.copyOf(len))
+                val total = fixedLen + rem
+                if (total in 1..buffer.size) return total
+            } catch (_: IllegalArgumentException) { /* need more bytes for remaining length */ }
+        }
+        return null
+    }
+
     fun buildConnect(
         clientId: String,
         username: String? = null,
@@ -201,9 +232,9 @@ object MQTTProtocol {
     
     /**
      * Parse PUBLISH payload (after fixed header).
-     * Returns (topic, packetId?, payload, newOffset). packetId only for QoS > 0.
+     * Returns (topic, packetId?, payload). packetId only for QoS > 0.
      */
-    fun parsePublish(data: ByteArray, offset: Int, qos: Int): Triple<String, Int?, ByteArray, Int> {
+    fun parsePublish(data: ByteArray, offset: Int, qos: Int): Triple<String, Int?, ByteArray> {
         var off = offset
         val (topic, next) = decodeString(data, off)
         off = next
@@ -214,7 +245,7 @@ object MQTTProtocol {
             off += 2
         }
         val payload = data.copyOfRange(off, data.size)
-        return Triple(topic, pid, payload, data.size)
+        return Triple(topic, pid, payload)
     }
 
     fun buildSubscribe(packetId: Int, topic: String, qos: Int = 0): ByteArray {

package/android/src/main/kotlin/ai/annadata/mqttquic/mqtt/MQTTTypes.kt

@@ -5,21 +5,21 @@ package ai.annadata.mqttquic.mqtt
  */
 
 object MQTTMessageType {
-    const val CONNECT: Byte = 0x10
-    const val CONNACK: Byte = 0x20
-    const val PUBLISH: Byte = 0x30
-    const val PUBACK: Byte = 0x40
-    const val PUBREC: Byte = 0x50
-    const val PUBREL: Byte = 0x62
-    const val PUBCOMP: Byte = 0x70
-    const val SUBSCRIBE: Byte = 0x82
-    const val SUBACK: Byte = 0x90
-    const val UNSUBSCRIBE: Byte = 0xA2
-    const val UNSUBACK: Byte = 0xB0
-    const val PINGREQ: Byte = 0xC0
-    const val PINGRESP: Byte = 0xD0
-    const val DISCONNECT: Byte = 0xE0
-    const val AUTH: Byte = 0xF0
+    const val CONNECT: Byte = 0x10.toByte()
+    const val CONNACK: Byte = 0x20.toByte()
+    const val PUBLISH: Byte = 0x30.toByte()
+    const val PUBACK: Byte = 0x40.toByte()
+    const val PUBREC: Byte = 0x50.toByte()
+    const val PUBREL: Byte = 0x62.toByte()
+    const val PUBCOMP: Byte = 0x70.toByte()
+    const val SUBSCRIBE: Byte = 0x82.toByte()
+    const val SUBACK: Byte = 0x90.toByte()
+    const val UNSUBSCRIBE: Byte = 0xA2.toByte()
+    const val UNSUBACK: Byte = 0xB0.toByte()
+    const val PINGREQ: Byte = 0xC0.toByte()
+    const val PINGRESP: Byte = 0xD0.toByte()
+    const val DISCONNECT: Byte = 0xE0.toByte()
+    const val AUTH: Byte = 0xF0.toByte()
 }
 
 object MQTTConnectFlags {

package/android/src/main/kotlin/ai/annadata/mqttquic/quic/NGTCP2Client.kt

@@ -40,21 +40,28 @@ class NGTCP2Client : QuicClient {
     
     // Native methods (implemented in ngtcp2_jni.cpp)
     private external fun nativeCreateConnection(host: String, port: Int): Long
+    private external fun nativeCreateConnectionWithAddress(hostnameForTls: String, connectAddress: String, port: Int): Long
     private external fun nativeConnect(connHandle: Long): Int
     private external fun nativeOpenStream(connHandle: Long): Long
     private external fun nativeWriteStream(connHandle: Long, streamId: Long, data: ByteArray): Int
     private external fun nativeReadStream(connHandle: Long, streamId: Long): ByteArray?
     private external fun nativeClose(connHandle: Long)
     private external fun nativeIsConnected(connHandle: Long): Boolean
-    internal external fun nativeCloseStream(connHandle: Long, streamId: Long): Int
-    internal external fun nativeGetLastError(connHandle: Long): String
-    
+    // Public to avoid Kotlin internal-name mangling (nativeCloseStream$module) which breaks JNI lookup
+    external fun nativeCloseStream(connHandle: Long, streamId: Long): Int
+    @JvmName("nativeGetLastError")
+    external fun nativeGetLastError(connHandle: Long): String
+    private external fun nativeGetLastResolvedAddress(connHandle: Long): String?
+
+    /** Resolved IP used for this connection (set after init_socket in native). Use for reconnect cache when Java DNS fails. */
+    fun getLastResolvedAddress(): String? = if (connHandle != 0L) nativeGetLastResolvedAddress(connHandle) else null
+
     // Connection state
     private var connHandle: Long = 0
     private var isConnected: Boolean = false
     private val streams = mutableMapOf<Long, NGTCP2Stream>()
     
-    override suspend fun connect(host: String, port: Int) {
+    override suspend fun connect(host: String, port: Int, connectAddress: String?) {
         if (!isAvailable()) {
             throw IllegalStateException("ngtcp2 native library is not loaded")
         }
@@ -62,8 +69,12 @@ class NGTCP2Client : QuicClient {
             throw IllegalStateException("Already connected")
         }
         
-        // Create native connection
-        connHandle = nativeCreateConnection(host, port)
+        // Create native connection (use pre-resolved IP when given to avoid "No address" on reconnect)
+        connHandle = if (!connectAddress.isNullOrBlank()) {
+            nativeCreateConnectionWithAddress(host, connectAddress, port)
+        } else {
+            nativeCreateConnection(host, port)
+        }
         if (connHandle == 0L) {
             throw IllegalStateException("Failed to create QUIC connection")
         }
@@ -146,19 +157,19 @@ internal class NGTCP2Stream(
     
     private var isClosed: Boolean = false
     
+    /**
+     * Read up to maxBytes from the stream. Returns immediately with whatever is
+     * currently available (possibly empty). This allows drain()-then-parse logic
+     * to complete: first read returns CONNACK bytes, second read returns empty
+     * so drain() breaks and tryConsumeNextPacket() can run. Never blocks waiting
+     * for more data (native recv_buf is already populated by the event loop).
+     */
     override suspend fun read(maxBytes: Int): ByteArray {
         if (isClosed) {
             throw IllegalStateException("Stream is closed")
         }
-
-        while (!isClosed) {
-            val data = client.readStreamData(streamId)
-            if (data != null && data.isNotEmpty()) {
-                return data
-            }
-            delay(5)
-        }
-        return ByteArray(0)
+        val data = client.readStreamData(streamId) ?: return ByteArray(0)
+        return data
     }
     
     override suspend fun write(data: ByteArray) {