@functionland/react-native-fula 1.54.25 → 1.54.27

package/ios/Fula.swift

@@ -1579,20 +1579,34 @@ class FulaModule: NSObject {
         }
     }
 
-
-  @objc(listPlugins:withRejecter:)
+@objc(listPlugins:withRejecter:)
 func listPlugins(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     DispatchQueue.global(qos: .background).async {
         do {
-            let result = try self.fula!.listPlugins()
-            let resultString = result.toUTF8String()!
+            guard let fula = self.fula else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1001, userInfo: [NSLocalizedDescriptionKey: "Fula instance is not initialized"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA", "Fula not initialized", error)
+                }
+                return
+            }
+
+            let result = try fula.listPlugins()
+            guard let resultString = result.toUTF8String() else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1002, userInfo: [NSLocalizedDescriptionKey: "Failed to convert plugin list to string"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA", "Plugin List Conversion Error", error)
+                }
+                return
+            }
+
             DispatchQueue.main.async {
                 resolve(resultString)
             }
         } catch let error {
             print("listPlugins", error.localizedDescription)
             DispatchQueue.main.async {
-                reject("ERR_FULA", "listPlugins", error)
+                reject("ERR_FULA", "listPlugins failed", error)
             }
         }
     }
@@ -1602,15 +1616,48 @@ func listPlugins(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RC
 func listActivePlugins(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     DispatchQueue.global(qos: .background).async {
         do {
-            let result = try self.fula!.listActivePlugins()
-            let resultString = result.toUTF8String()!
+            guard let fula = self.fula else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1001, userInfo: [NSLocalizedDescriptionKey: "Fula instance is not initialized"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA", "Fula not initialized", error)
+                }
+                return
+            }
+
+            let result: Data
+            do {
+                result = try fula.listActivePlugins()
+            } catch {
+                print("Error listing active plugins: \(error)")
+                DispatchQueue.main.async {
+                    reject("ERR_FULA", "Failed to list active plugins", error)
+                }
+                return
+            }
+
+            guard !result.isEmpty else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1002, userInfo: [NSLocalizedDescriptionKey: "Active plugin list is empty"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA", "Empty Active Plugin List", error)
+                }
+                return
+            }
+
+            guard let resultString = String(data: result, encoding: .utf8) else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1003, userInfo: [NSLocalizedDescriptionKey: "Failed to convert active plugin list to string"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA", "Active Plugin List Conversion Error", error)
+                }
+                return
+            }
+
             DispatchQueue.main.async {
                 resolve(resultString)
             }
         } catch let error {
-            print("listActivePlugins", error.localizedDescription)
+            print("listActivePlugins unexpected error:", error.localizedDescription)
             DispatchQueue.main.async {
-                reject("ERR_FULA", "listActivePlugins", error)
+                reject("ERR_FULA", "listActivePlugins failed unexpectedly", error)
             }
         }
     }
@@ -1620,15 +1667,30 @@ func listActivePlugins(resolve: @escaping RCTPromiseResolveBlock, reject: @escap
 func installPlugin(pluginName: String, params: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     DispatchQueue.global(qos: .background).async {
         do {
-            let result = try self.fula!.installPlugin(pluginName, params: params)
-            let resultString = result.toUTF8String()!
+            guard let fula = self.fula else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1001, userInfo: [NSLocalizedDescriptionKey: "Fula instance is not initialized"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_NOT_INITIALIZED", "Fula not initialized", error)
+                }
+                return
+            }
+
+            let result = try fula.installPlugin(pluginName, params: params)
+            guard let resultString = result.toUTF8String() else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1002, userInfo: [NSLocalizedDescriptionKey: "Failed to convert install result to string"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_RESULT_CONVERSION", "Install Result Conversion Error", error)
+                }
+                return
+            }
+
             DispatchQueue.main.async {
                 resolve(resultString)
             }
         } catch let error {
-            print("installPlugin", error.localizedDescription)
+            print("installPlugin error:", error.localizedDescription)
             DispatchQueue.main.async {
-                reject("ERR_FULA", "installPlugin", error)
+                reject("ERR_FULA_INSTALL_PLUGIN", "Failed to install plugin: \(pluginName)", error)
             }
         }
     }
