@annadata/capacitor-mqtt-quic 0.2.1 → 0.2.4

package/android/src/main/cpp/ngtcp2_jni.cpp

@@ -233,6 +233,20 @@ class QuicClient {
     state.recv_buf.insert(state.recv_buf.end(), data, data + datalen);
     LOGI("recv stream data stream_id=%" PRId64 " len=%zu recv_buf_total=%zu",
          (int64_t)stream_id, datalen, state.recv_buf.size());
+    if (datalen > 2 && datalen <= 32) {
+      char hex[128];
+      size_t n = datalen < 16 ? datalen : 16u;
+      char *p = hex;
+      for (size_t i = 0; i < n && p < hex + sizeof(hex) - 4; i++)
+        p += snprintf(p, (size_t)(hex + sizeof(hex) - p), "%02x", data[i]);
+      LOGI("recv first bytes (type 0x%02x = %s) hex=%s",
+           (unsigned)data[0],
+           (data[0] & 0xF0) == 0x30 ? "PUBLISH" : (data[0] == (uint8_t)0xd0 ? "PINGRESP" : "other"),
+           hex);
+    } else if (datalen > 32) {
+      LOGI("recv large chunk len=%zu first_byte=0x%02x (PUBLISH=0x30)",
+          datalen, (unsigned)data[0]);
+    }
     if (flags & NGTCP2_STREAM_DATA_FLAG_FIN) {
       state.fin_received = true;
     }

package/android/src/main/kotlin/ai/annadata/mqttquic/MqttQuicPlugin.kt

@@ -121,7 +121,10 @@ class MqttQuicPlugin : Plugin() {
                     } catch (_: Exception) {
                         Base64.encodeToString(payload, Base64.NO_WRAP)
                     }
-                    val data = JSObject().put("topic", topic).put("payload", payloadStr)
+                    // Ensure non-null strings so Capacitor bridge never receives undefined
+                    val safeTopic = topic ?: ""
+                    val safePayload = payloadStr ?: ""
+                    val data = JSObject().put("topic", safeTopic).put("payload", safePayload)
                     Handler(Looper.getMainLooper()).post {
                         notifyListeners("message", data)
                     }

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

@@ -613,30 +613,35 @@ class MQTTClient {
                         }
                         MQTTMessageType.PUBLISH -> {
                             val qos = (msgType.toInt() shr 1) and 0x03
-                            val (topic, packetId, payload) = lock.withLock {
-                                if (activeProtocolVersion == MQTTProtocolLevel.V5) {
-                                    MQTT5Protocol.parsePublishV5(rest, 0, qos, topicAliasMap)
-                                } else {
-                                    MQTTProtocol.parsePublish(rest, 0, qos)
-                                }
-                            }
-
-                            val (cb, globalCb) = lock.withLock {
-                                subscribedTopics[topic] to onPublish
-                            }
-                            globalCb?.invoke(topic, payload)
-                            cb?.invoke(payload)
-
-                            if (qos >= 1 && packetId != null) {
-                                val w = lock.withLock { writer }
-                                w?.let {
-                                    if (qos == 1) {
-                                        it.write(MQTTProtocol.buildPuback(packetId))
+                            try {
+                                val (topic, packetId, payload) = lock.withLock {
+                                    if (activeProtocolVersion == MQTTProtocolLevel.V5) {
+                                        MQTT5Protocol.parsePublishV5(rest, 0, qos, topicAliasMap)
                                     } else {
-                                        it.write(MQTTProtocol.buildPubrec(packetId))
+                                        MQTTProtocol.parsePublish(rest, 0, qos)
+                                    }
+                                }
+                                val (cb, globalCb) = lock.withLock {
+                                    subscribedTopics[topic] to onPublish
+                                }
+                                globalCb?.invoke(topic, payload)
+                                cb?.invoke(payload)
+
+                                if (qos >= 1 && packetId != null) {
+                                    val w = lock.withLock { writer }
+                                    w?.let {
+                                        if (qos == 1) {
+                                            it.write(MQTTProtocol.buildPuback(packetId))
+                                        } else {
+                                            it.write(MQTTProtocol.buildPubrec(packetId))
+                                        }
+                                        it.drain()
                                     }
-                                    it.drain()
                                 }
+                            } catch (e: Exception) {
+                                // PUBLISH parse failed: log and skip this message (don't disconnect)
+                                val hex = rest.take(64).joinToString("") { "%02x".format(it) }
+                                Log.w("MQTTClient", "PUBLISH parse failed: ${e.message} restLen=${rest.size} hex=$hex", e)
                             }
                         }
                         MQTTMessageType.PUBREL -> {

package/dist/esm/web.d.ts

@@ -5,27 +5,44 @@ import type { MqttQuicConnectOptions, MqttQuicPingOptions, MqttQuicPublishOption
  * Browsers cannot run ngtcp2/WolfSSL (no UDP). Same API as iOS/Android.
  * - Default: WSS via mqtt.js.
  * - Optional: pass webTransportUrl to use the browser's QUIC (HTTP/3) via WebTransport.
+ *
+ * The WebTransport path uses an internal hand-rolled MQTT 3.1.1/5.0 codec
+ * (`./webMqttCodec`) so it has zero Node `Buffer` / `mqtt-packet` dependency.
  */
 export declare class MqttQuicWeb extends WebPlugin {
     private client;
     private protocol;
     private wt;
     private wtWriter;
-    private wtReadAbort;
     private wtParser;
-    private wtReadBuffer;
+    private wtLevel;
     private wtNextMessageId;
     private wtConnackResolve;
+    private wtConnackReject;
     private wtPendingSuback;
     private wtPendingUnsuback;
     private wtConnected;
+    /**
+     * Single in-flight PINGREQ. MQTT mandates at most one outstanding PINGREQ;
+     * concurrent `sendKeepalive` calls share this promise.
+     */
+    private wtPendingPing;
+    /** Background auto-keepalive timer chain (recursive setTimeout). */
+    private wtKeepaliveTimer;
+    private wtKeepaliveSeconds;
     constructor();
     /** Web: no UDP; resolves ok if host looks valid. Native uses UDP reachability check. */
     ping(_options: MqttQuicPingOptions): Promise<{
         ok: boolean;
     }>;
-    /** Web: mqtt.js/WT handle keepalive; return ok if connected. */
-    sendKeepalive(_options?: MqttQuicSendKeepaliveOptions): Promise<{
+    /**
+     * Send a real PINGREQ and wait for PINGRESP.
+     * - WebTransport: writes a PINGREQ packet via the codec and resolves when the
+     *   broker's PINGRESP arrives, or `{ ok: false }` after `timeoutMs`.
+     * - WSS (`mqtt.js`): the underlying client runs its own keepalive timer, so
+     *   we just report whether the socket is currently connected.
+     */
+    sendKeepalive(options?: MqttQuicSendKeepaliveOptions): Promise<{
         ok: boolean;
     }>;
     connect(options: MqttQuicConnectOptions): Promise<{
@@ -36,8 +53,23 @@ export declare class MqttQuicWeb extends WebPlugin {
      * /devices/<deviceId>/<action>/<path> (like MQTT topic structure).
      */
     private getWebTransportUrl;
+    private resolveLevel;
     private connectWebTransport;
-    private wtWrite;
+    private failPendingWtOps;
+    /**
+     * Start an internal interval that sends PINGREQ at ~75% of the negotiated
+     * keepalive. This guarantees the broker idle-timeout never fires even if the
+     * consumer forgets to call `sendKeepalive`. Also matches the WSS path, where
+     * `mqtt.js` runs its own internal keepalive timer for free.
+     */
+    private startWtAutoKeepalive;
+    private stopWtAutoKeepalive;
+    /**
+     * Write a PINGREQ and wait up to `timeoutMs` for the matching PINGRESP.
+     * Concurrent callers share the in-flight request (only one PINGREQ may be
+     * outstanding per the MQTT spec).
+     */
+    private wtSendPingreq;
     private wtReadLoop;
     private connectWSS;
     disconnect(): Promise<void>;
@@ -55,5 +87,7 @@ export declare class MqttQuicWeb extends WebPlugin {
     testHarness(options: MqttQuicTestHarnessOptions): Promise<{
         success: boolean;
     }>;
+    /** Wraps message ID at the MQTT uint16 boundary (1..65535). */
+    private nextWtMessageId;
 }
 //# sourceMappingURL=web.d.ts.map

package/dist/esm/web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,OAAO,KAAK,EACV,sBAAsB,EACtB,mBAAmB,EACnB,sBAAsB,EACtB,wBAAwB,EACxB,4BAA4B,EAC5B,0BAA0B,EAC3B,MAAM,eAAe,CAAC;AAIvB;;;;;GAKG;AACH,qBAAa,WAAY,SAAQ,SAAS;IACxC,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,QAAQ,CAAuB;IAEvC,OAAO,CAAC,EAAE,CAAkD;IAC5D,OAAO,CAAC,QAAQ,CAAwD;IACxE,OAAO,CAAC,WAAW,CAAgC;IACnD,OAAO,CAAC,QAAQ,CAAqD;IACrE,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,gBAAgB,CAAwC;IAChE,OAAO,CAAC,eAAe,CAA6D;IACpF,OAAO,CAAC,iBAAiB,CAA8C;IACvE,OAAO,CAAC,WAAW,CAAS;;IAM5B,wFAAwF;IAClF,IAAI,CAAC,QAAQ,EAAE,mBAAmB,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAA;KAAE,CAAC;IAInE,gEAAgE;IAC1D,aAAa,CAAC,QAAQ,CAAC,EAAE,4BAA4B,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAA;KAAE,CAAC;IAKhF,OAAO,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE,CAAC;IAO/E;;;OAGG;IACH,OAAO,CAAC,kBAAkB;YAYZ,mBAAmB;YAsFnB,OAAO;YAMP,UAAU;YAiBV,UAAU;IAmElB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IA2B3B,OAAO,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAgEvE,SAAS,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAuC3E,WAAW,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IA4BtE,WAAW,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;CAwBtF"}
+{"version":3,"file":"web.d.ts","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAG5C,OAAO,KAAK,EACV,sBAAsB,EACtB,mBAAmB,EACnB,sBAAsB,EACtB,wBAAwB,EACxB,4BAA4B,EAC5B,0BAA0B,EAC3B,MAAM,eAAe,CAAC;AAkDvB;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,SAAS;IACxC,OAAO,CAAC,MAAM,CAA2B;IACzC,OAAO,CAAC,QAAQ,CAAuB;IAEvC,OAAO,CAAC,EAAE,CAAkD;IAC5D,OAAO,CAAC,QAAQ,CAAwD;IACxE,OAAO,CAAC,QAAQ,CAA2B;IAC3C,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,eAAe,CAAK;IAC5B,OAAO,CAAC,gBAAgB,CAA6B;IACrD,OAAO,CAAC,eAAe,CAAuC;IAC9D,OAAO,CAAC,eAAe,CAAyF;IAChH,OAAO,CAAC,iBAAiB,CAA0E;IACnG,OAAO,CAAC,WAAW,CAAS;IAC5B;;;OAGG;IACH,OAAO,CAAC,aAAa,CAIL;IAChB,oEAAoE;IACpE,OAAO,CAAC,gBAAgB,CAA8C;IACtE,OAAO,CAAC,kBAAkB,CAAK;;IAM/B,wFAAwF;IAClF,IAAI,CAAC,QAAQ,EAAE,mBAAmB,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAA;KAAE,CAAC;IAInE;;;;;;OAMG;IACG,aAAa,CAAC,OAAO,CAAC,EAAE,4BAA4B,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAA;KAAE,CAAC;IAU/E,OAAO,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC;QAAE,SAAS,EAAE,OAAO,CAAA;KAAE,CAAC;IAO/E;;;OAGG;IACH,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,YAAY;YAMN,mBAAmB;IAwKjC,OAAO,CAAC,gBAAgB;IAmBxB;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAkC5B,OAAO,CAAC,mBAAmB;IAO3B;;;;OAIG;YACW,aAAa;YA8Bb,UAAU;YA6BV,UAAU;IAmElB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAuC3B,OAAO,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IA2EvE,SAAS,CAAC,OAAO,EAAE,wBAAwB,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAwC3E,WAAW,CAAC,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAwBtE,WAAW,CAAC,OAAO,EAAE,0BAA0B,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAyBrF,+DAA+D;IAC/D,OAAO,CAAC,eAAe;CAKxB"}