bridgefy-react-native 1.1.0 → 1.1.2

package/README.md

@@ -38,11 +38,10 @@ below:
 
 ## Installation
 
-Since this SDK is still in beta, you'll need to add a reference to this repository in your
-`package.json` file:
-
-```
-npm i git+https://github.com/bridgefy/bridgefy-react-native.git
+```bash
+$ npm i bridgefy-react-native
+# --- or ---
+$ yarn install bridgefy-react-native
 ```
 
 ## Usage
@@ -58,19 +57,34 @@ import { Bridgefy, BridgefyPropagationProfile } from 'bridgefy-react-native';
 const bridgefy = new Bridgefy();
 
 export default function App() {
-  React.useEffect(() => {
-    bridgefy
-      .initialize('api-key', BridgefyPropagationProfile.standard)
-      .catch((error) => {
-        console.error(error);
-      });
-  });
+    React.useEffect(() => {
+        bridgefy
+            .initialize(
+                'your-api-key-here', // UUID - The license key registered on the Bridgefy developer site.
+                false, // The logging priority for SDK operations.
+            )
+            .catch((error) => {
+                console.error(error);
+            });
+    });
+}
 ```
 
-Once initialized, you can call `start` to begin using the SDK.
+Once initialized, you can call `start` and `stop` Bridgefy SDK operations as follows:
 
 ```typescript
-bridgefy.start();
+/**
+ * Start Bridgefy SDK operations
+ */
+bridgefy.start(
+  userId, // UUID? (optional) - The ID used to identify the user in the Bridgefy network.If null is passed, the SDK will assign an autogenerated ID.
+  propagationProfile, // PropagationProfile (optional, default: PropagationProfile.Standard) - A profile that defines a series of properties and rules for the propagation of messages.
+);
+
+/**
+ * Stop Bridgefy SDK operations
+ */
+bridgefy.stop()
 ```
 
 ### Sending data
