react-native-blob-util 0.24.7 → 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/ReactNativeBlobUtilFileResp.java

@@ -52,17 +52,32 @@ public class ReactNativeBlobUtilFileResp extends ResponseBody {
             boolean appendToExistingFile = !overwrite;
             path = path.replace("?append=true", "");
             mPath = path;
-            File f = new File(path);
+            File f = prepareOutputFile(path);
+            ofStream = new FileOutputStream(f, appendToExistingFile);
+        }
+    }
 
-            File parent = f.getParentFile();
-            if (parent != null && !parent.exists() && !parent.mkdirs()) {
-                throw new IllegalStateException("Couldn't create dir: " + parent);
-            }
+    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 (!f.exists())
-                f.createNewFile();
-            ofStream = new FileOutputStream(new File(path), appendToExistingFile);
+        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
@@ -137,8 +152,10 @@ public class ReactNativeBlobUtilFileResp extends ResponseBody {
                 }
 
                 return read;
+            } catch (IOException ex) {
+                throw ex;
             } catch (Exception ex) {
-                return -1;
+                throw new IOException(ex);
             }
         }
 

package/class/ReactNativeBlobUtilReadStream.js

@@ -1,84 +1,84 @@
-// Copyright 2016 wkh237@github. All rights reserved.
-// Use of this source code is governed by a MIT-style license that can be
-// found in the LICENSE file.
-
-import {NativeEventEmitter} from 'react-native';
-import UUID from '../utils/uuid';
-
-import ReactNativeBlobUtil from '../codegenSpecs/NativeBlobUtils';
-
-const emitter = new NativeEventEmitter(ReactNativeBlobUtil);
-
-export default class ReactNativeBlobUtilReadStream {
-
-    path: string;
-    encoding: 'utf8' | 'ascii' | 'base64';
-    bufferSize: ?number;
-    closed: boolean;
-    tick: number = 10;
-
-    constructor(path: string, encoding: string, bufferSize?: ?number, tick: number) {
-        if (!path)
-            throw Error('ReactNativeBlobUtil could not open file stream with empty `path`');
-        this.encoding = encoding || 'utf8';
-        this.bufferSize = bufferSize;
-        this.path = path;
-        this.closed = false;
-        this.tick = tick;
-        this._onData = () => {
-        };
-        this._onEnd = () => {
-        };
-        this._onError = () => {
-        };
-        this.streamId = 'RNFBRS' + UUID();
-
-        // register for file stream event
-        let subscription = emitter.addListener('ReactNativeBlobUtilFilesystem', (e) => {
-            if (typeof e === 'string') e = JSON.parse(e);
-            if (e.streamId !== this.streamId) return; // wrong stream
-            let {event, code, detail} = e;
-            if (this._onData && event === 'data') {
-                this._onData(detail);
-                return;
-            }
-            else if (this._onEnd && event === 'end') {
-                this._onEnd(detail);
-            }
-            else {
-                const err = new Error(detail);
-                err.code = code || 'EUNSPECIFIED';
-                if (this._onError)
-                    this._onError(err);
-                else
-                    throw err;
-            }
-            // when stream closed or error, remove event handler
-            if (event === 'error' || event === 'end') {
-                subscription.remove();
-                this.closed = true;
-            }
-        });
-
-    }
-
-    open() {
-        if (!this.closed)
-            ReactNativeBlobUtil.readStream(this.path, this.encoding, this.bufferSize || 10240, this.tick || -1, this.streamId);
-        else
-            throw new Error('Stream closed');
-    }
-
-    onData(fn: () => void) {
-        this._onData = fn;
-    }
-
-    onError(fn) {
-        this._onError = fn;
-    }
-
-    onEnd(fn) {
-        this._onEnd = fn;
-    }
-
-}
+// Copyright 2016 wkh237@github. All rights reserved.
+// Use of this source code is governed by a MIT-style license that can be
+// found in the LICENSE file.
+
+import {NativeEventEmitter} from 'react-native';
+import UUID from '../utils/uuid';
+
+import ReactNativeBlobUtil from '../codegenSpecs/NativeBlobUtils';
+
+const emitter = new NativeEventEmitter(ReactNativeBlobUtil);
+
+export default class ReactNativeBlobUtilReadStream {
+
+    path: string;
+    encoding: 'utf8' | 'ascii' | 'base64';
+    bufferSize: ?number;
+    closed: boolean;
+    tick: number = 10;
+
+    constructor(path: string, encoding: string, bufferSize?: ?number, tick: number) {
+        if (!path)
+            throw Error('ReactNativeBlobUtil could not open file stream with empty `path`');
+        this.encoding = encoding || 'utf8';
+        this.bufferSize = bufferSize;
+        this.path = path;
+        this.closed = false;
+        this.tick = tick;
+        this._onData = () => {
+        };
+        this._onEnd = () => {
+        };
+        this._onError = () => {
+        };
+        this.streamId = 'RNFBRS' + UUID();
+
+        // register for file stream event
+        let subscription = emitter.addListener('ReactNativeBlobUtilFilesystem', (e) => {
+            if (typeof e === 'string') e = JSON.parse(e);
+            if (e.streamId !== this.streamId) return; // wrong stream
+            let {event, code, detail} = e;
+            if (this._onData && event === 'data') {
+                this._onData(detail);
+                return;
+            }
+            else if (this._onEnd && event === 'end') {
+                this._onEnd(detail);
+            }
+            else {
+                const err = new Error(detail);
+                err.code = code || 'EUNSPECIFIED';
+                if (this._onError)
+                    this._onError(err);
+                else
+                    throw err;
+            }
+            // when stream closed or error, remove event handler
+            if (event === 'error' || event === 'end') {
+                subscription.remove();
+                this.closed = true;
+            }
+        });
+
+    }
+
+    open() {
+        if (!this.closed)
+            ReactNativeBlobUtil.readStream(this.path, this.encoding, this.bufferSize || 10240, this.tick || -1, this.streamId);
+        else
+            throw new Error('Stream closed');
+    }
+
+    onData(fn: () => void) {
+        this._onData = fn;
+    }
+
+    onError(fn) {
+        this._onError = fn;
+    }
+
+    onEnd(fn) {
+        this._onEnd = fn;
+    }
+
+}

