react-native-blob-util 0.24.9 → 0.24.11

package/.claude/settings.local.json

@@ -0,0 +1,9 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm view *)",
+      "Bash(npm install *)",
+      "Bash(git -C tests/e2e/android-app diff --stat package-lock.json)"
+    ]
+  }
+}

package/android/build.gradle

@@ -63,7 +63,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {
@@ -168,4 +168,4 @@ afterEvaluate { project ->
             }
         }
     }
-}
+}

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

@@ -29,6 +29,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.ByteArrayOutputStream;
 import java.security.MessageDigest;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -251,41 +252,27 @@ class ReactNativeBlobUtilFS {
             path = resolved;
         try {
             byte[] bytes;
-            int bytesRead;
-            int length;  // max. array length limited to "int", also see https://stackoverflow.com/a/10787175/544779
 
             if (resolved != null && resolved.startsWith(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET)) {
                 String assetName = path.replace(ReactNativeBlobUtilConst.FILE_PREFIX_BUNDLE_ASSET, "");
-                // This fails should an asset file be >2GB
-                InputStream in = ReactNativeBlobUtilImpl.RCTContext.getAssets().open(assetName);
-                length = in.available();
-                bytes = new byte[length];
-                bytesRead = in.read(bytes, 0, length);
-                in.close();
+                try (InputStream in = ReactNativeBlobUtilImpl.RCTContext.getAssets().open(assetName)) {
+                    bytes = readBytesWithLimit(in);
+                }
             }
             // issue 287
             else if (resolved == null) {
-                InputStream in = ReactNativeBlobUtilImpl.RCTContext.getContentResolver().openInputStream(Uri.parse(path));
-                // TODO See https://developer.android.com/reference/java/io/InputStream.html#available()
-                // Quote: "Note that while some implementations of InputStream will return the total number of bytes
-                // in the stream, many will not. It is never correct to use the return value of this method to
-                // allocate a buffer intended to hold all data in this stream."
-                length = in.available();
-                bytes = new byte[length];
-                bytesRead = in.read(bytes);
-                in.close();
+                try (InputStream in = ReactNativeBlobUtilImpl.RCTContext.getContentResolver().openInputStream(Uri.parse(path))) {
+                    if (in == null) {
+                        promise.reject("ENOENT", "No such file '" + path + "'");
+                        return;
+                    }
+                    bytes = readBytesWithLimit(in);
+                }
             } else {
                 File f = new File(path);
-                length = (int) f.length();
-                bytes = new byte[length];
-                FileInputStream in = new FileInputStream(f);
-                bytesRead = in.read(bytes);
-                in.close();
-            }
-
-            if (bytesRead < length) {
-                promise.reject("EUNSPECIFIED", "Read only " + bytesRead + " bytes of " + length);
-                return;
+                try (FileInputStream in = new FileInputStream(f)) {
+                    bytes = readBytesWithLimit(in);
+                }
             }
 
             if (transformFile) {
@@ -326,6 +313,18 @@ class ReactNativeBlobUtilFS {
 
     }
 
+    private static byte[] readBytesWithLimit(InputStream in) throws IOException {
+        byte[] buffer = new byte[10240];
+        ByteArrayOutputStream output = new ByteArrayOutputStream();
+        int read;
+
+        while ((read = in.read(buffer)) != -1) {
+            output.write(buffer, 0, read);
+        }
+
+        return output.toByteArray();
+    }
+
     /**
      * Static method that returns system folders to JS context
      *

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

@@ -217,7 +217,7 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                             cursor.close();
 
                             ReactNativeBlobUtilProgressConfig reportConfig = getReportProgress(taskId);
-                            float progress = (total > 0) ? written / total : 0;
+                            float progress = (total > 0) ? (float) written / total : 0;
 
                             if (reportConfig != null && reportConfig.shouldReport(progress /* progress */)) {
                                 WritableMap args = Arguments.createMap();
@@ -617,6 +617,14 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
 
             if (options.timeout >= 0) {
                 clientBuilder.connectTimeout(options.timeout, TimeUnit.MILLISECONDS);
+            }
+            // For file-to-disk downloads use no read timeout: the 60-second default
+            // can fire on slow connections before a large file finishes transferring.
+            // Individual socket reads on a healthy connection take milliseconds, so
+            // there is no risk of hanging indefinitely; the user can always cancel().
+            if (responseType == ResponseType.FileStorage) {
+                clientBuilder.readTimeout(0, TimeUnit.MILLISECONDS);
+            } else if (options.timeout >= 0) {
                 clientBuilder.readTimeout(options.timeout, TimeUnit.MILLISECONDS);
             }
 
@@ -781,11 +789,18 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
             case FileStorage:
                 ResponseBody responseBody = resp.body();
 
+                // Drain via byteStream() — avoids OkHttp's bytes() check that rejects
+                // content-length > Integer.MAX_VALUE (2 GB). ProgressReportingSource.read()
+                // writes each chunk to disk as a side-effect. Closing the stream flushes
+                // and closes the FileOutputStream that holds the destination file.
                 try {
-                    // In order to write response data to `destPath` we have to invoke this method.
-                    // It uses customized response body which is able to report download progress
-                    // and write response data to destination path.
-                    responseBody.bytes();
+                    java.io.InputStream drainStream = responseBody.byteStream();
+                    try {
+                        byte[] drainBuf = new byte[65536];
+                        while (drainStream.read(drainBuf) != -1) { }
+                    } finally {
+                        try { drainStream.close(); } catch (Exception ignored2) { }
+                    }
                 } catch (Exception ignored) {
 //                    ignored.printStackTrace();
                 }

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

@@ -67,7 +67,7 @@ public class ReactNativeBlobUtilDefaultResp extends ResponseBody {
             bytesRead += read > 0 ? read : 0;
             ReactNativeBlobUtilProgressConfig reportConfig = ReactNativeBlobUtilReq.getReportProgress(mTaskId);
             long cLen = contentLength();
-            if (reportConfig != null && cLen != 0 && reportConfig.shouldReport(bytesRead / contentLength())) {
+            if (reportConfig != null && cLen != 0 && reportConfig.shouldReport(cLen > 0 ? (float) bytesRead / cLen : 0)) {
                 WritableMap args = Arguments.createMap();
                 args.putString("taskId", mTaskId);
                 args.putString("written", String.valueOf(bytesRead));

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

@@ -123,6 +123,11 @@ public class ReactNativeBlobUtilFileResp extends ResponseBody {
                 bytesDownloaded += read > 0 ? read : 0;
                 if (read > 0) {
                     ofStream.write(bytes, 0, (int) read);
+                    // Forward bytes into the Okio sink too. Without this the buffer
+                    // stays empty and buffered consumers (byteStream()/source().read())
+                    // hit a false EOF after the first 8 KB segment, so any file larger
+                    // than one segment fails with "Download interrupted." (0.24.10 regression).
+                    sink.write(bytes, 0, (int) read);
                 } else if (contentLength() == -1 && read == -1) {
                     // End marker has been received for chunked download
                     isEndMarkerReceived = true;
@@ -133,7 +138,7 @@ public class ReactNativeBlobUtilFileResp extends ResponseBody {
 
                     // 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);
+                    float progress = (contentLength() != -1) ? (float) bytesDownloaded / contentLength() : ((isEndMarkerReceived) ? 1 : 0);
 
                     if (reportConfig != null && reportConfig.shouldReport(progress /* progress */)) {
                         if (contentLength() != -1) {