@@ -1638,15 +1700,30 @@ func installPlugin(pluginName: String, params: String, resolve: @escaping RCTPro
 func uninstallPlugin(pluginName: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     DispatchQueue.global(qos: .background).async {
         do {
-            let result = try self.fula!.uninstallPlugin(pluginName)
-            let resultString = result.toUTF8String()!
+            guard let fula = self.fula else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1001, userInfo: [NSLocalizedDescriptionKey: "Fula instance is not initialized"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_NOT_INITIALIZED", "Fula not initialized", error)
+                }
+                return
+            }
+
+            let result = try fula.uninstallPlugin(pluginName)
+            guard let resultString = result.toUTF8String() else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1002, userInfo: [NSLocalizedDescriptionKey: "Failed to convert uninstall result to string"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_RESULT_CONVERSION", "Uninstall Result Conversion Error", error)
+                }
+                return
+            }
+
             DispatchQueue.main.async {
                 resolve(resultString)
             }
         } catch let error {
-            print("uninstallPlugin", error.localizedDescription)
+            print("uninstallPlugin error:", error.localizedDescription)
             DispatchQueue.main.async {
-                reject("ERR_FULA", "uninstallPlugin", error)
+                reject("ERR_FULA_UNINSTALL_PLUGIN", "Failed to uninstall plugin: \(pluginName)", error)
             }
         }
     }
@@ -1656,15 +1733,48 @@ func uninstallPlugin(pluginName: String, resolve: @escaping RCTPromiseResolveBlo
 func showPluginStatus(pluginName: String, lines: Int, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     DispatchQueue.global(qos: .background).async {
         do {
-            let result = try self.fula!.showPluginStatus(pluginName, lines: lines)
-            let resultString = result.toUTF8String()!
+            guard let fula = self.fula else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1001, userInfo: [NSLocalizedDescriptionKey: "Fula instance is not initialized"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_NOT_INITIALIZED", "Fula not initialized", error)
+                }
+                return
+            }
+
+            let result: Data
+            do {
+                result = try fula.showPluginStatus(pluginName, lines: lines)
+            } catch {
+                print("Error showing plugin status: \(error)")
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_SHOW_PLUGIN_STATUS", "Failed to show plugin status", error)
+                }
+                return
+            }
+
+            guard !result.isEmpty else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1002, userInfo: [NSLocalizedDescriptionKey: "Plugin status result is empty"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_EMPTY_RESULT", "Empty Plugin Status Result", error)
+                }
+                return
+            }
+
+            guard let resultString = String(data: result, encoding: .utf8) else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1003, userInfo: [NSLocalizedDescriptionKey: "Failed to convert plugin status to string"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_RESULT_CONVERSION", "Plugin Status Conversion Error", error)
+                }
+                return
+            }
+
             DispatchQueue.main.async {
                 resolve(resultString)
             }
-        } catch let error {
-            print("showPluginStatus", error.localizedDescription)
+        } catch {
+            print("showPluginStatus unexpected error:", error.localizedDescription)
             DispatchQueue.main.async {
-                reject("ERR_FULA", "showPluginStatus", error)
+                reject("ERR_FULA_SHOW_PLUGIN_STATUS", "showPluginStatus failed unexpectedly", error)
             }
         }
     }
@@ -1674,15 +1784,48 @@ func showPluginStatus(pluginName: String, lines: Int, resolve: @escaping RCTProm
 func getInstallOutput(pluginName: String, params: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     DispatchQueue.global(qos: .background).async {
         do {
-            let result = try self.fula!.getInstallOutput(pluginName, params: params)
-            let resultString = result.toUTF8String()!
+            guard let fula = self.fula else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1001, userInfo: [NSLocalizedDescriptionKey: "Fula instance is not initialized"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_NOT_INITIALIZED", "Fula not initialized", error)
+                }
+                return
+            }
+
+            let result: Data
+            do {
+                result = try fula.getInstallOutput(pluginName, params: params)
+            } catch {
+                print("Error getting install output: \(error)")
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_GET_INSTALL_OUTPUT", "Failed to get install output", error)
+                }
+                return
+            }
+
+            guard !result.isEmpty else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1002, userInfo: [NSLocalizedDescriptionKey: "Install output is empty"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_EMPTY_RESULT", "Empty Install Output", error)
+                }
+                return
+            }
+
+            guard let resultString = String(data: result, encoding: .utf8) else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1003, userInfo: [NSLocalizedDescriptionKey: "Failed to convert install output to string"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_RESULT_CONVERSION", "Install Output Conversion Error", error)
+                }
+                return
+            }
+
             DispatchQueue.main.async {
                 resolve(resultString)
             }
