Fix XMLHttpRequest auto strategy

Author: wkh237

src/index.js

@@ -254,14 +254,31 @@ class FetchBlobResponse {
      * @return {string} Decoded base64 string.
      */
     this.text = ():string => {
-      return decodeURIComponent(base64.decode(this.data))
+      let res = this.data
+      try {
+        res = base64.decode(this.data)
+        res = decodeURIComponent(res)
+      } catch(err) {
+        console.warn(err)
+        res = ''
+      }
+      return res
     }
     /**
      * Convert result to JSON object.
      * @return {object} Parsed javascript object.
      */
     this.json = ():any => {
-      return JSON.parse(decodeURIComponent(base64.decode(this.data)))
+      let res = this.data
+      try {
+        res = base64.decode(this.data)
+        res = decodeURIComponent(res)
+        res = JSON.parse(res)
+      } catch(err) {
+        console.warn(err)
+        res = {}
+      }
+      return res
     }
     /**
      * Return BASE64 string directly.

src/ios/RNFetchBlobNetwork.m

@@ -137,9 +137,11 @@ - (void) sendRequest:(__weak NSDictionary  * _Nullable )options
 
 
     NSURLSessionConfiguration *defaultConfigObject = [NSURLSessionConfiguration defaultSessionConfiguration];
-    if([options valueForKey:@"timeout"] != nil)
+    float timeout = [options valueForKey:@"timeout"] == nil ? -1 : [[options valueForKey:@"timeout"] floatValue];
+    NSLog(@"timeout = %f",timeout);
+    if(timeout > 0)
     {
-        defaultConfigObject.timeoutIntervalForRequest = [[options valueForKey:@"timeout"] floatValue]/1000;
+        defaultConfigObject.timeoutIntervalForRequest = timeout/1000;
     }
     defaultConfigObject.HTTPMaximumConnectionsPerHost = 10;
     session = [NSURLSession sessionWithConfiguration:defaultConfigObject delegate:self delegateQueue:taskQueue];
@@ -196,21 +198,30 @@ - (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dat
 
     NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse*)response;
     NSInteger statusCode = [(NSHTTPURLResponse *)response statusCode];
+    NSString * respType = @"";
     respStatus = statusCode;
     if ([response respondsToSelector:@selector(allHeaderFields)])
     {
         NSDictionary *headers = [httpResponse allHeaderFields];
-        NSString * respType = [[RNFetchBlobReqBuilder getHeaderIgnoreCases:@"content-type"
+        NSString * respCType = [[RNFetchBlobReqBuilder getHeaderIgnoreCases:@"Content-Type"
                                                                fromHeaders:headers]
                                lowercaseString];
-        if([headers valueForKey:@"Content-Type"] != nil)
+        if(respCType != nil)
         {
             NSArray * extraBlobCTypes = [options objectForKey:CONFIG_EXTRA_BLOB_CTYPE];
+            if([respCType containsString:@"text/"])
+            {
+                respType = @"text";
+            }
+            else if([respCType containsString:@"application/json"])
+            {
+                respType = @"json";
+            }
             // If extra blob content type is not empty, check if response type matches
-            if( extraBlobCTypes !=  nil) {
+            else if( extraBlobCTypes !=  nil) {
                 for(NSString * substr in extraBlobCTypes)
                 {
-                    if([[respType lowercaseString] containsString:[substr lowercaseString]])
+                    if([respCType containsString:[substr lowercaseString]])
                     {
                         respType = @"blob";
                         respFile = YES;
@@ -219,14 +230,6 @@ - (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dat
                     }
                 }
             }
-            else if([respType containsString:@"text/"])
-            {
-                respType = @"text";
-            }
-            else if([respType containsString:@"application/json"])
-            {
-                respType = @"json";
-            }
             else
             {
                 respType = @"blob";
@@ -238,7 +241,7 @@ - (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dat
             }
         }
         else
-            respType = @"";
+            respType = @"text";
         respInfo = @{
                      @"taskId": taskId,
                      @"state": @"2",
@@ -255,6 +258,8 @@ - (void) URLSession:(NSURLSession *)session dataTask:(NSURLSessionDataTask *)dat
         headers = nil;
         respInfo = nil;
     }
+    else
+        NSLog(@"oops");
 
     if(respFile == YES)
     {
@@ -319,20 +324,20 @@ - (void) URLSession:(NSURLSession *)session task:(NSURLSessionTask *)task didCom
     self.error = error;
     NSString * errMsg = [NSNull null];
     NSString * respStr = [NSNull null];
-    NSString * respType = [respInfo valueForKey:@"respType"];
 
     [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO];
-    if(error != nil)
-    {
-        errMsg = [error localizedDescription];
-    }
+    
     if(respInfo == nil)
     {
         respInfo = [NSNull null];
     }
 
+    if(error != nil)
+    {
+        errMsg = [error localizedDescription];
+    }
     // Fix #72 response with status code 200 ~ 299 considered as success
-    if(respStatus> 299 || respStatus < 200)
+    else if(respStatus> 299 || respStatus < 200)
     {
         errMsg = [NSString stringWithFormat:@"Request failed, status %d", respStatus];
     }

src/polyfill/XMLHttpRequest.js

@@ -23,7 +23,9 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
   _onreadystatechange : () => void;
 
   upload : XMLHttpRequestEventTarget = new XMLHttpRequestEventTarget();
-  static binaryContentTypes : Array<string> = [];
+  static binaryContentTypes : Array<string> = [
+    'image/', 'video/', 'audio/'
+  ];
 
   // readonly
   _readyState : number = UNSENT;
@@ -145,7 +147,6 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
     }
     else
       body = body ? body.toString() : body
-
     this._task = RNFetchBlob
                   .config({
                     auto: true,
@@ -243,7 +244,6 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
   }
 
   _uploadProgressEvent(send:number, total:number) {
-    console.log('_upload', this.upload)
     if(!this._uploadStarted) {
       this.upload.dispatchEvent('loadstart')
       this._uploadStarted = true
@@ -265,12 +265,16 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
   }
 
   _onError(err) {
+    let statusCode = Math.floor(this.status)
+    if(statusCode >= 100 && statusCode !== 408) {
+      return
+    }
     log.verbose('XMLHttpRequest error', err)
     this._statusText = err
     this._status = String(err).match(/\d+/)
     this._status = this._status ? Math.floor(this.status) : 404
     this._dispatchReadStateChange(XMLHttpRequest.DONE)
-    if(err && String(err.message).match(/(timed\sout|timedout)/)) {
+    if(err && String(err.message).match(/(timed\sout|timedout)/) || this._status == 408) {
       this.dispatchEvent('timeout')
     }
     this.dispatchEvent('loadend')