react-native-blob-util 0.17.2 → 0.18.1

package/README.md

@@ -27,7 +27,7 @@ react-native-blob-util version **0.10.16** and up is only compatible with react
 - JSON stream supported base on [Oboe.js](https://github.com/jimhigson/oboe.js/) @jimhigson
 
 ## React Native New Architecture
-With Reacht Native 0.68.0 the switch to enable the new aritechture was introduced.
+With React Native 0.68.0 the switch to enable the new aritechture was introduced.
 Starting with version 0.17.0 this library introduces support for the new architecture as well. Of course the old architecture will still be supproted.
 Further information about it and how to use it you can find here: https://reactnative.dev/docs/next/the-new-architecture/landing-page
 
@@ -92,14 +92,21 @@ After `0.10.3` you can install this package directly from Github
 npm install --save github:RonRadtke/react-native-blob-util#<branch_name>
 ```
 
+**iOS**
+
+When using the package from npm, run `pod install` from the `ios` directory:
+
+```sh
+cd ios; pod install; cd ..
+```
+
 **Okhttp**
 
 For using the library okhttp3 is required. It's in general included in react-native. The library uses the okhttp version shipped with react-native or used by your app. For very old devices android devices okhttp 3.12 can be used.
 
 **Manually Link Native Modules**
 
-If you're using RN 0.60 or higher, manuall linking should not be required anymore.
-
+If you're using RN 0.60 or higher, manual linking should not be required anymore.
 
 If automatically linking doesn't work for you, see instructions on [manually linking](https://github.com/RonRadtke/react-native-blob-util/wiki/Manually-Link-Package#index).
 
@@ -658,14 +665,14 @@ Android 10 introduced scoped storage and thus new APIs to store files to Documen
 
 #### CopyToMediaStore
 
-Copies an existing file from the internal Storage to the Media Store. <br> An exmaple for downloading a file and storing it to the `downloads` collection
+Copies an existing file from the internal Storage to the Media Store. <br> An example for downloading a file and storing it to the `downloads` collection
 
 ```js
 ReactNativeBlobUtil
         .config({
             fileCache: true
         })
-        .fetch('GET', 'https://example.de/image.png', {'Accept': 'application/octet-stream'}, JSON.stringify(dat))
+        .fetch('GET', 'https://example.de/image.png')
         .then(async (res) => {
             let result = await ReactNativeBlobUtil.MediaCollection.copyToMediaStore({
                         name: filename, // name of the file

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

@@ -6,6 +6,7 @@ public class ReactNativeBlobUtilConst {
     public static final String EVENT_PROGRESS = "ReactNativeBlobUtilProgress";
     public static final String EVENT_HTTP_STATE = "ReactNativeBlobUtilState";
     public static final String EVENT_MESSAGE = "ReactNativeBlobUtilMessage";
+    public static final String EVENT_FILESYSTEM = "ReactNativeBlobUtilFilesystem";
     public static final String FILE_PREFIX = "ReactNativeBlobUtil-file://";
     public static final String CONTENT_PREFIX = "ReactNativeBlobUtil-content://";
     public static final String FILE_PREFIX_BUNDLE_ASSET = "bundle-assets://";

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

@@ -19,6 +19,8 @@ import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.events.EventDispatcher;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -37,9 +39,6 @@ class ReactNativeBlobUtilFS {
 
     private ReactApplicationContext mCtx;
     private DeviceEventManagerModule.RCTDeviceEventEmitter emitter;
-    private String encoding = "base64";
-    private OutputStream writeStreamInstance = null;
-    private static HashMap<String, ReactNativeBlobUtilFS> fileStreams = new HashMap<>();
 
     ReactNativeBlobUtilFS(ReactApplicationContext ctx) {
         this.mCtx = ctx;

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

@@ -13,6 +13,7 @@ import android.net.NetworkInfo;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.Handler;
 import android.os.Message;
 import android.util.Base64;
@@ -49,6 +50,8 @@ import java.nio.charset.CharsetDecoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import java.util.UUID;
+
 import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.Executors;
@@ -252,19 +255,29 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                 if (options.addAndroidDownloads.hasKey("path")) {
                     req.setDestinationUri(Uri.parse("file://" + options.addAndroidDownloads.getString("path")));
                 }
-                // #391 Add MIME type to the request
                 if (options.addAndroidDownloads.hasKey("mime")) {
                     req.setMimeType(options.addAndroidDownloads.getString("mime"));
                 }
                 if (options.addAndroidDownloads.hasKey("mediaScannable") && options.addAndroidDownloads.getBoolean("mediaScannable")) {
                     req.allowScanningByMediaScanner();
                 }
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && options.addAndroidDownloads.hasKey("storeInDownloads") && options.addAndroidDownloads.getBoolean("storeInDownloads")) {
+                    String t = options.addAndroidDownloads.getString("title");
+                    if(t == null || t.isEmpty())
+                        t = UUID.randomUUID().toString();
+                    if(this.options.appendExt != null && !this.options.appendExt.isEmpty())
+                        t += "." + this.options.appendExt;
+
+                    req.setDestinationInExternalPublicDir(Environment.DIRECTORY_DOWNLOADS, t);
+                }
+
                 // set headers
                 ReadableMapKeySetIterator it = headers.keySetIterator();
                 while (it.hasNextKey()) {
                     String key = it.nextKey();
                     req.addRequestHeader(key, headers.getString(key));
                 }
+
                 // Attempt to add cookie, if it exists
                 URL urlObj;
                 try {
@@ -862,9 +875,8 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                 DownloadManager dm = (DownloadManager) appCtx.getSystemService(Context.DOWNLOAD_SERVICE);
                 dm.query(query);
                 Cursor c = dm.query(query);
-                // #236 unhandled null check for DownloadManager.query() return value
                 if (c == null) {
-                    this.callback.invoke("Download manager failed to download from  " + this.url + ". Query was unsuccessful ", null, null);
+                    this.invoke_callback("Download manager failed to download from  " + this.url + ". Query was unsuccessful ", null, null);
                     return;
                 }
 
@@ -872,10 +884,9 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                 try {
                     // the file exists in media content database
                     if (c.moveToFirst()) {
-                        // #297 handle failed request
                         int statusCode = c.getInt(c.getColumnIndex(DownloadManager.COLUMN_STATUS));
                         if (statusCode == DownloadManager.STATUS_FAILED) {
-                            this.callback.invoke("Download manager failed to download from  " + this.url + ". Status Code = " + statusCode, null, null);
+                            this.invoke_callback("Download manager failed to download from  " + this.url + ". Status Code = " + statusCode, null, null);
                             return;
                         }
                         String contentUri = c.getString(c.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI));
@@ -904,17 +915,25 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
                         if (!exists)
                             throw new Exception("Download manager download failed, the file does not downloaded to destination.");
                         else
-                            this.callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, customDest);
+                            this.invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, customDest);
 
                     } catch (Exception ex) {
                         ex.printStackTrace();
-                        this.callback.invoke(ex.getLocalizedMessage(), null);
+                        this.invoke_callback(ex.getLocalizedMessage(), null);
                     }
-                } else {
+                }
+                else if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && options.addAndroidDownloads.hasKey("storeInDownloads") && options.addAndroidDownloads.getBoolean("storeInDownloads")){
+                    Uri downloadeduri = dm.getUriForDownloadedFile(downloadManagerId);
+                    if(downloadeduri == null)
+                        this.callback.invoke("Download manager could not resolve downloaded file uri.", ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, null);
+                    else
+                        this.callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, downloadeduri.toString());
+                }
+                else {
                     if (filePath == null)
-                        this.callback.invoke("Download manager could not resolve downloaded file path.", ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, null);
+                        this.invoke_callback("Download manager could not resolve downloaded file path.", ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, null);
                     else
-                        this.callback.invoke(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, filePath);
+                        this.invoke_callback(null, ReactNativeBlobUtilConst.RNFB_RESPONSE_PATH, filePath);
                 }
 
             }
@@ -946,6 +965,4 @@ public class ReactNativeBlobUtilReq extends BroadcastReceiver implements Runnabl
 
         return client;
     }
-
-
 }

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

