@functionland/react-native-fula 1.54.8 → 1.54.9

package/ios/Fula.mm

@@ -2,7 +2,8 @@
 
 @interface RCT_EXTERN_MODULE(FulaModule, NSObject)
 
-RCT_EXTERN_METHOD(registerLifecycleListener)
+RCT_EXTERN_METHOD(registerLifecycleListener:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(checkConnection: (nonnull NSNumber *) timeout
                   withResolver:(RCTPromiseResolveBlock)resolve

package/ios/Fula.swift

@@ -135,7 +135,31 @@ class FulaModule: NSObject {
         return convertIntToByte(keyInt)
     }
 
-    @objc func registerLifecycleListener() {
+    @objc func applicationWillResignActive() {
+        // Log that the app will resign active
+        os_log("Application will resign active", log: OSLog.viewCycle, type: .info)
+    }
+
+    @objc func applicationDidEnterBackground() {
+        // Log that the app has entered the background
+        os_log("Application did enter background", log: OSLog.viewCycle, type: .info)
+    }
+
+    @objc func applicationWillTerminate() {
+        // Attempt to shut down Fula cleanly (similar to onHostDestroy)
+        os_log("Application will terminate - shutting down Fula", log: OSLog.viewCycle, type: .info)
+        do {
+            if let fulaClient = fula {
+                try fulaClient.shutdown()
+                os_log("Fula shutdown successfully.", log: OSLog.viewCycle, type: .info)
+            }
+        } catch {
+            os_log("Error shutting down Fula: %{public}@", log: OSLog.viewCycle, type: .error, String(describing: error))
+        }
+    }
+
+    @objc(registerLifecycleListener:withRejecter:)
+    func registerLifecycleListener(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         NotificationCenter.default.addObserver(
             self,
             selector: #selector(applicationWillResignActive),
@@ -153,30 +177,15 @@ class FulaModule: NSObject {
             selector: #selector(applicationWillTerminate),
             name: UIApplication.willTerminateNotification,
             object: nil)
+
+        // Assuming the operation is always successful
+        resolve(true)
     }
 
     deinit {
         NotificationCenter.default.removeObserver(self)
     }
 
-    @objc func applicationWillResignActive() {
-        // Handle app will resign active (similar to onHostPause)
-    }
-
-    @objc func applicationDidEnterBackground() {
-        // Handle app entered background
-    }
-
-    @objc func applicationWillTerminate() {
-        // Attempt to shut down Fula cleanly (similar to onHostDestroy)
-        do {
-            try shutdownInternal()
-        } catch {
-            print("Error shutting down Fula: \(error)")
-        }
-    }
-
-
     @objc(checkConnection:withResolver:withRejecter:)
     func checkConnection(timeout: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         OSLog.viewCycle.info("ReactNative checkConnection started with timeout=\(timeout)")
@@ -510,7 +519,9 @@ class FulaModule: NSObject {
 
     func newClientInternal(identity: Data, storePath: String?, bloxAddr: String, exchange: String, autoFlush: Bool, useRelay: Bool, refresh: Bool) throws -> Data {
         do {
+            OSLog.viewCycle.info("ReactNative fula newClientInternal refresh=\(refresh)")
             fulaConfig = FulamobileConfig()
+            print("ReactNative", "cofig is set: ")
             if (storePath == nil || storePath!.isEmpty) {
                 fulaConfig!.storePath = fulaStorePath
             } else {
@@ -552,6 +563,7 @@ class FulaModule: NSObject {
     func initInternal(identity: Data, storePath: String, bloxAddr: String, exchange: String, autoFlush: Bool, _rootCid: String, useRelay: Bool, refresh: Bool) throws -> [String] {
 
         do {
+            OSLog.viewCycle.info("ReactNative fula initInternal=\(refresh)")
             if (fula == nil || refresh) {
                 try newClientInternal(identity: identity, storePath: storePath, bloxAddr: bloxAddr, exchange: exchange, autoFlush: autoFlush, useRelay: useRelay, refresh: refresh)
                 OSLog.viewCycle.info("ReactNative fula initialized: \(self.fula!.id_())")
@@ -1104,11 +1116,15 @@ class FulaModule: NSObject {
                     throw MyError.runtimeError("Fula client is not initialized")
                 }
                 guard let poolID = Int64(poolIDStr) else {
-                    reject("ERR_FULA", "Invalid poolID - not a valid number: \(poolIDStr)")
+                    let error = NSError(domain: "FULAErrorDomain", code: 1001, userInfo: [NSLocalizedDescriptionKey: "Invalid poolID - not a valid number: \(poolIDStr)"])
+                    reject("ERR_FULA", "Invalid poolID - not a valid number: \(poolIDStr)", error)
                     return
                 }
                 guard let replicationFactor = Int64(replicationFactorStr) else {
-                    reject("ERR_FULA", "Invalid replicationFactorStr - not a valid number: \(replicationFactorStr)")
+                    let error = NSError(domain: "FULAErrorDomain",
+                                        code: 1002,
+                                        userInfo: [NSLocalizedDescriptionKey: "Invalid replicationFactor - not a valid number: \(replicationFactorStr)"])
+                    reject("ERR_FULA", "Invalid replicationFactorStr - not a valid number: \(replicationFactorStr)", error)
                     return
                 }
 
@@ -1119,7 +1135,8 @@ class FulaModule: NSObject {
                     throw MyError.runtimeError("Unable to encode CIDs as data")
                 }
 
-                try fulaClient.batchUploadManifest(cidsData, poolID, replicationFactor)
+                // Adjusted call to match the expected method signature and argument types
+                try fulaClient.batchUploadManifest(cidsData, poolID: Int(poolID), replicationFactor: Int(replicationFactor))
                 resolve(true)
             } catch let error {
                 print("ReactNative", "batchUploadManifest failed with Error: \(error.localizedDescription)")
@@ -1201,44 +1218,55 @@ class FulaModule: NSObject {
     }
 
     @objc(listPoolJoinRequests:withResolver:withRejecter:)
-    func listPoolJoinRequests(poolIDStr: String,  resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock)  -> Void {
+    func listPoolJoinRequests(poolIDStr: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         print("ReactNative", "listPoolJoinRequests: poolIDStr = ", poolIDStr)
         do {
-            if let poolID = Int64(poolIDStr) {
-              // Conversion successful - use longPoolID
-
-              let result = try fula!.poolRequests(poolID)
-              let resultString = result.toUTF8String()!
-              resolve(resultString)
+            if let poolID = Int64(poolIDStr), let intPoolID = Int(exactly: poolID) {
+                // Conversion to Int successful - use intPoolID
+                let result = try fula!.poolRequests(intPoolID)
+                let resultString = result.toUTF8String()!
+                resolve(resultString)
             } else {
-                // Handle invalid input (e.g., "abc", "123.45")
-                reject("ERR_FULA", "Invalid poolIDStr - not a valid number: \(poolIDStr)")
+                // Handle invalid input or Int64 not convertible to Int
+                let error = NSError(domain: "FULAErrorDomain",
+                                    code: 1003,
+                                    userInfo: [NSLocalizedDescriptionKey: "Invalid poolIDStr - not a valid number or too large: \(poolIDStr)"])
+                reject("ERR_FULA", "Invalid poolIDStr - not a valid number or too large: \(poolIDStr)", error)
             }
         } catch let error {
             print("listPoolJoinRequests", error.localizedDescription)
-            reject("ERR_FULA", "listPoolJoinRequests", error)
+            let nsError = error as NSError
+            reject("ERR_FULA", "Failed listPoolJoinRequests due to error", nsError)
         }
-
     }
 
     @objc(listAvailableReplicationRequests:withResolver:withRejecter:)
-    func listAvailableReplicationRequests(poolIDStr: String,  resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock)  -> Void {
+    func listAvailableReplicationRequests(poolIDStr: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
         print("ReactNative", "listAvailableReplicationRequests: poolIDStr = ", poolIDStr)
         do {
-            guard let poolID = Int64(poolIDStr) else {
-                reject("ERR_FULA", "Invalid poolID - not a valid number: \(poolIDStr)")
+            guard let poolID = Int64(poolIDStr), let intPoolID = Int(exactly: poolID) else {
+                let error = NSError(domain: "FULAErrorDomain",
+                                    code: 1004, // Use appropriate error code
+                                    userInfo: [NSLocalizedDescriptionKey: "Invalid poolID - not a valid number: \(poolIDStr)"])
+                reject("ERR_FULA", "Invalid poolID - not a valid number: \(poolIDStr)", error)
+                return
+            }
+            let result = try fula!.manifestAvailable(intPoolID)
+            guard let resultString = result.toUTF8String() else {
+                let error = NSError(domain: "FULAErrorDomain",
+                                    code: 1005, // Use appropriate error code
+                                    userInfo: [NSLocalizedDescriptionKey: "Failed to convert result to UTF8 String"])
+                reject("ERR_FULA", "Conversion Error", error)
                 return
             }
-            let result = try fula!.manifestAvailable(poolID)
-            let resultString = result.toUTF8String()!
             resolve(resultString)
-        } catch let error {
+        } catch let error as NSError {
             print("listAvailableReplicationRequests", error.localizedDescription)
-            reject("ERR_FULA", "listAvailableReplicationRequests", error)
+            reject("ERR_FULA", "listAvailableReplicationRequests failed with error: \(error.localizedDescription)", error)
         }
-
     }
 
+
     @objc(bloxFreeSpace:withRejecter:)
     func bloxFreeSpace( resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) -> Void {
         print("ReactNative", "bloxFreeSpace")
@@ -1388,17 +1416,27 @@ class FulaModule: NSObject {
       }
   }
 
-  @objc(fetchContainerLogs:tailCount:withResolver:withRejecter:)
-  func fetchContainerLogs(containerName: String, tailCount: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      do {
-          let result = try fula!.fetchContainerLogs(containerName, tailCount)
-          let resultString = result.toUTF8String()!
-          resolve(resultString)
-      } catch let error {
-          print("fetchContainerLogs", error.localizedDescription)
-          reject("ERR_FULA", "fetchContainerLogs", error)
-      }
-  }
+    @objc(fetchContainerLogs:tailCount:withResolver:withRejecter:)
+    func fetchContainerLogs(containerName: String, tailCount: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        do {
+            // Since fetchContainerLogs expects a String for tailCount, pass it directly
+            let result = try fula!.fetchContainerLogs(containerName, tailCount: tailCount)
+            guard let resultString = result.toUTF8String() else {
+                // Handle the case where result.toUTF8String() returns nil
+                let error = NSError(domain: "FULAErrorDomain",
+                                    code: 1007, // Choose a suitable error code
+                                    userInfo: [NSLocalizedDescriptionKey: "Failed to convert log data to string."])
+                reject("ERR_FULA", "Log Conversion Error", error)
+                return
+            }
+            resolve(resultString)
+        } catch let error as NSError {
+            print("fetchContainerLogs", error.localizedDescription)
+            reject("ERR_FULA", "fetchContainerLogs failed", error)
+        }
+    }
+
+
 
   @objc(getFolderSize:withResolver:withRejecter:)
   func getFolderSize(folderPath: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
@@ -1412,17 +1450,18 @@ class FulaModule: NSObject {
       }
   }
 
-  @objc(getDatastoreSize:withResolver:withRejecter:)
-  func getDatastoreSize(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-      do {
-          let result = try fula!.getDatastoreSize()
-          let resultString = result.toUTF8String()!
-          resolve(resultString)
-      } catch let error {
-          print("getDatastoreSize", error.localizedDescription)
-          reject("ERR_FULA", "getDatastoreSize", error)
-      }
-  }
+    @objc(getDatastoreSizeWithResolver:withRejecter:)
+    func getDatastoreSize(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        do {
+            let result = try fula!.getDatastoreSize()
+            let resultString = result.toUTF8String()!
+            resolve(resultString)
+        } catch let error {
+            print("getDatastoreSize", error.localizedDescription)
+            let nsError = error as NSError
+            reject("ERR_FULA", "Failed to get datastore size", nsError)
+        }
+    }
 
   //Add Replicate In Pool (replicateInPool)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@functionland/react-native-fula",
-  "version": "1.54.8",
+  "version": "1.54.9",
   "description": "This package is a bridge to use the Fula libp2p protocols in the react-native which is using wnfs",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/react-native-fula.podspec

@@ -38,7 +38,7 @@ Pod::Spec.new do |s|
     s.dependency "ReactCommon/turbomodule/core"
    end
   end   
-  s.dependency 'Fula','~> 1.41.0'
+  s.dependency 'Fula','~> 1.54.8'
   s.dependency "Wnfs",  "1.1.1"
   s.dependency 'CryptoSwift', '~> 1.7.1'
   s.user_target_xcconfig = { 'EXCLUDED_ARCHS[sdk=iphonesimulator*]' => 'arm64' }