Merge branch '0.10.3'

Author: wkh237

LICENSE

@@ -13,6 +13,7 @@
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
 
 import java.util.Map;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -230,17 +231,32 @@ public void run() {
     @ReactMethod
     /**
      * Get cookies belongs specific host.
-     * @param host String host name.
+     * @param host String domain name.
      */
-    public void getCookies(String host, Promise promise) {
+    public void getCookies(String domain, Promise promise) {
         try {
-            WritableArray cookies = RNFBCookieJar.getCookies(host);
+            WritableMap cookies = RNFBCookieJar.getCookies(domain);
             promise.resolve(cookies);
         } catch(Exception err) {
             promise.reject("RNFetchBlob.getCookies", err.getMessage());
         }
     }
 
+    @ReactMethod
+    /**
+     * Remove cookies for specific domain
+     * @param domain String of the domain
+     * @param promise JSC promise injected by RN
+     */
+    public void removeCookies(String domain, Promise promise) {
+        try {
+            RNFBCookieJar.removeCookies(domain);
+            promise.resolve(null);
+        } catch(Exception err) {
+            promise.reject("RNFetchBlob.removeCookies", err.getMessage());
+        }
+    }
+
     @ReactMethod
     /**
      * @param path Stream file path

src/android.js renamed to android.js

@@ -248,9 +248,9 @@ public void readStream(String path, String encoding, int bufferSize, int tick, f
                 CharsetEncoder encoder = Charset.forName("UTF-8").newEncoder();
                 while ((cursor = fs.read(buffer)) != -1) {
                     encoder.encode(ByteBuffer.wrap(buffer).asCharBuffer());
-                    // if the data contains invalid characters the following lines will be
-                    // skipped.
                     String chunk = new String(buffer);
+                    if(cursor != bufferSize)
+                        chunk = chunk.substring(0, cursor);
                     emitStreamEvent(streamId, "data", chunk);
                     if(tick > 0)
                         SystemClock.sleep(tick);

src/android/.gitignore renamed to android/.gitignore

@@ -500,11 +500,32 @@ private void done(Response resp) {
                     // It uses customized response body which is able to report download progress
                     // and write response data to destination path.
                     resp.body().bytes();
+
                 } catch (Exception ignored) {
 //                    ignored.printStackTrace();
                 }
                 this.destPath = this.destPath.replace("?append=true", "");
-                callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_PATH, this.destPath);
+
+                try {
+                    long expectedLength = resp.body().contentLength();
+                    // when response contains Content-Length, check if the stream length is correct
+                    if(expectedLength > 0) {
+                        long actualLength = new File(this.destPath).length();
+                        if(actualLength != expectedLength) {
+                            callback.invoke("RNFetchBlob failed to write data to storage : expected " + expectedLength + " bytes but got " + actualLength + " bytes", null);
+                        }
+                        else {
+                            callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_PATH, this.destPath);
+                        }
+                    }
+                    else {
+                        callback.invoke(null, RNFetchBlobConst.RNFB_RESPONSE_PATH, this.destPath);
+                    }
+                }
+                catch (Exception err) {
+                    callback.invoke(err.getMessage());
+                    err.printStackTrace();
+                }
                 break;
             default:
                 try {

src/android/build.gradle renamed to android/build.gradle

@@ -8,6 +8,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Set;
 
 import okhttp3.Cookie;
 import okhttp3.CookieJar;
@@ -35,19 +36,31 @@ public List<Cookie> loadForRequest(HttpUrl url) {
         return cookies != null ? cookies : new ArrayList<Cookie>();
     }
 
-    public static WritableArray getCookies(String host) {
-        HttpUrl url = HttpUrl.parse(host);
-        List<Cookie> cookies = null;
-        if(url != null) {
-            cookies = cookieStore.get(url.host());
+    public static void removeCookies(String domain) {
+        if(domain != null && domain.length() > 0) {
+            if(cookieStore.containsKey(domain))
+                cookieStore.remove(domain);
         }
-        WritableArray cookieList = Arguments.createArray();
-        if(cookies != null) {
-            for(Cookie c : cookies){
-                cookieList.pushString(c.toString());
+        else
+            cookieStore.clear();
+    }
+
+    public static WritableMap getCookies(String host) {
+        Set<String> domains = cookieStore.keySet();
+        WritableMap cookieMap = Arguments.createMap();
+        if(host.length() > 0 && cookieStore.containsKey(host)) {
+            domains.clear();
+            domains.add(host);
+        }
+        // no domain specified, return all cookies
+        for(String key : domains) {
+            WritableArray cookiesInDomain = Arguments.createArray();
+            for(Cookie c: cookieStore.get(key)){
+                cookiesInDomain.pushString(c.toString());
             }
-            return cookieList;
+            cookieMap.putArray(key, cookiesInDomain);
         }
-        return null;
+
+        return cookieMap;
     }
 }

src/android/gradle/wrapper/gradle-wrapper.jar renamed to android/gradle/wrapper/gradle-wrapper.jar

@@ -201,8 +201,10 @@ function stat(path:string):Promise<RNFetchBlobFile> {
       if(err)
         reject(new Error(err))
       else {
-        if(stat)
+        if(stat) {
+          stat.size = parseInt(stat.size)
           stat.lastModified = parseInt(stat.lastModified)
+        }
         resolve(stat)
       }
     })

src/android/gradle/wrapper/gradle-wrapper.properties renamed to android/gradle/wrapper/gradle-wrapper.properties

@@ -247,14 +247,12 @@ function fetch(...args:any):Promise {
     })
 
     stateEvent = emitter.addListener('RNFetchBlobState', (e) => {
-      respInfo = e
-      if(e.taskId === taskId && promise.onStateChange) {
-        promise.onStateChange(e)
-      }
+      if(e.taskId === taskId)
+        respInfo = e
+      promise.onStateChange && promise.onStateChange(e)
     })
 
     subscription = emitter.addListener('RNFetchBlobExpire', (e) => {
-      console.log(e , 'EXPIRED!!')
       if(e.taskId === taskId && promise.onExpire) {
         promise.onExpire(e)
       }

src/android/gradlew renamed to android/gradlew

@@ -519,11 +519,24 @@ - (UIViewController *) documentInteractionControllerViewControllerForPreview: (U
 }
 
 # pragma mark - getCookies
+
 RCT_EXPORT_METHOD(getCookies:(NSString *)url resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 {
     resolve([RNFetchBlobNetwork getCookies:url]);
 }
 
+# pragma mark - removeCookie
+
+RCT_EXPORT_METHOD(removeCookies:(NSString *)domain resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+{
+    NSError * err = nil;
+    [RNFetchBlobNetwork removeCookies:domain error:&err];
+    if(err)
+        reject(@"RNFetchBlob failed to remove cookie", @"RNFetchBlob failed to remove cookie", nil);
+    else
+        resolve(@[[NSNull null]]);
+}
+
 # pragma mark - check expired network events
 
 RCT_EXPORT_METHOD(emitExpiredEvent:(RCTResponseSenderBlock)callback)
@@ -532,4 +545,6 @@ - (UIViewController *) documentInteractionControllerViewControllerForPreview: (U
 }
 
 
+
+
 @end

src/android/gradlew.bat renamed to android/gradlew.bat

@@ -516,7 +516,7 @@ + (NSDictionary *) stat:(NSString *) path error:(NSError **) error {
              @"size" : size,
              @"filename" : filename,
              @"path" : path,
-             @"lastModified" : [NSNumber numberWithLong:(time_t) [lastModified timeIntervalSince1970]*1000],
+             @"lastModified" : [NSString stringWithFormat:@"%@", [NSNumber numberWithLong:(time_t) [lastModified timeIntervalSince1970]*1000]],
              @"type" : isDir ? @"directory" : @"file"
             };
 

src/android/proguard-rules.pro renamed to android/proguard-rules.pro

@@ -23,6 +23,11 @@
 
 typedef void(^CompletionHander)(NSURL * _Nullable location, NSURLResponse * _Nullable response, NSError * _Nullable error);
 typedef void(^DataTaskCompletionHander) (NSData * _Nullable resp, NSURLResponse * _Nullable response, NSError * _Nullable error);
+typedef NS_ENUM(NSUInteger, ResponseFormat) {
+    UTF8,
+    BASE64,
+    AUTO
+};
 
 @interface RNFetchBlobNetwork : NSObject  <NSURLSessionDelegate, NSURLSessionTaskDelegate, NSURLSessionDataDelegate>
 
@@ -38,6 +43,19 @@ typedef void(^DataTaskCompletionHander) (NSData * _Nullable resp, NSURLResponse
 @property (strong, nonatomic) CompletionHander fileTaskCompletionHandler;
 @property (strong, nonatomic) DataTaskCompletionHander dataTaskCompletionHandler;
 @property (nullable, nonatomic) NSError * error;
+@property (nullable, nonatomic) NSMutableArray * redirects;
+
+@property (nonatomic) BOOL respFile;
+@property (nonatomic) BOOL isNewPart;
+@property (nonatomic) BOOL isIncrement;
+@property (nullable, nonatomic) NSMutableData * partBuffer;
+@property (nullable, nonatomic) NSString * destPath;
+@property (nullable, nonatomic) NSOutputStream * writeStream;
+@property (nonatomic) long bodyLength;
+@property (nullable, nonatomic) NSMutableDictionary * respInfo;
+@property (nonatomic) NSInteger respStatus;
+@property (nonatomic) ResponseFormat responseFormat;
+@property ( nonatomic) BOOL followRedirect;
 
 
 + (NSMutableDictionary  * _Nullable ) normalizeHeaders:(NSDictionary * _Nullable)headers;
@@ -49,9 +67,10 @@ typedef void(^DataTaskCompletionHander) (NSData * _Nullable resp, NSURLResponse
 - (nullable id) init;
 - (void) sendRequest;
 - (void) sendRequest:(NSDictionary  * _Nullable )options contentLength:(long)contentLength bridge:(RCTBridge * _Nullable)bridgeRef taskId:(NSString * _Nullable)taskId withRequest:(NSURLRequest * _Nullable)req callback:(_Nullable RCTResponseSenderBlock) callback;
++ (void) removeCookies:(NSString *) domain error:(NSError **)error;
 + (void) enableProgressReport:(NSString *) taskId config:(RNFetchBlobProgress *)config;
 + (void) enableUploadProgress:(NSString *) taskId config:(RNFetchBlobProgress *)config;
-+ (NSArray *) getCookies:(NSString *) url;
++ (NSDictionary *) getCookies:(NSString *) url;