react-native-blob-util 0.24.6 → 0.24.8

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

@@ -149,51 +149,56 @@ public class ReactNativeBlobUtilStream {
      */
     void writeStream(String path, String encoding, boolean append, Callback callback) {
         String resolved = ReactNativeBlobUtilUtils.normalizePath(path);
-        if (resolved != null)
-            path = resolved;
-
-        try {
-            File dest = new File(path);
-            File dir = dest.getParentFile();
-
-            if (resolved != null && !dest.exists()) {
-                if (dir != null && !dir.exists()) {
-                    if (!dir.mkdirs()) {
-                        callback.invoke("ENOTDIR", "Failed to create parent directory of '" + path + "'");
-                        return;
-                    }
-                }
-                if (!dest.createNewFile()) {
-                    callback.invoke("ENOENT", "File '" + path + "' does not exist and could not be created");
-                    return;
-                }
-            } else if (dest.isDirectory()) {
-                callback.invoke("EISDIR", "Expecting a file but '" + path + "' is a directory");
-                return;
-            }
-
-            OutputStream fs;
-            if (resolved != null && path.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET)) {
-                fs = ReactNativeBlobUtilImpl.RCTContext.getAssets().openFd(path.replace(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET, "")).createOutputStream ();
-            }
-            // fix issue 287
-            else if (resolved == null) {
-                fs = ReactNativeBlobUtilImpl.RCTContext.getContentResolver().openOutputStream(Uri.parse(path));
-            } else {
-                fs = new FileOutputStream(path, append);
-            }
-            this.encoding = encoding;
-            String streamId = UUID.randomUUID().toString();
-            ReactNativeBlobUtilStream.fileStreams.put(streamId, this);
-            this.writeStreamInstance = fs;
+        if (resolved != null)
+            path = resolved;
+
+        try {
+            OutputStream fs;
+            if (resolved != null && path.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET)) {
+                fs = ReactNativeBlobUtilImpl.RCTContext.getAssets().openFd(path.replace(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET, "")).createOutputStream ();
+            }
+            // fix issue 287
+            else if (resolved == null) {
+                fs = ReactNativeBlobUtilImpl.RCTContext.getContentResolver().openOutputStream(Uri.parse(path));
+            } else {
+                File dest = prepareOutputFile(path);
+                fs = new FileOutputStream(dest, append);
+            }
+            this.encoding = encoding;
+            String streamId = UUID.randomUUID().toString();
+            ReactNativeBlobUtilStream.fileStreams.put(streamId, this);
+            this.writeStreamInstance = fs;
             callback.invoke(null, null, streamId);
         } catch (Exception err) {
-            callback.invoke("EUNSPECIFIED", "Failed to create write stream at path `" + path + "`; " + err.getLocalizedMessage());
-        }
-    }
-
-    /**
-     * Write a chunk of data into a file stream.
+            callback.invoke("EUNSPECIFIED", "Failed to create write stream at path `" + path + "`; " + err.getLocalizedMessage());
+        }
+    }
+
+    private static File prepareOutputFile(String path) throws IOException {
+        File file = new File(path).getCanonicalFile();
+        File parent = file.getParentFile();
+
+        if (parent == null) {
+            throw new IOException("Invalid output path: " + path);
+        }
+
+        if (!parent.exists() && !parent.mkdirs() && !parent.exists()) {
+            throw new IOException("Failed to create parent directory of '" + path + "'");
+        }
+
+        if (file.exists() && file.isDirectory()) {
+            throw new IOException("Expecting a file but '" + path + "' is a directory");
+        }
+
+        if (!file.exists() && !file.createNewFile() && !file.exists()) {
+            throw new IOException("File '" + path + "' does not exist and could not be created");
+        }
+
+        return file;
+    }
+
+    /**
+     * Write a chunk of data into a file stream.
      *
      * @param streamId File stream ID
      * @param data     Data chunk in string format

package/android/src/main/java/com/ReactNativeBlobUtil/Response/ReactNativeBlobUtilDefaultResp.java

@@ -1,98 +1,98 @@
-package com.ReactNativeBlobUtil.Response;
-
-import com.ReactNativeBlobUtil.ReactNativeBlobUtilConst;
-import com.ReactNativeBlobUtil.ReactNativeBlobUtilProgressConfig;
-import com.ReactNativeBlobUtil.ReactNativeBlobUtilReq;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-
-import java.io.IOException;
-import java.nio.charset.Charset;
-
-import okhttp3.MediaType;
-import okhttp3.ResponseBody;
-import okio.Buffer;
-import okio.BufferedSource;
-import okio.Okio;
-import okio.Source;
-import okio.Timeout;
-
-/**
- * Created by wkh237 on 2016/7/11.
- */
-public class ReactNativeBlobUtilDefaultResp extends ResponseBody {
-
-    String mTaskId;
-    ReactApplicationContext rctContext;
-    ResponseBody originalBody;
-    boolean isIncrement = false;
-
-    public ReactNativeBlobUtilDefaultResp(ReactApplicationContext ctx, String taskId, ResponseBody body, boolean isIncrement) {
-        this.rctContext = ctx;
-        this.mTaskId = taskId;
-        this.originalBody = body;
-        this.isIncrement = isIncrement;
-    }
-
-    @Override
-    public MediaType contentType() {
-        return originalBody.contentType();
-    }
-
-    @Override
-    public long contentLength() {
-        return originalBody.contentLength();
-    }
-
-    @Override
-    public BufferedSource source() {
-        return Okio.buffer(new ProgressReportingSource(originalBody.source()));
-    }
-
-    private class ProgressReportingSource implements Source {
-
-        BufferedSource mOriginalSource;
-        long bytesRead = 0;
-
-        ProgressReportingSource(BufferedSource originalSource) {
-            mOriginalSource = originalSource;
-        }
-
-        @Override
-        public long read(Buffer sink, long byteCount) throws IOException {
-
-            long read = mOriginalSource.read(sink, byteCount);
-            bytesRead += read > 0 ? read : 0;
-            ReactNativeBlobUtilProgressConfig reportConfig = ReactNativeBlobUtilReq.getReportProgress(mTaskId);
-            long cLen = contentLength();
-            if (reportConfig != null && cLen != 0 && reportConfig.shouldReport(bytesRead / contentLength())) {
-                WritableMap args = Arguments.createMap();
-                args.putString("taskId", mTaskId);
-                args.putString("written", String.valueOf(bytesRead));
-                args.putString("total", String.valueOf(contentLength()));
-                if (isIncrement) {
-                    args.putString("chunk", sink.readString(Charset.defaultCharset()));
-                } else {
-                    args.putString("chunk", "");
-                }
-
-                rctContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                        .emit(ReactNativeBlobUtilConst.EVENT_PROGRESS, args);
-            }
-            return read;
-        }
-
-        @Override
-        public Timeout timeout() {
-            return null;
-        }
-
-        @Override
-        public void close() throws IOException {
-
-        }
-    }
-
-}
+package com.ReactNativeBlobUtil.Response;
+
+import com.ReactNativeBlobUtil.ReactNativeBlobUtilConst;
+import com.ReactNativeBlobUtil.ReactNativeBlobUtilProgressConfig;
+import com.ReactNativeBlobUtil.ReactNativeBlobUtilReq;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+
+import okhttp3.MediaType;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+import okio.BufferedSource;
+import okio.Okio;
+import okio.Source;
+import okio.Timeout;
+
+/**
+ * Created by wkh237 on 2016/7/11.
+ */
+public class ReactNativeBlobUtilDefaultResp extends ResponseBody {
+
+    String mTaskId;
+    ReactApplicationContext rctContext;
+    ResponseBody originalBody;
+    boolean isIncrement = false;
+
+    public ReactNativeBlobUtilDefaultResp(ReactApplicationContext ctx, String taskId, ResponseBody body, boolean isIncrement) {
+        this.rctContext = ctx;
+        this.mTaskId = taskId;
+        this.originalBody = body;
+        this.isIncrement = isIncrement;
+    }
+
+    @Override
+    public MediaType contentType() {
+        return originalBody.contentType();
+    }
+
+    @Override
+    public long contentLength() {
+        return originalBody.contentLength();
+    }
+
+    @Override
+    public BufferedSource source() {
+        return Okio.buffer(new ProgressReportingSource(originalBody.source()));
+    }
+
+    private class ProgressReportingSource implements Source {
+
+        BufferedSource mOriginalSource;
+        long bytesRead = 0;
+
+        ProgressReportingSource(BufferedSource originalSource) {
+            mOriginalSource = originalSource;
+        }
+
+        @Override
+        public long read(Buffer sink, long byteCount) throws IOException {
+
+            long read = mOriginalSource.read(sink, byteCount);
+            bytesRead += read > 0 ? read : 0;
+            ReactNativeBlobUtilProgressConfig reportConfig = ReactNativeBlobUtilReq.getReportProgress(mTaskId);
+            long cLen = contentLength();
+            if (reportConfig != null && cLen != 0 && reportConfig.shouldReport(bytesRead / contentLength())) {
+                WritableMap args = Arguments.createMap();
+                args.putString("taskId", mTaskId);
+                args.putString("written", String.valueOf(bytesRead));
+                args.putString("total", String.valueOf(contentLength()));
+                if (isIncrement) {
+                    args.putString("chunk", sink.readString(Charset.defaultCharset()));
+                } else {
+                    args.putString("chunk", "");
+                }
+
+                rctContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                        .emit(ReactNativeBlobUtilConst.EVENT_PROGRESS, args);
+            }
+            return read;
+        }
+
+        @Override
+        public Timeout timeout() {
+            return null;
+        }
+
+        @Override
+        public void close() throws IOException {
+
+        }
+    }
+
+}

