react-native-blob-util 0.16.3 → 0.17.0

package/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilStream.java

@@ -37,12 +37,12 @@ public class ReactNativeBlobUtilStream {
 
     /**
      * Create a file stream for read
-     *
-     * @param path       File stream target path
+     *  @param path       File stream target path
      * @param encoding   File stream decoder, should be one of `base64`, `utf8`, `ascii`
      * @param bufferSize Buffer size of read stream, default to 4096 (4095 when encode is `base64`)
+     * @param RCTContext
      */
-    void readStream(String path, String encoding, int bufferSize, int tick, final String streamId) {
+    void readStream(String path, String encoding, int bufferSize, int tick, final String streamId, ReactApplicationContext RCTContext) {
         String resolved = ReactNativeBlobUtilUtils.normalizePath(path);
         if (resolved != null)
             path = resolved;
@@ -55,11 +55,11 @@ public class ReactNativeBlobUtilStream {
             InputStream fs;
 
             if (resolved != null && path.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET)) {
-                fs = ReactNativeBlobUtil.RCTContext.getAssets().open(path.replace(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET, ""));
+                fs = ReactNativeBlobUtilImpl.RCTContext.getAssets().open(path.replace(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET, ""));
             }
             // fix issue 287
             else if (resolved == null) {
-                fs = ReactNativeBlobUtil.RCTContext.getContentResolver().openInputStream(Uri.parse(path));
+                fs = ReactNativeBlobUtilImpl.RCTContext.getContentResolver().openInputStream(Uri.parse(path));
             } else {
                 fs = new FileInputStream(new File(path));
             }
@@ -279,7 +279,7 @@ public class ReactNativeBlobUtilStream {
      */
     public static InputStream inputStreamFromPath(String path) throws IOException {
         if (path.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET)) {
-            return ReactNativeBlobUtil.RCTContext.getAssets().open(path.replace(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET, ""));
+            return ReactNativeBlobUtilImpl.RCTContext.getAssets().open(path.replace(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET, ""));
         }
         return new FileInputStream(new File(path));
     }

package/android/src/main/java/com/ReactNativeBlobUtil/ReactNativeBlobUtilUtils.java

@@ -55,7 +55,7 @@ public class ReactNativeBlobUtilUtils {
         args.putString("detail", data);
 
         // emit event to js context
-        ReactNativeBlobUtil.RCTContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+        ReactNativeBlobUtilImpl.RCTContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
                 .emit(ReactNativeBlobUtilConst.EVENT_MESSAGE, args);
     }
 
@@ -125,7 +125,7 @@ public class ReactNativeBlobUtilUtils {
         if (path.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET)) {
             return path;
         } else
-            return PathResolver.getRealPathFromURI(ReactNativeBlobUtil.RCTContext, uri);
+            return PathResolver.getRealPathFromURI(ReactNativeBlobUtilImpl.RCTContext, uri);
     }
 
     public static boolean isAsset(String path) {

package/android/src/main/java/com/ReactNativeBlobUtil/Utils/MimeType.java

@@ -27,7 +27,7 @@ public class MimeType {
     public static String getFullFileName(String name, String mimeType) {
         // Prior to API 29, MimeType.BINARY_FILE has no file extension
         String ext = MimeType.getExtensionFromMimeType(mimeType);
-        if (ext.isEmpty() || name.endsWith("." + "ext")) return name;
+        if ((ext == null || ext.isEmpty()) || name.endsWith("." + "ext")) return name;
         else {
             String fn = name + "." + ext;
             if (fn.endsWith(".")) return StringUtils.stripEnd(fn, ".");

package/android/src/newarch/java/com/ReactNativeBlobUtil/ReactNativeBlobUtil.java

@@ -0,0 +1,281 @@
+package com.ReactNativeBlobUtil;
+
+import android.os.Build;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
+import com.facebook.fbreact.specs.NativeBlobUtilsSpec;
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+public class ReactNativeBlobUtil extends NativeBlobUtilsSpec {
+
+    private final ReactNativeBlobUtilImpl delegate;
+
+    public ReactNativeBlobUtil(ReactApplicationContext reactContext) {
+        super(reactContext);
+        delegate = new ReactNativeBlobUtilImpl(reactContext);
+    }
+
+    @Override
+    protected Map<String, Object> getTypedExportedConstants() {
+        Map<String, Object> res = new HashMap<>();
+        res.putAll(ReactNativeBlobUtilFS.getSystemfolders(this.getReactApplicationContext()));
+        res.putAll(ReactNativeBlobUtilFS.getLegacySystemfolders(this.getReactApplicationContext()));
+        return res;
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return ReactNativeBlobUtilImpl.NAME;
+    }
+
+    @Override
+    public void fetchBlobForm(ReadableMap options, String taskId, String method, String url, ReadableMap headers, ReadableArray form, Callback callback) {
+        delegate.fetchBlobForm(options, taskId, method, url, headers, form, callback);
+    }
+
+    @Override
+    public void fetchBlob(ReadableMap options, String taskId, String method, String url, ReadableMap headers, String body, Callback callback) {
+        delegate.fetchBlob(options, taskId, method, url, headers, body, callback);
+    }
+
+    @Override
+    public void createFile(String path, String data, String encoding, Promise promise) {
+        delegate.createFile(path, data, encoding, promise);
+    }
+
+    @Override
+    public void createFileASCII(String path, ReadableArray data, Promise promise) {
+        delegate.createFileASCII(path, data, promise);
+    }
+
+
+    @Override
+    public void pathForAppGroup(String groupName, Promise promise) {
+        // Not implemented as ReactNativeBlobUtil.pathForAppGroup only supports IOS
+        // This will be rejected at the iOS layer
+    }
+
+    @Override
+    public String syncPathAppGroup(String groupName) {
+        // Not implemented as ReactNativeBlobUtil.syncPathAppGroup only supports IOS
+        // This will be rejected at the iOS layer
+        return null;
+    }
+
+    @Override
+    public void exists(String path, Callback callback) {
+        delegate.exists(path, callback);
+    }
+
+    @Override
+    public void writeFile(String path, String encoding, String data, boolean transformFile, boolean append, Promise promise) {
+        delegate.writeFile(path, encoding, data, transformFile, append, promise);
+    }
+
+    @Override
+    public void writeFileArray(String path, ReadableArray data, boolean append, Promise promise) {
+        delegate.writeFileArray(path, data, append, promise);
+    }
+
+    @Override
+    public void writeStream(String path, String withEncoding, boolean appendData, Callback callback) {
+        delegate.writeStream(path, withEncoding, appendData, callback);
+    }
+
+    @Override
+    public void writeArrayChunk(String streamId, ReadableArray withArray, Callback callback) {
+        delegate.writeArrayChunk(streamId, withArray, callback);
+    }
+
+    @Override
+    public void writeChunk(String streamId, String withData, Callback callback) {
+        delegate.writeChunk(streamId, withData, callback);
+    }
+
+    @Override
+    public void closeStream(String streamId, Callback callback) {
+        delegate.closeStream(streamId, callback);
+    }
+
+    @Override
+    public void unlink(String path, Callback callback) {
+        delegate.unlink(path, callback);
+    }
+
+    @Override
+    public void removeSession(ReadableArray paths, Callback callback) {
+        delegate.removeSession(paths, callback);
+    }
+
+    @Override
+    public void ls(String path, Promise promise) {
+        delegate.ls(path, promise);
+    }
+
+    @Override
+    public void stat(String target, Callback callback) {
+        delegate.stat(target, callback);
+    }
+
+    @Override
+    public void lstat(String path, Callback callback) {
+        delegate.lstat(path, callback);
+    }
+
+    @Override
+    public void cp(String src, String dest, Callback callback) {
+        delegate.cp(src, dest, callback);
+    }
+
+    @Override
+    public void mv(String path, String dest, Callback callback) {
+        delegate.mv(path, dest, callback);
+    }
+
+    @Override
+    public void mkdir(String path, Promise promise) {
+        delegate.mkdir(path, promise);
+    }
+
+    @Override
+    public void readFile(String path, String encoding, boolean transformFile, Promise promise) {
+        delegate.readFile(path, encoding, transformFile, promise);
+    }
+
+    @Override
+    public void hash(String path, String algorithm, Promise promise) {
+        delegate.hash(path, algorithm, promise);
+    }
+
+    @Override
+    public void readStream(String path, String encoding, double bufferSize, double tick, String streamId) {
+         delegate.readStream(path, encoding, (int) bufferSize, (int) tick, streamId);
+    }
+
+    @Override
+    public void getEnvironmentDirs(Callback callback) {
+        // Not implemented as ReactNativeBlobUtil.getEnvironmentDirs only supports IOS
+    }
+
+    @Override
+    public void cancelRequest(String taskId, Callback callback) {
+        delegate.cancelRequest(taskId, callback);
+    }
+
+    @Override
+    public void enableProgressReport(String taskId, double interval, double count) {
+        delegate.enableProgressReport(taskId, (int) interval, (int) count);
+    }
+
+    @Override
+    public void enableUploadProgressReport(String taskId, double interval, double count) {
+        delegate.enableUploadProgressReport(taskId, (int) interval, (int) count);
+    }
+
+    @Override
+    public void slice(String src, String dest, double start, double end, Promise promise) {
+       delegate.slice(src, dest, (int) start, (int) end, promise);
+    }
+
+    @Override
+    public void presentOptionsMenu(String uri, String scheme, Promise promise) {
+        // Not implemented as ReactNativeBlobUtil.presentOptionsMenu only supports IOS
+        // This will be rejected at the iOS layer
+    }
+
+    @Override
+    public void presentOpenInMenu(String uri, String scheme, Promise promise) {
+        // Not implemented as ReactNativeBlobUtil.presentOpenInMenu only supports IOS
+        // This will be rejected at the iOS layer
+    }
+
+    @Override
+    public void presentPreview(String uri, String scheme, Promise promise) {
+        // Not implemented as ReactNativeBlobUtil.presentPreview only supports IOS
+        // This will be rejected at the iOS layer
+    }
+
+    @Override
+    public void excludeFromBackupKey(String url, Promise promise) {
+        // Not implemented as ReactNativeBlobUtil.excludeFromBackupKey only supports IOS
+    }
+
+    @Override
+    public void df(Callback callback) {
+        delegate.df(callback);
+    }
+
+    @Override
+    public void emitExpiredEvent(Callback callback) {
+        // Not implemented as ReactNativeBlobUtil.emitExpiredEvent only supports IOS
+    }
+
+    @Override
+    public void actionViewIntent(String path, String mime, String chooserTitle, Promise promise) {
+        delegate.actionViewIntent(path, mime, chooserTitle, promise);
+    }
+
+    @Override
+    public void addCompleteDownload(ReadableMap config, Promise promise) {
+        delegate.addCompleteDownload(config, promise);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.Q)
+    @Override
+    public void copyToInternal(String contentUri, String destpath, Promise promise) {
+        delegate.copyToInternal(contentUri, destpath, promise);
+    }
+
+    @Override
+    public void copyToMediaStore(ReadableMap filedata, String mt, String path, Promise promise) {
+        delegate.copyToMediaStore(filedata, mt, path, promise);
+    }
+
+    @Override
+    public void createMediaFile(ReadableMap filedata, String mt, Promise promise) {
+        delegate.createMediaFile(filedata, mt, promise);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.Q)
+    @Override
+    public void getBlob(String contentUri, String encoding, Promise promise) {
+        delegate.getBlob(contentUri, encoding, promise);
+    }
+
+    @Override
+    public void getContentIntent(String mime, Promise promise) {
+        delegate.getContentIntent(mime, promise);
+    }
+
+    @Override
+    public void getSDCardDir(Promise promise) {
+        delegate.getSDCardDir(promise);
+    }
+
+    @Override
+    public void getSDCardApplicationDir(Promise promise) {
+        delegate.getSDCardApplicationDir(promise);
+    }
+
+    @Override
+    public void scanFile(final ReadableArray pairs, final Callback callback) {
+        delegate.scanFile(pairs, callback);
+    }
+
+    @Override
+    public void writeToMediaFile(String fileUri, String path, boolean transformFile, Promise promise) {
+        delegate.writeToMediaFile(fileUri, path, transformFile, promise);
+    }
+}

package/android/src/oldarch/java/com/ReactNativeBlobUtil/ReactNativeBlobUtil.java

@@ -0,0 +1,242 @@
+package com.ReactNativeBlobUtil;
+
+import android.os.Build;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+
+import com.facebook.react.bridge.Callback;
+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.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
+
+    private final ReactNativeBlobUtilImpl delegate;
+
+    public ReactNativeBlobUtil(ReactApplicationContext reactContext) {
+        super(reactContext);
+        delegate = new ReactNativeBlobUtilImpl(reactContext);
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return ReactNativeBlobUtilImpl.NAME;
+    }
+
+    @Override
+    public Map<String, Object> getConstants() {
+        Map<String, Object> res = new HashMap<>();
+        res.putAll(ReactNativeBlobUtilFS.getSystemfolders(this.getReactApplicationContext()));
+        res.putAll(ReactNativeBlobUtilFS.getLegacySystemfolders(this.getReactApplicationContext()));
+
+        return res;
+    }
+
+    @ReactMethod
+    public void createFile(final String path, final String content, final String encode, final Promise promise) {
+        delegate.createFile(path, content, encode, promise);
+    }
+
+    @ReactMethod
+    public void createFileASCII(final String path, final ReadableArray dataArray, final Promise promise) {
+        delegate.createFileASCII(path, dataArray, promise);
+    }
+
+    @ReactMethod
+    public void actionViewIntent(String path, String mime, @Nullable String chooserTitle, final Promise promise) {
+        delegate.actionViewIntent(path, mime, chooserTitle, promise);
+    }
+
+    @ReactMethod
+    public void writeArrayChunk(final String streamId, final ReadableArray dataArray, final Callback callback) {
+        delegate.writeArrayChunk(streamId, dataArray, callback);
+    }
+
+    @ReactMethod
+    public void unlink(String path, Callback callback) {
+        delegate.unlink(path, callback);
+    }
+
+    @ReactMethod
+    public void mkdir(String path, Promise promise) {
+        delegate.mkdir(path, promise);
+    }
+
+    @ReactMethod
+    public void exists(String path, Callback callback) {
+        delegate.exists(path, callback);
+    }
+
+    @ReactMethod
+    public void cp(final String path, final String dest, final Callback callback) {
+        delegate.cp(path, dest, callback);
+    }
+
+    @ReactMethod
+    public void mv(String path, String dest, Callback callback) {
+        delegate.mv(path, dest, callback);
+    }
+
+    @ReactMethod
+    public void ls(String path, Promise promise) {
+        delegate.ls(path, promise);
+    }
+
+    @ReactMethod
+    public void writeStream(String path, String encode, boolean append, Callback callback) {
+        delegate.writeStream(path, encode, append, callback);
+    }
+
+    @ReactMethod
+    public void writeChunk(String streamId, String data, Callback callback) {
+        delegate.writeChunk(streamId, data, callback);
+    }
+
+    @ReactMethod
+    public void closeStream(String streamId, Callback callback) {
+        delegate.closeStream(streamId, callback);
+    }
+
+    @ReactMethod
+    public void removeSession(ReadableArray paths, Callback callback) {
+        delegate.removeSession(paths, callback);
+    }
+
+    @ReactMethod
+    public void readFile(final String path, final String encoding, final boolean transformFile, final Promise promise) {
+        delegate.readFile(path, encoding, transformFile, promise);
+    }
+
+    @ReactMethod
+    public void writeFileArray(final String path, final ReadableArray data, final boolean append, final Promise promise) {
+        delegate.writeFileArray(path, data, append, promise);
+    }
+
+    @ReactMethod
+    public void writeFile(final String path, final String encoding, final String data, final boolean transformFile, final boolean append, final Promise promise) {
+        delegate.writeFile(path, encoding, data, transformFile, append, promise);
+    }
+
+    @ReactMethod
+    public void lstat(String path, Callback callback) {
+        delegate.lstat(path, callback);
+    }
+
+    @ReactMethod
+    public void stat(String path, Callback callback) {
+        delegate.stat(path, callback);
+    }
+
+    @ReactMethod
+    public void scanFile(final ReadableArray pairs, final Callback callback) {
+        delegate.scanFile(pairs, callback);
+    }
+
+    @ReactMethod
+    public void hash(final String path, final String algorithm, final Promise promise) {
+        delegate.hash(path, algorithm, promise);
+    }
+
+    /**
+     * @param path       Stream file path
+     * @param encoding   Stream encoding, should be one of `base64`, `ascii`, and `utf8`
+     * @param bufferSize Stream buffer size, default to 4096 or 4095(base64).
+     */
+    @ReactMethod
+    public void readStream(final String path, final String encoding, final int bufferSize, final int tick, final String streamId) {
+        delegate.readStream(path, encoding, bufferSize, tick, streamId);
+    }
+
+    @ReactMethod
+    public void cancelRequest(String taskId, Callback callback) {
+        delegate.cancelRequest(taskId, callback);
+    }
+
+    @ReactMethod
+    public void slice(String src, String dest, int start, int end, Promise promise) {
+        delegate.slice(src, dest, start, end, promise);
+    }
+
+    @ReactMethod
+    public void enableProgressReport(String taskId, int interval, int count) {
+        delegate.enableProgressReport(taskId, interval, count);
+    }
+
+    @ReactMethod
+    public void df(final Callback callback) {
+        delegate.df(callback);
+    }
+
+
+    @ReactMethod
+    public void enableUploadProgressReport(String taskId, int interval, int count) {
+        delegate.enableUploadProgressReport(taskId, interval, count);
+    }
+
+    @ReactMethod
+    public void fetchBlob(ReadableMap options, String taskId, String method, String url, ReadableMap headers, String body, final Callback callback) {
+        delegate.fetchBlob(options, taskId, method, url, headers, body, callback);
+    }
+
+    @ReactMethod
+    public void fetchBlobForm(ReadableMap options, String taskId, String method, String url, ReadableMap headers, ReadableArray body, final Callback callback) {
+        delegate.fetchBlobForm(options, taskId, method, url, headers, body, callback);
+    }
+
+    @ReactMethod
+    public void getContentIntent(String mime, Promise promise) {
+        delegate.getContentIntent(mime, promise);
+    }
+
+    @ReactMethod
+    public void addCompleteDownload(ReadableMap config, Promise promise) {
+        delegate.addCompleteDownload(config, promise);
+    }
+
+    @ReactMethod
+    public void getSDCardDir(Promise promise) {
+        delegate.getSDCardDir(promise);
+    }
+
+    @ReactMethod
+    public void getSDCardApplicationDir(Promise promise) {
+        delegate.getSDCardApplicationDir(promise);
+    }
+
+    @ReactMethod
+    public void createMediaFile(ReadableMap filedata, String mt, Promise promise) {
+        delegate.createMediaFile(filedata, mt, promise);
+    }
+
+    @ReactMethod
+    public void writeToMediaFile(String fileUri, String path, boolean transformFile, Promise promise) {
+        delegate.writeToMediaFile(fileUri, path, transformFile, promise);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.Q)
+    @ReactMethod
+    public void copyToInternal(String contentUri, String destpath, Promise promise) {
+        delegate.copyToInternal(contentUri, destpath, promise);
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.Q)
+    @ReactMethod
+    public void getBlob(String contentUri, String encoding, Promise promise) {
+        delegate.getBlob(contentUri, encoding, promise);
+    }
+
+    @ReactMethod
+    public void copyToMediaStore(ReadableMap filedata, String mt, String path, Promise promise) {
+        delegate.copyToMediaStore(filedata, mt, path, promise);
+    }
+}

package/android.js

@@ -2,9 +2,8 @@
 // Use of this source code is governed by a MIT-style license that can be
 // found in the LICENSE file.
 
-import { NativeModules, Platform } from 'react-native';
-
-const ReactNativeBlobUtil = NativeModules.ReactNativeBlobUtil;
+import { Platform } from 'react-native';
+import ReactNativeBlobUtil from './codegenSpecs/NativeBlobUtils';
 
 /**
  * Send an intent to open the file.

package/class/ReactNativeBlobUtilFile.js

@@ -2,16 +2,4 @@
 // Use of this source code is governed by a MIT-style license that can be
 // found in the LICENSE file.
 
-
-import {
-  NativeModules,
-  DeviceEventEmitter,
-  NativeAppEventEmitter,
-} from 'react-native';
-
-const ReactNativeBlobUtil = NativeModules.ReactNativeBlobUtil;
-const emitter = DeviceEventEmitter;
-
-export default class ReactNativeBlobUtilFile {
-
-}
+export default class ReactNativeBlobUtilFile {}

package/class/ReactNativeBlobUtilReadStream.js

@@ -3,13 +3,12 @@
 // found in the LICENSE file.
 
 import {
-  NativeModules,
   DeviceEventEmitter,
   NativeAppEventEmitter,
 } from 'react-native';
 import UUID from '../utils/uuid';
 
-const ReactNativeBlobUtil = NativeModules.ReactNativeBlobUtil;
+import ReactNativeBlobUtil from "../codegenSpecs/NativeBlobUtils";
 const emitter = DeviceEventEmitter;
 
 export default class ReactNativeBlobUtilReadStream {

package/class/ReactNativeBlobUtilSession.js

@@ -3,12 +3,11 @@
 // found in the LICENSE file.
 
 import {
- NativeModules,
  DeviceEventEmitter,
  NativeAppEventEmitter,
 } from 'react-native';
 
-const ReactNativeBlobUtil = NativeModules.ReactNativeBlobUtil;
+import ReactNativeBlobUtil from "../codegenSpecs/NativeBlobUtils";
 
 let sessions = {};
 

package/class/ReactNativeBlobUtilWriteStream.js

@@ -3,13 +3,11 @@
 // found in the LICENSE file.
 
 import {
- NativeModules,
  DeviceEventEmitter,
  NativeAppEventEmitter,
 } from 'react-native';
 
-const ReactNativeBlobUtil = NativeModules.ReactNativeBlobUtil;
-
+import ReactNativeBlobUtil from "../codegenSpecs/NativeBlobUtils";
 export default class ReactNativeBlobUtilWriteStream {
 
   id : string;