react-native-blob-util 0.24.9 → 0.24.10

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

@@ -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/ios/ReactNativeBlobUtilRequest.mm

@@ -241,6 +241,52 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
     }
 }
 
+- (BOOL)copyDownloadedFile:(NSURL *)sourceURL toPath:(NSString *)targetPath append:(BOOL)append
+{
+    NSInputStream *inputStream = [NSInputStream inputStreamWithURL:sourceURL];
+    NSOutputStream *outputStream = [NSOutputStream outputStreamToFileAtPath:targetPath append:append];
+
+    if (!inputStream || !outputStream) {
+        return NO;
+    }
+
+    [inputStream open];
+    [outputStream open];
+
+    uint8_t buffer[65536];
+    BOOL success = YES;
+
+    while ([inputStream hasBytesAvailable]) {
+        NSInteger bytesRead = [inputStream read:buffer maxLength:sizeof(buffer)];
+        if (bytesRead < 0) {
+            success = NO;
+            break;
+        }
+        if (bytesRead == 0) {
+            break;
+        }
+
+        NSInteger bytesWritten = 0;
+        while (bytesWritten < bytesRead) {
+            NSInteger writeResult = [outputStream write:&buffer[bytesWritten] maxLength:(NSUInteger)(bytesRead - bytesWritten)];
+            if (writeResult <= 0) {
+                success = NO;
+                break;
+            }
+            bytesWritten += writeResult;
+        }
+
+        if (!success) {
+            break;
+        }
+    }
+
+    [inputStream close];
+    [outputStream close];
+
+    return success;
+}
+
 
 #pragma mark - Received Response
 // set expected content length on response received
@@ -558,10 +604,40 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
 - (void)URLSession:(NSURLSession *)session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location {
 
     NSFileManager *fm = [NSFileManager defaultManager];
-    NSData *data = [fm contentsAtPath:location.path];
+    if (respFile && ![self ShouldTransformFile]) {
+        if (writeStream) {
+            [writeStream close];
+            writeStream = nil;
+        }
 
-    [self configureWriteStream];
+        NSString *folder = [destPath stringByDeletingLastPathComponent];
+        if (![fm fileExistsAtPath:folder]) {
+            [fm createDirectoryAtPath:folder withIntermediateDirectories:YES attributes:NULL error:nil];
+        }
+
+        BOOL overwrite = [options valueForKey:@"overwrite"] == nil ? YES : [[options valueForKey:@"overwrite"] boolValue];
+        BOOL appendToExistingFile = [destPath containsString:@"?append=true"] || !overwrite;
+        NSString *normalizedDestPath = [destPath stringByReplacingOccurrencesOfString:@"?append=true" withString:@""];
+        destPath = normalizedDestPath;
+
+        if (!appendToExistingFile && [fm fileExistsAtPath:destPath]) {
+            [fm removeItemAtPath:destPath error:nil];
+        }
+
+        if (!appendToExistingFile) {
+            NSError *moveError = nil;
+            if ([fm moveItemAtURL:location toURL:[NSURL fileURLWithPath:destPath] error:&moveError]) {
+                return;
+            }
+        }
 
+        if ([self copyDownloadedFile:location toPath:destPath append:appendToExistingFile]) {
+            return;
+        }
+    }
+
+    NSData *data = [fm contentsAtPath:location.path];
+    [self configureWriteStream];
     [self processData:data];
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "react-native-blob-util",
-    "version": "0.24.9",
+    "version": "0.24.10",
     "description": "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
     "main": "index",
     "scripts": {
@@ -13,8 +13,8 @@
         "e2e:all": "node tests/e2e/run-all.js"
     },
     "dependencies": {
-        "base-64": "0.1.0",
-        "glob": "13.0.1"
+        "base-64": "1.0.0",
+        "glob": "13.0.6"
     },
     "keywords": [
         "react-native",
@@ -48,18 +48,18 @@
         "wkh237 <xeiyan@gmail.com>"
     ],
     "devDependencies": {
-        "@typescript-eslint/eslint-plugin": "^8.46.4",
-        "@typescript-eslint/parser": "^8.46.4",
-        "appium-uiautomator2-driver": "^7.0.0",
+        "@typescript-eslint/eslint-plugin": "^8.61.1",
+        "@typescript-eslint/parser": "^8.61.1",
+        "appium-uiautomator2-driver": "^7.6.2",
         "eslint": "^8.57.1",
         "eslint-plugin-ft-flow": "^3.0.11",
         "eslint-plugin-import": "^2.32.0",
         "eslint-plugin-react": "^7.37.5",
         "eslint-plugin-react-native": "^5.0.0",
-        "react": "19.0.0",
-        "react-native": "0.78.2",
-        "react-native-windows": "0.78.2",
-        "webdriverio": "^8.41.0"
+        "react": "19.2.3",
+        "react-native": "0.84.1",
+        "react-native-windows": "0.84.0",
+        "webdriverio": "^9.29.0"
     },
     "peerDependencies": {
         "react": "*",

package/utils/uuid.js

@@ -1,11 +1,11 @@
-function getUUID() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
-    const r = Math.floor(Math.random() * 16);
-    const v = c === 'x' ? r : (r & 0x3) | 0x8;
-
-    return v.toString(16);
-  });
-}
-
-export {getUUID};
-export default getUUID;
+function getUUID() {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
+    const r = Math.floor(Math.random() * 16);
+    const v = c === 'x' ? r : (r & 0x3) | 0x8;
+
+    return v.toString(16);
+  });
+}
+
+export {getUUID};
+export default getUUID;