@functionland/react-native-fula 1.46.0 → 1.53.0

package/README.md

@@ -197,6 +197,24 @@ curl -H "Content-Type: application/json" -d "{\"id\":\"1\", \"jsonrpc\":\"2.0\",
 yarn build:polkadot
 ```
 
+## Testing
+
+Open a cmd or terminal as admin (sudo)
+
+```
+corepack enable
+```
+
+Then cd to the `react-native-fula` folder (no need for admin, sudo) and run:
+```
+yarn install
+```
+
+to run the example app, run:
+```
+yarn example android
+```
+
 ## Roadmap
 
 Please note the following might not be done in order:
@@ -205,7 +223,7 @@ Please note the following might not be done in order:
 - [x] Add WNFS tree encryption key generation from an input (deterministically)
 - [x] Improve ead function to use a stream. ( :100: v1 Release here )
 - [x] Connect to backend
-- [ ] Connect to Blockchain codes using APIs
+- [x] Connect to Blockchain codes using APIs
 
 ## Other related libraries
 

package/android/build.gradle

@@ -1,3 +1,5 @@
+import com.android.Version
+
 buildscript {
   repositories {
     google()
@@ -5,7 +7,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.2"
+    classpath "com.android.tools.build:gradle:8.2.2"
   }
 }
 
@@ -30,8 +32,8 @@ def getExtOrIntegerDefault(name) {
   return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["Fula_" + name]).toInteger()
 }
 
-def supportsNamespace() {
-  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+static def supportsNamespace() {
+  def parsed = Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
   def major = parsed[0].toInteger()
   def minor = parsed[1].toInteger()
 
@@ -72,10 +74,13 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_17
+    targetCompatibility JavaVersion.VERSION_17
+  }
+  ndkVersion '26.2.11394342'
+  buildFeatures {
+    buildConfig true
   }
-  ndkVersion '25.1.8937393'
 }
 
 repositories {
@@ -94,7 +99,7 @@ dependencies {
   // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
   //noinspection GradleDynamicVersion
   implementation "com.facebook.react:react-native:+"
-  implementation 'com.github.functionland:fula-build-aar:v1.46.0' // From jitpack.io
+  implementation 'com.github.functionland:fula-build-aar:v1.53.0' // From jitpack.io
   implementation 'com.github.functionland:wnfs-android:v1.8.1' // From jitpack.io
   implementation 'commons-io:commons-io:20030203.000550'
   implementation 'commons-codec:commons-codec:1.15'

package/android/gradle.properties

@@ -1,5 +1,5 @@
-Fula_kotlinVersion=1.7.0
+Fula_kotlinVersion=1.9.22
 Fula_minSdkVersion=26
-Fula_targetSdkVersion=31
-Fula_compileSdkVersion=31
-Fula_ndkversion=21.4.7075529
+Fula_targetSdkVersion=33
+Fula_compileSdkVersion=33
+Fula_ndkversion=26.2.11394342

package/android/src/main/java/land/fx/fula/FulaModule.java

@@ -1346,10 +1346,11 @@ public class FulaModule extends ReactContextBaseJavaModule {
   }
 
   @ReactMethod
-  public void listPoolJoinRequests(long poolID, Promise promise) {
+  public void listPoolJoinRequests(String poolIDStr, Promise promise) {
     ThreadUtils.runOnExecutor(() -> {
-      Log.d("ReactNative", "listPoolJoinRequests: poolID = " + poolID);
+      Log.d("ReactNative", "listPoolJoinRequests: poolID = " + poolIDStr);
       try {
+        long poolID = Long.parseLong(poolIDStr);
         byte[] result = this.fula.poolRequests(poolID);
         String resultString = toString(result);
         promise.resolve(resultString);
@@ -1377,10 +1378,11 @@ public class FulaModule extends ReactContextBaseJavaModule {
   }
 
   @ReactMethod
-  public void listAvailableReplicationRequests(long poolID, Promise promise) {
+  public void listAvailableReplicationRequests(String poolIDStr, Promise promise) {
     ThreadUtils.runOnExecutor(() -> {
-      Log.d("ReactNative", "listAvailableReplicationRequests: poolID = " + poolID);
+      Log.d("ReactNative", "listAvailableReplicationRequests: poolID = " + poolIDStr);
       try {
+        long poolID = Long.parseLong(poolIDStr);
         byte[] result = this.fula.manifestAvailable(poolID);
         String resultString = toString(result);
         promise.resolve(resultString);
@@ -1427,6 +1429,42 @@ public class FulaModule extends ReactContextBaseJavaModule {
     });
   }
 
+  @ReactMethod
+  private void listRecentCidsAsStringWithChildren(Promise promise) throws Exception {
+    ThreadUtils.runOnExecutor(() -> {
+      try {
+        if (this.fula != null) {
+          Log.d("ReactNative", "listRecentCidsAsStringWithChildren");
+          fulamobile.StringIterator recentLinks = this.fula.listRecentCidsAsStringWithChildren();
+          ArrayList<String> recentLinksList = new ArrayList<>();
+          while (recentLinks.hasNext()) {
+            recentLinksList.add(recentLinks.next());
+          }
+          if (!recentLinksList.isEmpty()) {
+            // return the whole list
+            Log.d("ReactNative", "listRecentCidsAsStringWithChildren found: "+ recentLinksList);
+            WritableArray recentLinksArray = Arguments.createArray();
+            for (String link : recentLinksList) {
+              recentLinksArray.pushString(link);
+            }
+            promise.resolve(recentLinksArray);
+          } else {
+            promise.resolve(false);
+          }
+        } else {
+          throw new Exception("listRecentCidsAsStringWithChildren: Fula is not initialized");
+        }
+      } catch (Exception e) {
+        Log.d("ReactNative", "listRecentCidsAsStringWithChildren failed with Error: " + e.getMessage());
+        try {
+          throw (e);
+        } catch (Exception ex) {
+          throw new RuntimeException(ex);
+        }
+      }
+    });
+  }
+
   @ReactMethod
   public void clearCidsFromRecent(ReadableArray cidArray, Promise promise) {
     ThreadUtils.runOnExecutor(() -> {
@@ -1453,6 +1491,61 @@ public class FulaModule extends ReactContextBaseJavaModule {
     });
   }
 
+  @ReactMethod
+  public void batchUploadManifest(ReadableArray cidArray, String poolIDStr, String replicationFactorStr, Promise promise) {
+    ThreadUtils.runOnExecutor(() -> {
+      try {
+        long poolID = Long.parseLong(poolIDStr);
+        long replicationFactor = Long.parseLong(replicationFactorStr);
+        if (this.fula != null) {
+          StringBuilder cidStrBuilder = new StringBuilder();
+          for (int i = 0; i < cidArray.size(); i++) {
+            if (i > 0) {
+              cidStrBuilder.append("|");
+            }
+            cidStrBuilder.append(cidArray.getString(i));
+          }
+
+          byte[] cidsBytes = cidStrBuilder.toString().getBytes(StandardCharsets.UTF_8);
+          this.fula.batchUploadManifest(cidsBytes, poolID, replicationFactor);
+          promise.resolve(true); // Indicate success
+        } else {
+          throw new Exception("BatchUploadManifest: Fula is not initialized");
+        }
+      } catch (Exception e) {
+        Log.d("ReactNative", "BatchUploadManifest failed with Error: " + e.getMessage());
+        promise.reject("Error", e.getMessage());
+      }
+    });
+  }
+
+  @ReactMethod
+  public void replicateInPool(ReadableArray cidArray, String account, String poolIDStr, Promise promise) {
+    ThreadUtils.runOnExecutor(() -> {
+      try {
+        long poolID = Long.parseLong(poolIDStr);
+        if (this.fula != null) {
+          StringBuilder cidStrBuilder = new StringBuilder();
+          for (int i = 0; i < cidArray.size(); i++) {
+            if (i > 0) {
+              cidStrBuilder.append("|");
+            }
+            cidStrBuilder.append(cidArray.getString(i));
+          }
+
+          byte[] cidsBytes = cidStrBuilder.toString().getBytes(StandardCharsets.UTF_8);
+          byte[] res = this.fula.replicateInPool(cidsBytes, account, poolID);
+          String receivedJsonString = new String(res, StandardCharsets.UTF_8);
+          promise.resolve(receivedJsonString); // Indicate success
+        } else {
+          throw new Exception("replicateInPool: Fula is not initialized");
+        }
+      } catch (Exception e) {
+        Log.d("ReactNative", "replicateInPool failed with Error: " + e.getMessage());
+        promise.reject("Error", e.getMessage());
+      }
+    });
+  }
 
   ////////////////////////////////////////////////////////////////
   ///////////////// Blox Hardware Methods ////////////////////////
@@ -1522,6 +1615,22 @@ public class FulaModule extends ReactContextBaseJavaModule {
     });
   }
 
+  @ReactMethod
+  public void getDatastoreSize(Promise promise) {
+    ThreadUtils.runOnExecutor(() -> {
+      Log.d("ReactNative", "getDatastoreSize");
+      try {
+        byte[] result = this.fula.getDatastoreSize();
+        String resultString = toString(result);
+        Log.d("ReactNative", "result string="+resultString);
+        promise.resolve(resultString);
+      } catch (Exception e) {
+        Log.d("ReactNative", "an error happened="+e.getMessage());
+        promise.reject(e);
+      }
+    });
+  }
+
   @ReactMethod
   public void reboot(Promise promise) {
     ThreadUtils.runOnExecutor(() -> {

package/ios/Fula.mm

@@ -106,6 +106,22 @@ RCT_EXTERN_METHOD(setAuth:(NSString *)peerIdString
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(clearCidsFromRecent:(NSArray *)cidArray
+                  withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(listRecentCidsAsString:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(listRecentCidsAsStringWithChildren:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
+
+RCT_EXTERN_METHOD(batchUploadManifest:(NSArray *)cidArray
+                  withPoolId:(NSString *) poolIdStr
+                  withReplicationFactor:(NSString *) replicationFactorStr
+                  withResolver:(RCTPromiseResolveBlock)resolve
+                  withRejecter:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(shutdown:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
@@ -129,7 +145,7 @@ RCT_EXTERN_METHOD(cancelPoolJoin:(NSString *)poolID
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(listPoolJoinRequests:(NSNumber *)poolID
+RCT_EXTERN_METHOD(listPoolJoinRequests:(NSString *)poolIDStr
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
@@ -138,7 +154,7 @@ RCT_EXTERN_METHOD(leavePool:(NSString *)poolID
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
 
-RCT_EXTERN_METHOD(listAvailableReplicationRequests:(NSNumber *)poolID
+RCT_EXTERN_METHOD(listAvailableReplicationRequests:(NSString *)poolIDStr
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
@@ -173,6 +189,8 @@ RCT_EXTERN_METHOD(getFolderSize:(NSString *)folderPath
                   withResolver:(RCTPromiseResolveBlock)resolve
                   withRejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(getDatastoreSize:(RCTPromiseResolveBlock)resolve withRejecter:(RCTPromiseRejectBlock)reject)
+
 + (BOOL)requiresMainQueueSetup
 {
     return NO;

package/ios/Fula.swift

@@ -1061,6 +1061,73 @@ class FulaModule: NSObject {
         }
     }
 
+    @objc(listRecentCidsAsStringWithChildren:withRejecter:)
+    func listRecentCidsAsStringWithChildren(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        DispatchQueue.global(qos: .default).async {
+            do {
+                guard let fulaClient = self.fula else {
+                    throw MyError.runtimeError("Fula client is not initialized")
+                }
+
+                let recentLinksIterator = try fulaClient.listRecentCidsAsStringWithChildren()
+                var recentLinksList = [String]()
+
+                while recentLinksIterator.hasNext() {
+                    var error: NSError?
+                    let nextLink = try recentLinksIterator.next(&error)
+
+                    if let error = error {
+                        throw error
+                    }
+
+                    recentLinksList.append(nextLink)
+                }
+
+                if !recentLinksList.isEmpty {
+                    // Return the whole list
+                    resolve(recentLinksList)
+                } else {
+                    resolve(false)
+                }
+            } catch let error {
+                print("ReactNative", "listRecentCidsAsStringWithChildren failed with Error: \(error.localizedDescription)")
+                reject("ERR_FULA_LIST_RECENT_CIDS_WITH_CHILDREN", "Failed to list recent CIDs as string with children", error)
+            }
+        }
+    }
+
+    @objc(batchUploadManifest:withPoolId:withReplicationFactor:withResolver:withRejecter:)
+    func batchUploadManifest(cidArray: NSArray, poolIDStr: String, replicationFactorStr: String, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+        DispatchQueue.global(qos: .default).async {
+            do {
+                guard let fulaClient = self.fula else {
+                    throw MyError.runtimeError("Fula client is not initialized")
+                }
+                guard let poolID = Int64(poolIDStr) else {
+                    reject("ERR_FULA", "Invalid poolID - not a valid number: \(poolIDStr)")
+                    return
+                }
+                guard let replicationFactor = Int64(replicationFactorStr) else {
+                    reject("ERR_FULA", "Invalid replicationFactorStr - not a valid number: \(replicationFactorStr)")
+                    return
+                }
+
+                // 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")
+                }
+
+                try fulaClient.batchUploadManifest(cidsData, poolID, replicationFactor)
+                resolve(true)
+            } catch let error {
+                print("ReactNative", "batchUploadManifest failed with Error: \(error.localizedDescription)")
+                reject("ERR_FULA_BATCH_UPLOAD_MANIFEST", "Failed to batch upload CIDs", error)
+            }
+        }
+    }
+
 
 
     @objc(shutdown:withRejecter:)
@@ -1134,12 +1201,19 @@ class FulaModule: NSObject {
     }
 
     @objc(listPoolJoinRequests:withResolver:withRejecter:)
-    func listPoolJoinRequests(poolID: Int,  resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock)  -> Void {
-        print("ReactNative", "listPoolJoinRequests: poolID = ", poolID)
+    func listPoolJoinRequests(poolIDStr: String,  resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock)  -> Void {
+        print("ReactNative", "listPoolJoinRequests: poolIDStr = ", poolIDStr)
         do {
-            let result = try fula!.poolRequests(poolID)
-            let resultString = result.toUTF8String()!
-            resolve(resultString)
+            if let poolID = Int64(poolIDStr) {
+              // Conversion successful - use longPoolID
+
+              let result = try fula!.poolRequests(poolID)
+              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)")
+            }
         } catch let error {
             print("listPoolJoinRequests", error.localizedDescription)
             reject("ERR_FULA", "listPoolJoinRequests", error)
@@ -1148,9 +1222,13 @@ class FulaModule: NSObject {
     }
 
     @objc(listAvailableReplicationRequests:withResolver:withRejecter:)
-    func listAvailableReplicationRequests(poolID: Int,  resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock)  -> Void {
-        print("ReactNative", "listAvailableReplicationRequests: poolID = ", poolID)
+    func listAvailableReplicationRequests(poolIDStr: String,  resolve:RCTPromiseResolveBlock,reject:RCTPromiseRejectBlock)  -> Void {
+        print("ReactNative", "listAvailableReplicationRequests: poolIDStr = ", poolIDStr)
         do {
+            guard let poolID = Int64(poolIDStr) else {
+                reject("ERR_FULA", "Invalid poolID - not a valid number: \(poolIDStr)")
+                return
+            }
             let result = try fula!.manifestAvailable(poolID)
             let resultString = result.toUTF8String()!
             resolve(resultString)
@@ -1334,6 +1412,20 @@ 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)
+      }
+  }
+
+  //Add Replicate In Pool (replicateInPool)
+
 }
 
 

package/lib/commonjs/interfaces/fulaNativeModule.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","Fula","NativeModules","FulaModule","Proxy","get","Error","_default","exports"],"sourceRoot":"../../../src","sources":["interfaces/fulaNativeModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAmIA,MAAMC,aAAa,GAChB,iFAAgF,GACjFC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,6CAA6C;AAE/C,MAAMC,IAAI,GAAGC,0BAAa,CAACC,UAAU,GACjCD,0BAAa,CAACC,UAAU,GACxB,IAAIC,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACV,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAAC,IAAAW,QAAA,GAAAC,OAAA,CAAAR,OAAA,GAESC,IAAI"}
+{"version":3,"names":["_reactNative","require","LINKING_ERROR","Platform","select","ios","default","Fula","NativeModules","FulaModule","Proxy","get","Error","_default","exports"],"sourceRoot":"../../../src","sources":["interfaces/fulaNativeModule.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAuIA,MAAMC,aAAa,GAChB,iFAAgF,GACjFC,qBAAQ,CAACC,MAAM,CAAC;EAAEC,GAAG,EAAE,gCAAgC;EAAEC,OAAO,EAAE;AAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,6CAA6C;AAE/C,MAAMC,IAAI,GAAGC,0BAAa,CAACC,UAAU,GACjCD,0BAAa,CAACC,UAAU,GACxB,IAAIC,KAAK,CACP,CAAC,CAAC,EACF;EACEC,GAAGA,CAAA,EAAG;IACJ,MAAM,IAAIC,KAAK,CAACV,aAAa,CAAC;EAChC;AACF,CACF,CAAC;AAAC,IAAAW,QAAA,GAAAC,OAAA,CAAAR,OAAA,GAESC,IAAI"}

package/lib/commonjs/interfaces/lookup.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 // Auto-generated via `yarn polkadot-types-from-defs`, do not edit
 /* eslint-disable */
-/* eslint-disable sort-keys */
 var _default = exports.default = {
   /**
    * Lookup3: frame_system::AccountInfo<Index, pallet_balances::types::AccountData<Balance>>