@annadata/capacitor-mqtt-quic 0.1.7 → 0.1.9

package/ios/{MqttQuicPlugin.podspec → AnnadataCapacitorMqttQuic.podspec}

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name = 'MqttQuicPlugin'
+  s.name = 'AnnadataCapacitorMqttQuic'
   s.version = package['version']
   s.summary = 'MQTT-over-QUIC Capacitor plugin (iOS)'
   s.license = package['license']
@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.source = { :git => 'https://github.com/annadata/capacitor-mqtt-quic', :tag => s.version.to_s }
   s.source_files = 'Sources/**/*.{swift,h,m,c,cc,mm,cpp}'
   s.resources = ['Sources/MqttQuicPlugin/Resources/*.pem']
-  s.ios.deployment_target = '14.0'
+  s.ios.deployment_target = '15.0'
   s.dependency 'Capacitor'
   s.swift_version = '5.1'
   s.vendored_libraries = [
@@ -25,8 +25,8 @@ Pod::Spec.new do |s|
   s.private_header_files = 'Sources/**/*.h', 'include/**/*.h'
   s.header_mappings_dir = 'Sources'
   s.pod_target_xcconfig = {
-    'HEADER_SEARCH_PATHS' => '$(PODS_ROOT)/MqttQuicPlugin/include/ngtcp2 $(PODS_ROOT)/MqttQuicPlugin/include/nghttp3 $(PODS_ROOT)/MqttQuicPlugin/include/wolfssl',
-    'LIBRARY_SEARCH_PATHS' => '$(PODS_ROOT)/MqttQuicPlugin/libs',
+    'HEADER_SEARCH_PATHS' => '$(PODS_ROOT)/AnnadataCapacitorMqttQuic/include/ngtcp2 $(PODS_ROOT)/AnnadataCapacitorMqttQuic/include/nghttp3 $(PODS_ROOT)/AnnadataCapacitorMqttQuic/include/wolfssl',
+    'LIBRARY_SEARCH_PATHS' => '$(PODS_ROOT)/AnnadataCapacitorMqttQuic/libs',
     'OTHER_LDFLAGS' => '-lngtcp2 -lngtcp2_crypto_wolfssl -lnghttp3 -lwolfssl',
     'SWIFT_ACTIVE_COMPILATION_CONDITIONS' => 'NGTCP2_ENABLED NGHTTP3_ENABLED'
   }

package/ios/App/App/capacitor.config.json

@@ -1,6 +1,6 @@
 {
 	"appId": "ai.annadata.mqttquic",
-	"appName": "MqttQuicPlugin",
+	"appName": "AnnadataCapacitorMqttQuic",
 	"webDir": "www",
 	"packageClassList": [
 		"MqttQuicPlugin"

package/ios/NGTCP2_BUILD_INSTRUCTIONS.md

@@ -34,7 +34,7 @@ If you have access to pre-built ngtcp2, nghttp3, and OpenSSL libraries:
 2. Place `libnghttp3.a` in `ios/libs/`
 3. Place OpenSSL libraries (`libssl.a`, `libcrypto.a`) in `ios/libs/`
 4. Place headers in `ios/include/ngtcp2/`, `ios/include/nghttp3/`, and `ios/include/openssl/`
-5. Update `MqttQuicPlugin.podspec` to link against these libraries
+5. Update `AnnadataCapacitorMqttQuic.podspec` to link against these libraries
 
 ### Option 2: Build from Source
 
@@ -154,7 +154,7 @@ Then clean and rebuild the iOS app so it links the new xcframework. See the app
 
 ### Option A: CocoaPods
 
-Update `ios/MqttQuicPlugin.podspec`:
+Update `ios/AnnadataCapacitorMqttQuic.podspec`:
 
 ```ruby
 Pod::Spec.new do |s|
@@ -342,4 +342,4 @@ After building ngtcp2:
 2. Replace `QuicClientStub` with `NGTCP2Client` in `MQTTClient.swift`
 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/ios/Package.swift

@@ -1,17 +1,16 @@
 // swift-tools-version: 5.9
 import PackageDescription
 
-// MqttQuicPlugin iOS – Swift Package for Capacitor 8 (SPM).
-// Requires Libs/MqttQuicLibs.xcframework. After building OpenSSL, ngtcp2, nghttp3
-// (see build-openssl.sh, build-ngtcp2.sh, build-nghttp3.sh), run:
+// AnnadataCapacitorMqttQuic – Swift Package for Capacitor 8 (SPM).
+// Requires Libs/MqttQuicLibs.xcframework. After building (see build-native.sh), run:
 //   ./create-xcframework.sh
 let package = Package(
-    name: "MqttQuicPlugin",
-    platforms: [.iOS(.v14)],
+    name: "AnnadataCapacitorMqttQuic",
+    platforms: [.iOS(.v15)],
     products: [
         .library(
-            name: "MqttQuicPlugin",
-            targets: ["MqttQuicPlugin"]
+            name: "AnnadataCapacitorMqttQuic",
+            targets: ["AnnadataCapacitorMqttQuic"]
         )
     ],
     dependencies: [
@@ -38,7 +37,7 @@ let package = Package(
             ]
         ),
         .target(
-            name: "MqttQuicPlugin",
+            name: "AnnadataCapacitorMqttQuic",
             dependencies: [
                 "NGTCP2Bridge",
                 .product(name: "Capacitor", package: "capacitor-swift-pm")

package/ios/Tests/MQTTProtocolTests.swift

@@ -4,7 +4,7 @@
 //
 
 import XCTest
-@testable import MqttQuicPlugin
+@testable import AnnadataCapacitorMqttQuic
 
 final class MQTTProtocolTests: XCTestCase {
 

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.7",
+  "version": "0.1.9",
   "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",
@@ -11,6 +11,7 @@
     "dist",
     "ios",
     "android",
+    "Package.swift",
     "AnnadataCapacitorMqttQuic.podspec",
     "README.md",
     "deps-versions.sh",
@@ -21,6 +22,7 @@
     "build": "npm run build:tsc && npm run build:rollup",
     "build:tsc": "npx tsc",
     "build:rollup": "npx rollup -c rollup.config.js",
+    "build:android-prebuilts": "./build-native.sh --android-only --abi arm64-v8a && ./build-native.sh --android-only --abi armeabi-v7a && ./build-native.sh --android-only --abi x86_64",
     "watch": "rollup -c rollup.config.js -w",
     "lint": "eslint src --ext ts",
     "prepack": "npm run clean:build-artifacts",
@@ -41,7 +43,8 @@
   ],
   "capacitor": {
     "ios": {
-      "src": "ios"
+      "src": "ios",
+      "name": "AnnadataCapacitorMqttQuic"
     },
     "android": {
       "src": "android"

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>