feat: tests for android & ios

.github/workflows/test.yml

@@ -7,7 +7,7 @@ on:
   pull_request:
     branches: [ "main" ]
 jobs:
-  test:
+  test-web:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -22,3 +22,36 @@ jobs:
         cache: 'yarn'
     - run: yarn
     - run: yarn test
+
+  test-ios:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        node-version: [lts/*]
+        # See supported Node.js release schedule at https://nodejs.org/en/about/previous-releases
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'yarn'
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '3.3'
+          bundler-cache: true
+      - name: "Get Ruby Version"
+        run: ruby --version
+      - uses: SwiftyLab/setup-swift@latest
+        with:
+          swift-version: "5.10.0"
+      - name: Get Swift Version
+        run: swift --version
+      - name: Set Swift Version
+        if: runner.os == 'macOS'
+        run: xcrun --toolchain ${{ env.TOOLCHAINS }} swift --version
+      - run: corepack enable
+      - run: yarn
+      - run: cd example; bundle; cd -
+      - run: cd example/ios; bundle exec pod install; cd -
+      - run: make test

Makefile

@@ -0,0 +1,10 @@
+test:
+	$(MAKE) test-ios
+
+test-ios:
+	xcodebuild -quiet \
+      -workspace example/ios/ExampleAppExample.xcworkspace \
+      -scheme ExampleAppExample \
+      -sdk iphonesimulator \
+      -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' \
+      test || exit 1

abrevva-react-native.podspec

@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
 
   s.dependency "CocoaMQTT"
   s.dependency "CryptoSwift"
-  s.dependency "AbrevvaSDK", '~> 1.0.20'
+  s.dependency "AbrevvaSDK", '~> 1.0.23'
 
   # Use install_modules_dependencies helper to install the dependencies if React Native version >=0.71.0.
   # See https://github.com/facebook/react-native/blob/febf6b7f33fdb4904669f99d795eba4c0f95d7bf/scripts/cocoapods/new_architecture.rb#L79.

android/build.gradle

@@ -75,6 +75,11 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    testOptions {
+        unitTests.all {
+            useJUnitPlatform()
+        }
+    }
 }
 
 repositories {
@@ -102,4 +107,4 @@ dependencies {
 
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
-}
+}

android/src/main/java/com/evva/xesar/abrevva/reactnative/AbrevvaBleModule.kt

@@ -80,11 +80,11 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
 
     private fun runInitialization(options: ReadableMap, promise: Promise) {
         if (!currentActivity!!.packageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) {
-            return promise.reject("runInitialization(): BLE is not supported")
+            return promise.reject(Exception("runInitialization(): BLE is not supported"))
         }
 
         if (!manager.isBleEnabled()) {
-            return promise.reject("runInitialization(): BLE is not available")
+            return promise.reject(Exception("runInitialization(): BLE is not available"))
         }
         promise.resolve("success")
     }
@@ -114,8 +114,7 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
         }
 
         if (!success) {
-            promise.reject("startEnabledNotifications(): Failed to set handler")
-            return
+            return promise.reject(Exception("startEnabledNotifications(): Failed to set handler"))
         }
         promise.resolve("success")
     }
@@ -165,7 +164,7 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
             if (success) {
                 promise.resolve("success")
             } else {
-                promise.reject("requestLEScan(): failed to start")
+                promise.reject(Exception("requestLEScan(): failed to start"))
             }
         }, { result: BleScanResult ->
             val scanResult = getScanResultFromNordic(result)
@@ -199,7 +198,7 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
             if (success) {
                 promise.resolve("success")
             } else {
-                promise.reject("connect(): failed to connect")
+                promise.reject(Exception("connect(): failed to connect"))
             }
         }, timeout)
     }
@@ -213,7 +212,7 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
             if (success) {
                 promise.resolve("success")
             } else {
-                promise.reject("disconnect(): failed to disconnect")
+                promise.reject(Exception("disconnect(): failed to disconnect"))
             }
         }
     }
@@ -229,7 +228,7 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
         }
 
         val characteristic = getCharacteristic(options, promise)
-            ?: return promise.reject("read(): bad characteristic")
+            ?: return promise.reject(Exception("read(): bad characteristic"))
 
         manager.read(
             deviceId,
@@ -262,7 +261,7 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
             getCharacteristic(options, promise)
                 ?: return promise.reject("read(): bad characteristic")
         val value =
-            options.getString("value") ?: return promise.reject("write(): missing value for write")
+            options.getString("value") ?: return promise.reject(Exception("write(): missing value for write"))
 
         manager.write(
             deviceId,
@@ -273,7 +272,7 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
                 if (success) {
                     promise.resolve("success")
                 } else {
-                    promise.reject("write(): failed to write to device")
+                    promise.reject(Exception("write(): failed to write to device"))
                 }
             },
             timeout
@@ -315,7 +314,7 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
         val deviceId = options.getString("deviceId") ?: ""
         val characteristic =
             getCharacteristic(options, promise)
-                ?: return promise.reject("startNotifications(): bad characteristic")
+                ?: return promise.reject(Exception("startNotifications(): bad characteristic"))
 
         manager.startNotifications(
             deviceId,
@@ -325,7 +324,7 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
                 if (success) {
                     promise.resolve("success")
                 } else {
-                    promise.reject("startNotifications(): failed to set notifications")
+                    promise.reject(Exception("startNotifications(): failed to set notifications"))
                 }
             }, { data: ByteArray ->
                 val key =
@@ -343,7 +342,7 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
         val deviceId = options.getString("deviceId") ?: ""
         val characteristic =
             getCharacteristic(options, promise)
-                ?: return promise.reject("stopNotifications(): bad characteristic")
+                ?: return promise.reject(Exception("stopNotifications(): bad characteristic"))
 
         manager.stopNotifications(
             deviceId,
@@ -353,7 +352,7 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
             if (success) {
                 promise.resolve("success")
             } else {
-                promise.reject("stopNotifications(): failed to unset notifications")
+                promise.reject(Exception("stopNotifications(): failed to unset notifications"))
             }
         }
     }
@@ -365,12 +364,12 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
         try {
             serviceUUID = UUID.fromString(serviceString)
         } catch (e: IllegalArgumentException) {
-            promise.reject("getCharacteristic(): invalid service uuid")
+            promise.reject(Exception("getCharacteristic(): invalid service uuid"))
             return null
         }
 
         if (serviceUUID == null) {
-            promise.reject("getCharacteristic(): service uuid required")
+            promise.reject(Exception("getCharacteristic(): service uuid required"))
             return null
         }
 
@@ -380,19 +379,19 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
         try {
             characteristicUUID = UUID.fromString(characteristicString)
         } catch (e: IllegalArgumentException) {
-            promise.reject("getCharacteristic(): invalid characteristic uuid")
+            promise.reject(Exception("getCharacteristic(): invalid characteristic uuid"))
             return null
         }
 
         if (characteristicUUID == null) {
-            promise.reject("getCharacteristic(): characteristic uuid required")
+            promise.reject(Exception("getCharacteristic(): characteristic uuid required"))
             return null
         }
 
         return Pair(serviceUUID, characteristicUUID)
     }
 
-    private fun getBleDeviceFromNordic(result: BleScanResult): ReadableMap {
+    fun getBleDeviceFromNordic(result: BleScanResult): ReadableMap {
         val bleDevice = Arguments.createMap()
 
         bleDevice.putString("deviceId", result.device.address)
@@ -410,7 +409,7 @@ class AbrevvaBleModule(reactContext: ReactApplicationContext) :
         return bleDevice
     }
 
-    private fun getScanResultFromNordic(result: BleScanResult): ReadableMap {
+    fun getScanResultFromNordic(result: BleScanResult): ReadableMap {
         val scanResult = Arguments.createMap()
         val bleDevice = getBleDeviceFromNordic(result)
 

android/src/main/java/com/evva/xesar/abrevva/reactnative/AbrevvaCryptoModule.kt

@@ -11,10 +11,13 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
+import com.hivemq.client.mqtt.mqtt3.Mqtt3AsyncClient.Mqtt3SubscribeAndCallbackBuilder.Call.Ex
 import org.bouncycastle.util.encoders.Base64
 import org.bouncycastle.util.encoders.Hex
 import java.io.BufferedInputStream
 import java.io.FileOutputStream
+import java.io.IOException
+import java.io.InputStream
 import java.net.URL
 import java.nio.file.Paths
 
@@ -72,8 +75,8 @@ class AbrevvaCryptoModule(reactContext: ReactApplicationContext) :
             val keyPair: X25519Wrapper.KeyPair = X25519Wrapper.generateKeyPair()
 
             val ret = Arguments.createMap()
-            ret.putString("privateKey", Base64.toBase64String(keyPair.privateKey))
-            ret.putString("publicKey", Base64.toBase64String(keyPair.publicKey))
+            ret.putString("privateKey", Hex.toHexString(keyPair.privateKey))
+            ret.putString("publicKey", Hex.toHexString(keyPair.publicKey))
             promise.resolve(ret)
         } catch (e: Exception) {
             promise.reject(Exception("generateKeyPair(): private key creation failed"))
@@ -94,8 +97,8 @@ class AbrevvaCryptoModule(reactContext: ReactApplicationContext) :
                 return
             }
             val sharedSecret: ByteArray = X25519Wrapper.computeSharedSecret(
-                Base64.decode(privateKey),
-                Base64.decode(peerPublicKey)
+               Hex.decode(privateKey),
+               Hex.decode(peerPublicKey)
             )
 
             val ret = Arguments.createMap()
@@ -165,7 +168,6 @@ class AbrevvaCryptoModule(reactContext: ReactApplicationContext) :
             promise.reject(e)
         }
     }
-
     fun writeToFile(ctPath: String, url: String) {
 
         BufferedInputStream(URL(url).openStream()).use { `in` ->