Add new attribute to fs.readStream #118

Introduce new argument which can limit readStream event frequency

Author: wkh237

src/android/src/main/java/com/RNFetchBlob/RNFetchBlob.java

@@ -207,13 +207,13 @@ public void run() {
      * @param encoding Stream encoding, should be one of `base64`, `ascii`, and `utf8`
      * @param bufferSize Stream buffer size, default to 4096 or 4095(base64).
      */
-    public void readStream(final String path, final String encoding, final int bufferSize, final String streamId) {
+    public void readStream(final String path, final String encoding, final int bufferSize, final int tick, final String streamId) {
         final ReactApplicationContext ctx = this.getReactApplicationContext();
         threadPool.execute(new Runnable() {
             @Override
             public void run() {
                 RNFetchBlobFS fs = new RNFetchBlobFS(ctx);
-                fs.readStream(path, encoding, bufferSize, streamId);
+                fs.readStream(path, encoding, bufferSize, tick, streamId);
             }
         });
     }

src/android/src/main/java/com/RNFetchBlob/RNFetchBlobFS.java

@@ -11,6 +11,7 @@
 import android.os.AsyncTask;
 import android.os.Environment;
 import android.os.Looper;
+import android.os.SystemClock;
 import android.provider.MediaStore;
 import android.util.Base64;
 
@@ -229,7 +230,7 @@ static public String getTmpPath(ReactApplicationContext ctx, String taskId) {
      * @param encoding  File stream decoder, should be one of `base64`, `utf8`, `ascii`
      * @param bufferSize    Buffer size of read stream, default to 4096 (4095 when encode is `base64`)
      */
-    public void readStream(String path, String encoding, int bufferSize, final String streamId) {
+    public void readStream(String path, String encoding, int bufferSize, int tick, final String streamId) {
         path = normalizePath(path);
         try {
 
@@ -253,6 +254,8 @@ public void readStream(String path, String encoding, int bufferSize, final Strin
                 while ((cursor = fs.read(buffer)) != -1) {
                     String chunk = new String(buffer, 0, cursor, "UTF-8");
                     emitStreamEvent(streamId, "data", chunk);
+                    if(tick > 0)
+                        SystemClock.sleep(tick);
                 }
             } else if (encoding.equalsIgnoreCase("ascii")) {
                 while ((cursor = fs.read(buffer)) != -1) {
@@ -262,6 +265,8 @@ public void readStream(String path, String encoding, int bufferSize, final Strin
                         chunk.pushInt((int)buffer[i]);
                     }
                     emitStreamEvent(streamId, "data", chunk);
+                    if(tick > 0)
+                        SystemClock.sleep(tick);
                 }
             } else if (encoding.equalsIgnoreCase("base64")) {
                 while ((cursor = fs.read(buffer)) != -1) {
@@ -274,6 +279,8 @@ public void readStream(String path, String encoding, int bufferSize, final Strin
                     }
                     else
                         emitStreamEvent(streamId, "data", Base64.encodeToString(buffer, Base64.NO_WRAP));
+                    if(tick > 0)
+                        SystemClock.sleep(tick);
                 }
             } else {
                 String msg = "unrecognized encoding `" + encoding + "`";

src/android/src/main/java/com/RNFetchBlob/RNFetchBlobReq.java

@@ -17,6 +17,7 @@
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableMapKeySetIterator;
+import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
@@ -32,6 +33,7 @@
 import java.nio.charset.CharacterCodingException;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.concurrent.TimeUnit;
 
@@ -87,6 +89,7 @@ enum ResponseType {
     ResponseType responseType;
     WritableMap respInfo;
     boolean timeout = false;
+    ArrayList<String> redirects = new ArrayList<>();
 
     public RNFetchBlobReq(ReadableMap options, String taskId, String method, String url, ReadableMap headers, String body, ReadableArray arrayBody, final Callback callback) {
         this.method = method.toUpperCase();
@@ -277,7 +280,13 @@ else if(cType.isEmpty()) {
             }
 
             final Request req = builder.build();
-
+            clientBuilder.addNetworkInterceptor(new Interceptor() {
+                @Override
+                public Response intercept(Chain chain) throws IOException {
+                        redirects.add(chain.request().url().toString());
+                        return chain.proceed(chain.request());
+                    }
+            });
             // Add request interceptor for upload progress event
             clientBuilder.addInterceptor(new Interceptor() {
                 @Override
@@ -330,6 +339,7 @@ public Response intercept(Chain chain) throws IOException {
             clientBuilder.retryOnConnectionFailure(false);
             clientBuilder.followRedirects(true);
 
+
             OkHttpClient client = clientBuilder.retryOnConnectionFailure(true).build();
             Call call =  client.newCall(req);
             taskTable.put(taskId, call);
@@ -508,6 +518,11 @@ private WritableMap getResponseInfo(Response resp, boolean isBlobResp) {
         for(int i =0;i< resp.headers().size();i++) {
             headers.putString(resp.headers().name(i), resp.headers().value(i));
         }
+        WritableArray redirectList = Arguments.createArray();
+        for(String r : redirects) {
+                redirectList.pushString(r);
+        }
+        info.putArray("redirects", redirectList);
         info.putMap("headers", headers);
         Headers h = resp.headers();
         if(isBlobResp) {

src/fs.js

@@ -113,8 +113,11 @@ function readStream(
   path : string,
   encoding : 'utf8' | 'ascii' | 'base64',
   bufferSize? : ?number
+  tick? : ?number
 ):Promise<RNFetchBlobReadStream> {
-  return Promise.resolve(new RNFetchBlobReadStream(path, encoding, bufferSize))
+  if(!tick)
+    tick = -1
+  return Promise.resolve(new RNFetchBlobReadStream(path, encoding, bufferSize, tick))
 }
 
 /**

src/ios/RNFetchBlob/RNFetchBlob.m

@@ -374,7 +374,7 @@ - (NSDictionary *)constantsToExport
 })
 
 #pragma mark - fs.readStream
-RCT_EXPORT_METHOD(readStream:(NSString *)path withEncoding:(NSString *)encoding bufferSize:(int)bufferSize streamId:(NSString *)streamId
+RCT_EXPORT_METHOD(readStream:(NSString *)path withEncoding:(NSString *)encoding bufferSize:(int)bufferSize tick:(int)tick streamId:(NSString *)streamId
 {
 
 //    RNFetchBlobFS *fileStream = [[RNFetchBlobFS alloc] initWithBridgeRef:self.bridge];
@@ -386,7 +386,7 @@ - (NSDictionary *)constantsToExport
     }
 
 //    [fileStream readWithPath:path useEncoding:encoding bufferSize:bufferSize];
-    [RNFetchBlobFS readStream:path encoding:encoding bufferSize:bufferSize streamId:streamId bridgeRef:_bridge];
+    [RNFetchBlobFS readStream:path encoding:encoding bufferSize:bufferSize tick:tick streamId:streamId bridgeRef:_bridge];
 })
 
 #pragma mark - fs.getEnvionmentDirs

src/ios/RNFetchBlobFS.h

@@ -64,7 +64,7 @@
      rejecter:(RCTPromiseRejectBlock)reject;
 //+ (void) writeFileFromFile:(NSString *)src toFile:(NSString *)dest append:(BOOL)append;
 + (void) writeAssetToPath:(ALAssetRepresentation * )rep dest:(NSString *)dest;
-+ (void) readStream:(NSString *)uri encoding:(NSString * )encoding bufferSize:(int)bufferSize streamId:(NSString *)streamId bridgeRef:(RCTBridge *)bridgeRef;
++ (void) readStream:(NSString *)uri encoding:(NSString * )encoding bufferSize:(int)bufferSize tick:(int)tick streamId:(NSString *)streamId bridgeRef:(RCTBridge *)bridgeRef;
 
 // constructor
 - (id) init;

src/ios/RNFetchBlobFS.m

@@ -122,6 +122,7 @@ + (NSString *) getTempPath:(NSString*)taskId withExtension:(NSString *)ext {
 + (void) readStream:(NSString *)uri
            encoding:(NSString * )encoding
          bufferSize:(int)bufferSize
+               tick:(int)tick
            streamId:(NSString *)streamId
           bridgeRef:(RCTBridge *)bridgeRef
 {