@@ -1,5 +1,7 @@
 package com.ReactNativeBlobUtil;
 
+import static com.ReactNativeBlobUtil.ReactNativeBlobUtilConst.EVENT_FILESYSTEM;
+
 import android.net.Uri;
 import android.os.SystemClock;
 import android.util.Base64;
@@ -249,7 +251,8 @@ public class ReactNativeBlobUtilStream {
         WritableMap eventData = Arguments.createMap();
         eventData.putString("event", event);
         eventData.putString("detail", data);
-        this.emitter.emit(streamName, eventData);
+        eventData.putString("streamId", streamName);
+        this.emitter.emit(EVENT_FILESYSTEM, eventData);
     }
 
     // "event" always is "data"...
@@ -257,7 +260,8 @@ public class ReactNativeBlobUtilStream {
         WritableMap eventData = Arguments.createMap();
         eventData.putString("event", event);
         eventData.putArray("detail", data);
-        this.emitter.emit(streamName, eventData);
+        eventData.putString("streamId", streamName);
+        this.emitter.emit(EVENT_FILESYSTEM, eventData);
     }
 
     // "event" always is "error"...
@@ -266,7 +270,8 @@ public class ReactNativeBlobUtilStream {
         eventData.putString("event", event);
         eventData.putString("code", code);
         eventData.putString("detail", message);
-        this.emitter.emit(streamName, eventData);
+        eventData.putString("streamId", streamName);
+        this.emitter.emit(EVENT_FILESYSTEM, eventData);
     }
 
     /**

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

@@ -26,6 +26,17 @@ public class ReactNativeBlobUtil extends NativeBlobUtilsSpec {
         delegate = new ReactNativeBlobUtilImpl(reactContext);
     }
 
+    // Required for rn built in EventEmitter Calls.
+    @ReactMethod
+    public void addListener(String eventName) {
+
+    }
+
+    @ReactMethod
+    public void removeListeners(Integer count) {
+
+    }
+
     @Override
     protected Map<String, Object> getTypedExportedConstants() {
         Map<String, Object> res = new HashMap<>();

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

@@ -27,6 +27,17 @@ public class ReactNativeBlobUtil extends ReactContextBaseJavaModule {
         delegate = new ReactNativeBlobUtilImpl(reactContext);
     }
 
+    // Required for rn built in EventEmitter Calls.
+    @ReactMethod
+    public void addListener(String eventName) {
+
+    }
+
+    @ReactMethod
+    public void removeListeners(Integer count) {
+
+    }
+
     @NonNull
     @Override
     public String getName() {

package/class/ReactNativeBlobUtilReadStream.js

@@ -2,80 +2,84 @@
 // Use of this source code is governed by a MIT-style license that can be
 // found in the LICENSE file.
 
-import {
-  DeviceEventEmitter,
-  NativeAppEventEmitter,
-} from 'react-native';
+import {NativeEventEmitter} from 'react-native';
 import UUID from '../utils/uuid';
 
 import ReactNativeBlobUtil from "../codegenSpecs/NativeBlobUtils";
-const emitter = DeviceEventEmitter;
+
+const emitter = new NativeEventEmitter(ReactNativeBlobUtil);
 
 export default class ReactNativeBlobUtilReadStream {
 
-  path : string;
-  encoding : 'utf8' | 'ascii' | 'base64';
-  bufferSize : ?number;
-  closed : boolean;
-  tick : number = 10;
+    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();
+    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(this.streamId, (e) => {
-      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;
-      }
-    });
+        // register for file stream event
+        let subscription = emitter.addListener('ReactNativeBlobUtilFilesystem', (e) => {
+            if (typeof e === 'string') e = JSON.parse(e);
+            console.log(e, this.streamId, e.streamId, e.streamId === this.streamId)
+            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');
-  }
+    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;
-  }
+    onData(fn: () => void) {
+        this._onData = fn;
+    }
 
-  onError(fn) {
-    this._onError = fn;
-  }
+    onError(fn) {
+        this._onError = fn;
+    }
 
-  onEnd (fn) {
-    this._onEnd = fn;
-  }
+    onEnd(fn) {
+        this._onEnd = fn;
+    }
 
 }

package/class/ReactNativeBlobUtilSession.js

@@ -2,12 +2,7 @@
 // Use of this source code is governed by a MIT-style license that can be
 // found in the LICENSE file.
 
-import {
- DeviceEventEmitter,
- NativeAppEventEmitter,
-} from 'react-native';
-
-import ReactNativeBlobUtil from "../codegenSpecs/NativeBlobUtils";
+import ReactNativeBlobUtil from '../codegenSpecs/NativeBlobUtils';
 
 let sessions = {};
 
@@ -29,8 +24,8 @@ export default class ReactNativeBlobUtilSession {
 
   constructor(name:string, list:Array<string>) {
     this.name = name;
-    if(!sessions[name]) {
-      if(Array.isArray(list))
+    if (!sessions[name]) {
+      if (Array.isArray(list))
       sessions[name] = list;
       else
       sessions[name] = [];
@@ -44,8 +39,8 @@ export default class ReactNativeBlobUtilSession {
 
   remove(path:string):ReactNativeBlobUtilSession {
     let list = sessions[this.name];
-    for(let i of list) {
-      if(list[i] === path) {
+    for (let i of list) {
+      if (list[i] === path) {
         sessions[this.name].splice(i, 1);
         break;
       }
@@ -60,7 +55,7 @@ export default class ReactNativeBlobUtilSession {
   dispose():Promise {
     return new Promise((resolve, reject) => {
       ReactNativeBlobUtil.removeSession(sessions[this.name], (err) => {
-        if(err)
+        if (err)
           reject(new Error(err));
         else {
           delete sessions[this.name];

package/class/ReactNativeBlobUtilWriteStream.js

@@ -2,12 +2,7 @@
 // Use of this source code is governed by a MIT-style license that can be
 // found in the LICENSE file.
 
-import {
- DeviceEventEmitter,
- NativeAppEventEmitter,
-} from 'react-native';
-
-import ReactNativeBlobUtil from "../codegenSpecs/NativeBlobUtils";
+import ReactNativeBlobUtil from '../codegenSpecs/NativeBlobUtils';
 export default class ReactNativeBlobUtilWriteStream {
 
   id : string;
@@ -24,17 +19,17 @@ export default class ReactNativeBlobUtilWriteStream {
     return new Promise((resolve, reject) => {
       try {
         let method = this.encoding === 'ascii' ? 'writeArrayChunk' : 'writeChunk';
-        if(this.encoding.toLocaleLowerCase() === 'ascii' && !Array.isArray(data)) {
+        if (this.encoding.toLocaleLowerCase() === 'ascii' && !Array.isArray(data)) {
             reject(new Error('ascii input data must be an Array'));
             return;
         }
         ReactNativeBlobUtil[method](this.id, data, (error) => {
-          if(error)
+          if (error)
             reject(new Error(error));
           else
             resolve(this);
         });
-      } catch(err) {
+      } catch (err) {
         reject(new Error(err));
       }
     });

package/codegenSpecs/NativeBlobUtils.js

@@ -66,9 +66,9 @@ export interface Spec extends TurboModule {
     // Android Only APIs
     +actionViewIntent: (path: string, mime: string, chooserTitle: string) => Promise<void>;
     +addCompleteDownload: (config: Object) => Promise<void>;
-    +copyToInternal: (contentUri: string, destpath: string) => Promise<string>; 
+    +copyToInternal: (contentUri: string, destpath: string) => Promise<string>;
     +copyToMediaStore: (filedata: Object, mt: string, path: string) => Promise<string>;
-    +createMediaFile: (filedata: Object, mt: string) => Promise<string>;    
+    +createMediaFile: (filedata: Object, mt: string) => Promise<string>;
     +getBlob: (contentUri: string, encoding: string) => Promise<Array<any>>;
     +getContentIntent: (mime: string) => Promise<string>;
     +getSDCardDir: () => Promise<string>;
@@ -76,10 +76,7 @@ export interface Spec extends TurboModule {
     +scanFile: (pairs: Array<any>, callback: (value: Array<any>) => void) => void;
     +writeToMediaFile: (fileUri: string, path: string, transformFile: boolean) => Promise<string>;
   }
-  
-  export default (TurboModuleRegistry.get<Spec>(
-    'ReactNativeBlobUtil'
-    ): ?Spec);
-    
-    
-    
+
+  export default (TurboModuleRegistry.get<Spec>('ReactNativeBlobUtil'): ?Spec);
+
+

package/fetch.js

@@ -1,17 +1,19 @@
-import {ReactNativeBlobUtilConfig} from "./types";
-import URIUtil from "./utils/uri";
-import fs from "./fs";
-import getUUID from "./utils/uuid";
-import {DeviceEventEmitter} from "react-native";
-import {FetchBlobResponse} from "./class/ReactNativeBlobUtilBlobResponse";
-import CanceledFetchError from "./class/ReactNativeBlobUtilCanceledFetchError";
-import ReactNativeBlobUtil from "./codegenSpecs/NativeBlobUtils";
+import {ReactNativeBlobUtilConfig} from 'types';
+import URIUtil from './utils/uri';
+import fs from './fs';
+import getUUID from './utils/uuid';
+import {NativeEventEmitter} from 'react-native';
+import {FetchBlobResponse} from './class/ReactNativeBlobUtilBlobResponse';
+import CanceledFetchError from './class/ReactNativeBlobUtilCanceledFetchError';
+import ReactNativeBlobUtil from './codegenSpecs/NativeBlobUtils';
 
-const emitter = DeviceEventEmitter;
+const eventEmitter = new NativeEventEmitter(ReactNativeBlobUtil);
 
 // register message channel event handler.
-emitter.addListener("ReactNativeBlobUtilMessage", (e) => {
+eventEmitter.addListener('ReactNativeBlobUtilMessage', (e) => {
+    if (typeof e === 'string') e = JSON.parse(e);
 
+    console.log('add listener')
     if (e.event === 'warn') {
         console.warn(e.detail);
     }
@@ -19,7 +21,7 @@ emitter.addListener("ReactNativeBlobUtilMessage", (e) => {
         throw e.detail;
     }
     else {
-        console.log("ReactNativeBlobUtil native message", e.detail);
+        console.log('ReactNativeBlobUtil native message', e.detail);
     }
 });
 
@@ -105,7 +107,7 @@ function fetchFile(options = {}, method, url, headers = {}, body): Promise {
                 .then((stream) => new Promise((resolve, reject) => {
                     stream.open();
                     info = {
-                        state: "2",
+                        state: '2',
                         headers: {'source': 'system-fs'},
                         status: 200,
                         respType: 'text',
@@ -188,31 +190,36 @@ export function fetch(...args: any): Promise {
         let nativeMethodName = Array.isArray(body) ? 'fetchBlobForm' : 'fetchBlob';
 
         // on progress event listener
-        subscription = emitter.addListener('ReactNativeBlobUtilProgress', (e) => {
+        subscription = eventEmitter.addListener('ReactNativeBlobUtilProgress', (e) => {
+            if (typeof e === 'string') e = JSON.parse(e);
             if (e.taskId === taskId && promise.onProgress) {
                 promise.onProgress(e.written, e.total, e.chunk);
             }
         });
 
-        subscriptionUpload = emitter.addListener('ReactNativeBlobUtilProgress-upload', (e) => {
+        subscriptionUpload = eventEmitter.addListener('ReactNativeBlobUtilProgress-upload', (e) => {
+            if (typeof e === 'string') e = JSON.parse(e);
             if (e.taskId === taskId && promise.onUploadProgress) {
                 promise.onUploadProgress(e.written, e.total);
             }
         });
 
-        stateEvent = emitter.addListener('ReactNativeBlobUtilState', (e) => {
+        stateEvent = eventEmitter.addListener('ReactNativeBlobUtilState', (e) => {
+            if (typeof e === 'string') e = JSON.parse(e);
             if (e.taskId === taskId)
                 respInfo = e;
             promise.onStateChange && promise.onStateChange(e);
         });
 
-        subscription = emitter.addListener('ReactNativeBlobUtilExpire', (e) => {
+        subscription = eventEmitter.addListener('ReactNativeBlobUtilExpire', (e) => {
+            if (typeof e === 'string') e = JSON.parse(e);
             if (e.taskId === taskId && promise.onExpire) {
                 promise.onExpire(e);
             }
         });
 
-        partEvent = emitter.addListener('ReactNativeBlobUtilServerPush', (e) => {
+        partEvent = eventEmitter.addListener('ReactNativeBlobUtilServerPush', (e) => {
+            if (typeof e === 'string') e = JSON.parse(e);
             if (e.taskId === taskId && promise.onPartData) {
                 promise.onPartData(e.chunk);
             }
@@ -244,11 +251,11 @@ export function fetch(...args: any): Promise {
             subscriptionUpload.remove();
             stateEvent.remove();
             partEvent.remove();
-            delete promise['progress'];
-            delete promise['uploadProgress'];
-            delete promise['stateChange'];
-            delete promise['part'];
-            delete promise['cancel'];
+            delete promise.progress;
+            delete promise.uploadProgress;
+            delete promise.stateChange;
+            delete promise.part;
+            delete promise.cancel;
             // delete promise['expire']
             promise.cancel = () => {
             };
@@ -329,7 +336,7 @@ export function fetch(...args: any): Promise {
         subscriptionUpload.remove();
         stateEvent.remove();
         ReactNativeBlobUtil.cancelRequest(taskId, fn);
-        promiseReject(new CanceledFetchError("canceled"));
+        promiseReject(new CanceledFetchError('canceled'));
     };
     promise.taskId = taskId;
 

package/index.d.ts

@@ -782,6 +782,10 @@ export interface AddAndroidDownloads {
      * (https://developer.android.com/reference/android/app/DownloadManager.html#addCompletedDownload(java.lang.String, java.lang.String, boolean, java.lang.String, java.lang.String, long, boolean))
      */
     mediaScannable?: boolean;
+    /**
+     * Only for Android >= Q; Enforces the file being stored to the MediaCollection Downloads. This might overwrite any value given in "path"
+     */
+    storeInDownloads?: boolean;
     /**
      * A boolean value decide whether show a notification when download complete.
      */