package/android/src/main/java/com/ReactNativeBlobUtil/Response/ReactNativeBlobUtilFileResp.java

@@ -1,166 +1,183 @@
-package com.ReactNativeBlobUtil.Response;
-
-import androidx.annotation.NonNull;
-
-import com.ReactNativeBlobUtil.ReactNativeBlobUtilConst;
-import com.ReactNativeBlobUtil.ReactNativeBlobUtilProgressConfig;
-import com.ReactNativeBlobUtil.ReactNativeBlobUtilReq;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import okhttp3.MediaType;
-import okhttp3.ResponseBody;
-import okio.Buffer;
-import okio.BufferedSource;
-import okio.Okio;
-import okio.Source;
-import okio.Timeout;
-
-/**
- * Created by wkh237 on 2016/7/11.
- */
-public class ReactNativeBlobUtilFileResp extends ResponseBody {
-
-    String mTaskId;
-    ResponseBody originalBody;
-    String mPath;
-    long bytesDownloaded = 0;
-    ReactApplicationContext rctContext;
-    FileOutputStream ofStream;
-    boolean isEndMarkerReceived;
-
-    public ReactNativeBlobUtilFileResp(ResponseBody body) {
-        super();
-        this.originalBody = body;
-    }
-
-    public ReactNativeBlobUtilFileResp(ReactApplicationContext ctx, String taskId, ResponseBody body, String path, boolean overwrite) throws IOException {
-        super();
-        this.rctContext = ctx;
-        this.mTaskId = taskId;
-        this.originalBody = body;
-        assert path != null;
-        this.mPath = path;
-        this.isEndMarkerReceived = false;
-        if (path != null) {
-            boolean appendToExistingFile = !overwrite;
-            path = path.replace("?append=true", "");
-            mPath = path;
-            File f = new File(path);
-
-            File parent = f.getParentFile();
-            if (parent != null && !parent.exists() && !parent.mkdirs()) {
-                throw new IllegalStateException("Couldn't create dir: " + parent);
-            }
-
-            if (!f.exists())
-                f.createNewFile();
-            ofStream = new FileOutputStream(new File(path), appendToExistingFile);
-        }
-    }
-
-    @Override
-    public MediaType contentType() {
-        return originalBody.contentType();
-    }
-
-    @Override
-    public long contentLength() {
-
-        /**
-         * 
-         * Okio buffer issue in current version seems to be fixed in the latest versions
-         * 
-         * limiting this was causing the download progress to stop at 2GB size but files still was downloading
-         * 
-         */
-
-        // if (originalBody.contentLength() > Integer.MAX_VALUE) {
-            // This is a workaround for a bug Okio buffer where it can't handle larger than int.
-            // return Integer.MAX_VALUE;
-        // }
-        return originalBody.contentLength();
-    }
-
-    public boolean isDownloadComplete() {
-        return (bytesDownloaded == contentLength()) // Case of non-chunked downloads
-                || (contentLength() == -1 && isEndMarkerReceived); // Case of chunked downloads
-    }
-
-    @Override
-    public BufferedSource source() {
-        ProgressReportingSource countable = new ProgressReportingSource();
-        return Okio.buffer(countable);
-    }
-
-    private class ProgressReportingSource implements Source {
-        @Override
-        public long read(@NonNull Buffer sink, long byteCount) throws IOException {
-            try {
-                byte[] bytes = new byte[(int) byteCount];
-                long read = originalBody.byteStream().read(bytes, 0, (int) byteCount);
-                bytesDownloaded += read > 0 ? read : 0;
-                if (read > 0) {
-                    ofStream.write(bytes, 0, (int) read);
-                } else if (contentLength() == -1 && read == -1) {
-                    // End marker has been received for chunked download
-                    isEndMarkerReceived = true;
-                }
-                ReactNativeBlobUtilProgressConfig reportConfig = ReactNativeBlobUtilReq.getReportProgress(mTaskId);
-
-                if (contentLength() != 0) {
-
-                    // For non-chunked download, progress is received / total
-                    // For chunked download, progress can be either 0 (started) or 1 (ended)
-                    float progress = (contentLength() != -1) ? bytesDownloaded / contentLength() : ((isEndMarkerReceived) ? 1 : 0);
-
-                    if (reportConfig != null && reportConfig.shouldReport(progress /* progress */)) {
-                        if (contentLength() != -1) {
-                            // For non-chunked downloads
-                            reportProgress(mTaskId, bytesDownloaded, contentLength());
-                        } else {
-                            // For chunked downloads
-                            if (!isEndMarkerReceived) {
-                                reportProgress(mTaskId, 0, contentLength());
-                            } else {
-                                reportProgress(mTaskId, bytesDownloaded, bytesDownloaded);
-                            }
-                        }
-                    }
-
-                }
-
-                return read;
-            } catch (Exception ex) {
-                return -1;
-            }
-        }
-
-        private void reportProgress(String taskId, long bytesDownloaded, long contentLength) {
-            WritableMap args = Arguments.createMap();
-            args.putString("taskId", taskId);
-            args.putString("written", String.valueOf(bytesDownloaded));
-            args.putString("total", String.valueOf(contentLength));
-            rctContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                    .emit(ReactNativeBlobUtilConst.EVENT_PROGRESS, args);
-        }
-
-        @Override
-        public Timeout timeout() {
-            return null;
-        }
-
-        @Override
-        public void close() throws IOException {
-            ofStream.close();
-
-        }
-    }
-
-}
+package com.ReactNativeBlobUtil.Response;
+
+import androidx.annotation.NonNull;
+
+import com.ReactNativeBlobUtil.ReactNativeBlobUtilConst;
+import com.ReactNativeBlobUtil.ReactNativeBlobUtilProgressConfig;
+import com.ReactNativeBlobUtil.ReactNativeBlobUtilReq;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+import okhttp3.MediaType;
+import okhttp3.ResponseBody;
+import okio.Buffer;
+import okio.BufferedSource;
+import okio.Okio;
+import okio.Source;
+import okio.Timeout;
+
+/**
+ * Created by wkh237 on 2016/7/11.
+ */
+public class ReactNativeBlobUtilFileResp extends ResponseBody {
+
+    String mTaskId;
+    ResponseBody originalBody;
+    String mPath;
+    long bytesDownloaded = 0;
+    ReactApplicationContext rctContext;
+    FileOutputStream ofStream;
+    boolean isEndMarkerReceived;
+
+    public ReactNativeBlobUtilFileResp(ResponseBody body) {
+        super();
+        this.originalBody = body;
+    }
+
+    public ReactNativeBlobUtilFileResp(ReactApplicationContext ctx, String taskId, ResponseBody body, String path, boolean overwrite) throws IOException {
+        super();
+        this.rctContext = ctx;
+        this.mTaskId = taskId;
+        this.originalBody = body;
+        assert path != null;
+        this.mPath = path;
+        this.isEndMarkerReceived = false;
+        if (path != null) {
+            boolean appendToExistingFile = !overwrite;
+            path = path.replace("?append=true", "");
+            mPath = path;
+            File f = prepareOutputFile(path);
+            ofStream = new FileOutputStream(f, appendToExistingFile);
+        }
+    }
+
+    private static File prepareOutputFile(String path) throws IOException {
+        File file = new File(path).getCanonicalFile();
+        File parent = file.getParentFile();
+
+        if (parent == null) {
+            throw new IOException("Invalid output path: " + path);
+        }
+
+        if (!parent.exists() && !parent.mkdirs() && !parent.exists()) {
+            throw new IOException("Couldn't create dir: " + parent);
+        }
+
+        if (file.exists() && file.isDirectory()) {
+            throw new IOException("Output path is a directory: " + file);
+        }
+
+        if (!file.exists() && !file.createNewFile() && !file.exists()) {
+            throw new IOException("Couldn't create file: " + file);
+        }
+
+        return file;
+    }
+
+    @Override
+    public MediaType contentType() {
+        return originalBody.contentType();
+    }
+
+    @Override
+    public long contentLength() {
+
+        /**
+         * 
+         * Okio buffer issue in current version seems to be fixed in the latest versions
+         * 
+         * limiting this was causing the download progress to stop at 2GB size but files still was downloading
+         * 
+         */
+
+        // if (originalBody.contentLength() > Integer.MAX_VALUE) {
+            // This is a workaround for a bug Okio buffer where it can't handle larger than int.
+            // return Integer.MAX_VALUE;
+        // }
+        return originalBody.contentLength();
+    }
+
+    public boolean isDownloadComplete() {
+        return (bytesDownloaded == contentLength()) // Case of non-chunked downloads
+                || (contentLength() == -1 && isEndMarkerReceived); // Case of chunked downloads
+    }
+
+    @Override
+    public BufferedSource source() {
+        ProgressReportingSource countable = new ProgressReportingSource();
+        return Okio.buffer(countable);
+    }
+
+    private class ProgressReportingSource implements Source {
+        @Override
+        public long read(@NonNull Buffer sink, long byteCount) throws IOException {
+            try {
+                byte[] bytes = new byte[(int) byteCount];
+                long read = originalBody.byteStream().read(bytes, 0, (int) byteCount);
+                bytesDownloaded += read > 0 ? read : 0;
+                if (read > 0) {
+                    ofStream.write(bytes, 0, (int) read);
+                } else if (contentLength() == -1 && read == -1) {
+                    // End marker has been received for chunked download
+                    isEndMarkerReceived = true;
+                }
+                ReactNativeBlobUtilProgressConfig reportConfig = ReactNativeBlobUtilReq.getReportProgress(mTaskId);
+
+                if (contentLength() != 0) {
+
+                    // For non-chunked download, progress is received / total
+                    // For chunked download, progress can be either 0 (started) or 1 (ended)
+                    float progress = (contentLength() != -1) ? bytesDownloaded / contentLength() : ((isEndMarkerReceived) ? 1 : 0);
+
+                    if (reportConfig != null && reportConfig.shouldReport(progress /* progress */)) {
+                        if (contentLength() != -1) {
+                            // For non-chunked downloads
+                            reportProgress(mTaskId, bytesDownloaded, contentLength());
+                        } else {
+                            // For chunked downloads
+                            if (!isEndMarkerReceived) {
+                                reportProgress(mTaskId, 0, contentLength());
+                            } else {
+                                reportProgress(mTaskId, bytesDownloaded, bytesDownloaded);
+                            }
+                        }
+                    }
+
+                }
+
+                return read;
+            } catch (IOException ex) {
+                throw ex;
+            } catch (Exception ex) {
+                throw new IOException(ex);
+            }
+        }
+
+        private void reportProgress(String taskId, long bytesDownloaded, long contentLength) {
+            WritableMap args = Arguments.createMap();
+            args.putString("taskId", taskId);
+            args.putString("written", String.valueOf(bytesDownloaded));
+            args.putString("total", String.valueOf(contentLength));
+            rctContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                    .emit(ReactNativeBlobUtilConst.EVENT_PROGRESS, args);
+        }
+
+        @Override
+        public Timeout timeout() {
+            return null;
+        }
+
+        @Override
+        public void close() throws IOException {
+            ofStream.close();
+
+        }
+    }
+
+}