package/index.d.ts

@@ -3,9 +3,9 @@
 // Definitions by: MNB <https://github.com/MNBuyskih>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export const ReactNativeBlobUtil: ReactNativeBlobUtilStatic;
-export type ReactNativeBlobUtil = ReactNativeBlobUtilStatic;
+declare const ReactNativeBlobUtil: ReactNativeBlobUtilStatic;
 export default ReactNativeBlobUtil;
+export type ReactNativeBlobUtil = ReactNativeBlobUtilStatic;
 import { filedescriptor } from "./types";
 import CanceledFetchError from "./class/ReactNativeBlobUtilCanceledFetchError";
 
@@ -800,7 +800,7 @@ export interface AddAndroidDownloads {
     /**
      * If true android download manager will try to save the file to the apps Download direcotry
      */
-    storeLocal?: boolean
+    storeLocal?: boolean;
 }
 
 export interface ReactNativeBlobUtilResponseInfo {
@@ -878,4 +878,4 @@ export interface MediaCollection {
      * @param encoding
      */
     getBlob(contenturi: string, encoding: string): Promise<string>;
-}
+}

package/ios/ReactNativeBlobUtilNetwork.h

@@ -41,6 +41,7 @@
 - (void) cancelRequest:(NSString * _Nonnull)taskId;
 - (void) enableProgressReport:(NSString * _Nonnull) taskId config:(ReactNativeBlobUtilProgress * _Nullable)config;
 - (void) enableUploadProgress:(NSString * _Nonnull) taskId config:(ReactNativeBlobUtilProgress * _Nullable)config;