-        } catch let error {
-            print("getInstallOutput", error.localizedDescription)
+        } catch {
+            print("getInstallOutput unexpected error:", error.localizedDescription)
             DispatchQueue.main.async {
-                reject("ERR_FULA", "getInstallOutput", error)
+                reject("ERR_FULA_GET_INSTALL_OUTPUT", "getInstallOutput failed unexpectedly", error)
             }
         }
     }
@@ -1692,15 +1835,48 @@ func getInstallOutput(pluginName: String, params: String, resolve: @escaping RCT
 func getInstallStatus(pluginName: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     DispatchQueue.global(qos: .background).async {
         do {
-            let result = try self.fula!.getInstallStatus(pluginName)
-            let resultString = result.toUTF8String()!
+            guard let fula = self.fula else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1001, userInfo: [NSLocalizedDescriptionKey: "Fula instance is not initialized"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_NOT_INITIALIZED", "Fula not initialized", error)
+                }
+                return
+            }
+
+            let result: Data
+            do {
+                result = try fula.getInstallStatus(pluginName)
+            } catch {
+                print("Error getting install status: \(error)")
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_GET_INSTALL_STATUS", "Failed to get install status", error)
+                }
+                return
+            }
+
+            guard !result.isEmpty else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1002, userInfo: [NSLocalizedDescriptionKey: "Install status result is empty"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_EMPTY_RESULT", "Empty Install Status Result", error)
+                }
+                return
+            }
+
+            guard let resultString = String(data: result, encoding: .utf8) else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1003, userInfo: [NSLocalizedDescriptionKey: "Failed to convert install status to string"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_RESULT_CONVERSION", "Install Status Conversion Error", error)
+                }
+                return
+            }
+
             DispatchQueue.main.async {
                 resolve(resultString)
             }
-        } catch let error {
-            print("getInstallStatus", error.localizedDescription)
+        } catch {
+            print("getInstallStatus unexpected error:", error.localizedDescription)
             DispatchQueue.main.async {
-                reject("ERR_FULA", "getInstallStatus", error)
+                reject("ERR_FULA_GET_INSTALL_STATUS", "getInstallStatus failed unexpectedly", error)
             }
         }
     }
@@ -1710,15 +1886,48 @@ func getInstallStatus(pluginName: String, resolve: @escaping RCTPromiseResolveBl
 func updatePlugin(pluginName: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     DispatchQueue.global(qos: .background).async {
         do {
-            let result = try self.fula!.updatePlugin(pluginName)
-            let resultString = result.toUTF8String()!
+            guard let fula = self.fula else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1001, userInfo: [NSLocalizedDescriptionKey: "Fula instance is not initialized"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_NOT_INITIALIZED", "Fula not initialized", error)
+                }
+                return
+            }
+
+            let result: Data
+            do {
+                result = try fula.updatePlugin(pluginName)
+            } catch {
+                print("Error updating plugin: \(error)")
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_UPDATE_PLUGIN", "Failed to update plugin: \(pluginName)", error)
+                }
+                return
+            }
+
+            guard !result.isEmpty else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1002, userInfo: [NSLocalizedDescriptionKey: "Update plugin result is empty"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_EMPTY_RESULT", "Empty Update Plugin Result", error)
+                }
+                return
+            }
+
+            guard let resultString = String(data: result, encoding: .utf8) else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1003, userInfo: [NSLocalizedDescriptionKey: "Failed to convert update plugin result to string"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_RESULT_CONVERSION", "Update Plugin Result Conversion Error", error)
+                }
+                return
+            }
+
             DispatchQueue.main.async {
                 resolve(resultString)
             }
