bridgefy-react-native 1.0.3 → 1.1.0

package/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
+    classpath "com.android.tools.build:gradle:8.1.1"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -85,7 +85,7 @@ repositories {
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
-  implementation (group: "me.bridgefy", name: "android-sdk", version: "1.0.3", ext: "aar") {
+  implementation (group: "me.bridgefy", name: "android-sdk", version: "1.1.0", ext: "aar") {
     transitive = true
   }
   // For < 0.71, this will be from the local maven repo

package/android/gradle.properties

@@ -1,5 +1,5 @@
-BridgefyReactNative_kotlinVersion=1.7.0
+BridgefyReactNative_kotlinVersion=1.9.10
 BridgefyReactNative_minSdkVersion=21
-BridgefyReactNative_targetSdkVersion=31
-BridgefyReactNative_compileSdkVersion=31
+BridgefyReactNative_targetSdkVersion=34
+BridgefyReactNative_compileSdkVersion=34
 BridgefyReactNative_ndkversion=21.4.7075529

package/android/src/main/java/me/bridgefy/plugin/react_native/BridgefyReactNativeModule.kt

@@ -1,11 +1,12 @@
 package me.bridgefy.plugin.react_native
 
+import android.util.Log
 import com.facebook.react.bridge.Arguments
+import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
-import com.facebook.react.bridge.Promise
-import com.facebook.react.bridge.ReactContext
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
@@ -30,15 +31,14 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun initialize(apiKey: String,
-                 propagationProfile: String,
-                 promise: Promise) {
-    val profile = propagationProfileFromString(propagationProfile)
+  fun initialize(
+    apiKey: String,
+    verboseLogging: Boolean = false,
+    promise: Promise,
+  ) {
     try {
       bridgefy.init(
-        null,
         UUID.fromString(apiKey),
-        profile!!,
         object : BridgefyDelegate {
           override fun onConnected(peerID: UUID) {
             val params = Arguments.createMap().apply {
@@ -53,14 +53,14 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
             }
           }
 
-          override fun onConnectedSecurely(peerID: UUID) {
+          override fun onEstablishSecureConnection(userId: UUID) {
             val params = Arguments.createMap().apply {
-              putString("userId", peerID.toString())
+              putString("userId", userId.toString())
             }
             sendEvent(
               reactApplicationContext,
               "bridgefyDidEstablishSecureConnection",
-              params
+              params,
             )
           }
 
@@ -71,10 +71,10 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
             sendEvent(reactApplicationContext, "bridgefyDidDisconnect", params)
           }
 
-          // TODO: iOS provides BridgefyError
-          override fun onFailToSend(messageID: UUID) {
+          override fun onFailToSend(messageID: UUID, error: BridgefyException) {
             val params = Arguments.createMap().apply {
               putString("messageId", messageID.toString())
+              putMap("error", mapFromBridgefyException(error))
             }
             sendEvent(reactApplicationContext, "bridgefyDidFailSendingMessage", params)
           }
@@ -102,10 +102,10 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
             sendEvent(reactApplicationContext, "bridgefyDidSendDataProgress", params)
           }
 
-          override fun onReceive(
+          override fun onReceiveData(
             data: ByteArray,
             messageID: UUID,
-            transmissionMode: TransmissionMode
+            transmissionMode: TransmissionMode,
           ) {
             val params = Arguments.createMap().apply {
               putString("data", String(data))
@@ -129,14 +129,30 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
             sendEvent(reactApplicationContext, "bridgefyDidStart", params)
           }
 
-          // TODO: bridgefyDidFailToEstablishSecureConnection
-          // TODO: bridgefyDidDestroySession
-          // TODO: bridgefyDidFailToDestroySession
+          override fun onFailToEstablishSecureConnection(userId: UUID, error: BridgefyException) {
+            val params = Arguments.createMap().apply {
+              putString("userId", userId.toString())
+              putMap("error", mapFromBridgefyException(error))
+            }
+            sendEvent(reactApplicationContext, "bridgefyDidFailToEstablishSecureConnection", params)
+          }
+
+          override fun onDestroySession() {
+            sendEvent(reactApplicationContext, "bridgefyDidDestroySession", null)
+          }
+
+          override fun onFailToDestroySession(error: BridgefyException) {
+            val params = Arguments.createMap().apply {
+              putMap("error", mapFromBridgefyException(error))
+            }
+            sendEvent(reactApplicationContext, "bridgefyDidFailToDestroySession", params)
+          }
 
           override fun onStopped() {
             sendEvent(reactApplicationContext, "bridgefyDidStop", null)
           }
-        }
+        },
+        if (verboseLogging) Log.DEBUG else 1,
       )
       promise.resolve(null)
     } catch (error: BridgefyException) {
@@ -146,8 +162,16 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun start(promise: Promise) {
-    bridgefy.start()
+  fun start(
+    customUserID: String?,
+    propagationProfile: String,
+    promise: Promise,
+  ) {
+    val profile = propagationProfileFromString(propagationProfile)
+    bridgefy.start(
+      customUserID?.let { UUID.fromString(it) },
+      profile ?: PropagationProfile.Standard,
+    )
     promise.resolve(null)
   }
 
@@ -156,9 +180,11 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
     val mode = transmissionModeFromMap(transmissionMode)!!
     try {
       val uuid = bridgefy.send(data.toByteArray(), mode)
-      promise.resolve(Arguments.createMap().apply {
-        putString("messageId", uuid.toString())
-      })
+      promise.resolve(
+        Arguments.createMap().apply {
+          putString("messageId", uuid.toString())
+        },
+      )
     } catch (error: BridgefyException) {
       val map = mapFromBridgefyException(error)
       promise.reject(map.getString("code"), map.getString("message"), error)
@@ -173,8 +199,11 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun connectedPeers(promise: Promise) {
-    promise.resolve(arrayOf<String>())
-    TODO("Android impl")
+    val peers = bridgefy.connectedPeers().getOrNull()
+    val nodes = Arguments.createArray().apply {
+      peers?.forEach { pushString(it.toString()) }
+    }
+    promise.resolve(Arguments.createMap().apply { putArray("connectedPeers", nodes) })
   }
 
   @ReactMethod
@@ -191,7 +220,7 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun currentUserID(promise: Promise) {
-    val userId = bridgefy.currentBridgefyUser()
+    val userId = bridgefy.currentUserId().getOrThrow()
     promise.resolve(Arguments.createMap().apply {
       putString("userId", userId.toString())
     })
@@ -206,10 +235,12 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun licenseExpirationDate(promise: Promise) {
-    val date = bridgefy.licenseExpirationDate()
-    promise.resolve(Arguments.createMap().apply {
-      putString("licenseExpirationDate", date?.time.toString())
-    })
+    val date = bridgefy.licenseExpirationDate().getOrThrow()
+    promise.resolve(
+      Arguments.createMap().apply {
+        putString("licenseExpirationDate", date?.time.toString())
+      },
+    )
   }
 
   companion object {

package/ios/BridgefyReactNative.m

@@ -8,7 +8,9 @@ RCT_EXTERN_METHOD(initialize:(NSString *)apiKey
                   resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(start:(RCTPromiseResolveBlock)resolve
+RCT_EXTERN_METHOD(start:(NSString *)userId
+                  propagationProfile:(NSString *)propagationProfile
+                  resolve:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(send:(NSString *)data

package/ios/BridgefyReactNative.swift

@@ -13,15 +13,13 @@ class BridgefyReactNative: RCTEventEmitter, BridgefyDelegate {
 
   @objc(initialize:propagationProfile:resolve:reject:)
   func initialize(apiKey: String,
-                  propagationProfile: String,
+                  verboseLogging: Boolean,
                   resolve: RCTPromiseResolveBlock,
                   reject: RCTPromiseRejectBlock) -> Void {
     do {
-      let profile = self.propagationProfile(from: propagationProfile)!
       bridgefy = try Bridgefy(withApiKey: apiKey,
-                              propagationProfile: profile,
                               delegate: self,
-                              verboseLogging: false)
+                              verboseLogging: verboseLogging)
       resolve(nil)
     } catch let error {
       let dict = errorDictionary(from: error as! BridgefyError)
@@ -29,9 +27,17 @@ class BridgefyReactNative: RCTEventEmitter, BridgefyDelegate {
     }
   }
 
-  @objc(start:reject:)
-  func start(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-    bridgefy!.start()
+  @objc(start:propagationProfile:resolve:reject:)
+  func start(userId: String,
+             propagationProfile: String,
+             resolve: RCTPromiseResolveBlock,
+             reject: RCTPromiseRejectBlock) -> Void {
+    let profile = self.propagationProfile(from: propagationProfile)!
+    if let uuid = UUID(uuidString: userId) {
+        bridgefy?.start(withUserId: uuid, andPropagationProfile: profile)
+    }else{
+        bridgefy?.start(withUserId: nil, andPropagationProfile: profile)
+    }
     resolve(nil)
   }
 
@@ -58,14 +64,14 @@ class BridgefyReactNative: RCTEventEmitter, BridgefyDelegate {
 
   @objc(connectedPeers:reject:)
   func connectedPeers(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-    resolve(["connectedPeers": bridgefy!.connectedPeers.map({ uuid in
+    resolve(["connectedPeers": bridgefy!.connectedPeers!.map({ uuid in
       uuid.uuidString
     })])
   }
 
   @objc(currentUserId:reject:)
   func currentUserId(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-    resolve(["userId": bridgefy!.currentUserId.uuidString])
+    resolve(["userId": bridgefy!.currentUserId!.uuidString])
   }
 
   @objc(establishSecureConnection:resolve:reject:)
@@ -95,7 +101,7 @@ class BridgefyReactNative: RCTEventEmitter, BridgefyDelegate {
 
   @objc(updateLicense:reject:)
   func updateLicense(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-    bridgefy!.updateLicense()
+    //bridgefy!.updateLicense()
     resolve(nil)
   }
 
@@ -136,8 +142,9 @@ class BridgefyReactNative: RCTEventEmitter, BridgefyDelegate {
     BridgefyReactNative.emitter.sendEvent(withName: "bridgefyDidDestroySession", body: nil)
   }
 
-  func bridgefyDidFailToDestroySession() {
-    BridgefyReactNative.emitter.sendEvent(withName: "bridgefyDidFailToDestroySession", body: nil)
+  func bridgefyDidFailToDestroySession(with error: BridgefySDK.BridgefyError) {
+    BridgefyReactNative.emitter.sendEvent(withName: "bridgefyDidFailToDestroySession",
+                                          body: ["error": errorDictionary(from: error)])
   }
 
   func bridgefyDidConnect(with userId: UUID) {
@@ -268,7 +275,7 @@ class BridgefyReactNative: RCTEventEmitter, BridgefyDelegate {
     case .missingBundleID:
       type = "missingBundleID"
       break;
-    case .invalidAPIKey:
+    case .invalidApiKey:
       type = "invalidAPIKey"
       break;
     case .internetConnectionRequired:

package/ios/Frameworks/BridgefySDK.xcframework/Info.plist

@@ -8,32 +8,32 @@
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>BridgefySDK.framework</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>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>BridgefySDK.framework</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>
 	</array>
 	<key>CFBundlePackageType</key>