@functionland/react-native-fula 1.54.9 → 1.54.11

package/ios/Cryptography.swift

@@ -1,49 +1,59 @@
 import Foundation
-import CommonCrypto
 import CryptoSwift
 import os.log
 
-
-
-public class Cryptography: NSObject {
-    public static func encryptMsg(_ message: Array<UInt8>, _ secretKey: Array<UInt8>)
-    throws -> String {
-        OSLog.viewCycle.info("ReactNative encryptMsg started for \(message)")
-        let aes = try! AES(key: secretKey, blockMode: ECB(), padding: .pkcs5)
-        OSLog.viewCycle.info("ReactNative encryptMsg aes")
-        let encrypted = try! aes.encrypt(message)
-        OSLog.viewCycle.info("ReactNative encryptMsg encrypted")
-        do{
-            let data = Data(encrypted).base64EncodedString()
-            OSLog.viewCycle.info("ReactNative encryptMsg: \(data)")
-            return data
-        } catch let error {
-            OSLog.viewCycle.info("ReactNative encryptMsg error: \(error.localizedDescription)")
-            throw error
+public class Cryptography {
+    // AES/GCM Encryption with IV handling
+    public static func encryptMsg(_ message: [UInt8], _ secretKey: [UInt8], _ providedIv: [UInt8]? = nil) throws -> String {
+        var iv = providedIv ?? [UInt8](repeating: 0, count: 12) // Default IV value
+        if iv.isEmpty {
+            iv = AES.randomIV(12) // Generate a random IV if not provided or if empty
         }
+        
+        let gcm = GCM(iv: iv, mode: .combined)
+        let aes = try AES(key: secretKey, blockMode: gcm, padding: .noPadding)
+        
+        let encrypted = try aes.encrypt(message)
+        let encryptedDataWithIv = Data(iv + encrypted) // Prepend IV to the encrypted data
+        return encryptedDataWithIv.base64EncodedString()
     }
     
-    public static func decryptMsg(_ cipherText: String, _ secretKey: Array<UInt8>)
-    throws -> Array<UInt8> {
-        let aes = try! AES(key: secretKey, blockMode: ECB(), padding: .pkcs5)
-        let data =  cipherText.fromBase64()!
-        return try! aes.decrypt(data.bytes)
-
+    // AES/GCM Decryption with IV extracted from the beginning of the cipherText
+    public static func decryptMsg(_ cipherText: String, _ secretKey: [UInt8]) throws -> [UInt8] {
+        guard let encryptedDataWithIv = Data(base64Encoded: cipherText) else {
+            throw NSError(domain: "DecryptionError", code: -1, userInfo: nil)
+        }
+        let iv = Array(encryptedDataWithIv.prefix(12)) // Extract IV (first 12 bytes)
+        let encryptedData = Array(encryptedDataWithIv.dropFirst(12)) // The rest is the encrypted data
+        
+        let gcm = GCM(iv: iv, mode: .combined)
+        let aes = try AES(key: secretKey, blockMode: gcm, padding: .noPadding)
+        
+        let decrypted = try aes.decrypt(encryptedData)
+        return decrypted
     }
     
-    public static func generateKey(_ salt: Data)
-    throws -> Array<UInt8> {
-        let password: [UInt8] = Array("".utf8)
-        let salt: [UInt8] = salt.bytes
-
-        //TODO: Generate a key from a salt and an empty password
-        let key = try PKCS5.PBKDF2(
-            password: password,
-            salt: salt,
-            iterations: 4096,
-            keyLength: 16, /* AES-128 */
-            variant: .sha2(SHA2.Variant.sha256)
-        ).calculate()
-        return key
+    // Key Generation matching Java's logic
+    public static func generateKey(_ identity: Data) throws -> Data {
+        // Transform identity to base64 string to mimic Java's behavior
+        let passwordString = identity.base64EncodedString()
+        let passwordData = Array(passwordString.utf8) // Convert to byte array
+        
+        // Use identity itself as salt for simplicity to mimic Java behavior
+        let salt = Array(identity)
+        
+        do {
+            let key = try PKCS5.PBKDF2(
+                password: passwordData,
+                salt: salt,
+                iterations: 1000, // Adjust the iteration count as needed
+                keyLength: 16, // AES-128
+                variant: .sha256
+            ).calculate()
+            
+            return Data(key)
+        } catch {
+            throw error // Propagate error
+        }
     }
 }

package/ios/Fula.mm

@@ -190,7 +190,8 @@ RCT_EXTERN_METHOD(getFolderSize:(NSString *)folderPath
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(getDatastoreSize:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(getDatastoreSize:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
 
 + (BOOL)requiresMainQueueSetup
 {

package/ios/Fula.swift

@@ -149,7 +149,7 @@ class FulaModule: NSObject {
         // 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 {
+            if let fulaClient = self.fula {
                 try fulaClient.shutdown()
                 os_log("Fula shutdown successfully.", log: OSLog.viewCycle, type: .info)
             }
@@ -188,23 +188,23 @@ class FulaModule: NSObject {
 
     @objc(checkConnection:withResolver:withRejecter:)
     func checkConnection(timeout: NSNumber, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        OSLog.viewCycle.info("ReactNative checkConnection started with timeout=\(timeout)")
+        NSLog("ReactNative checkConnection started with timeout=\(timeout)")
 
         if let timeoutInt = timeout as? Int {
-            if fula != nil {
+            if self.fula != nil {
                 DispatchQueue.global(qos: .default).async {
                     do {
                         let connectionStatus = try self.checkConnectionInternal(timeout: timeoutInt)
-                        OSLog.viewCycle.info("ReactNative checkConnection ended \(connectionStatus)")
+                        NSLog("ReactNative checkConnection ended \(connectionStatus)")
                         resolve(connectionStatus)
                     }
                     catch let error {
-                        OSLog.viewCycle.info("ReactNative checkConnection failed with Error: \(error.localizedDescription)")
+                        NSLog("ReactNative checkConnection failed with Error: \(error.localizedDescription)")
                         resolve(false)
                     }
                 }
             } else {
-                OSLog.viewCycle.info("ReactNative checkConnection fula is null")
+                NSLog("ReactNative checkConnection fula is null")
                 resolve(false)
             }
         } else {
@@ -216,13 +216,13 @@ class FulaModule: NSObject {
 
     @objc(newClient:withStorePath:withBloxAddr:withExchange:withAutoFlush:withUseRelay:withRefresh:withResolver:withRejecter:)
     func newClient(identityString: String, storePath: String, bloxAddr: String, exchange: String, autoFlush: Bool, useRelay: Bool, refresh: Bool, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) -> Void  {
-            print("ReactNative", "newClient storePath= " , storePath , " bloxAddr= " , bloxAddr , " exchange= " , exchange , " autoFlush= " , autoFlush , " useRelay= " , useRelay , " refresh= " , refresh);
+            print("ReactNative", "newClient storePath= " , storePath , " bloxAddr= " , bloxAddr , " exchange= " , exchange , " autoFlush= " , autoFlush , " useRelay= " , useRelay , " refresh= " , refresh)
             do {
                 print("ReactNative", "newClient storePath= ", storePath)
                 let identity = toByte(identityString)
                 print("ReactNative", "newClient identity= ", identityString)
                 try newClientInternal(identity: identity, storePath: storePath, bloxAddr: bloxAddr, exchange: exchange, autoFlush: autoFlush, useRelay: useRelay, refresh: refresh)
-                let peerId = fula?.id_()
+                let peerId = self.fula?.id_()
                 resolve(peerId)
             } catch let error {
                 print("ReactNative", "newClient failed with Error: ", error.localizedDescription)
@@ -236,9 +236,9 @@ class FulaModule: NSObject {
         print("ReactNative", "isReady started")
         var initialized = false
         do {
-            if (fula != nil && !fula!.id_().isEmpty) {
+            if (self.fula != nil && !self.fula!.id_().isEmpty) {
                 if (filesystemCheck) {
-                    if (client != nil && rootCid != nil && !rootCid!.isEmpty) {
+                    if (self.client != nil && rootCid != nil && !rootCid!.isEmpty) {
                         initialized = true
                     }
                 } else {
@@ -257,23 +257,23 @@ class FulaModule: NSObject {
     @objc(initFula:withStorePath:withBloxAddr:withExchange:withAutoFlush:withRootConfig:withUseRelay:withRefresh:withResolver:withRejecter:)
     func initFula(identityString: String, storePath: String, bloxAddr: String, exchange: String, autoFlush: Bool, rootConfig: String, useRelay: Bool, refresh: Bool, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) -> Void {
 
-        OSLog.viewCycle.info("ReactNative - init started")
+        NSLog("ReactNative - init started")
 
         do {
 
             var resultData = Dictionary<String, String>()
-            OSLog.viewCycle.info("ReactNative init storePath= \(storePath)")
+            NSLog("ReactNative init storePath= \(storePath)")
             let identity = self.toByte(identityString)
-            OSLog.viewCycle.info("ReactNative init identity= \(identityString)")
+            NSLog("ReactNative init identity= \(identityString)")
             let obj = try initInternal(identity: identity, storePath: storePath, bloxAddr: bloxAddr, exchange: exchange, autoFlush: autoFlush, _rootCid: rootConfig, useRelay: useRelay, refresh: refresh)
-            OSLog.viewCycle.info("ReactNative init object created: [  \(obj[0]), \(obj[1]), \(obj[2]) ]")
+            NSLog("ReactNative init object created: [  \(obj[0]), \(obj[1]), \(obj[2]) ]")
             resultData["peerId"] = obj[0]
             resultData["rootCid"] = obj[1]
             resultData["wnfs_key"] = obj[2]
             resolve(resultData as NSDictionary)
 
         } catch let error {
-            OSLog.viewCycle.info("ReactNative init failed with Error: \(error.localizedDescription)")
+            NSLog("ReactNative init failed with Error: \(error.localizedDescription)")
             reject("ERR_FULA", "init failed", error)
         }
 
@@ -297,7 +297,7 @@ class FulaModule: NSObject {
     }
 
     func checkConnectionInternal(timeout: Int) throws -> Bool {
-        OSLog.viewCycle.info("ReactNative checkConnectionInternal started with timeout: \(timeout)")
+        NSLog("ReactNative checkConnectionInternal started with timeout: \(timeout)")
         var connectionStatus = false
 
         if let fula = self.fula {
@@ -306,13 +306,13 @@ class FulaModule: NSObject {
 
             queue.async {
                 do {
-                    OSLog.viewCycle.info("ReactNative connectToBlox started")
+                    NSLog("ReactNative connectToBlox started")
                     try fula.connectToBlox()
                     connectionStatus = true
-                    OSLog.viewCycle.info("ReactNative checkConnectionInternal succeeded")
+                    NSLog("ReactNative checkConnectionInternal succeeded")
                     semaphore.signal()
                 } catch let error {
-                    OSLog.viewCycle.info("ReactNative checkConnectionInternal failed with Error: \(error.localizedDescription)")
+                    NSLog("ReactNative checkConnectionInternal failed with Error: \(error.localizedDescription)")
                     semaphore.signal()
                 }
             }
@@ -320,13 +320,13 @@ class FulaModule: NSObject {
             let timeoutResult = semaphore.wait(timeout: .now() + .seconds(timeout))
             switch timeoutResult {
             case .timedOut:
-                OSLog.viewCycle.info("ReactNative checkConnectionInternal timed out")
+                NSLog("ReactNative checkConnectionInternal timed out")
                 return false
             case .success:
                 return connectionStatus
             }
         } else {
-            OSLog.viewCycle.info("ReactNative checkConnectionInternal failed because fula is not initialized")
+            NSLog("ReactNative checkConnectionInternal failed because fula is not initialized")
             return false
         }
     }
@@ -334,29 +334,29 @@ class FulaModule: NSObject {
     @objc(checkFailedActions:withTimeout:withResolver:withRejecter:)
     func checkFailedActions(retry: Bool, timeout: Int, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) -> Void {
             do {
-                guard let fula = fula else {
+                guard let fula = self.fula else {
                     throw NSError(domain: "ERR_FULA", code: 1001, userInfo: [NSLocalizedDescriptionKey: "Fula is not initialized"])
                 }
 
                 if !retry {
-                    OSLog.viewCycle.info("ReactNative checkFailedActions without retry")
+                    NSLog("ReactNative checkFailedActions without retry")
                     let failedLinks = try fula.listFailedPushes()
 
                     let nextFailedLink = try failedLinks.next()
                     if nextFailedLink != nil {
                         // Assuming nextFailedLink is of type Data; replace `toHex()` with an appropriate method to convert Data to a hex string
-                        OSLog.viewCycle.info("ReactNative checkFailedActions found")
+                        NSLog("ReactNative checkFailedActions found")
                         resolve(true)
                     } else {
                         resolve(false)
                     }
                 } else {
-                    OSLog.viewCycle.info("ReactNative checkFailedActions with retry")
+                    NSLog("ReactNative checkFailedActions with retry")
                     let retryResults = try retryFailedActionsInternal(timeout: timeout)  // Ensure retryFailedActionsInternal accepts a timeout parameter
                     resolve(!retryResults)
                 }
             } catch let error {
-                OSLog.viewCycle.info("ReactNative checkFailedActions failed with Error: \(error.localizedDescription)")
+                NSLog("ReactNative checkFailedActions failed with Error: \(error.localizedDescription)")
                 reject("ERR_FULA", "CheckFailedActions failed", error)
             }
     }
@@ -364,10 +364,10 @@ class FulaModule: NSObject {
 
 
     func retryFailedActionsInternal(timeout: Int) throws -> Bool {
-        OSLog.viewCycle.info("ReactNative retryFailedActionsInternal started")
+        NSLog("ReactNative retryFailedActionsInternal started")
 
-        guard let fula = fula else {
-            OSLog.viewCycle.info("ReactNative retryFailedActionsInternal failed because fula is not initialized")
+        guard let fula = self.fula else {
+            NSLog("ReactNative retryFailedActionsInternal failed because fula is not initialized")
             return false
         }
 
@@ -376,79 +376,107 @@ class FulaModule: NSObject {
 
             if connectionCheck {
                 do {
-                    OSLog.viewCycle.info("ReactNative retryFailedPushes started")
+                    NSLog("ReactNative retryFailedPushes started")
                     try fula.retryFailedPushes()
-                    OSLog.viewCycle.info("ReactNative flush started")
+                    NSLog("ReactNative flush started")
                     try fula.flush()
                     return true
                 } catch let error {
                     try fula.flush()
-                    OSLog.viewCycle.info("ReactNative retryFailedActionsInternal failed with Error: \(error.localizedDescription)")
+                    NSLog("ReactNative retryFailedActionsInternal failed with Error: \(error.localizedDescription)")
                     return false
                 }
             } else {
-                OSLog.viewCycle.info("ReactNative retryFailedActionsInternal failed because blox is offline")
+                NSLog("ReactNative retryFailedActionsInternal failed because blox is offline")
                 return false
             }
         } catch let error {
-            OSLog.viewCycle.info("ReactNative retryFailedActionsInternal failed with Error: \(error.localizedDescription)")
+            NSLog("ReactNative retryFailedActionsInternal failed with Error: \(error.localizedDescription)")
             return false
         }
     }
 
-
-
     func createPeerIdentity(privateKey: Data) throws -> Data {
-        do {
-            // 1: First: create public key from provided private key
-            // 2: Should read the local keychain store (if it is key-value, key is public key above,
-            // 3: if found, decrypt using the private key
-            // 4: If not found or decryption not successful, generate an identity
-            // 5: then encrypt and store in keychain
-            // TODO: recheck error handling
-            var encryptedKey = userDataHelper.getValue(FulaModule.PRIVATE_KEY_STORE_ID)
-            let secretKey = try Cryptography.generateKey(privateKey)
-            if (encryptedKey == nil) {
-                var error: NSError?
-                let autoGeneratedIdentity = FulamobileGenerateEd25519Key(&error)
-                if error != nil {
-                    throw error!
-                }
-                encryptedKey = try Cryptography.encryptMsg(autoGeneratedIdentity!.toUint8Array(), secretKey)
-                userDataHelper.add(FulaModule.PRIVATE_KEY_STORE_ID, encryptedKey!)
+        let secretKey = try Cryptography.generateKey(privateKey)
+        
+        var encryptedKey: String? = userDataHelper.getValue(FulaModule.PRIVATE_KEY_STORE_ID)
+        NSLog("ReactNative createPeerIdentity encryptedKey=\(encryptedKey ?? "nil")")
+        if encryptedKey == nil {
+            let privateKeyString = String(data: privateKey, encoding: .utf8) ?? ""
+    
+            guard !privateKeyString.isEmpty else {
+                throw NSError(domain: "KeyGenerationError", code: -1, userInfo: [NSLocalizedDescriptionKey: "Private key string conversion failed"])
+            }
+            var error: NSError?
+            guard let autoGeneratedIdentity = FulamobileGenerateEd25519KeyFromString(privateKeyString, &error)?.toUint8Array() else {
+                throw error ?? NSError(domain: "KeyGenerationError", code: -1, userInfo: nil)
             }
-            return try Cryptography.decryptMsg(encryptedKey!, secretKey).toData()
+            encryptedKey = try Cryptography.encryptMsg([UInt8](autoGeneratedIdentity), [UInt8](secretKey))
+            NSLog("ReactNative createPeerIdentity encryptedKey2=\(encryptedKey)")
+            userDataHelper.add(FulaModule.PRIVATE_KEY_STORE_ID, encryptedKey ?? "")
+        }
+        
+        // Assuming decryptMsg returns Data or throws an error if decryption fails
+        guard let encryptedKeyData = encryptedKey, !encryptedKeyData.isEmpty else {
+            throw NSError(domain: "DecryptionError", code: -1, userInfo: [NSLocalizedDescriptionKey: "Encrypted key is empty"])
+        }
+        let decryptedData = try Cryptography.decryptMsg(encryptedKeyData, Array(secretKey))
+        let hexString = decryptedData.map { String(format: "%02hhx", $0) }.joined()
+        NSLog("ReactNative createPeerIdentity decryptedData=\(hexString)")
+        return Data(decryptedData)
+    }
+
+    func decryptLibp2pIdentity(_ encryptedLibp2pId: String, with encryptionSecretKey: Data) throws -> String {
+        // Convert Data to [UInt8]
+        let secretKeyBytes = [UInt8](encryptionSecretKey)
+        
+        // Attempt decryption
+        guard let decryptedBytes = try? Cryptography.decryptMsg(encryptedLibp2pId, secretKeyBytes) else {
+            throw NSError(domain: "DecryptionError", code: 1, userInfo: [NSLocalizedDescriptionKey: "Failed to decrypt Libp2p ID"])
+        }
+        
+        // Assuming decryptedBytes is an array of UInt8
+        return String(decoding: decryptedBytes, as: UTF8.self)
+    }
 
-        } catch let error {
-            print("ReactNative", "createPeerIdentity failed with Error: ", error.localizedDescription)
-            throw error
+    func createEncryptedLibp2pId(from identity: Data, with encryptionSecretKey: Data) throws -> String {
+        var error: NSError?
+        guard let autoGeneratedIdentity = FulamobileGenerateEd25519Key(&error) else {
+            throw error ?? NSError(domain: "KeyGenerationError", code: -1, userInfo: nil)
         }
+        let encryptedLibp2pId = try Cryptography.encryptMsg(Array(autoGeneratedIdentity), Array(encryptionSecretKey))
+        userDataHelper.add(FulaModule.PRIVATE_KEY_STORE_ID, encryptedLibp2pId)
+        return encryptedLibp2pId
     }
 
     func createNewrootCid(identity: Data) throws -> Void {
         let hash32 = identity.sha256()
-        print("ReactNative", "wnfsKey=" , identity.toHex() , "; hash32 = " , hash32.toHex());
-        if (fula != nil) {
-            try fula?.flush()
+        NSLog("ReactNative createNewrootCid wnfsKey= \(identity.toHex()) , hash32 = \(hash32.toHex())")
+        if (self.fula != nil) {
+            NSLog("ReactNative createNewrootCid self.fula not null")
+            try self.fula?.flush()
         }
-        rootCid = try wnfs?.Init(wnfsKey: hash32)
-        print("ReactNative", "privateForest is created: ", rootCid!)
+        NSLog("ReactNative fula flushed")
+        rootCid = try self.wnfs?.Init(wnfsKey: hash32)
+        NSLog("ReactNative privateForest is created: \(rootCid!)")
         wnfsKey = identity
-        print("ReactNative", "rootCid is created: cid=", rootCid!, " ; wnfs_key=", wnfsKey!.toHex(), "; hash32=", hash32)
+        NSLog("ReactNative rootCid is created: cid= \(rootCid!) wnfs_key= \(wnfsKey!.toHex()), hash32=\(hash32)")
         try encryptAndStoreConfig()
     }
 
     func loadWnfs(_ _wnfsKey: Data , _ _rootCid: String) throws {
-        OSLog.viewCycle.info("ReactNative loadWnfs called: rootCid=\(_rootCid)")
+        NSLog("ReactNative loadWnfs called: _rootCid=\(_rootCid)")
         let hash32 = _wnfsKey.sha256()
-        OSLog.viewCycle.info("ReactNative wnfsKey= \(_wnfsKey.toHex()) ; hash32 = \(hash32.toHex())");
-        try wnfs?.LoadWithWNFSKey(wnfsKey: hash32, cid: _rootCid)
+        NSLog("ReactNative wnfsKey= \(_wnfsKey.toHex()) ; hash32 = \(hash32.toHex())")
+        try self.wnfs?.LoadWithWNFSKey(wnfsKey: hash32, cid: _rootCid)
+        NSLog("ReactNative loadWnfs LoadWithWNFSKey")
         rootCid = _rootCid
         wnfsKey = _wnfsKey
-        if (fula != nil) {
-            try fula?.flush()
+        NSLog("ReactNative loadWnfs called: rootCid=\(rootCid)")
+        if (self.fula != nil) {
+            try self.fula?.flush()
         }
-        OSLog.viewCycle.info("ReactNative loadWnfs completed")
+        NSLog("ReactNative loadWnfs completed")
         try encryptAndStoreConfig()
     }
 
@@ -456,37 +484,38 @@ class FulaModule: NSObject {
     func encryptAndStoreConfig() throws {
         do {
             if let identityEncryptedGlobalUnwrapped = identityEncryptedGlobal {
-                OSLog.viewCycle.info("ReactNative encryptAndStoreConfig started")
+                NSLog("ReactNative encryptAndStoreConfig started")
 
                 if let rootCidUnwrapped = rootCid, let wnfsKeyUnwrapped = wnfsKey, let secretKeyGlobalUnwrapped = secretKeyGlobal {
-                    OSLog.viewCycle.info("ReactNative encryptAndStoreConfig started with rootCid: \(rootCidUnwrapped.toUint8Array()) and wnfsKey:\(wnfsKeyUnwrapped)")
+                    NSLog("ReactNative encryptAndStoreConfig started with rootCid: \(rootCidUnwrapped.toUint8Array()) and wnfsKey:\(wnfsKeyUnwrapped)")
 
                     let cid_encrypted = try Cryptography.encryptMsg(rootCidUnwrapped.toUint8Array(), secretKeyGlobalUnwrapped)
-                    OSLog.viewCycle.info("ReactNative encryptAndStoreConfig cid_encrypted: \(cid_encrypted)")
+                    NSLog("ReactNative encryptAndStoreConfig cid_encrypted: \(cid_encrypted)")
 
                     let wnfs_key_encrypted = try Cryptography.encryptMsg(wnfsKeyUnwrapped.toUint8Array(), secretKeyGlobalUnwrapped)
-                    OSLog.viewCycle.info("ReactNative encryptAndStoreConfig wnfs_key_encrypted: \(wnfs_key_encrypted)")
+                    NSLog("ReactNative encryptAndStoreConfig wnfs_key_encrypted: \(wnfs_key_encrypted)")
 
                     userDataHelper.add("cid_encrypted_" + identityEncryptedGlobalUnwrapped, cid_encrypted)
                     userDataHelper.add("wnfs_key_encrypted_" + identityEncryptedGlobalUnwrapped, wnfs_key_encrypted)
                 } else {
                     // Handle the case where rootCid, wnfsKey, or secretKeyGlobal is nil
-                    OSLog.viewCycle.info("ReactNative encryptAndStoreConfig failed because one of the values is nil")
+                    NSLog("ReactNative encryptAndStoreConfig failed because one of the values is nil")
                 }
             }
         } catch let error {
-            OSLog.viewCycle.info("ReactNative encryptAndStoreConfig failed with Error: \(error.localizedDescription)")
+            NSLog("ReactNative encryptAndStoreConfig failed with Error: \(error.localizedDescription)")
             throw error
         }
     }
 
     func logoutInternal(identity: Data, _storePath: String?) throws {
         do {
-            if (fula != nil) {
-                try fula?.flush()
+            if (self.fula != nil) {
+                try self.fula?.flush()
             }
             let secretKey = try Cryptography.generateKey(identity)
-            let identity_encrypted: String = try Cryptography.encryptMsg(identity.toUint8Array(), secretKey)
+            let identity_encrypted: String = try Cryptography.encryptMsg(identity.toUint8Array(), [UInt8](secretKey))
+
             userDataHelper.remove("cid_encrypted_"+identity_encrypted)
 
             //TODO: Should also remove peerid @Mahdi
@@ -514,48 +543,59 @@ class FulaModule: NSObject {
     }
 
     func getFulaClient() -> FulamobileClient? {
-        return fula
+        return self.fula
     }
 
-    func newClientInternal(identity: Data, storePath: String?, bloxAddr: String, exchange: String, autoFlush: Bool, useRelay: Bool, refresh: Bool) throws -> Data {
+    func newClientInternal(identity: Data, storePath: String?, bloxAddr: String, exchange: String, autoFlush: Bool, useRelay: Bool, refresh: Bool) throws -> Void {
         do {
-            OSLog.viewCycle.info("ReactNative fula newClientInternal refresh=\(refresh)")
+            NSLog("ReactNative fula newClientInternal refresh=\(refresh)")
             fulaConfig = FulamobileConfig()
-            print("ReactNative", "cofig is set: ")
+            NSLog("ReactNative: cofig is set")
             if (storePath == nil || storePath!.isEmpty) {
                 fulaConfig!.storePath = fulaStorePath
             } else {
                 fulaConfig!.storePath = storePath!
             }
-            print("ReactNative", "storePath is set: " + fulaConfig!.storePath)
+            NSLog("ReactNative storePath is set:  \(fulaConfig!.storePath)")
 
             let peerIdentity = try createPeerIdentity(privateKey: identity)
             fulaConfig!.identity = peerIdentity
-            print("ReactNative", "peerIdentity is set: " + fulaConfig!.identity!.toHex())
+            NSLog("ReactNative peerIdentity is set:  \(fulaConfig!.identity!.toHex())")
             fulaConfig!.bloxAddr = bloxAddr
-            print("ReactNative", "bloxAddr is set: " + fulaConfig!.bloxAddr)
+            NSLog("ReactNative bloxAddr is set:  \(fulaConfig!.bloxAddr)")
             fulaConfig!.exchange = exchange
             fulaConfig!.syncWrites = autoFlush
             if (useRelay) {
                 fulaConfig!.allowTransientConnection = true
                 fulaConfig!.forceReachabilityPrivate = true
             }
-            if (fula == nil || refresh) {
-                print("ReactNative", "Creating a new Fula instance");
+            if (self.fula == nil || refresh) {
+                NSLog("ReactNative Creating a new Fula instance")
                 do {
-                try shutdownInternal();
-                fula = FulamobileClient(fulaConfig)
-                if (fula != nil) {
-                    try fula?.flush();
-                }
+                    try shutdownInternal()
+                    NSLog("ReactNative Creating a new Fula instance shutdown done")
+                    var error: NSError?
+                    let client = FulamobileNewClient(fulaConfig, &error)
+                    if let error = error {
+                        throw error
+                    }
+
+                    self.fula = client
+                    NSLog("ReactNative FulamobileClient created")
+                    if (self.fula != nil) {
+                        NSLog("ReactNative Creating a new Fula instance fula is not null, flushing")
+                        try self.fula?.flush()
+                    } else {
+                        NSLog("** ReactNative Creating a new Fula instance fula failed **")
+                    }
                 } catch let error {
-                print("ReactNative", "Failed to create new Fula instance: " , error.localizedDescription);
-                throw MyError.runtimeError("Failed to create new Fula instance")
+                    NSLog("ReactNative Failed to create new Fula instance: \(error.localizedDescription)")
+                    throw MyError.runtimeError("ReactNative Failed to create new Fula instance")
                 }
             }
-            return peerIdentity
+            NSLog("ReactNative peerIdentity returned: \(peerIdentity)")
         } catch let error {
-            print("ReactNative", "newclientInternal failed with Error: ", error.localizedDescription)
+            NSLog("ReactNative newclientInternal failed with Error: \(error.localizedDescription)")
             throw error
         }
     }
@@ -563,62 +603,79 @@ 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) {
+            os_log("ReactNative: This is an info message.", log: OSLog.viewCycle, type: .info)
+            NSLog("ReactNative: This is a simple log message.")
+
+            NSLog("ReactNative fula initInternal=\(refresh)")
+            if (self.fula == nil || refresh) {
+                NSLog("ReactNative fula self.fula is null or refresh is set")
                 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_())")
+                NSLog("ReactNative fula initialized")
+                if (self.fula == nil) {
+                    NSLog("ReactNative: fula is not initialized")
+                }
+                guard let fulaId = self.fula?.id_() else {
+                    NSLog("ReactNative error: fula is not initialized")
+                    throw MyError.runtimeError("ReactNative: fula client not ready")
+                }
+                NSLog("ReactNative fula initialized: \(fulaId)")
             }
-            if(client == nil || refresh) {
-                client = Client(clientInput: fula!)
-                wnfs = Wnfs(putFn: { cid, data in
+            if(self.client == nil || self.wnfs == nil || refresh) {
+                NSLog("ReactNative fula self.client is null or refresh is set")
+                self.client = Client(clientInput: self.fula!)
+                self.wnfs = Wnfs(putFn: { cid, data in
                     guard let c = self.client else {
-                        throw MyError.runtimeError("wnfs: fula client not ready")
+                        NSLog("ReactNative wnfs put: fula client not ready")
+                        throw MyError.runtimeError("ReactNative wnfs: fula client not ready")
                     }
                     try c.put(cid, data)
                 }, getFn: { cid in
                     guard let c = self.client else {
-                        throw MyError.runtimeError("wnfs: fula client not ready")
+                        NSLog("ReactNative wnfs get: fula client not ready")
+                        throw MyError.runtimeError("ReactNative wnfs: fula client not ready")
                     }
                     return try c.get(cid)
                 })
-                OSLog.viewCycle.info("ReactNative wnfs initialized")
+                NSLog("ReactNative wnfs initialized")
             }
 
             let secretKey = try Cryptography.generateKey(identity)
-            let identity_encrypted = try Cryptography.encryptMsg(identity.toUint8Array(), secretKey)
+            let identity_encrypted = try Cryptography.encryptMsg(identity.toUint8Array(), [UInt8](secretKey))
+
             identityEncryptedGlobal = identity_encrypted
-            secretKeyGlobal = secretKey
+            secretKeyGlobal = [UInt8](secretKey)
 
             if (rootCid == nil || rootCid!.isEmpty) {
-                OSLog.viewCycle.info("ReactNative rootCid is empty.")
+                NSLog("ReactNative rootCid is empty.")
                 //Load from keystore
 
                 let cid_encrypted_fetched = userDataHelper.getValue("cid_encrypted_"+identity_encrypted)
-                OSLog.viewCycle.info("ReactNative Here1")
+                NSLog("ReactNative Here1")
                 var cid: Array<UInt8>? = nil
                 if(cid_encrypted_fetched != nil && !cid_encrypted_fetched!.isEmpty) {
-                    OSLog.viewCycle.info("ReactNative decrypting cid= \(cid_encrypted_fetched!) with secret \(secretKey.toHex())")
-                    cid = try Cryptography.decryptMsg(cid_encrypted_fetched!, secretKey)
+                    NSLog("ReactNative decrypting cid= \(cid_encrypted_fetched!) with secret \(secretKey.toHex())")
+                    cid = try Cryptography.decryptMsg(cid_encrypted_fetched!, [UInt8](secretKey))
+
                 }
-                print("ReactNative", "Here2")
+                NSLog("ReactNative Here2")
                 //print("ReactNative", "Attempted to fetch cid from keystore cid="+cid+" & wnfs_key="+wnfs_key)
                 if(cid == nil || cid!.isEmpty){
-                    OSLog.viewCycle.info("ReactNative cid or wnfs key was not found")
+                    NSLog("ReactNative cid or wnfs key was not found")
                     if(!_rootCid.isEmpty){
-                        OSLog.viewCycle.info("ReactNative Re-setting cid from input: \(_rootCid)")
+                        NSLog("ReactNative Re-setting cid from input: \(_rootCid)")
                         cid = _rootCid.toUint8Array()
                     }
 
                 }
                 if(cid == nil || cid!.isEmpty){
-                        OSLog.viewCycle.info("ReactNative Tried to recover cid but was not successful. Creating ones")
+                        NSLog("ReactNative Tried to recover cid but was not successful. Creating ones")
                         try createNewrootCid(identity: identity)
                 } else {
-                    OSLog.viewCycle.info("ReactNative Found cid and wnfs key in keychain store")
-                    OSLog.viewCycle.info("ReactNative Recovered cid and private ref from keychain store. cid=\(cid!) & wnfs_key=\(identity)")
+                    NSLog("ReactNative Found cid and wnfs key in keychain store")
+                    NSLog("ReactNative Recovered cid and private ref from keychain store. cid=\(cid!) & wnfs_key=\(identity)")
                     try loadWnfs(identity, cid!.toData().toUTF8String()!)
                 }
-                OSLog.viewCycle.info("ReactNative creating/reloading rootCid completed")
+                NSLog("ReactNative creating/reloading rootCid completed")
 
                 /*
                  byte[] testbyte = convertStringToByte("-104,40,24,-93,24,100,24,114,24,111,24,111,24,116,24,-126,24,-126,0,0,24,-128,24,103,24,118,24,101,24,114,24,115,24,105,24,111,24,110,24,101,24,48,24,46,24,49,24,46,24,48,24,105,24,115,24,116,24,114,24,117,24,99,24,116,24,117,24,114,24,101,24,100,24,104,24,97,24,109,24,116")
@@ -631,22 +688,26 @@ class FulaModule: NSObject {
                  */
 
 
-                OSLog.viewCycle.info("ReactNative rootCid is created: cid=\(self.rootCid!) & wnfs_key=\(self.wnfsKey!.toHex())")
+                NSLog("ReactNative rootCid is created: cid=\(self.rootCid!) & wnfs_key=\(self.wnfsKey!.toHex())")
             } else {
-                OSLog.viewCycle.info("ReactNative rootCid existed: cid=\(self.rootCid!) & wnfs_key=\(self.wnfsKey!.toHex())")
+                NSLog("ReactNative rootCid existed: cid=\(self.rootCid!) & wnfs_key=\(self.wnfsKey!.toHex())")
+            }
+            guard let peerId = self.fula?.id_() else {
+                NSLog("ReactNative error: fula is not initialized")
+                throw MyError.runtimeError("ReactNative: fula client not ready")
             }
-            let peerId = fula!.id_()
+            NSLog("ReactNative fula peerId initialized: \(peerId)")
             var obj = [String]()
             obj.append(peerId)
             obj.append(rootCid!)
             obj.append(wnfsKey!.toHex())
-            OSLog.viewCycle.info("ReactNative initInternal is completed successfully")
-            if (fula != nil) {
-                try fula?.flush()
+            NSLog("ReactNative initInternal is completed successfully")
+            if (self.fula != nil) {
+                try self.fula?.flush()
             }
             return obj
         } catch let error {
-            OSLog.viewCycle.info("ReactNative init internal failed with Error: \(error.localizedDescription)")
+            NSLog("ReactNative init internal failed with Error: \(error.localizedDescription)")
             throw error
         }
     }
@@ -654,18 +715,18 @@ class FulaModule: NSObject {
 
     @objc(mkdir:withResolver:withRejecter:)
     func mkdir(path: String, resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) -> Void {
-        print("ReactNative", "mkdir: path = " + path)
+        NSLog("ReactNative mkdir: path = \(path)")
         do {
-            let cid = try wnfs?.MkDir(cid: rootCid!, remotePath: path)
+            let cid = try self.wnfs?.MkDir(cid: rootCid!, remotePath: path)
             if(cid != nil) {
                 rootCid = cid
                 try encryptAndStoreConfig()
-                if (fula != nil) {
-                    try fula?.flush()
+                if (self.fula != nil) {
+                    try self.fula?.flush()
                 }
                 resolve(rootCid)
             } else {
-                print("ReactNative", "mkdir Error: config is nil")
+                NSLog("ReactNative mkdir Error: config is nil")
                 reject("ERR_WNFS", "Can't make dir", nil)
             }
 
@@ -684,18 +745,18 @@ class FulaModule: NSObject {
          // localFilename: a string containing full path and filename of local file on hte device (e.g /usr/bin/cat.jpg)
          // Returns: new cid of the root after this file is placed in the tree
          */
-        print("ReactNative", "writeFile to : path = " + fulaTargetFilename + ", from: " + localFilename)
+        NSLog("ReactNative writeFile to : path = \(fulaTargetFilename) + from: \(localFilename)")
         do {
-            let cid = try wnfs?.WriteFileFromPath(cid: rootCid!, remotePath: fulaTargetFilename, fileUrl: URL.init(string: localFilename)!)
+            let cid = try self.wnfs?.WriteFileFromPath(cid: rootCid!, remotePath: fulaTargetFilename, fileUrl: URL.init(string: localFilename)!)
             if(cid != nil) {
                 rootCid = cid
                 try encryptAndStoreConfig()
-                if (fula != nil) {
-                    try fula?.flush()
+                if (self.fula != nil) {
+                    try self.fula?.flush()
                 }
                 resolve(rootCid)
             } else {
-                print("ReactNative", "writeFile Error: config is nil")
+                NSLog("ReactNative writeFile Error: config is nil")
                 reject("ERR_WNFS", "writeFile Error: config is nil", nil)
             }
         } catch let error {
@@ -707,15 +768,15 @@ class FulaModule: NSObject {
     @objc(writeFileContent:withContentString:withResolver:withRejecter:)
     func writeFileContent(path: String, contentString: String,  resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock)  -> Void {
 
-        print("ReactNative", "writeFile: contentString = " + contentString)
-        print("ReactNative", "writeFile: path = " + path)
+        NSLog("ReactNative writeFile: contentString = \(contentString)")
+        NSLog("ReactNative writeFile: path = \(path)")
         do {
             let content = convertStringToByte(contentString)
-            let cid = try wnfs?.WriteFile(cid: rootCid!, remotePath: path, data: content.toData())
+            let cid = try self.wnfs?.WriteFile(cid: rootCid!, remotePath: path, data: content.toData())
             rootCid = cid
             try encryptAndStoreConfig()
-            if (fula != nil) {
-                try fula?.flush()
+            if (self.fula != nil) {
+                try self.fula?.flush()
             }
             resolve(rootCid)
         } catch let error {
@@ -727,15 +788,15 @@ class FulaModule: NSObject {
 
     @objc(ls:withResolver:withRejecter:)
     func ls(path: String,  resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock)  -> Void {
-        print("ReactNative", "ls: path = " + path)
+        NSLog("ReactNative ls: path = \(path)")
         do {
-            let res =  try wnfs?.Ls(cid: rootCid!, remotePath: path)
+            let res =  try self.wnfs?.Ls(cid: rootCid!, remotePath: path)
 
             //JSONArray jsonArray = new JSONArray(res)
             guard let s = res?.toUTF8String() else {
-                throw MyError.runtimeError("converting bytes to utf8 string")
+                throw MyError.runtimeError("ReactNative converting bytes to utf8 string")
             }
-            print("ReactNative", "ls: res = " + s)
+            NSLog("ReactNative ls: res = \(s)")
             resolve(s)
         } catch let error {
             print("ls", error.localizedDescription)
@@ -749,12 +810,12 @@ class FulaModule: NSObject {
 
         print("ReactNative", "rm: path = " + path)
         do {
-            let cid = try wnfs?.Rm(cid: rootCid!, remotePath: path)
+            let cid = try self.wnfs?.Rm(cid: rootCid!, remotePath: path)
             if(cid != nil) {
                 rootCid = cid
                 try encryptAndStoreConfig()
-                if (fula != nil) {
-                    try fula?.flush()
+                if (self.fula != nil) {
+                    try self.fula?.flush()
                 }
                 resolve(rootCid)
             } else {
@@ -773,12 +834,12 @@ class FulaModule: NSObject {
 
         print("ReactNative", "rm: sourcePath = " + sourcePath)
         do {
-            let cid = try wnfs?.Cp(cid: rootCid!, remotePathFrom: sourcePath, remotePathTo: targetPath)
+            let cid = try self.wnfs?.Cp(cid: rootCid!, remotePathFrom: sourcePath, remotePathTo: targetPath)
             if(cid != nil) {
                 rootCid = cid
                 try encryptAndStoreConfig()
-                if (fula != nil) {
-                    try fula?.flush()
+                if (self.fula != nil) {
+                    try self.fula?.flush()
                 }
                 resolve(rootCid)
             } else {
@@ -796,12 +857,12 @@ class FulaModule: NSObject {
     func mv(sourcePath: String, targetPath: String,  resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock)  -> Void {
         print("ReactNative", "rm: sourcePath = " + sourcePath)
         do {
-            let cid = try wnfs?.Mv(cid: rootCid!, remotePathFrom: sourcePath, remotePathTo: targetPath)
+            let cid = try self.wnfs?.Mv(cid: rootCid!, remotePathFrom: sourcePath, remotePathTo: targetPath)
             if(cid != nil) {
                 rootCid = cid
                 try encryptAndStoreConfig()
-                if (fula != nil) {
-                    try fula?.flush()
+                if (self.fula != nil) {
+                    try self.fula?.flush()
                 }
                 resolve(rootCid)
             } else {
@@ -826,7 +887,7 @@ class FulaModule: NSObject {
          */
         print("ReactNative", "readFile: fulaTargetFilename = " + fulaTargetFilename)
         do {
-            let path = try wnfs?.ReadFileToPath(cid: rootCid!, remotePath: fulaTargetFilename, fileUrl: URL.init(string: localFilename)!)
+            let path = try self.wnfs?.ReadFileToPath(cid: rootCid!, remotePath: fulaTargetFilename, fileUrl: URL.init(string: localFilename)!)
             resolve(path)
         } catch let error {
             print("readFile", error.localizedDescription)
@@ -841,9 +902,9 @@ class FulaModule: NSObject {
             print("ReactNative", "readFileContent: path = " + path)
             do {
                 // FIXME: dhouldn't we output an NSData object instead?
-                let res = try wnfs?.ReadFile(cid: rootCid!, remotePath: path)
+                let res = try self.wnfs?.ReadFile(cid: rootCid!, remotePath: path)
                 guard let resString = res?.toUTF8String() else{
-                    throw MyError.runtimeError("converting bytes to utf8 string")
+                    throw MyError.runtimeError(" ReactNative converting bytes to utf8 string")
                 }
                 resolve(resString)
             } catch let error {
@@ -873,7 +934,7 @@ class FulaModule: NSObject {
         do {
             print("ReactNative", "getInternal: key.toUTF8String() = " , key.toUTF8String()!)
             print("ReactNative", "getInternal: key.toHex().bytes = " , key.toHex())
-            let value = try fula!.get(key)
+            let value = try self.fula!.get(key)
             print("ReactNative", "getInternal: value.toHex() = " , value.toHex())
             return value
         } catch let error {
@@ -901,7 +962,7 @@ class FulaModule: NSObject {
     func hasInternal(_ key: Data) throws -> Bool {
         do {
             let ret = UnsafeMutablePointer<ObjCBool>.allocate(capacity: 1)
-            try fula?.has(key, ret0_: ret)
+            try self.fula?.has(key, ret0_: ret)
             let res = ret.pointee.boolValue
             ret.deallocate()
             return res
@@ -913,7 +974,7 @@ class FulaModule: NSObject {
 
     func pullInternal(key: Data) throws -> Void {
         do {
-            try fula!.pull(key)
+            try self.fula!.pull(key)
         } catch let error {
             print("pullInternal", error.localizedDescription)
             throw error
@@ -935,12 +996,12 @@ class FulaModule: NSObject {
     func pushInternal(key: Data) throws -> Void {
         do {
             let hasIt = try hasInternal(key)
-            if (fula != nil && hasIt) {
-                try fula?.push(key)
-                try fula?.flush()
+            if (self.fula != nil && hasIt) {
+                try self.fula?.push(key)
+                try self.fula?.flush()
             } else {
                 print("ReactNative", "pushInternal error: key wasn't found or fula is not initialized")
-                throw MyError.runtimeError("pushInternal error: key wasn't found or fula is not initialized")
+                throw MyError.runtimeError("ReactNative pushInternal error: key wasn't found or fula is not initialized")
             }
         } catch let error {
             print("ReactNative", "pushInternal", error.localizedDescription)
@@ -976,13 +1037,13 @@ class FulaModule: NSObject {
     // FIXME: unused codec arg
     func putInternal(value: Data, codec: Int) throws -> Data {
         do {
-            if(fula != nil) {
-                let key: Data = try fula!.put(value, codec: Int64(FulaModule.CODEC_DAG_CBOR))
-                try fula?.flush()
+            if(self.fula != nil) {
+                let key: Data = try self.fula!.put(value, codec: Int64(FulaModule.CODEC_DAG_CBOR))
+                try self.fula?.flush()
                 return key
             } else {
                 print("ReactNative", "putInternal Error: fula is not initialized")
-                throw MyError.runtimeError("putInternal Error: fula is not initialized")
+                throw MyError.runtimeError("ReactNative putInternal Error: fula is not initialized")
             }
         } catch let error {
             print("ReactNative", "putInternal", error.localizedDescription)
@@ -995,15 +1056,15 @@ class FulaModule: NSObject {
 
         print("ReactNative", "setAuth: peerIdString = " + peerIdString)
         do {
-            if (fula != nil && !(fula?.id_().isEmpty)! && fulaConfig != nil && !fulaConfig!.bloxAddr.isEmpty) {
+            if (self.fula != nil && !(self.fula?.id_().isEmpty)! && fulaConfig != nil && !fulaConfig!.bloxAddr.isEmpty) {
                 let bloxAddr = fulaConfig!.bloxAddr
                 print("ReactNative", "setAuth: bloxAddr = '",bloxAddr,"'"," peerIdString = '",peerIdString,"'")
                 let parts = bloxAddr.split(separator: "/").map(String.init)
-                try fula?.setAuth(parts.last, subject: peerIdString, allow: allow)
+                try self.fula?.setAuth(parts.last, subject: peerIdString, allow: allow)
                 resolve(true)
             } else {
                 print("ReactNative", "setAuth error: fula is not initialized")
-                throw MyError.runtimeError("fula is not initialized")
+                throw MyError.runtimeError("ReactNative fula is not initialized")
             }
             resolve(false)
         } catch let error {
@@ -1018,14 +1079,14 @@ class FulaModule: NSObject {
         DispatchQueue.global(qos: .default).async {
             do {
                 guard let fulaClient = self.fula else {
-                    throw MyError.runtimeError("Fula client is not initialized")
+                    throw MyError.runtimeError("ReactNative Fula client is not initialized")
                 }
 
                 // Concatenate all CID strings into a single string separated by "|"
                 let concatenatedCids = (cidArray as? [String])?.joined(separator: "|")
 
                 guard let cidsData = concatenatedCids?.data(using: .utf8) else {
-                    throw MyError.runtimeError("Unable to encode CIDs as data")
+                    throw MyError.runtimeError("ReactNative Unable to encode CIDs as data")
                 }
 
                 try fulaClient.clearCids(fromRecent: cidsData)
@@ -1043,7 +1104,7 @@ class FulaModule: NSObject {
         DispatchQueue.global(qos: .default).async {
             do {
                 guard let fulaClient = self.fula else {
-                    throw MyError.runtimeError("Fula client is not initialized")
+                    throw MyError.runtimeError("ReactNative Fula client is not initialized")
                 }
 
                 let recentLinksIterator = try fulaClient.listRecentCidsAsString()
@@ -1078,7 +1139,7 @@ class FulaModule: NSObject {
         DispatchQueue.global(qos: .default).async {
             do {
                 guard let fulaClient = self.fula else {
-                    throw MyError.runtimeError("Fula client is not initialized")
+                    throw MyError.runtimeError("ReactNative Fula client is not initialized")
                 }
 
                 let recentLinksIterator = try fulaClient.listRecentCidsAsStringWithChildren()
@@ -1113,7 +1174,7 @@ class FulaModule: NSObject {
         DispatchQueue.global(qos: .default).async {
             do {
                 guard let fulaClient = self.fula else {
-                    throw MyError.runtimeError("Fula client is not initialized")
+                    throw MyError.runtimeError("ReactNative Fula client is not initialized")
                 }
                 guard let poolID = Int64(poolIDStr) else {
                     let error = NSError(domain: "FULAErrorDomain", code: 1001, userInfo: [NSLocalizedDescriptionKey: "Invalid poolID - not a valid number: \(poolIDStr)"])
@@ -1132,7 +1193,7 @@ class FulaModule: NSObject {
                 let concatenatedCids = (cidArray as? [String])?.joined(separator: "|")
 
                 guard let cidsData = concatenatedCids?.data(using: .utf8) else {
-                    throw MyError.runtimeError("Unable to encode CIDs as data")
+                    throw MyError.runtimeError("ReactNative Unable to encode CIDs as data")
                 }
 
                 // Adjusted call to match the expected method signature and argument types
@@ -1153,18 +1214,21 @@ class FulaModule: NSObject {
             try shutdownInternal()
             resolve(true)
         } catch let error {
-            print("ReactNative", "shutdown", error.localizedDescription)
+            NSLog("ReactNative shutdown \(error.localizedDescription)")
             reject("ERR_FULA", "shutdown", error)
         }
 
     }
 
     func shutdownInternal() throws {
-        if(fula != nil) {
-            try fula?.shutdown()
-            fula = nil
-            client = nil
-            wnfs = nil
+        NSLog("ReactNative shutdownInternal")
+        if(self.fula != nil) {
+            NSLog("ReactNative shutdownInternal fula is not null")
+            try self.fula?.shutdown()
+            NSLog("ReactNative shutdownInternal fula.shutdown called")
+            self.fula = nil
+            self.client = nil
+            self.wnfs = nil
         }
     }
 
@@ -1179,7 +1243,7 @@ class FulaModule: NSObject {
     func checkAccountExists(accountString: String,  resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock)  -> Void {
         print("ReactNative", "checkAccountExists: accountString = ", accountString)
         do {
-            let result = try fula!.accountExists(accountString)
+            let result = try self.fula!.accountExists(accountString)
             let resultString = result.toUTF8String()!
             resolve(resultString)
         } catch let error {
@@ -1193,7 +1257,7 @@ class FulaModule: NSObject {
     func accountFund(accountString: String,  resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock)  -> Void {
         print("ReactNative", "accountFund: accountString = ", accountString)
         do {
-            let result = try fula!.accountFund(accountString)
+            let result = try self.fula!.accountFund(accountString)
             let resultString = result.toUTF8String()!
             resolve(resultString)
         } catch let error {
@@ -1207,7 +1271,7 @@ class FulaModule: NSObject {
     func listPools( resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock)  -> Void {
         print("ReactNative", "listPools")
         do {
-            let result = try fula!.poolList()
+            let result = try self.fula!.poolList()
             let resultString = result.toUTF8String()!
             resolve(resultString)
         } catch let error {
@@ -1223,7 +1287,7 @@ class FulaModule: NSObject {
         do {
             if let poolID = Int64(poolIDStr), let intPoolID = Int(exactly: poolID) {
                 // Conversion to Int successful - use intPoolID
-                let result = try fula!.poolRequests(intPoolID)
+                let result = try self.fula!.poolRequests(intPoolID)
                 let resultString = result.toUTF8String()!
                 resolve(resultString)
             } else {
@@ -1251,7 +1315,7 @@ class FulaModule: NSObject {
                 reject("ERR_FULA", "Invalid poolID - not a valid number: \(poolIDStr)", error)
                 return
             }
-            let result = try fula!.manifestAvailable(intPoolID)
+            let result = try self.fula!.manifestAvailable(intPoolID)
             guard let resultString = result.toUTF8String() else {
                 let error = NSError(domain: "FULAErrorDomain",
                                     code: 1005, // Use appropriate error code
@@ -1271,7 +1335,7 @@ class FulaModule: NSObject {
     func bloxFreeSpace( resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock) -> Void {
         print("ReactNative", "bloxFreeSpace")
         do {
-            let result = try fula!.bloxFreeSpace()
+            let result = try self.fula!.bloxFreeSpace()
             let resultString = result.toUTF8String()!
             resolve(resultString)
         } catch let error {
@@ -1300,7 +1364,7 @@ class FulaModule: NSObject {
   @objc(getAccount:withRejecter:)
   func getAccount(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
       do {
-          let account = try fula!.getAccount()
+          let account = try self.fula!.getAccount()
           let accountString = String(data: account, encoding: .utf8)
           resolve(accountString)
       } catch let error {
@@ -1316,7 +1380,7 @@ class FulaModule: NSObject {
         }
 
         do {
-            let balance = try fula!.assetsBalance(account, assetId: assetIdInt, classId: classIdInt)
+            let balance = try self.fula!.assetsBalance(account, assetId: assetIdInt, classId: classIdInt)
             let balanceString = String(data: balance, encoding: .utf8)
             resolve(balanceString)
         } catch let error {
@@ -1331,7 +1395,7 @@ class FulaModule: NSObject {
           guard let poolIdInt = Int(poolID) else {
               throw NSError(domain: "Invalid poolID", code: 0, userInfo: nil)
           }
-          let result = try fula!.poolJoin(poolIdInt)
+          let result = try self.fula!.poolJoin(poolIdInt)
           let resultString = String(data: result, encoding: .utf8)
           resolve(resultString)
       } catch let error {
@@ -1345,7 +1409,7 @@ class FulaModule: NSObject {
           guard let poolIdInt = Int(poolID) else {
               throw NSError(domain: "Invalid poolID", code: 0, userInfo: nil)
           }
-          let result = try fula!.poolCancelJoin(poolIdInt)
+          let result = try self.fula!.poolCancelJoin(poolIdInt)
           let resultString = String(data: result, encoding: .utf8)
           resolve(resultString)
       } catch let error {
@@ -1360,7 +1424,7 @@ class FulaModule: NSObject {
           guard let poolIdInt = Int(poolID) else {
               throw NSError(domain: "Invalid poolID", code: 0, userInfo: nil)
           }
-          let result = try fula!.poolLeave(poolIdInt)
+          let result = try self.fula!.poolLeave(poolIdInt)
           let resultString = String(data: result, encoding: .utf8)
           resolve(resultString)
       } catch let error {
@@ -1372,7 +1436,7 @@ class FulaModule: NSObject {
   @objc(eraseBlData:withRejecter:)
   func eraseBlData(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
       do {
-          let result = try fula!.eraseBlData()
+          let result = try self.fula!.eraseBlData()
           let resultString = String(data: result, encoding: .utf8)
           resolve(resultString)
       } catch let error {
@@ -1383,7 +1447,7 @@ class FulaModule: NSObject {
   @objc(reboot:withRejecter:)
   func reboot(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
       do {
-          let result = try fula!.reboot()
+          let result = try self.fula!.reboot()
           let resultString = result.toUTF8String()!
           resolve(resultString)
       } catch let error {
@@ -1395,7 +1459,7 @@ class FulaModule: NSObject {
   @objc(partition:withRejecter:)
   func partition(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
       do {
-          let result = try fula!.partition()
+          let result = try self.fula!.partition()
           let resultString = result.toUTF8String()!
           resolve(resultString)
       } catch let error {
@@ -1407,7 +1471,7 @@ class FulaModule: NSObject {
   @objc(wifiRemoveall:withRejecter:)
   func wifiRemoveall(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
       do {
-          let result = try fula!.wifiRemoveall()
+          let result = try self.fula!.wifiRemoveall()
           let resultString = result.toUTF8String()!
           resolve(resultString)
       } catch let error {
@@ -1420,7 +1484,7 @@ class FulaModule: NSObject {
     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)
+            let result = try self.fula!.fetchContainerLogs(containerName, tailCount: tailCount)
             guard let resultString = result.toUTF8String() else {
                 // Handle the case where result.toUTF8String() returns nil
                 let error = NSError(domain: "FULAErrorDomain",
@@ -1441,7 +1505,7 @@ class FulaModule: NSObject {
   @objc(getFolderSize:withResolver:withRejecter:)
   func getFolderSize(folderPath: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
       do {
-          let result = try fula!.getFolderSize(folderPath)
+          let result = try self.fula!.getFolderSize(folderPath)
           let resultString = result.toUTF8String()!
           resolve(resultString)
       } catch let error {
@@ -1450,19 +1514,33 @@ class FulaModule: NSObject {
       }
   }
 
-    @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)
+    @objc
+    func getDatastoreSize(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+        DispatchQueue.global(qos: .background).async {
+            // Safely unwrap `self.fula` using `guard let`
+            guard let fulaClient = self.fula else {
+                let error = NSError(domain: "FulaModuleError", code: 0, userInfo: [NSLocalizedDescriptionKey: "Fula client is not initialized"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_NOT_INITIALIZED", "Fula client is not initialized", error)
+                }
+                return
+            }
+
+            do {
+                let result = try fulaClient.getDatastoreSize()
+                let resultString = String(decoding: result, as: UTF8.self)
+                DispatchQueue.main.async {
+                    resolve(resultString)
+                }
+            } catch let error {
+                DispatchQueue.main.async {
+                    reject("ERR_FULA", "Failed to get datastore size: \(error.localizedDescription)", error)
+                }
+            }
         }
     }
 
+
   //Add Replicate In Pool (replicateInPool)
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@functionland/react-native-fula",
-  "version": "1.54.9",
+  "version": "1.54.11",
   "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",