@functionland/react-native-fula 1.1.6 → 1.1.8

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

@@ -164,12 +164,16 @@ public class FulaModule extends ReactContextBaseJavaModule {
       if (this.fula != null) {
         try {
           boolean connectionStatus = this.checkConnectionInternal(timeout);
+          Log.d("ReactNative", "checkConnection ended " + connectionStatus);
           promise.resolve(connectionStatus);
         }
         catch (Exception e) {
           Log.d("ReactNative", "checkConnection failed with Error: " + e.getMessage());
           promise.resolve(false);
         }
+      } else {
+        Log.d("ReactNative", "checkConnection failed with Error: " + "fula is null");
+        promise.resolve(false);
       }
     });
   }
@@ -179,12 +183,13 @@ public class FulaModule extends ReactContextBaseJavaModule {
     Log.d("ReactNative", "newClient started");
     ThreadUtils.runOnExecutor(() -> {
       try {
-        Log.d("ReactNative", "newClient storePath= " + storePath);
+        Log.d("ReactNative", "newClient storePath= " + storePath + " bloxAddr= " + bloxAddr + " exchange= " + exchange + " autoFlush= " + autoFlush + " useRelay= " + useRelay + " refresh= " + refresh);
         byte[] identity = toByte(identityString);
         Log.d("ReactNative", "newClient identity= " + identityString);
         this.newClientInternal(identity, storePath, bloxAddr, exchange, autoFlush, useRelay, refresh);
         //String objString = Arrays.toString(obj);
         String peerId = this.fula.id();
+        Log.d("ReactNative", "newClient peerId= " + peerId);
         promise.resolve(peerId);
       } catch (Exception e) {
         Log.d("ReactNative", "newClient failed with Error: " + e.getMessage());
@@ -203,8 +208,10 @@ public class FulaModule extends ReactContextBaseJavaModule {
           if (filesystemCheck) {
             if (this.client != null && this.rootConfig != null && !this.rootConfig.getCid().isEmpty()) {
               initialized = true;
+              Log.d("ReactNative", "isReady is true with filesystem check");
             }
           } else {
+            Log.d("ReactNative", "isReady is true without filesystem check");
             initialized = true;
           }
         }
@@ -267,6 +274,7 @@ public class FulaModule extends ReactContextBaseJavaModule {
                     try {
                         this.fula.connectToBlox();
                         connectionStatus.set(true);
+                        Log.d("ReactNative", "checkConnectionInternal succeeded ");
                     } catch (Exception e) {
                         Log.d("ReactNative", "checkConnectionInternal failed with Error: " + e.getMessage());
                     }
@@ -502,7 +510,7 @@ public class FulaModule extends ReactContextBaseJavaModule {
       } else {
         fulaConfig.setStorePath(storePath);
       }
-      Log.d("ReactNative", "storePath is set: " + fulaConfig.getStorePath());
+      Log.d("ReactNative", "newClientInternal storePath is set: " + fulaConfig.getStorePath());
 
       byte[] peerIdentity = this.createPeerIdentity(identity);
       fulaConfig.setIdentity(peerIdentity);
@@ -517,6 +525,7 @@ public class FulaModule extends ReactContextBaseJavaModule {
       }
       if (this.fula == null || refresh) {
         Log.d("ReactNative", "Creating a new Fula instance");
+        shutdownInternal();
         this.fula = Fulamobile.newClient(fulaConfig);
       }
       if (this.fula != null) {
@@ -994,20 +1003,23 @@ public class FulaModule extends ReactContextBaseJavaModule {
     });
   }
 
+  private void shutdownInternal() throws Exception {
+    try {
+      if(this.fula != null) {
+        this.fula.shutdown();
+        this.fula = null;
+        this.client = null;
+      }
+    } catch (Exception e) {
+      Log.d("ReactNative", "shutdownInternal"+ e.getMessage());
+      throw (e);
+    }
+  }
+
   @ReactMethod
   public void shutdown(Promise promise) {
     ThreadUtils.runOnExecutor(() -> {
-      try {
-        if(this.fula != null) {
-          this.fula.shutdown();
-          this.fula = null;
-          this.client = null;
-        }
-        promise.resolve(true);
-      } catch (Exception e) {
-        promise.reject(e);
-        Log.d("ReactNative", "shutdown"+ e.getMessage());
-      }
+      shutdownInternal();
     });
   }
 

package/package.json

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