Merge pull request #1686 from wordpress-mobile/issue/network-retry

Adding retry feature to mobile apiFetch handler
wordpress-mobile · Jan 31, 2020 · 772b610 · 772b610
2 parents b7ffa8c + 5ee454d
commit 772b610
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 8 deletions.
diff --git a/android/app/src/main/java/com/gutenberg/MainApplication.java b/android/app/src/main/java/com/gutenberg/MainApplication.java
@@ -1,6 +1,7 @@
 package com.gutenberg;
 
 import android.app.Application;
+import android.os.Bundle;
 import android.util.Log;
 
 import androidx.core.util.Consumer;
@@ -118,7 +119,7 @@ public void editorDidEmitLog(String message, LogLevel logLevel) {
             }
 
             @Override
-            public void performRequest(String path, Consumer<String> onSuccess, Consumer<String> onError) {}
+            public void performRequest(String path, Consumer<String> onSuccess, Consumer<Bundle> onError) {}
         });
 
         return new ReactNativeHost(this) {

diff --git a/...a/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java b/...a/org/wordpress/mobile/ReactNativeGutenbergBridge/RNReactNativeGutenbergBridgeModule.java
@@ -2,6 +2,7 @@
 
 import androidx.annotation.Nullable;
 
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -197,7 +198,15 @@ public void getOtherMediaOptions(ReadableArray filter, final Callback jsCallback
     public void fetchRequest(String path, Promise promise) {
         mGutenbergBridgeJS2Parent.performRequest(path,
                 promise::resolve,
-                errorMessage -> promise.reject(new Error(errorMessage)));
+                errorBundle -> {
+                    WritableMap writableMap = Arguments.makeNativeMap(errorBundle);
+                    if (writableMap.hasKey("code")) {
+                        String code = String.valueOf(writableMap.getInt("code"));
+                        promise.reject(code, new Error(), writableMap);
+                    } else {
+                        promise.reject(new Error(), writableMap);
+                    }
+                });
     }
 
     private OtherMediaOptionsReceivedCallback getNewOtherMediaReceivedCallback(final Callback jsCallback) {

diff --git a/...berg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/RequestExecutor.java b/...berg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/RequestExecutor.java
@@ -1,7 +1,9 @@
 package org.wordpress.mobile.WPAndroidGlue;
 
+import android.os.Bundle;
+
 import androidx.core.util.Consumer;
 
 public interface RequestExecutor {
-    void performRequest(String path, Consumer<String> onSuccess, Consumer<String> onError);
+    void performRequest(String path, Consumer<String> onSuccess, Consumer<Bundle> onError);
 }
diff --git a/...rg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java b/...rg-bridge/android/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
@@ -24,7 +24,6 @@
 import com.facebook.react.ReactInstanceManagerBuilder;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.ReactRootView;
-import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.common.LifecycleState;
@@ -302,7 +301,7 @@ public void requestMediaPickFrom(String mediaSource,
             }
 
             @Override
-            public void performRequest(String pathFromJS, Consumer<String> onSuccess, Consumer<String> onError) {
+            public void performRequest(String pathFromJS, Consumer<String> onSuccess, Consumer<Bundle> onError) {
                 mRequestExecutor.performRequest(pathFromJS, onSuccess, onError);
             }
 

diff --git a/src/api-fetch-setup.js b/src/api-fetch-setup.js
@@ -10,7 +10,9 @@ import { fetchRequest } from 'react-native-gutenberg-bridge';
  */
 import apiFetch from '@wordpress/api-fetch';
 
-const fetchHandler = ( { path } ) => {
+const setTimeoutPromise = ( delay ) => new Promise( ( resolve ) => setTimeout( resolve, delay ) );
+
+const fetchHandler = ( { path }, retries = 20, retryCount = 1 ) => {
 	if ( ! isPathSupported( path ) ) {
 		return Promise.reject( `Unsupported path: ${ path }` );
 	}
@@ -26,8 +28,15 @@ const fetchHandler = ( { path } ) => {
 
 	return responsePromise.then( parseResponse ).catch( ( error ) => {
 		// eslint-disable-next-line no-console
-		console.warn( 'Network Error: ', error );
-		return Promise.resolve( error );
+		console.warn( 'Network Error: ', JSON.stringify( error, null, 2 ) );
+		if ( error.code >= 400 && error.code < 600 ) {
+			return error;
+		} else if ( retries === 0 ) {
+			return Promise.reject( error );
+		}
+		return setTimeoutPromise( 1000 * retryCount ).then( () =>
+			fetchHandler( { path }, retries - 1, retryCount + 1 )
+		);
 	} );
 };