@functionland/react-native-fula 0.4.0 → 1.0.0

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

@@ -1,7 +1,7 @@
-package land.fx.fula;
-
-public final class ConfigRef {
-    public byte[] identity;
-    public java.lang.String storePath;
-}
-
+package land.fx.fula;
+
+public final class ConfigRef {
+    public byte[] identity;
+    public java.lang.String storePath;
+}
+

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

@@ -1,47 +1,47 @@
-package land.fx.fula;
-
-import android.util.Base64;
-
-import java.io.UnsupportedEncodingException;
-import java.security.InvalidAlgorithmParameterException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.spec.InvalidKeySpecException;
-import java.security.spec.InvalidParameterSpecException;
-
-import javax.crypto.BadPaddingException;
-import javax.crypto.Cipher;
-import javax.crypto.IllegalBlockSizeException;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.SecretKeySpec;
-
-public class Cryptography {
-  public static String encryptMsg(String message, SecretKey secret)
-    throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, InvalidParameterSpecException, IllegalBlockSizeException, BadPaddingException, UnsupportedEncodingException {
-    Cipher cipher = null;
-    cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
-    cipher.init(Cipher.ENCRYPT_MODE, secret);
-    byte[] cipherText = cipher.doFinal(message.getBytes("UTF-8"));
-    return Base64.encodeToString(cipherText, Base64.NO_WRAP);
-  }
-
-  public static String decryptMsg(String cipherText, SecretKey secret)
-    throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidParameterSpecException, InvalidAlgorithmParameterException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException, UnsupportedEncodingException {
-    Cipher cipher = null;
-    cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
-    cipher.init(Cipher.DECRYPT_MODE, secret);
-    byte[] decode = Base64.decode(cipherText, Base64.NO_WRAP);
-    String decryptString = new String(cipher.doFinal(decode), "UTF-8");
-    return decryptString;
-  }
-
-  public static SecretKey generateKey(byte[] key)
-    throws NoSuchAlgorithmException, InvalidKeySpecException {
-    PBEKeySpec pbeKeySpec = new PBEKeySpec(StaticHelper.bytesToBase64(key).toCharArray(), key, 1000, 128);
-    SecretKey pbeKey = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256").generateSecret(pbeKeySpec);
-    return new SecretKeySpec(pbeKey.getEncoded(), "AES");
-  }
-}
+package land.fx.fula;
+
+import android.util.Base64;
+
+import java.io.UnsupportedEncodingException;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.InvalidParameterSpecException;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.SecretKey;
+import javax.crypto.SecretKeyFactory;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.SecretKeySpec;
+
+public class Cryptography {
+  public static String encryptMsg(String message, SecretKey secret)
+    throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException, InvalidParameterSpecException, IllegalBlockSizeException, BadPaddingException, UnsupportedEncodingException {
+    Cipher cipher = null;
+    cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+    cipher.init(Cipher.ENCRYPT_MODE, secret);
+    byte[] cipherText = cipher.doFinal(message.getBytes("UTF-8"));
+    return Base64.encodeToString(cipherText, Base64.NO_WRAP);
+  }
+
+  public static String decryptMsg(String cipherText, SecretKey secret)
+    throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidParameterSpecException, InvalidAlgorithmParameterException, InvalidKeyException, BadPaddingException, IllegalBlockSizeException, UnsupportedEncodingException {
+    Cipher cipher = null;
+    cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
+    cipher.init(Cipher.DECRYPT_MODE, secret);
+    byte[] decode = Base64.decode(cipherText, Base64.NO_WRAP);
+    String decryptString = new String(cipher.doFinal(decode), "UTF-8");
+    return decryptString;
+  }
+
+  public static SecretKey generateKey(byte[] key)
+    throws NoSuchAlgorithmException, InvalidKeySpecException {
+    PBEKeySpec pbeKeySpec = new PBEKeySpec(StaticHelper.bytesToBase64(key).toCharArray(), key, 1000, 128);
+    SecretKey pbeKey = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256").generateSecret(pbeKeySpec);
+    return new SecretKeySpec(pbeKey.getEncoded(), "AES");
+  }
+}

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

@@ -8,8 +8,11 @@ import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.module.annotations.ReactModule;
 
+import org.apache.commons.io.FileUtils;
 import org.jetbrains.annotations.Contract;
 
 import java.io.File;
@@ -18,13 +21,25 @@ import java.util.Arrays;
 
 import javax.crypto.SecretKey;
 
+import org.json.JSONObject;
+import org.json.JSONArray;
+
 import fulamobile.Config;
 import fulamobile.Fulamobile;
 
-import land.fx.wnfslib.LibKt;
+import land.fx.wnfslib.Fs;
 
 @ReactModule(name = FulaModule.NAME)
 public class FulaModule extends ReactContextBaseJavaModule {
+
+
+  @Override
+  public void initialize() {
+    System.loadLibrary("wnfslib");
+    System.loadLibrary("gojni");
+  }
+
+
   public static final String NAME = "FulaModule";
   fulamobile.Client fula;
   Client client;
@@ -33,36 +48,43 @@ public class FulaModule extends ReactContextBaseJavaModule {
   String privateForest;
   land.fx.wnfslib.Config rootConfig;
   SharedPreferenceHelper sharedPref;
+  SecretKey secretKeyGlobal;
+  String identityEncryptedGlobal;
   static String PRIVATE_KEY_STORE_ID = "PRIVATE_KEY";
 
-  public class Client implements land.fx.wnfslib.Client {
+  public static class Client implements land.fx.wnfslib.Datastore {
 
-    private fulamobile.Client internalClient;
+    private final fulamobile.Client internalClient;
 
     Client(fulamobile.Client clientInput) {
-      internalClient = clientInput;
+      this.internalClient = clientInput;
     }
 
     @NonNull
     @Override
     public byte[] get(@NonNull byte[] cid) {
       try {
-        internalClient.get(cid);
+        Log.d("ReactNative", Arrays.toString(cid));
+        return this.internalClient.get(cid);
       } catch (Exception e) {
         e.printStackTrace();
       }
-      return null;
+      Log.d("ReactNative","Error get");
+      return cid;
     }
 
     @NonNull
     @Override
     public byte[] put(@NonNull byte[] data, long codec) {
       try {
-        return client.put(data, codec);
+        //Log.d("ReactNative", "data="+ Arrays.toString(data) +" ;codec="+codec);
+        return this.internalClient.put(data, codec);
       } catch (Exception e) {
+        Log.d("ReactNative", "put Error="+e.getMessage());
         e.printStackTrace();
       }
-      return null;
+      Log.d("ReactNative","Error put");
+      return data;
     }
   }
 
@@ -85,7 +107,7 @@ public class FulaModule extends ReactContextBaseJavaModule {
 
   @Override
   @NonNull
-  public String getName() {
+  public java.lang.String getName() {
     return NAME;
   }
 
@@ -129,19 +151,39 @@ public class FulaModule extends ReactContextBaseJavaModule {
   }
 
   @ReactMethod
-  public void init(String identityString, String storePath, String bloxAddr, Promise promise) {
+  public void init(String identityString, String storePath, String bloxAddr, String exchange, String rootConfig, Promise promise) {
     Log.d("ReactNative", "init started");
     ThreadUtils.runOnExecutor(() -> {
       try {
+        WritableMap resultData = new WritableNativeMap();
         Log.d("ReactNative", "init storePath= " + storePath);
         byte[] identity = toByte(identityString);
         Log.d("ReactNative", "init identity= " + identityString);
-        String[] obj = initInternal(identity, storePath, bloxAddr);
+        String[] obj = initInternal(identity, storePath, bloxAddr, exchange, rootConfig);
         Log.d("ReactNative", "init object created: [ " + obj[0] + ", " + obj[1] + ", " + obj[2] + " ]");
-        promise.resolve(obj);
+        resultData.putString("peerId", obj[0]);
+        resultData.putString("rootCid", obj[1]);
+        resultData.putString("private_ref", obj[2]);
+        promise.resolve(resultData);
       } catch (Exception e) {
         Log.d("ReactNative", "init failed with Error: " + e.getMessage());
-        promise.reject(e);
+        promise.reject("Error", e.getMessage());
+      }
+    });
+  }
+
+  @ReactMethod
+  public void logout(String identityString, String storePath, Promise promise) {
+    Log.d("ReactNative", "logout started");
+    ThreadUtils.runOnExecutor(() -> {
+      try {
+        byte[] identity = toByte(identityString);
+        boolean obj = logoutInternal(identity, storePath);
+        Log.d("ReactNative", "logout completed");
+        promise.resolve(obj);
+      } catch (Exception e) {
+        Log.d("ReactNative", "logout failed with Error: " + e.getMessage());
+        promise.reject("Error", e.getMessage());
       }
     });
   }
@@ -170,12 +212,86 @@ public class FulaModule extends ReactContextBaseJavaModule {
     }
   }
 
+  private void loadForestInternal(String privateRef, String cid) throws Exception {
+    try {
+      this.privateForest = Fs.createPrivateForest(this.client);
+    } catch (Exception e) {
+      Log.d("ReactNative", "loadForestInternal failed with Error: " + e.getMessage());
+      throw (e);
+    }
+  }
+
+  private void createNewRootConfig(FulaModule.Client iClient, byte[] identity) throws Exception {
+    this.privateForest = Fs.createPrivateForest(iClient);
+    Log.d("ReactNative", "privateForest is created: " + this.privateForest);
+    this.rootConfig = Fs.createRootDir(iClient, this.privateForest, identity);
+    Log.d("ReactNative", "new rootConfig is created: cid=" + this.rootConfig.getCid()+" & private_ref="+this.rootConfig.getPrivate_ref());
+
+    encrypt_and_store_config();
+  }
+
+  private String getPrivateRef(FulaModule.Client iClient, byte[] wnfsKey, String rootCid) throws Exception {
+    Log.d("ReactNative", "getPrivateRef called: rootCid=" + rootCid);
+    String privateRef = Fs.getPrivateRef(iClient, wnfsKey, rootCid);
+    Log.d("ReactNative", "getPrivateRef completed: privateRef=" + privateRef);
+    return privateRef;
+  }
+
+  private boolean encrypt_and_store_config() throws Exception {
+    try {
+      if(!this.identityEncryptedGlobal.isEmpty() && !this.identityEncryptedGlobal.isEmpty()) {
+        String cid_encrypted = Cryptography.encryptMsg(this.rootConfig.getCid(), this.secretKeyGlobal);
+        String private_ref_encrypted = Cryptography.encryptMsg(this.rootConfig.getPrivate_ref(), this.secretKeyGlobal);
+
+        sharedPref.add("cid_encrypted_" + this.identityEncryptedGlobal, cid_encrypted);
+        sharedPref.add("private_ref_encrypted_" + this.identityEncryptedGlobal, private_ref_encrypted);
+        return true;
+      } else {
+        return false;
+      }
+    } catch (Exception e) {
+      Log.d("ReactNative", "encrypt_and_store_config failed with Error: " + e.getMessage());
+      throw (e);
+    }
+  }
+
+  @NonNull
+  private boolean logoutInternal(byte[] identity, String storePath) throws Exception {
+    try {
+      SecretKey secretKey = Cryptography.generateKey(identity);
+      String identity_encrypted = Cryptography.encryptMsg(Arrays.toString(identity), secretKey);
+      sharedPref.remove("cid_encrypted_"+ identity_encrypted);
+      sharedPref.remove("private_ref_encrypted_"+identity_encrypted);
+
+      //TODO: Should also remove peerid @Mahdi
+
+      sharedPref.remove("cid_encrypted_"+ identity_encrypted);
+      sharedPref.remove("private_ref_encrypted_"+ identity_encrypted);
+
+      this.rootConfig = null;
+      this.secretKeyGlobal = null;
+      this.identityEncryptedGlobal = null;
+
+      if (storePath == null || storePath.trim().isEmpty()) {
+        storePath = this.fulaStorePath;
+      }
+
+      File file = new File(storePath);
+      FileUtils.deleteDirectory(file);
+      return true;
+
+    } catch (Exception e) {
+      Log.d("ReactNative", "logout internal failed with Error: " + e.getMessage());
+      throw (e);
+    }
+  }
+
   @NonNull
-  private String[] initInternal(byte[] identity, String storePath, String bloxAddr) throws Exception {
+  private String[] initInternal(byte[] identity, String storePath, String bloxAddr, String exchange, String rootCid) throws Exception {
     try {
       Config config_ext = new Config();
       if (storePath == null || storePath.trim().isEmpty()) {
-        config_ext.setStorePath(fulaStorePath);
+        config_ext.setStorePath(this.fulaStorePath);
       } else {
         config_ext.setStorePath(storePath);
       }
@@ -186,17 +302,87 @@ public class FulaModule extends ReactContextBaseJavaModule {
       Log.d("ReactNative", "peerIdentity is set: " + toString(config_ext.getIdentity()));
       config_ext.setBloxAddr(bloxAddr);
       Log.d("ReactNative", "bloxAddr is set: " + config_ext.getBloxAddr());
+      config_ext.setExchange(exchange);
       this.fula = Fulamobile.newClient(config_ext);
       this.client = new Client(this.fula);
       Log.d("ReactNative", "fula initialized: " + this.fula.id());
-      if (this.rootConfig == null) {
-        Log.d("ReactNative", "creating rootConfig");
-        this.privateForest = LibKt.createPrivateForest(this.client);
-        Log.d("ReactNative", "privateForest is created: " + this.privateForest);
-        this.rootConfig = LibKt.createRootDir(this.client, this.privateForest);
-        Log.d("ReactNative", "rootConfig is created: " + this.rootConfig.getCid());
+
+      SecretKey secretKey = Cryptography.generateKey(identity);
+      String identity_encrypted =Cryptography.encryptMsg(Arrays.toString(identity), secretKey);
+      this.identityEncryptedGlobal = identity_encrypted;
+      this.secretKeyGlobal = secretKey;
+
+      if (this.rootConfig == null || this.rootConfig.getCid().isEmpty() || this.rootConfig.getPrivate_ref().isEmpty()) {
+        Log.d("ReactNative", "this.rootCid is empty.");
+        //Load from keystore
+
+        String cid_encrypted_fetched = sharedPref.getValue("cid_encrypted_"+ identity_encrypted);
+        String private_ref_encrypted_fetched = sharedPref.getValue("private_ref_encrypted_"+identity_encrypted);
+        Log.d("ReactNative", "Here1");
+        String cid = "";
+        String private_ref = "";
+        if(cid_encrypted_fetched != null && !cid_encrypted_fetched.isEmpty()) {
+          Log.d("ReactNative", "decrypting cid="+cid_encrypted_fetched+" with secret="+secretKey.toString());
+          cid = Cryptography.decryptMsg(cid_encrypted_fetched, secretKey);
+        }
+        if(private_ref_encrypted_fetched != null && !private_ref_encrypted_fetched.isEmpty()) {
+          Log.d("ReactNative", "decrypting private_ref="+private_ref_encrypted_fetched+" with secret="+secretKey.toString());
+          private_ref = Cryptography.decryptMsg(private_ref_encrypted_fetched, secretKey);
+        }
+        Log.d("ReactNative", "Here2");
+        //Log.d("ReactNative", "Attempted to fetch cid from keystore; cid="+cid+" & private_ref="+private_ref);
+        if((cid == null || cid.isEmpty()) || (private_ref == null || private_ref.isEmpty()) ){
+          Log.d("ReactNative", "cid or PrivateRef was not found");
+          if(rootCid !=null && !rootCid.isEmpty()){
+            Log.d("ReactNative", "Re-setting cid from input: "+rootCid);
+            cid = rootCid;
+          }
+          if((private_ref == null || private_ref.isEmpty()) && (cid != null && !cid.isEmpty())){
+            Log.d("ReactNative", "Re-fetching privateRef from wnfs: cid="+cid);
+            private_ref = getPrivateRef(this.client, identity, cid);
+            Log.d("ReactNative", "Re-fetching privateRef from wnfs: "+private_ref);
+          }
+          if(cid == null || cid.isEmpty() || private_ref == null || private_ref.isEmpty()) {
+            Log.d("ReactNative", "Tried to recover cid and privateRef but was not successful. Creating new ones");
+            createNewRootConfig(this.client, identity);
+          } else {
+            Log.d("ReactNative", "Tried to recover cid and privateRef and was successful. cid:"+cid+" & private_ref="+private_ref);
+            this.rootConfig = new land.fx.wnfslib.Config(cid, private_ref);
+            encrypt_and_store_config();
+          }
+        } else if(cid != null && !cid.isEmpty() && private_ref != null && !private_ref.isEmpty()) {
+          Log.d("ReactNative", "Found cid and private ref in keychain store");
+          if(cid != null && !cid.isEmpty() && private_ref!=null && !private_ref.isEmpty()) {
+            Log.d("ReactNative", "Recovered cid and private ref from keychain store. cid="+cid+" & private_ref="+private_ref);
+            this.rootConfig = new land.fx.wnfslib.Config(cid, private_ref);
+          } else{
+            Log.d("ReactNative", "Found but Could not recover cid and private_ref from keychain store");
+            createNewRootConfig(this.client, identity);
+          }
+        } else{
+          Log.d("ReactNative", "This cid and private_ref generation should never happen!!!");
+          //Create new root and store cid and private_ref
+          createNewRootConfig(this.client, identity);
+        }
+
+
+        Log.d("ReactNative", "creating rootConfig 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");
+        long testcodec = 85;
+        byte[] testputcid = this.client.put(testbyte, testcodec);
+        Log.d("ReactNative", "client.put test done"+ Arrays.toString(testputcid));
+        byte[] testfetchedcid = convertStringToByte("1,113,18,32,-6,-63,-128,79,-102,-89,57,77,-8,67,-98,8,-81,40,-87,123,122,29,-52,-124,-60,-53,100,105,125,123,-5,-99,41,106,-124,-64");
+        byte[] testfetchedbytes = this.client.get(testfetchedcid);
+        Log.d("ReactNative", "client.get test done"+ Arrays.toString(testfetchedbytes));
+        */
+
+
+        Log.d("ReactNative", "rootConfig is created: cid=" + this.rootConfig.getCid()+ "& private_ref="+this
+          .rootConfig.getPrivate_ref());
       } else {
-        Log.d("ReactNative", "rootConfig existed: " + this.rootConfig.getCid());
+        Log.d("ReactNative", "rootConfig existed: cid=" + this.rootConfig.getCid()+ " & private_ref="+this.rootConfig.getPrivate_ref());
       }
       String peerId = this.fula.id();
       String[] obj = new String[3];
@@ -216,7 +402,7 @@ public class FulaModule extends ReactContextBaseJavaModule {
     ThreadUtils.runOnExecutor(() -> {
       Log.d("ReactNative", "mkdir: path = " + path);
       try {
-        land.fx.wnfslib.Config config = LibKt.mkdir(this.client, this.rootConfig.getCid(), this.rootConfig.getPrivate_ref(), path);
+        land.fx.wnfslib.Config config = Fs.mkdir(this.client, this.rootConfig.getCid(), this.rootConfig.getPrivate_ref(), path);
         this.rootConfig = config;
         promise.resolve(config.getCid());
       } catch (Exception e) {
@@ -238,8 +424,9 @@ public class FulaModule extends ReactContextBaseJavaModule {
     ThreadUtils.runOnExecutor(() -> {
       Log.d("ReactNative", "writeFile to : path = " + fulaTargetFilename + ", from: " + localFilename);
       try {
-        land.fx.wnfslib.Config config = LibKt.writeFileFromPath(this.client, this.rootConfig.getCid(), this.rootConfig.getPrivate_ref(), fulaTargetFilename, localFilename);
+        land.fx.wnfslib.Config config = Fs.writeFileFromPath(this.client, this.rootConfig.getCid(), this.rootConfig.getPrivate_ref(), fulaTargetFilename, localFilename);
         this.rootConfig = config;
+        encrypt_and_store_config();
         promise.resolve(config.getCid());
       } catch (Exception e) {
         Log.d("get", e.getMessage());
@@ -255,8 +442,9 @@ public class FulaModule extends ReactContextBaseJavaModule {
       Log.d("ReactNative", "writeFile: path = " + path);
       try {
         byte[] content = convertStringToByte(contentString);
-        land.fx.wnfslib.Config config = LibKt.writeFile(this.client, this.rootConfig.getCid(), this.rootConfig.getPrivate_ref(), path, content);
+        land.fx.wnfslib.Config config = Fs.writeFile(this.client, this.rootConfig.getCid(), this.rootConfig.getPrivate_ref(), path, content);
         this.rootConfig = config;
+        encrypt_and_store_config();
         promise.resolve(config.getCid());
       } catch (Exception e) {
         Log.d("get", e.getMessage());
@@ -270,8 +458,12 @@ public class FulaModule extends ReactContextBaseJavaModule {
     ThreadUtils.runOnExecutor(() -> {
       Log.d("ReactNative", "ls: path = " + path);
       try {
-        String res = LibKt.ls(this.client, this.rootConfig.getCid(), this.rootConfig.getPrivate_ref(), path);
-        promise.resolve(res);
+        byte[] res = Fs.ls(this.client, this.rootConfig.getCid(), this.rootConfig.getPrivate_ref(), path);
+
+        //JSONArray jsonArray = new JSONArray(res);
+        String s = new String(res, StandardCharsets.UTF_8);
+        Log.d("ReactNative", "ls: res = " + s);
+        promise.resolve(s);
       } catch (Exception e) {
         Log.d("get", e.getMessage());
         promise.reject(e);
@@ -280,11 +472,80 @@ public class FulaModule extends ReactContextBaseJavaModule {
   }
 
   @ReactMethod
-  public void readFile(String path, Promise promise) {
+  public void rm(String path, Promise promise) {
     ThreadUtils.runOnExecutor(() -> {
-      Log.d("ReactNative", "ls: path = " + path);
+      Log.d("ReactNative", "rm: path = " + path);
       try {
-        byte[] res = LibKt.readFile(this.client, this.rootConfig.getCid(), this.rootConfig.getPrivate_ref(), path);
+        land.fx.wnfslib.Config config = Fs.rm(this.client, this.rootConfig.getCid(), this.rootConfig.getPrivate_ref(), path);
+        this.rootConfig = config;
+        encrypt_and_store_config();
+        promise.resolve(config.getCid());
+      } catch (Exception e) {
+        Log.d("get", e.getMessage());
+        promise.reject(e);
+      }
+    });
+  }
+
+  @ReactMethod
+  public void cp(String sourcePath, String targetPath, Promise promise) {
+    ThreadUtils.runOnExecutor(() -> {
+      Log.d("ReactNative", "rm: sourcePath = " + sourcePath);
+      try {
+        land.fx.wnfslib.Config config = Fs.cp(this.client, this.rootConfig.getCid(), this.rootConfig.getPrivate_ref(), sourcePath, targetPath);
+        this.rootConfig = config;
+        encrypt_and_store_config();
+        promise.resolve(config.getCid());
+      } catch (Exception e) {
+        Log.d("get", e.getMessage());
+        promise.reject(e);
+      }
+    });
+  }
+
+  @ReactMethod
+  public void mv(String sourcePath, String targetPath, Promise promise) {
+    ThreadUtils.runOnExecutor(() -> {
+      Log.d("ReactNative", "rm: sourcePath = " + sourcePath);
+      try {
+        land.fx.wnfslib.Config config = Fs.mv(this.client, this.rootConfig.getCid(), this.rootConfig.getPrivate_ref(), sourcePath, targetPath);
+        this.rootConfig = config;
+        encrypt_and_store_config();
+        promise.resolve(config.getCid());
+      } catch (Exception e) {
+        Log.d("get", e.getMessage());
+        promise.reject(e);
+      }
+    });
+  }
+
+  @ReactMethod
+  public void readFile(String fulaTargetFilename, String localFilename, Promise promise) {
+    /*
+    // reads content of the file form localFilename (should include full absolute path to local file with read permission
+    // writes content to the specified location by fulaTargetFilename in Fula filesystem
+    // fulaTargetFilename: a string including full path and filename of target file on Fula (e.g. root/pictures/cat.jpg)
+    // 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
+     */
+    ThreadUtils.runOnExecutor(() -> {
+      Log.d("ReactNative", "readFile: fulaTargetFilename = " + fulaTargetFilename);
+      try {
+        String path = Fs.readFilestreamToPath(this.client, this.rootConfig.getCid(), this.rootConfig.getPrivate_ref(), fulaTargetFilename, localFilename);
+        promise.resolve(path);
+      } catch (Exception e) {
+        Log.d("get", e.getMessage());
+        promise.reject(e);
+      }
+    });
+  }
+
+  @ReactMethod
+  public void readFileContent(String path, Promise promise) {
+    ThreadUtils.runOnExecutor(() -> {
+      Log.d("ReactNative", "readFileContent: path = " + path);
+      try {
+        byte[] res = Fs.readFile(this.client, this.rootConfig.getCid(), this.rootConfig.getPrivate_ref(), path);
         String resString = toString(res);
         promise.resolve(resString);
       } catch (Exception e) {
@@ -340,7 +601,6 @@ public class FulaModule extends ReactContextBaseJavaModule {
     });
   }
 
-  @NonNull
   private boolean hasInternal(byte[] key) throws Exception {
     try {
       boolean res = this.fula.has(key);
@@ -351,7 +611,6 @@ public class FulaModule extends ReactContextBaseJavaModule {
     }
   }
 
-  @NonNull
   private void pullInternal(byte[] key) throws Exception {
     try {
       this.fula.pull(key);
@@ -375,7 +634,6 @@ public class FulaModule extends ReactContextBaseJavaModule {
     });
   }
 
-  @NonNull
   private void pushInternal(byte[] key) throws Exception {
     try {
       if (this.fula.has(key)) {

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

@@ -1,32 +1,32 @@
-package land.fx.fula;
-
-import androidx.annotation.NonNull;
-
-import com.facebook.react.ReactPackage;
-import com.facebook.react.bridge.NativeModule;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.uimanager.ViewManager;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-public class FulaPackage implements ReactPackage {
-  @NonNull
-  @Override
-  public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
-      List<NativeModule> modules = new ArrayList<>();
-      try {
-          modules.add(new FulaModule(reactContext));
-      } catch (Exception e) {
-          e.printStackTrace();
-      }
-      return modules;
-  }
-
-  @NonNull
-  @Override
-  public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
-      return Collections.emptyList();
-  }
-}
+package land.fx.fula;
+
+import androidx.annotation.NonNull;
+
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.NativeModule;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.uimanager.ViewManager;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class FulaPackage implements ReactPackage {
+  @NonNull
+  @Override
+  public List<NativeModule> createNativeModules(@NonNull ReactApplicationContext reactContext) {
+      List<NativeModule> modules = new ArrayList<>();
+      try {
+          modules.add(new FulaModule(reactContext));
+      } catch (Exception e) {
+          e.printStackTrace();
+      }
+      return modules;
+  }
+
+  @NonNull
+  @Override
+  public List<ViewManager> createViewManagers(@NonNull ReactApplicationContext reactContext) {
+      return Collections.emptyList();
+  }
+}