@functionland/react-native-fula 1.2.0 → 1.2.1-rnf1

package/README.md

@@ -149,6 +149,17 @@ await fula.checkFailedActions(
 );
 ```
 
+```js
+//Gives access to the blox for a specific peerId. This call must be made from the authorizer only.
+const result //returns true if succesful and false if fails
+= 
+await fula.setAuth(
+    peerId: string, //peer ID of the app that needs access to the blox
+    allow: boolean, // true to allow and false to remove access
+);
+
+```
+
 ```js
 //shuts down the fula libp2p and datastore
 await fula.shutdown();

package/android/build.gradle

@@ -1,69 +1,69 @@
-buildscript {
-    if (project == rootProject) {
-        repositories {
-            google()
-            mavenCentral()
-            jcenter()
-        }
-
-        dependencies {
-            classpath 'com.android.tools.build:gradle:4.2.2'
-        }
-    }
-}
-
-apply plugin: 'com.android.library'
-
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-}
-
-android {
-  compileSdk 33
-  defaultConfig {
-        minSdkVersion safeExtGet('Fula_minSdkVersion', 26)
-        targetSdkVersion safeExtGet('Fula_targetSdkVersion', 31)
-        versionCode 1
-        versionName "1.0"
-
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-    }
-    lintOptions {
-        disable 'GradleCompatible'
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-  ndkVersion '25.1.8937393'
-}
-
-repositories {
-    mavenLocal()
-    google()
-    jcenter()
-    mavenCentral()
-    maven {
-        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-        url("$rootDir/../node_modules/react-native/android")
-    }
-
-
-
-    // Add this repo to get go-fula package
-    maven { url 'https://jitpack.io' }
-}
-
-dependencies {
-    //noinspection GradleDynamicVersion
-    implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation 'com.github.functionland:fula-build-aar:0.8.8beta' // From jitpack.io
-    implementation 'com.github.functionland:wnfs-build-aar:v1.4.1' // From jitpack.io
-    implementation 'commons-io:commons-io:20030203.000550'
-    // implementation files('mobile.aar')
-}
+buildscript {
+    if (project == rootProject) {
+        repositories {
+            google()
+            mavenCentral()
+            jcenter()
+        }
+
+        dependencies {
+            classpath 'com.android.tools.build:gradle:4.2.2'
+        }
+    }
+}
+
+apply plugin: 'com.android.library'
+
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
+android {
+  compileSdk 33
+  defaultConfig {
+        minSdkVersion safeExtGet('Fula_minSdkVersion', 26)
+        targetSdkVersion safeExtGet('Fula_targetSdkVersion', 31)
+        versionCode 1
+        versionName "1.0"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+    lintOptions {
+        disable 'GradleCompatible'
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+  ndkVersion '25.1.8937393'
+}
+
+repositories {
+    mavenLocal()
+    google()
+    jcenter()
+    mavenCentral()
+    maven {
+        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+        url("$rootDir/../node_modules/react-native/android")
+    }
+
+
+
+    // Add this repo to get go-fula package
+    maven { url 'https://jitpack.io' }
+}
+
+dependencies {
+    //noinspection GradleDynamicVersion
+    implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation 'com.github.functionland:fula-build-aar:1.2.1' // From jitpack.io
+    implementation 'com.github.functionland:wnfs-build-aar:v1.4.1' // From jitpack.io
+    implementation 'commons-io:commons-io:20030203.000550'
+    // implementation files('mobile.aar')
+}

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

@@ -25,6 +25,8 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeoutException;
 
 import org.json.JSONObject;
 import org.json.JSONArray;
@@ -263,42 +265,50 @@ public class FulaModule extends ReactContextBaseJavaModule {
 
   private boolean checkConnectionInternal(int timeout) throws Exception {
     try {
-        Log.d("ReactNative", "checkConnectionInternal started");
-        if (this.fula != null) {
+      Log.d("ReactNative", "checkConnectionInternal started");
+      if (this.fula != null) {
+        try {
+          Log.d("ReactNative", "connectToBlox started");
+
+          AtomicBoolean connectionStatus = new AtomicBoolean(false);
+          ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
+          Future<?> future = executor.submit(() -> {
             try {
-                Log.d("ReactNative", "connectToBlox started");
-
-                AtomicBoolean connectionStatus = new AtomicBoolean(false);
-                ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor();
-                executor.schedule(() -> {
-                    try {
-                        this.fula.connectToBlox();
-                        connectionStatus.set(true);
-                        Log.d("ReactNative", "checkConnectionInternal succeeded ");
-                    } catch (Exception e) {
-                        Log.d("ReactNative", "checkConnectionInternal failed with Error: " + e.getMessage());
-                    }
-                }, 0, TimeUnit.SECONDS);
-
-                executor.schedule(() -> {
-                    executor.shutdown();
-                }, timeout, TimeUnit.SECONDS);
-
-                executor.awaitTermination(timeout, TimeUnit.SECONDS);
-                return connectionStatus.get();
+              this.fula.connectToBlox();
+              connectionStatus.set(true);
+              Log.d("ReactNative", "checkConnectionInternal succeeded ");
             } catch (Exception e) {
-                Log.d("ReactNative", "checkConnectionInternal failed with Error: " + e.getMessage());
-                return false;
+              Log.d("ReactNative", "checkConnectionInternal failed with Error: " + e.getMessage());
             }
-        } else {
-            Log.d("ReactNative", "checkConnectionInternal failed because fula is not initialized ");
+          });
+
+          try {
+            future.get(timeout, TimeUnit.SECONDS);
+          } catch (TimeoutException te) {
+            // If the timeout occurs, shut down the executor and return false
+            executor.shutdownNow();
             return false;
+          } finally {
+            // If the future task is done, we can shut down the executor
+            if (future.isDone()) {
+              executor.shutdown();
+            }
+          }
+
+          return connectionStatus.get();
+        } catch (Exception e) {
+          Log.d("ReactNative", "checkConnectionInternal failed with Error: " + e.getMessage());
+          return false;
         }
+      } else {
+        Log.d("ReactNative", "checkConnectionInternal failed because fula is not initialized ");
+        return false;
+      }
     } catch (Exception e) {
-        Log.d("ReactNative", "checkConnectionInternal failed with Error: " + e.getMessage());
-        throw (e);
+      Log.d("ReactNative", "checkConnectionInternal failed with Error: " + e.getMessage());
+      throw (e);
     }
-}
+  }
 
   @ReactMethod
   private void checkFailedActions(boolean retry, int timeout, Promise promise) throws Exception {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@functionland/react-native-fula",
-  "version": "1.2.0",
+  "version": "1.2.1rnf1",
   "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",
@@ -28,7 +28,7 @@
     "lint": "eslint \"**/*.{js,ts,tsx}\"",
     "prepare": "bob build",
     "release": "release-it",
-    "example": "set NODE_OPTIONS=--openssl-legacy-provider && yarn --cwd example",
+    "example": "set NODE_OPTIONS='' && yarn --cwd example",
     "pods": "cd example && pod-install --quiet",
     "bootstrap": "yarn example && yarn && yarn pods"
   },