@@ -130,6 +144,34 @@ React.useEffect(() => {
 
 To see a full list of events, see the `BridgefyEvents` enum.
 
+## Additional Functionality
+The `Bridgefy` class also provides various functionalities:
+
+- `destroySession()`: Destroy current session.
+- `updateLicense()`: Update license.
+- `establishSecureConnection(userId: string): Promise<void>`: Establish a secure connection with a specified user.
+- `currentUserId(): Promise<string>`: Get the current user ID.
+- `connectedPeers(): Promise<string[]>`: Get a list of connected peers.
+- `licenseExpirationDate(): Promise<Date>`: Get the license expiration date.
+- `isInitialized(): Promise<boolean>`: Check if the SDK is initialized.
+- `isStarted(): Promise<boolean>`: Check if the SDK is started.
+
+Make sure to handle promises and error scenarios appropriately when using these methods.
+
+## Bridgefy Propagation Profiles
+
+The `BridgefyPropagationProfile` enum defines the following propagation profiles available for use:
+
+- `standard`: Standard propagation profile.
+- `highDensityNetwork`: High-density network profile.
+- `sparseNetwork`: Sparse network profile.
+- `longReach`: Long-reach profile.
+- `shortReach`: Short-reach profile.
+
+These profiles can be used when configuring the Bridgefy SDK operations within your React Native application.
+
+
+
 ## Multi-Platform Support
 
 Bridgefy's SDKs are designed to work seamlessly across different platforms, including iOS and Android. This means that users with different devices can communicate with each other as long as they have the Bridgefy-enabled applications installed.

package/android/build.gradle

@@ -85,7 +85,7 @@ repositories {
 def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
-  implementation (group: "me.bridgefy", name: "android-sdk", version: "1.1.0", ext: "aar") {
+  implementation (group: "me.bridgefy", name: "android-sdk", version: "1.1.2", ext: "aar") {
     transitive = true
   }
   // For < 0.71, this will be from the local maven repo
@@ -93,7 +93,6 @@ dependencies {
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-  implementation "androidx.preference:preference-ktx:1.2.0"
 }
 
 if (isNewArchitectureEnabled()) {

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

@@ -10,12 +10,12 @@ import com.facebook.react.bridge.ReactMethod
 import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.modules.core.DeviceEventManagerModule
+import java.util.UUID
 import me.bridgefy.Bridgefy
 import me.bridgefy.commons.TransmissionMode
 import me.bridgefy.commons.exception.BridgefyException
 import me.bridgefy.commons.listener.BridgefyDelegate
 import me.bridgefy.commons.propagation.PropagationProfile
-import java.util.UUID
 
 class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
   ReactContextBaseJavaModule(reactContext) {
@@ -34,7 +34,7 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
   fun initialize(
     apiKey: String,
     verboseLogging: Boolean = false,
-    promise: Promise,
+    promise: Promise
   ) {
     try {
       bridgefy.init(
@@ -60,7 +60,7 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
             sendEvent(
               reactApplicationContext,
               "bridgefyDidEstablishSecureConnection",
-              params,
+              params
             )
           }
 
@@ -105,7 +105,7 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
           override fun onReceiveData(
             data: ByteArray,
             messageID: UUID,
-            transmissionMode: TransmissionMode,
+            transmissionMode: TransmissionMode
           ) {
             val params = Arguments.createMap().apply {
               putString("data", String(data))
@@ -152,12 +152,14 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
             sendEvent(reactApplicationContext, "bridgefyDidStop", null)
           }
         },
-        if (verboseLogging) Log.DEBUG else 1,
+        if (verboseLogging) Log.DEBUG else 1
       )
       promise.resolve(null)
     } catch (error: BridgefyException) {
       val map = mapFromBridgefyException(error)
       promise.reject(map.getString("code"), map.getString("message"), error)
+    } catch (e: Exception) {
+      promise.reject("sessionError", "${e.message ?: e.localizedMessage}", e)
     }
   }
 
@@ -165,40 +167,53 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
   fun start(
     customUserID: String?,
     propagationProfile: String,
-    promise: Promise,
+    promise: Promise
   ) {
-    val profile = propagationProfileFromString(propagationProfile)
-    bridgefy.start(
-      customUserID?.let { UUID.fromString(it) },
-      profile ?: PropagationProfile.Standard,
-    )
-    promise.resolve(null)
+    try {
+      assert(bridgefy.isInitialized) { "Bridgefy SDK isn't initialized" }
+      val profile = propagationProfileFromString(propagationProfile)
+      bridgefy.start(
+        customUserID?.let { UUID.fromString(it) },
+        profile ?: PropagationProfile.Standard
+      )
+      promise.resolve(null)
+    } catch (e: Exception) {
+      promise.reject("sessionError", "${e.message ?: e.localizedMessage}", e)
+    }
   }
 
   @ReactMethod
   fun send(data: String, transmissionMode: ReadableMap, promise: Promise) {
-    val mode = transmissionModeFromMap(transmissionMode)!!
     try {
+      assert(bridgefy.isInitialized) { "Bridgefy SDK isn't initialized" }
+      assert(bridgefy.isStarted) { "Bridgefy SDK isn't started" }
+      val mode = transmissionModeFromMap(transmissionMode)!!
       val uuid = bridgefy.send(data.toByteArray(), mode)
       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)
+    } catch (e: Exception) {
+      promise.reject("sessionError", "${e.message ?: e.localizedMessage}", e)
     }
   }
 
   @ReactMethod
   fun stop(promise: Promise) {
+    assert(bridgefy.isInitialized) { "Bridgefy SDK isn't initialized" }
+    assert(bridgefy.isStarted) { "Bridgefy SDK isn't started" }
     bridgefy.stop()
     promise.resolve(null)
   }
 
   @ReactMethod
   fun connectedPeers(promise: Promise) {
+    assert(bridgefy.isInitialized) { "Bridgefy SDK isn't initialized" }
+    assert(bridgefy.isStarted) { "Bridgefy SDK isn't started" }
     val peers = bridgefy.connectedPeers().getOrNull()
     val nodes = Arguments.createArray().apply {
       peers?.forEach { pushString(it.toString()) }
@@ -214,20 +229,27 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun updateLicense(promise: Promise) {
+    assert(bridgefy.isInitialized) { "Bridgefy SDK isn't initialized" }
     bridgefy.updateLicense()
     promise.resolve(null)
   }
 
   @ReactMethod
   fun currentUserID(promise: Promise) {
+    assert(bridgefy.isInitialized) { "Bridgefy SDK isn't initialized" }
+    assert(bridgefy.isStarted) { "Bridgefy SDK isn't started" }
     val userId = bridgefy.currentUserId().getOrThrow()
-    promise.resolve(Arguments.createMap().apply {
-      putString("userId", userId.toString())
-    })
+    promise.resolve(
+      Arguments.createMap().apply {
+        putString("userId", userId.toString())
+      }
+    )
   }
 
   @ReactMethod
   fun establishSecureConnection(userId: String, promise: Promise) {
+    assert(bridgefy.isInitialized) { "Bridgefy SDK isn't initialized" }
+    assert(bridgefy.isStarted) { "Bridgefy SDK isn't started" }
     val uuid = UUID.fromString(userId)
     bridgefy.establishSecureConnection(uuid)
     promise.resolve(null)
@@ -235,14 +257,33 @@ class BridgefyReactNativeModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun licenseExpirationDate(promise: Promise) {
+    assert(bridgefy.isInitialized) { "Bridgefy SDK isn't initialized" }
     val date = bridgefy.licenseExpirationDate().getOrThrow()
     promise.resolve(
       Arguments.createMap().apply {
         putString("licenseExpirationDate", date?.time.toString())
-      },
+      }
     )
   }
 
+  @ReactMethod
+  fun isInitialized(promise: Promise) {
+    try {
+      val isInitialized = bridgefy.isInitialized
+      promise.resolve(isInitialized)
+    } catch (e: Exception) {
+      e.printStackTrace()
+      promise.resolve(false)
+    }
+  }
+
+  @ReactMethod
+  fun isStarted(promise: Promise) {
+    assert(bridgefy.isInitialized) { "Bridgefy SDK isn't initialized" }
+    val isStarted = bridgefy.isStarted
+    promise.resolve(isStarted)
+  }
+
   companion object {
     const val NAME = "BridgefyReactNative"
   }

package/ios/BridgefyReactNative.m

@@ -40,6 +40,12 @@ RCT_EXTERN_METHOD(destroySession:(RCTPromiseResolveBlock)resolve
 RCT_EXTERN_METHOD(updateLicense:(RCTPromiseResolveBlock)resolve
                   reject:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(isInitialized:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(isStarted:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(supportedEvents)
 
 + (BOOL)requiresMainQueueSetup

package/ios/BridgefyReactNative.swift

@@ -13,7 +13,7 @@ class BridgefyReactNative: RCTEventEmitter, BridgefyDelegate {
 
   @objc(initialize:propagationProfile:resolve:reject:)
   func initialize(apiKey: String,
-                  verboseLogging: Boolean,
+                  verboseLogging: Bool,
                   resolve: RCTPromiseResolveBlock,
                   reject: RCTPromiseRejectBlock) -> Void {
     do {
@@ -101,10 +101,19 @@ class BridgefyReactNative: RCTEventEmitter, BridgefyDelegate {
 
   @objc(updateLicense:reject:)
   func updateLicense(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
-    //bridgefy!.updateLicense()
-    resolve(nil)
+    // resolve(bridgefy!.updateLicense)
+      resolve(nil)
+  }
+  @objc(isInitialized:reject:)
+  func isInitialized(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+      resolve(Bridgefy.isInitialized)
   }
 
+  @objc(isStarted:reject:)
+    func isStarted(resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
+        resolve(Bridgefy.isStarted)
+    }
+
   // MARK: - RCTEventEmitter
 
   open override func supportedEvents() -> [String] {
@@ -338,6 +347,12 @@ class BridgefyReactNative: RCTEventEmitter, BridgefyDelegate {
       type = "encryptionError"
       details = code
       break;
+    case .inconsistentUserId:
+        type = "inconsistentUserId"
+    case .stopInProgress:
+        type = "stopInProgress"
+    case .destroySessionInProgress:
+        type = "destroySessionInProgress"
     @unknown default:
       return [:]
     }

package/ios/BridgefyReactNative.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/BridgefyReactNative.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?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>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/ios/BridgefyReactNative.xcodeproj/xcuserdata/bridgefy.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?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>SchemeUserState</key>
+	<dict>
+		<key>BridgefyReactNative.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

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

@@ -5,6 +5,8 @@
 	<key>AvailableLibraries</key>
 	<array>
 		<dict>
+			<key>BinaryPath</key>
+			<string>BridgefySDK.framework/BridgefySDK</string>
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>
@@ -22,6 +24,8 @@
 			<string>simulator</string>
 		</dict>
 		<dict>
+			<key>BinaryPath</key>
+			<string>BridgefySDK.framework/BridgefySDK</string>
 			<key>DebugSymbolsPath</key>
 			<string>dSYMs</string>
 			<key>LibraryIdentifier</key>

package/ios/Frameworks/BridgefySDK.xcframework/ios-arm64/BridgefySDK.framework/Headers/BridgefySDK-Swift.h

@@ -1,6 +1,6 @@
 #if 0
 #elif defined(__arm64__) && __arm64__
-// Generated by Apple Swift version 5.8 (swiftlang-5.8.0.124.2 clang-1403.0.22.11.100)
+// Generated by Apple Swift version 5.9 (swiftlang-5.9.0.128.108 clang-1500.0.40.1)
 #ifndef BRIDGEFYSDK_SWIFT_H
 #define BRIDGEFYSDK_SWIFT_H
 #pragma clang diagnostic push
@@ -42,12 +42,18 @@
 #include <string.h>
 #endif
 #if defined(__cplusplus)
-#if __has_include(<ptrauth.h>)
+#if defined(__arm64e__) && __has_include(<ptrauth.h>)
 # include <ptrauth.h>
 #else
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wreserved-macro-identifier"
 # ifndef __ptrauth_swift_value_witness_function_pointer
 #  define __ptrauth_swift_value_witness_function_pointer(x)
 # endif
+# ifndef __ptrauth_swift_class_method_pointer
+#  define __ptrauth_swift_class_method_pointer(x)
+# endif
+#pragma clang diagnostic pop
 #endif
 #endif
 
@@ -246,6 +252,17 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 #else
 # define SWIFT_NOEXCEPT 
 #endif
+#if !defined(SWIFT_C_INLINE_THUNK)
+# if __has_attribute(always_inline)
+# if __has_attribute(nodebug)
+#  define SWIFT_C_INLINE_THUNK inline __attribute__((always_inline)) __attribute__((nodebug))
+# else
+#  define SWIFT_C_INLINE_THUNK inline __attribute__((always_inline))
+# endif
+# else
+#  define SWIFT_C_INLINE_THUNK inline
+# endif
+#endif
 #if defined(_WIN32)
 #if !defined(SWIFT_IMPORT_STDLIB_SYMBOL)
 # define SWIFT_IMPORT_STDLIB_SYMBOL __declspec(dllimport)
@@ -282,12 +299,12 @@ typedef unsigned int swift_uint4  __attribute__((__ext_vector_type__(4)));
 #if defined(__OBJC__)
 
 
-#endif
-#if defined(__cplusplus)
 #endif
 #if __has_attribute(external_source_symbol)
 # pragma clang attribute pop
 #endif
+#if defined(__cplusplus)
+#endif
 #pragma clang diagnostic pop
 #endif