@annadata/capacitor-mqtt-quic 0.1.7 → 0.1.9

package/AnnadataCapacitorMqttQuic.podspec

@@ -8,8 +8,8 @@ Pod::Spec.new do |s|
   s.summary = 'MQTT-over-QUIC Capacitor plugin (iOS)'
   s.license = package['license']
   s.homepage = 'https://github.com/annadata/capacitor-mqtt-quic'
-  s.author = 'Yakub Mohammad'
-  s.authors = { 'Yakub Mohammad' => 'yakub@annadata.ai' }
+  s.author = 'Mr. Yakub Mohammad'
+  s.authors = { 'Mr. Yakub Mohammad' => 'yakub@annadata.ai' }
   s.source = { :git => 'https://github.com/annadata/capacitor-mqtt-quic', :tag => s.version.to_s }
   s.source_files = 'ios/Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.resources = ['ios/Sources/MqttQuicPlugin/Resources/*.pem']

package/Package.swift

@@ -0,0 +1,59 @@
+// swift-tools-version: 5.9
+import PackageDescription
+
+// AnnadataCapacitorMqttQuic – Swift Package for Capacitor 8 (SPM).
+// At plugin root so Capacitor's SPM logic detects and adds it to CapApp-SPM automatically.
+// Requires ios/libs/MqttQuicLibs.xcframework. After building (see build-native.sh), run:
+//   cd ios && ./create-xcframework.sh
+let package = Package(
+    name: "AnnadataCapacitorMqttQuic",
+    platforms: [.iOS(.v15)],
+    products: [
+        .library(
+            name: "AnnadataCapacitorMqttQuic",
+            targets: ["AnnadataCapacitorMqttQuic"]
+        )
+    ],
+    dependencies: [
+        .package(url: "https://github.com/ionic-team/capacitor-swift-pm.git", from: "8.0.0")
+    ],
+    targets: [
+        .binaryTarget(
+            name: "MqttQuicLibs",
+            path: "ios/libs/MqttQuicLibs.xcframework"
+        ),
+        .target(
+            name: "NGTCP2Bridge",
+            dependencies: ["MqttQuicLibs"],
+            path: "ios/Sources/MqttQuicPlugin/QUIC",
+            sources: ["NGTCP2Bridge.mm"],
+            publicHeadersPath: ".",
+            cxxSettings: [
+                .define("NGTCP2_ENABLED"),
+                .define("NGHTTP3_ENABLED"),
+                .headerSearchPath("../../../include")
+            ],
+            linkerSettings: [
+                .linkedLibrary("c++")
+            ]
+        ),
+        .target(
+            name: "AnnadataCapacitorMqttQuic",
+            dependencies: [
+                "NGTCP2Bridge",
+                .product(name: "Capacitor", package: "capacitor-swift-pm")
+            ],
+            path: "ios/Sources/MqttQuicPlugin",
+            exclude: [
+                "MQTT/MQTT5ReasonCodes.swift.rej",
+                "QUIC/NGTCP2Bridge.mm",
+                "QUIC/NGTCP2Bridge.h"
+            ],
+            resources: [.process("Resources")],
+            swiftSettings: [
+                .define("NGTCP2_ENABLED"),
+                .define("NGHTTP3_ENABLED")
+            ]
+        )
+    ]
+)

package/README.md

@@ -2,7 +2,7 @@
 
 MQTT-over-QUIC Capacitor plugin for **iOS**, **Android**, and **Web (browser/PWA)**. Native: ngtcp2 + WolfSSL for QUIC; Web: MQTT over WebSocket (WSS), same API and event listeners.
 
-**Capacitor:** Supports **Capacitor 7** and **Capacitor 8**.
+**Capacitor:** **8.0+** (tested with Capacitor 8).
 
 **Features:**
 - ✅ **MQTT 5.0** support with full properties and reason codes
@@ -20,7 +20,7 @@ MQTT-over-QUIC Capacitor plugin for **iOS**, **Android**, and **Web (browser/PWA
   - Transport abstraction (StreamReader/StreamWriter)
 - **Phase 2**: QUIC transport (ngtcp2) + stream adapters - **In Progress** ⏳
   - Currently uses stub implementations for testing
-  - See [NGTCP2_INTEGRATION_PLAN.md](./NGTCP2_INTEGRATION_PLAN.md) for build instructions
+  - See [NGTCP2_INTEGRATION_PLAN.md](./docs/NGTCP2_INTEGRATION_PLAN.md) for build instructions
 - **Phase 3**: MQTT client API + Capacitor plugin bridge - **Complete** ✅
 - **Phase 4**: Platform integration in annadata-production - **Complete** ✅
 
@@ -274,7 +274,7 @@ await MqttQuic.publish({
 | **Reason Codes** | Detailed error information | Better debugging |
 | **Topic Aliases** | Reduce bandwidth | High-frequency publishing |
 
-See [MQTT5_IMPLEMENTATION_COMPLETE.md](./MQTT5_IMPLEMENTATION_COMPLETE.md) for full details.
+See [MQTT5_IMPLEMENTATION_COMPLETE.md](./docs/MQTT5_IMPLEMENTATION_COMPLETE.md) for full details.
 
 ## TypeScript Interface
 
@@ -357,22 +357,25 @@ This script builds WolfSSL → nghttp3 → ngtcp2 in the correct order for both
 For detailed manual build instructions, see:
 - **iOS**: [ios/NGTCP2_BUILD_INSTRUCTIONS.md](./ios/NGTCP2_BUILD_INSTRUCTIONS.md)
 - **Android**: [android/NGTCP2_BUILD_INSTRUCTIONS.md](./android/NGTCP2_BUILD_INSTRUCTIONS.md)
-- **Full Plan**: [NGTCP2_INTEGRATION_PLAN.md](./NGTCP2_INTEGRATION_PLAN.md)
+- **Full Plan**: [NGTCP2_INTEGRATION_PLAN.md](./docs/NGTCP2_INTEGRATION_PLAN.md)
 
 **Prerequisites:**
-- iOS: macOS with Xcode 14+
+- iOS: macOS with Xcode 15+
 - Android: Android Studio with NDK r25+ (auto-detected from `$ANDROID_HOME`)
 
 ## Production / First-time build
 
-When you install the plugin from npm (`npm install @annadata/capacitor-mqtt-quic`), the published package may include **prebuilt native libs** (iOS and optionally Android, both using **WolfSSL**). In that case you only need:
+When you install the plugin from npm (`npm install @annadata/capacitor-mqtt-quic`), the published package **may** include **prebuilt native libs** (iOS and optionally Android, both using **WolfSSL**). If it does (a "complete" / zero-config package), you only need:
 
 ```bash
 npm install @annadata/capacitor-mqtt-quic
 npx cap sync
+ionic cap run android   # or ios
 ```
 
-**If your Android build fails with "WolfSSL not found"**, run this **one-time** setup from your app project root (requires Android NDK r25+). Both iOS and Android use **WolfSSL** as the TLS backend (license/size/QUIC support):
+**If your Android build fails with "WolfSSL not found"**, the package you installed does not include prebuilt Android libs. Do **one** of the following.
+
+**Option A – One-time build (from your app project root, requires Android NDK r25+):** Both iOS and Android use **WolfSSL** as the TLS backend (license/size/QUIC support):
 
 ```bash
 cd node_modules/@annadata/capacitor-mqtt-quic
@@ -402,14 +405,51 @@ Or add to your app’s `package.json` and run once:
 "setup:wolfssl-android": "cd node_modules/@annadata/capacitor-mqtt-quic && ./build-native.sh --android-only --abi arm64-v8a && ./build-native.sh --android-only --abi armeabi-v7a && ./build-native.sh --android-only --abi x86_64"
 ```
 
-**iOS:** The plugin ships with vendored static libs (`ios/libs/`) using WolfSSL. If you built the plugin from source and those are missing, run from the plugin repo: `./build-native.sh --ios-only`, then pack/publish.
+**Option B – Use a complete package:** Reinstall a version of the plugin that was published with Android prebuilts (see *Publishing a complete package* below). Then no one-time build is needed.
+
+**iOS:** The plugin typically ships with vendored static libs (`ios/libs/`) using WolfSSL. If you built the plugin from source and those are missing, run from the plugin repo: `./build-native.sh --ios-only`, then pack/publish.
+
+### Publishing a complete (zero-config) package
+
+So that **clients have no native build step**, build Android (and iOS) prebuilts **before** publishing, then publish. The tarball will include `android/install/` and consumers can `npm install` and run the app without running `build-native.sh`.
+
+From the **plugin repo** (capacitor-mqtt-quic), before `npm publish`:
+
+```bash
+# 1) Android prebuilts for all ABIs (required for zero-config Android)
+npm run build:android-prebuilts
+
+# 2) iOS prebuilts (if not already present)
+./build-native.sh --ios-only
+
+# 3) Build JS and publish (clean does not remove android/install or ios/libs)
+npm run build
+npm run clean:build-artifacts
+npm version patch   # or minor
+npm publish --access public
+```
+
+See **docs/PRODUCTION_PUBLISH_STEPS.md** for the full checklist.
+
+### Connection error: `{"code":"UNIMPLEMENTED"}`
+
+Capacitor returns this when the **native plugin method is not found** on the current platform. Common causes and fixes:
+
+| Platform | Check |
+|----------|--------|
+| **iOS** | Plugin must be linked. Run `npx cap sync ios` and `cd ios && pod install`, then rebuild in Xcode. Ensure `@annadata/capacitor-mqtt-quic` is in your app’s `package.json` and that the iOS project includes the plugin (Capacitor should auto-discover it). If you use a custom Podfile, ensure the AnnadataCapacitorMqttQuic plugin target is included. |
+| **Android** | Run `npx cap sync android` and rebuild. If you see "WolfSSL not found", run the one-time native build (see above). |
+| **Web / browser** | In browser, the plugin uses the **web** implementation (WSS or WebTransport). If you get UNIMPLEMENTED in the browser, the app may be resolving the native bridge instead of the web plugin—e.g. wrong `capacitor.config` or build. Ensure you’re opening the app as a web build (e.g. `ionic serve` or `cap run web`), not a native app with a WebView. |
+
+After adding the plugin or changing native code, always run **`npx cap sync`** and on iOS **`pod install`**, then rebuild the native app.
 
 ## Development
 
 ### Build Plugin
 
 ```bash
-cd production/capacitor-mqtt-quic
+git clone https://github.com/annadata/capacitor-mqtt-quic.git
+cd capacitor-mqtt-quic
 npm install
 npm run build
 ```
@@ -417,8 +457,8 @@ npm run build
 ### Add to Capacitor App
 
 ```bash
-cd production/annadata-production
-npm i @annadata/capacitor-mqtt-quic
+cd your-capacitor-app
+npm install @annadata/capacitor-mqtt-quic
 npx cap sync
 ```
 
@@ -443,14 +483,14 @@ await MqttQuic.connect({
 
 ## Publishing (maintainers)
 
-To pack the plugin **with native libs** and publish to npm, follow **[PRODUCTION_PUBLISH_STEPS.md](./PRODUCTION_PUBLISH_STEPS.md)**.
+To pack the plugin **with native libs** and publish to npm, follow **[PRODUCTION_PUBLISH_STEPS.md](./docs/PRODUCTION_PUBLISH_STEPS.md)**.
 
 ## Documentation
 
-- [Implementation Summary](./IMPLEMENTATION_SUMMARY.md) - Complete project overview
-- [MQTT 5.0 Implementation](./MQTT5_IMPLEMENTATION_COMPLETE.md) - MQTT 5.0 features and usage
-- [ngtcp2 Integration Plan](./NGTCP2_INTEGRATION_PLAN.md) - Build instructions for real QUIC
-- [MQTT Version Analysis](./MQTT_VERSION_ANALYSIS.md) - Why MQTT 5.0?
+- [Implementation Summary](./docs/IMPLEMENTATION_SUMMARY.md) - Complete project overview
+- [MQTT 5.0 Implementation](./docs/MQTT5_IMPLEMENTATION_COMPLETE.md) - MQTT 5.0 features and usage
+- [ngtcp2 Integration Plan](./docs/NGTCP2_INTEGRATION_PLAN.md) - Build instructions for real QUIC
+- [MQTT Version Analysis](./docs/MQTT_VERSION_ANALYSIS.md) - Why MQTT 5.0?
 
 ## Web / browser support
 
@@ -522,7 +562,7 @@ await MqttQuic.connect({
 - **iOS:** 15.0+
 - **Android:** API 21+ (Android 5.0+)
 - **Web:** Any modern browser; MQTT over WSS
-- **Capacitor:** 7.0+
+- **Capacitor:** 8.0+
 - **QUIC:** ngtcp2 + WolfSSL on native; on web, optional WebTransport (browser's HTTP/3/QUIC) when server supports it
 
 ## Author

package/android/NGTCP2_BUILD_INSTRUCTIONS.md

@@ -337,4 +337,4 @@ After building ngtcp2/nghttp3:
 2. Replace `QuicClientStub` with `NGTCP2Client` in `MQTTClient.kt`
 3. Test connection to MQTT server over QUIC
 
-See `NGTCP2_INTEGRATION_PLAN.md` for detailed implementation guide.
+See [NGTCP2_INTEGRATION_PLAN.md](../docs/NGTCP2_INTEGRATION_PLAN.md) for detailed implementation guide.

package/android/app/src/main/assets/capacitor.config.json

@@ -1,5 +1,5 @@
 {
 	"appId": "ai.annadata.mqttquic",
-	"appName": "MqttQuicPlugin",
+	"appName": "AnnadataCapacitorMqttQuic",
 	"webDir": "www"
 }

package/android/build-wolfssl.sh

@@ -47,9 +47,15 @@ fi
 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"
-    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
 
 # Map ABI to toolchain

package/android/build.gradle

@@ -36,7 +36,10 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
-                arguments "-DANDROID_STL=c++_shared"
+                arguments "-DANDROID_STL=c++_shared",
+                    "-DWOLFSSL_ROOT_DIR=${file('install/wolfssl-android').absolutePath}",
+                    "-DNGTCP2_INSTALL_DIR=${file('install/ngtcp2-android').absolutePath}",
+                    "-DNGHTTP3_INSTALL_DIR=${file('install/nghttp3-android').absolutePath}"
                 cppFlags "-std=c++17"
             }
         }

package/android/install/nghttp3-android/arm64-v8a/lib/pkgconfig/libnghttp3.pc

@@ -21,10 +21,10 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/nghttp3-android/arm64-v8a
-exec_prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/nghttp3-android/arm64-v8a
-libdir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/nghttp3-android/arm64-v8a/lib
-includedir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/nghttp3-android/arm64-v8a/include
+prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/nghttp3-android/arm64-v8a
+exec_prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/nghttp3-android/arm64-v8a
+libdir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/nghttp3-android/arm64-v8a/lib
+includedir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/nghttp3-android/arm64-v8a/include
 
 Name: libnghttp3
 Description: nghttp3 library

package/android/install/nghttp3-android/armeabi-v7a/lib/pkgconfig/libnghttp3.pc

@@ -21,10 +21,10 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/nghttp3-android/armeabi-v7a
-exec_prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/nghttp3-android/armeabi-v7a
-libdir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/nghttp3-android/armeabi-v7a/lib
-includedir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/nghttp3-android/armeabi-v7a/include
+prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/nghttp3-android/armeabi-v7a
+exec_prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/nghttp3-android/armeabi-v7a
+libdir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/nghttp3-android/armeabi-v7a/lib
+includedir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/nghttp3-android/armeabi-v7a/include
 
 Name: libnghttp3
 Description: nghttp3 library

package/android/install/nghttp3-android/x86_64/lib/pkgconfig/libnghttp3.pc

@@ -21,10 +21,10 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/nghttp3-android/x86_64
-exec_prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/nghttp3-android/x86_64
-libdir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/nghttp3-android/x86_64/lib
-includedir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/nghttp3-android/x86_64/include
+prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/nghttp3-android/x86_64
+exec_prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/nghttp3-android/x86_64
+libdir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/nghttp3-android/x86_64/lib
+includedir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/nghttp3-android/x86_64/include
 
 Name: libnghttp3
 Description: nghttp3 library

package/android/install/ngtcp2-android/arm64-v8a/lib/pkgconfig/libngtcp2.pc

@@ -20,10 +20,10 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a
-exec_prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a
-libdir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a/lib
-includedir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a/include
+prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a
+exec_prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a
+libdir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a/lib
+includedir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a/include
 
 Name: libngtcp2
 Description: ngtcp2 library

package/android/install/ngtcp2-android/arm64-v8a/lib/pkgconfig/libngtcp2_crypto_wolfssl.pc

@@ -20,10 +20,10 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a
-exec_prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a
-libdir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a/lib
-includedir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a/include
+prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a
+exec_prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a
+libdir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a/lib
+includedir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/arm64-v8a/include
 
 Name: libngtcp2_crypto_wolfssl
 Description: ngtcp2 wolfSSL crypto library

package/android/install/ngtcp2-android/armeabi-v7a/lib/pkgconfig/libngtcp2.pc

@@ -20,10 +20,10 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a
-exec_prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a
-libdir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a/lib
-includedir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a/include
+prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a
+exec_prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a
+libdir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a/lib
+includedir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a/include
 
 Name: libngtcp2
 Description: ngtcp2 library

package/android/install/ngtcp2-android/armeabi-v7a/lib/pkgconfig/libngtcp2_crypto_wolfssl.pc

@@ -20,10 +20,10 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a
-exec_prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a
-libdir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a/lib
-includedir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a/include
+prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a
+exec_prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a
+libdir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a/lib
+includedir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/armeabi-v7a/include
 
 Name: libngtcp2_crypto_wolfssl
 Description: ngtcp2 wolfSSL crypto library

package/android/install/ngtcp2-android/x86_64/lib/pkgconfig/libngtcp2.pc

@@ -20,10 +20,10 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64
-exec_prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64
-libdir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64/lib
-includedir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64/include
+prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64
+exec_prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64
+libdir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64/lib
+includedir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64/include
 
 Name: libngtcp2
 Description: ngtcp2 library

package/android/install/ngtcp2-android/x86_64/lib/pkgconfig/libngtcp2_crypto_wolfssl.pc

@@ -20,10 +20,10 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64
-exec_prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64
-libdir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64/lib
-includedir=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64/include
+prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64
+exec_prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64
+libdir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64/lib
+includedir=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/ngtcp2-android/x86_64/include
 
 Name: libngtcp2_crypto_wolfssl
 Description: ngtcp2 wolfSSL crypto library

package/android/install/wolfssl-android/arm64-v8a/bin/wolfssl-config

@@ -4,7 +4,7 @@ package="wolfssl"
 version="5.8.4"
 libs="-lwolfssl"
  
-prefix="/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/wolfssl-android/arm64-v8a"
+prefix="/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/wolfssl-android/arm64-v8a"
 exec_prefix="${prefix}"
 bindir="${exec_prefix}/bin"
 sbindir="${exec_prefix}/sbin"

package/android/install/wolfssl-android/arm64-v8a/lib/libwolfssl.la

@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/wolfssl-android/arm64-v8a/lib'
+libdir='/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/wolfssl-android/arm64-v8a/lib'

package/android/install/wolfssl-android/arm64-v8a/lib/pkgconfig/wolfssl.pc

@@ -1,4 +1,4 @@
-prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/wolfssl-android/arm64-v8a
+prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/wolfssl-android/arm64-v8a
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include

package/android/install/wolfssl-android/armeabi-v7a/bin/wolfssl-config

@@ -4,7 +4,7 @@ package="wolfssl"
 version="5.8.4"
 libs="-lwolfssl"
  
-prefix="/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/wolfssl-android/armeabi-v7a"
+prefix="/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/wolfssl-android/armeabi-v7a"
 exec_prefix="${prefix}"
 bindir="${exec_prefix}/bin"
 sbindir="${exec_prefix}/sbin"

package/android/install/wolfssl-android/armeabi-v7a/lib/libwolfssl.la

@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/wolfssl-android/armeabi-v7a/lib'
+libdir='/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/wolfssl-android/armeabi-v7a/lib'

package/android/install/wolfssl-android/armeabi-v7a/lib/pkgconfig/wolfssl.pc

@@ -1,4 +1,4 @@
-prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/wolfssl-android/armeabi-v7a
+prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/wolfssl-android/armeabi-v7a
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include

package/android/install/wolfssl-android/x86_64/bin/wolfssl-config

@@ -4,7 +4,7 @@ package="wolfssl"
 version="5.8.4"
 libs="-lwolfssl"
  
-prefix="/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/wolfssl-android/x86_64"
+prefix="/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/wolfssl-android/x86_64"
 exec_prefix="${prefix}"
 bindir="${exec_prefix}/bin"
 sbindir="${exec_prefix}/sbin"

package/android/install/wolfssl-android/x86_64/lib/libwolfssl.la

@@ -38,4 +38,4 @@ dlopen=''
 dlpreopen=''
 
 # Directory that this library needs to be installed in:
-libdir='/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/wolfssl-android/x86_64/lib'
+libdir='/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/wolfssl-android/x86_64/lib'

package/android/install/wolfssl-android/x86_64/lib/pkgconfig/wolfssl.pc

@@ -1,4 +1,4 @@
-prefix=/Users/annadata/Project_A/capacitor-mqtt-quic/android/install/wolfssl-android/x86_64
+prefix=/Users/annadata/Ionic/capacitor-mqtt-quic/android/install/wolfssl-android/x86_64
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include

package/android/src/main/cpp/CMakeLists.txt

@@ -14,9 +14,10 @@ endif()
 # WolfSSL path (same layout as iOS: TLS backend for ngtcp2). Override via -DWOLFSSL_ROOT_DIR=...
 if(NOT WOLFSSL_ROOT_DIR)
     set(WOLFSSL_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../install/wolfssl-android" CACHE PATH "Path to WolfSSL for Android")
-    if(EXISTS "${WOLFSSL_ROOT_DIR}/${ANDROID_ABI}")
-        set(WOLFSSL_ROOT_DIR "${WOLFSSL_ROOT_DIR}/${ANDROID_ABI}" CACHE PATH "Path to WolfSSL for Android (ABI)" FORCE)
-    endif()
+endif()
+# Prefer ABI-specific subdir when present (e.g. when WOLFSSL_ROOT_DIR is passed as base path from Gradle)
+if(EXISTS "${WOLFSSL_ROOT_DIR}/${ANDROID_ABI}")
+    set(WOLFSSL_ROOT_DIR "${WOLFSSL_ROOT_DIR}/${ANDROID_ABI}" CACHE PATH "Path to WolfSSL for Android (ABI)" FORCE)
 endif()
 if(NOT WOLFSSL_INCLUDE_DIR AND EXISTS "${WOLFSSL_ROOT_DIR}/include")
     set(WOLFSSL_INCLUDE_DIR "${WOLFSSL_ROOT_DIR}/include")
@@ -25,7 +26,12 @@ if(NOT WOLFSSL_LIBRARY AND EXISTS "${WOLFSSL_ROOT_DIR}/lib/libwolfssl.a")
     set(WOLFSSL_LIBRARY "${WOLFSSL_ROOT_DIR}/lib/libwolfssl.a")
 endif()
 if(NOT WOLFSSL_LIBRARY OR NOT WOLFSSL_INCLUDE_DIR)
-    message(FATAL_ERROR "WolfSSL not found. Build it first: cd android && ./build-wolfssl.sh --abi ${ANDROID_ABI}. Then run ./build-ngtcp2.sh (default uses WolfSSL).")
+    message(FATAL_ERROR
+        "WolfSSL not found at ${WOLFSSL_ROOT_DIR}. "
+        "One-time fix (from your app project root): "
+        "cd node_modules/@annadata/capacitor-mqtt-quic && "
+        "./build-native.sh --android-only --abi ${ANDROID_ABI} "
+        "(repeat for armeabi-v7a, x86_64). See plugin README 'Production / First-time build'.")
 endif()
 
 # ngtcp2 install/source directories (adjust as needed)
@@ -46,6 +52,14 @@ if(NOT NGHTTP3_INSTALL_DIR)
 endif()
 set(NGHTTP3_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../../../nghttp3" CACHE PATH "Path to nghttp3 source")
 
+# Prefer ABI-specific subdir when install dirs are passed as base path from Gradle
+if(EXISTS "${NGTCP2_INSTALL_DIR}/${ANDROID_ABI}")
+    set(NGTCP2_INSTALL_DIR "${NGTCP2_INSTALL_DIR}/${ANDROID_ABI}" CACHE PATH "Path to ngtcp2 install (ABI)" FORCE)
+endif()
+if(EXISTS "${NGHTTP3_INSTALL_DIR}/${ANDROID_ABI}")
+    set(NGHTTP3_INSTALL_DIR "${NGHTTP3_INSTALL_DIR}/${ANDROID_ABI}" CACHE PATH "Path to nghttp3 install (ABI)" FORCE)
+endif()
+
 # Prefer installed libraries (WolfSSL backend: libngtcp2_crypto_wolfssl.a), fallback to source build
 set(NGTCP2_INCLUDE_DIR "")
 set(NGTCP2_LIBRARY "")
@@ -112,7 +126,7 @@ target_include_directories(ngtcp2_client PRIVATE
 )
 
 # Link libraries: WolfSSL + ngtcp2 (same TLS backend as iOS)
-target_link_libraries(ngtcp2_client
+target_link_libraries(ngtcp2_client PRIVATE
     ${WOLFSSL_LIBRARY}
     log
 )