-        } catch let error {
-            print("updatePlugin", error.localizedDescription)
+        } catch {
+            print("updatePlugin unexpected error:", error.localizedDescription)
             DispatchQueue.main.async {
-                reject("ERR_FULA", "updatePlugin", error)
+                reject("ERR_FULA_UPDATE_PLUGIN", "updatePlugin failed unexpectedly", error)
             }
         }
     }
@@ -1728,33 +1937,77 @@ func updatePlugin(pluginName: String, resolve: @escaping RCTPromiseResolveBlock,
 func replicateInPool(cidArray: [String], account: String, poolID: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     DispatchQueue.global(qos: .background).async {
         do {
+            guard let fula = self.fula else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1001, userInfo: [NSLocalizedDescriptionKey: "Fula instance is not initialized"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_NOT_INITIALIZED", "Fula not initialized", error)
+                }
+                return
+            }
+
             guard let poolIDLong = Int64(poolID) else {
-                throw NSError(domain: "FULAErrorDomain", code: 1001, userInfo: [NSLocalizedDescriptionKey: "Invalid poolID"])
+                let error = NSError(domain: "FULAErrorDomain", code: 1002, userInfo: [NSLocalizedDescriptionKey: "Invalid poolID"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_INVALID_POOL_ID", "Invalid poolID", error)
+                }
+                return
             }
 
-            // Convert Int64 to Int, checking for overflow
             guard let poolIDInt = Int(exactly: poolIDLong) else {
-                throw NSError(domain: "FULAErrorDomain", code: 1002, userInfo: [NSLocalizedDescriptionKey: "PoolID is too large for Int"])
+                let error = NSError(domain: "FULAErrorDomain", code: 1003, userInfo: [NSLocalizedDescriptionKey: "PoolID is too large for Int"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_POOL_ID_OVERFLOW", "PoolID is too large", error)
+                }
+                return
             }
 
             let cidString = cidArray.joined(separator: "|")
-            let cidsBytes = cidString.data(using: .utf8)
+            guard let cidsBytes = cidString.data(using: .utf8) else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1004, userInfo: [NSLocalizedDescriptionKey: "Failed to encode CIDs as data"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_CID_ENCODING", "Failed to encode CIDs", error)
+                }
+                return
+            }
 
-            guard let result = self.fula?.replicate(inPool: cidsBytes, account: account, poolID: poolIDInt) else {
-                throw NSError(domain: "FULAErrorDomain", code: 1003, userInfo: [NSLocalizedDescriptionKey: "Replication result is nil"])
+            let result: Data
+            do {
+                if let replicationResult = try fula.replicate(inPool: cidsBytes, account: account, poolID: poolIDInt) {
+                    result = replicationResult
+                } else {
+                    throw NSError(domain: "FULAErrorDomain", code: 1007, userInfo: [NSLocalizedDescriptionKey: "Replication result is nil"])
+                }
+            } catch {
+                print("Error replicating in pool: \(error)")
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_REPLICATION", "Failed to replicate in pool", error)
+                }
+                return
+            }
+
+            guard !result.isEmpty else {
+                let error = NSError(domain: "FULAErrorDomain", code: 1005, userInfo: [NSLocalizedDescriptionKey: "Replication result is empty"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_EMPTY_RESULT", "Empty replication result", error)
+                }
+                return
             }
 
             guard let resultString = String(data: result, encoding: .utf8) else {
-                throw NSError(domain: "FULAErrorDomain", code: 1004, userInfo: [NSLocalizedDescriptionKey: "Failed to decode result data to string"])
+                let error = NSError(domain: "FULAErrorDomain", code: 1006, userInfo: [NSLocalizedDescriptionKey: "Failed to decode result data to string"])
+                DispatchQueue.main.async {
+                    reject("ERR_FULA_RESULT_DECODING", "Failed to decode result", error)
+                }
+                return
             }
 
             DispatchQueue.main.async {
                 resolve(resultString)
             }
-        } catch let error {
-            print("replicateInPool", error.localizedDescription)
+        } catch {
+            print("replicateInPool unexpected error:", error.localizedDescription)
             DispatchQueue.main.async {
-                reject("ERR_FULA", "replicateInPool failed", error)
+                reject("ERR_FULA_REPLICATE_IN_POOL", "replicateInPool failed unexpectedly", error)
             }
         }
     }

package/package.json

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