feat: add timeout in request

Cap-go · Jan 3, 2023 · bfdc5cd · bfdc5cd
1 parent 47900d1
commit bfdc5cd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdater.java b/android/src/main/java/ee/forgr/capacitor_updater/CapacitorUpdater.java
@@ -11,6 +11,7 @@
 import android.util.Base64;
 import android.util.Log;
 import com.android.volley.BuildConfig;
+import com.android.volley.DefaultRetryPolicy;
 import com.android.volley.NetworkResponse;
 import com.android.volley.Request;
 import com.android.volley.RequestQueue;
@@ -64,6 +65,7 @@ public class CapacitorUpdater {
 
   public static final String TAG = "Capacitor-updater";
   public static final String pluginVersion = "4.14.18";
+  public static final int timeout = 20;
 
   public SharedPreferences.Editor editor;
   public SharedPreferences prefs;
@@ -755,6 +757,9 @@ public void onErrorResponse(VolleyError error) {
         }
       }
     );
+    request.setRetryPolicy(new DefaultRetryPolicy(this.timeout,
+                DefaultRetryPolicy.DEFAULT_MAX_RETRIES, 
+                DefaultRetryPolicy.DEFAULT_BACKOFF_MULT));
     this.requestQueue.add(request);
   }
 
@@ -820,6 +825,9 @@ public void onErrorResponse(VolleyError error) {
         }
       }
     );
+    request.setRetryPolicy(new DefaultRetryPolicy(this.timeout, 
+            DefaultRetryPolicy.DEFAULT_MAX_RETRIES, 
+            DefaultRetryPolicy.DEFAULT_BACKOFF_MULT));
     this.requestQueue.add(request);
   }
 
@@ -880,6 +888,9 @@ public void onErrorResponse(VolleyError error) {
         }
       }
     );
+    request.setRetryPolicy(new DefaultRetryPolicy(this.timeout, 
+                DefaultRetryPolicy.DEFAULT_MAX_RETRIES, 
+                DefaultRetryPolicy.DEFAULT_BACKOFF_MULT));
     this.requestQueue.add(request);
   }
 
@@ -918,6 +929,9 @@ public void onErrorResponse(VolleyError error) {
         }
       }
     );
+    request.setRetryPolicy(new DefaultRetryPolicy(this.timeout, 
+                DefaultRetryPolicy.DEFAULT_MAX_RETRIES, 
+                DefaultRetryPolicy.DEFAULT_BACKOFF_MULT));
     this.requestQueue.add(request);
   }
 

diff --git a/ios/Plugin/CapacitorUpdater.swift b/ios/Plugin/CapacitorUpdater.swift
@@ -229,6 +229,7 @@ extension CustomError: LocalizedError {
     public let CAP_SERVER_PATH: String = "serverBasePath"
     public var customId: String = ""
     public let pluginVersion: String = "4.13.4"
+    public let timeout: Double = 20
     public var statsUrl: String = ""
     public var channelUrl: String = ""
     public var appId: String = ""
@@ -393,7 +394,7 @@ extension CustomError: LocalizedError {
         let latest: AppVersion = AppVersion()
         let parameters: InfoObject = self.createInfoObject()
         print("\(self.TAG) Auto-update parameters: \(parameters)")
-        let request = AF.request(url, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default)
+        let request = AF.request(url, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
 
         request.validate().responseDecodable(of: AppVersionDec.self) { response in
             switch response.result {
@@ -630,7 +631,7 @@ extension CustomError: LocalizedError {
         var parameters: InfoObject = self.createInfoObject()
         parameters.channel = channel
 
-        let request = AF.request(self.channelUrl, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default)
+        let request = AF.request(self.channelUrl, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
 
         request.validate().responseDecodable(of: SetChannelDec.self) { response in
             switch response.result {
@@ -665,7 +666,7 @@ extension CustomError: LocalizedError {
         }
         let semaphore: DispatchSemaphore = DispatchSemaphore(value: 0)
         let parameters: InfoObject = self.createInfoObject()
-        let request = AF.request(self.channelUrl, method: .put, parameters: parameters, encoder: JSONParameterEncoder.default)
+        let request = AF.request(self.channelUrl, method: .put, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
 
         request.validate().responseDecodable(of: GetChannelDec.self) { response in
             switch response.result {
@@ -703,7 +704,7 @@ extension CustomError: LocalizedError {
         var parameters: InfoObject = self.createInfoObject()
         parameters.action = action
         DispatchQueue.global(qos: .background).async {
-            let request = AF.request(self.statsUrl, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default)
+            let request = AF.request(self.statsUrl, method: .post, parameters: parameters, encoder: JSONParameterEncoder.default, requestModifier: { $0.timeoutInterval = self.timeout })
             request.responseData { response in
                 switch response.result {
                 case .success: