Add android timeout exception handling. #44

Fix Blob constructor error

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

@@ -82,6 +82,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
     RequestType requestType;
     ResponseType responseType;
     boolean timeout = false;
+    WritableMap respInfo;
 
     public RNFetchBlobReq(ReadableMap options, String taskId, String method, String url, ReadableMap headers, String body, ReadableArray arrayBody, final Callback callback) {
         this.method = method;
@@ -250,7 +251,12 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
                     break;
 
                 case WithoutBody:
-                    builder.method(method, null);
+                    if(method.equalsIgnoreCase("POST") || method.equalsIgnoreCase("PUT"))
+                    {
+                        builder.method(method, RequestBody.create(null, new byte[0]));
+                    }
+                    else
+                        builder.method(method, null);
                     break;
             }
 
@@ -291,23 +297,36 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
                     return chain.proceed(chain.request());
                 }
             });
-            
-            if(options.timeout != -1) {
+
+            if(options.timeout > 0) {
                 clientBuilder.connectTimeout(options.timeout, TimeUnit.SECONDS);
+                clientBuilder.readTimeout(options.timeout, TimeUnit.SECONDS);
             }
 
             OkHttpClient client = clientBuilder.build();
             Call call = client.newCall(req);
             taskTable.put(taskId, call);
             call.enqueue(new okhttp3.Callback() {
+
                 @Override
                 public void onFailure(Call call, IOException e) {
-                    callback.invoke(e.getLocalizedMessage(), null);
+                    if(respInfo == null) {
+                        respInfo = Arguments.createMap();
+                    }
+
+                    // check if this error caused by timeout
+                    if(e.getClass().equals(SocketTimeoutException.class)) {
+                        respInfo.putBoolean("timeout", true);
+                        callback.invoke("request timed out.", respInfo, null);
+                    }
+                    else
+                        callback.invoke(e.getLocalizedMessage(), respInfo, null);
                 }
 
                 @Override
                 public void onResponse(Call call, Response response) throws IOException {
                     ReadableMap notifyConfig = options.addAndroidDownloads;
+                    respInfo = getResponseInfo(response);
                     // Download manager settings
                     if(notifyConfig != null ) {
                         String title = "", desc = "", mime = "text/plain";
@@ -333,7 +352,7 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
         } catch (Exception error) {
             error.printStackTrace();
             taskTable.remove(taskId);
-            callback.invoke("RNFetchBlob request error: " + error.getMessage() + error.getCause());
+            callback.invoke("RNFetchBlob request error: " + error.getMessage() + error.getCause(), this.respInfo);
         }
     }
 
@@ -405,10 +424,10 @@ public class RNFetchBlobReq extends BroadcastReceiver implements Runnable {
         }
         info.putMap("headers", headers);
         Headers h = resp.headers();
-        if(getHeaderIgnoreCases(h, "content-type").equalsIgnoreCase("text/plain")) {
+        if(getHeaderIgnoreCases(h, "content-type").equalsIgnoreCase("text/")) {
             info.putString("respType", "text");
         }
-        else if(getHeaderIgnoreCases(h, "content-type").equalsIgnoreCase("application/json")) {
+        else if(getHeaderIgnoreCases(h, "content-type").contains("application/json")) {
             info.putString("respType", "json");
         }
         else if(getHeaderIgnoreCases(h, "content-type").length() < 1) {

src/index.js

@@ -150,6 +150,7 @@ function fetch(...args:any):Promise {
       subscription.remove()
       subscriptionUpload.remove()
       stateEvent.remove()
+      info = info ? info : {}
       if(err)
         reject(new Error(err, info))
       else {

src/polyfill/Blob.js

@@ -47,6 +47,7 @@ export default class Blob extends EventTarget {
    *                    by default
    */
   constructor(data:any, cType:any) {
+    super()
     cType = cType || {}
     this.cacheName = getBlobName()
     this.isRNFetchBlobPolyfill = true

src/polyfill/XMLHttpRequest.js

@@ -124,7 +124,7 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
       body = JSON.stringify(body)
     }
     else
-      body = body.toString()
+      body = body ? body.toString() : body
 
     this._task = RNFetchBlob
                   .config({ auto: true, timeout : this._timeout })
@@ -299,7 +299,7 @@ export default class XMLHttpRequest extends XMLHttpRequestEventTarget{
     this._onreadystatechange = fn
   }
 
-  get onreadystatechange(fn:() => void) {
+  get onreadystatechange() {
     return this._onreadystatechange
   }
 

src/polyfill/index.js

@@ -3,6 +3,7 @@ import File from './File.js'
 import XMLHttpRequest from './XMLHttpRequest.js'
 import FormData from './FormData.js'
 import ProgressEvent from './ProgressEvent'
+import Event from './Event'
 
 export default {
   Blob, File, XMLHttpRequest, FormData, ProgressEvent, Event