+- (void) removeRequestForTaskId:(NSString * _Nonnull)taskId;
 
 
 @end

package/ios/ReactNativeBlobUtilNetwork.mm

@@ -45,7 +45,7 @@ static void initialize_tables() {
 - (id)init {
     self = [super init];
     if (self) {
-        self.requestsTable = [NSMapTable mapTableWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableWeakMemory];
+        self.requestsTable = [NSMapTable mapTableWithKeyOptions:NSMapTableStrongMemory valueOptions:NSMapTableStrongMemory];
 
         self.taskQueue = [[NSOperationQueue alloc] init];
         self.taskQueue.qualityOfService = NSQualityOfServiceUtility;
@@ -85,8 +85,10 @@ static void initialize_tables() {
                 callback:callback];
 
     @synchronized([ReactNativeBlobUtilNetwork class]) {
-        [self.requestsTable setObject:request forKey:taskId];
-        [self checkProgressConfigForTask:taskId];
+        if (taskId != nil && request.task != nil) {
+            [self.requestsTable setObject:request forKey:taskId];
+            [self checkProgressConfigForTask:taskId];
+        }
     }
 }
 
@@ -138,6 +140,9 @@ static void initialize_tables() {
 
     @synchronized ([ReactNativeBlobUtilNetwork class]) {
         task = [self.requestsTable objectForKey:taskId].task;
+        [self.requestsTable removeObjectForKey:taskId];
+        [self.rebindProgressDict removeObjectForKey:taskId];
+        [self.rebindUploadProgressDict removeObjectForKey:taskId];
     }
 
     if (task && task.state == NSURLSessionTaskStateRunning) {
@@ -145,6 +150,15 @@ static void initialize_tables() {
     }
 }
 
+- (void) removeRequestForTaskId:(NSString *)taskId
+{
+    @synchronized ([ReactNativeBlobUtilNetwork class]) {
+        [self.requestsTable removeObjectForKey:taskId];
+        [self.rebindProgressDict removeObjectForKey:taskId];
+        [self.rebindUploadProgressDict removeObjectForKey:taskId];
+    }
+}
+
 // removing case from headers
 + (NSMutableDictionary *) normalizeHeaders:(NSDictionary *)headers
 {

package/ios/ReactNativeBlobUtilRequest.h

@@ -33,7 +33,7 @@
 @property (nullable, nonatomic) NSError * error;
 @property (nullable, nonatomic) ReactNativeBlobUtilProgress *progressConfig;
 @property (nullable, nonatomic) ReactNativeBlobUtilProgress *uploadProgressConfig;
-@property (nullable, nonatomic, weak) NSURLSessionTask *task;
+@property (nullable, strong, nonatomic) NSURLSessionTask *task;
 
 - (void) sendRequest:(NSDictionary  * _Nullable )options
        contentLength:(long)contentLength

package/ios/ReactNativeBlobUtilRequest.mm

@@ -11,6 +11,7 @@
 #import "ReactNativeBlobUtilFS.h"
 #import "ReactNativeBlobUtilConst.h"
 #import "ReactNativeBlobUtilFileTransformer.h"
+#import "ReactNativeBlobUtilNetwork.h"
 #import "ReactNativeBlobUtilReqBuilder.h"
 
 #import <CommonCrypto/CommonDigest.h>
@@ -489,6 +490,7 @@ typedef NS_ENUM(NSUInteger, ResponseFormat) {
                  }
              ]);
 
+    [[ReactNativeBlobUtilNetwork sharedInstance] removeRequestForTaskId:self.taskId];
     respData = nil;
     receivedBytes = 0;
     [session finishTasksAndInvalidate];

package/package.json

@@ -1,16 +1,24 @@
 {
-    "name" : "react-native-blob-util",
-    "version" : "0.24.7",
-    "description" : "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
-    "main" : "index",
-    "scripts" : {
-        "test" : "echo \"Error: no test specified\" && exit 1"
+    "name": "react-native-blob-util",
+    "version": "0.24.8",
+    "description": "A module provides upload, download, and files access API. Supports file stream read/write for process large files.",
+    "main": "index",
+    "scripts": {
+        "test": "echo \"Error: no test specified\" && exit 1",
+        "e2e:server": "node tests/e2e/server.js",
+        "e2e:android": "node tests/e2e/run-all.js --platforms android",
+        "e2e:ios": "node tests/e2e/run-all.js --platforms ios",
+        "e2e:windows": "node tests/e2e/run-all.js --platforms windows",
+        "e2e:runner": "node tests/e2e/appium/run.js",
+        "e2e:all": "node tests/e2e/run-all.js"
     },
-    "dependencies" : {
-        "base-64" : "0.1.0",
-        "glob" : "13.0.1"
+    "dependencies": {
+        "appium-uiautomator2-driver": "^7.0.0",
+        "base-64": "0.1.0",
+        "glob": "13.0.1",
+        "uuid" : "^13.0.0"
     },
-    "keywords" : [
+    "keywords": [
         "react-native",
         "fetch",
         "blob",
@@ -24,54 +32,55 @@
         "ios",
         "file system"
     ],
-    "repository" : {
-        "url" : "https://github.com/RonRadtke/react-native-blob-util"
+    "repository": {
+        "url": "https://github.com/RonRadtke/react-native-blob-util"
     },
-    "author" : {
-        "name" : "RonRadtke",
-        "username" : "RonRadtke"
+    "author": {
+        "name": "RonRadtke",
+        "username": "RonRadtke"
     },
     "funding": {
-    "type": "github",
-    "url": "https://github.com/sponsors/ronradtke"
+        "type": "github",
+        "url": "https://github.com/sponsors/ronradtke"
     },
-    "license" : "MIT",
-    "contributors" : [
+    "license": "MIT",
+    "contributors": [
         "Traviskn <>",
         "Ben <benhsieh@catchplay.com>",
         "wkh237 <xeiyan@gmail.com>"
     ],
-    "devDependencies" : {
+    "devDependencies": {
         "@typescript-eslint/eslint-plugin": "^8.46.4",
         "@typescript-eslint/parser": "^8.46.4",
         "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"
+        "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"
     },
-    "peerDependencies" : {
-        "react" : "*",
-        "react-native" : "*"
+    "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
     },
-    "codegenConfig" : {
-        "name" : "ReactNativeBlobUtilSpec",
-        "type" : "modules",
-        "jsSrcsDir" : "codegenSpecs",
-        "windows" : {
-            "namespace" : "ReactNativeBlobUtilCodegen",
-            "outputDirectory" : "windows/ReactNativeBlobUtil/codegen",
-            "separateDataTypes" : true
+    "codegenConfig": {
+        "name": "ReactNativeBlobUtilSpec",
+        "type": "modules",
+        "jsSrcsDir": "codegenSpecs",
+        "windows": {
+            "namespace": "ReactNativeBlobUtilCodegen",
+            "outputDirectory": "windows/ReactNativeBlobUtil/codegen",
+            "separateDataTypes": true
         }
     },
-    "react-native-windows" : {
-        "init-windows" : {
-            "name" : "ReactNativeBlobUtil",
-            "namespace" : "ReactNativeBlobUtil",
-            "template" : "cpp-lib"
+    "react-native-windows": {
+        "init-windows": {
+            "name": "ReactNativeBlobUtil",
+            "namespace": "ReactNativeBlobUtil",
+            "template": "cpp-lib"
         }
     }
 }

package/utils/uuid.js

@@ -1,4 +1,5 @@
+import {v4 as uuidv4} from 'uuid';
+
 export default function getUUID() {
-  return Math.random().toString(36).substring(2, 15) +
-        Math.random().toString(36).substring(2, 15);
+  return uuidv4();
 }