fix: connection reset error (#6)

Author: zyLiu-aftership

README.md

@@ -19,16 +19,16 @@ If you need support using AfterShip products, please contact [email protected]
   - [Error Handling](#error-handling)
     - [Error List](#error-list)
   - [Endpoints](#endpoints)
-    - [/address-validations](#address-validations)
+    - [/locations](#locations)
     - [/rates](#rates)
     - [/shipper-accounts](#shipper-accounts)
     - [/labels](#labels)
     - [/couriers](#couriers)
     - [/cancel-labels](#cancel-labels)
-    - [/cancel-pickups](#cancel-pickups)
-    - [/locations](#locations)
+    - [/address-validations](#address-validations)
     - [/manifests](#manifests)
     - [/pickups](#pickups)
+    - [/cancel-pickups](#cancel-pickups)
   - [Help](#help)
   - [License](#license)
 
@@ -48,7 +48,7 @@ Before you begin to integrate:
 <dependency>
     <groupId>com.aftership</groupId>
     <artifactId>shipping-sdk</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
 </dependency>
 ```
 
@@ -161,8 +161,8 @@ The SDK will return an error object when there is any error during the request,
 
 The AfterShip SDK has the following resource which are exactly the same as the API endpoints:
 
-- AddressValidationsBetaResource
-  - Create an address validation
+- LocationsResource
+  - Get locations
 - RatesResource
   - Get rates
   - Calculate rates
@@ -185,12 +185,8 @@ The AfterShip SDK has the following resource which are exactly the same as the A
   - Get the cancelled labels
   - Cancel a label
   - Get a cancelled label
-- CancelPickupsResource
-  - Get the cancelled pickups
-  - Cancel a pickup
-  - Get a cancelled pickup
-- LocationsResource
-  - Get locations
+- AddressValidationsBetaResource
+  - Create an address validation
 - ManifestsResource
   - Get manifests
   - Create a manifest
@@ -199,15 +195,17 @@ The AfterShip SDK has the following resource which are exactly the same as the A
   - Get pickups
   - Create a pickup
   - Get a pickup
+- CancelPickupsResource
+  - Get the cancelled pickups
+  - Cancel a pickup
+  - Get a cancelled pickup
 
-### /address-validations
-**POST** /address-validations
+### /locations
+**GET** /locations
 
 ```java
-    PostAddressValidationsRequest request = new PostAddressValidationsRequest();
-    PostAddressValidationsResponse response = AddressValidationsBetaResource.postAddressValidations()
-        .setPostAddressValidationsRequest(request)
-        .create();
+    GetLocationsResponse response = LocationsResource.getLocations()
+        .fetch();
     System.out.println(response.getData());
 ```
 
@@ -374,45 +372,17 @@ The AfterShip SDK has the following resource which are exactly the same as the A
     System.out.println(response.getData());
 ```
 
-### /cancel-pickups
-**GET** /cancel-pickups
-
-```java
-    GetCancelPickupsResponse response = CancelPickupsResource.getCancelPickups()
-        .fetch();
-    System.out.println(response.getData());
-```
-
-**POST** /cancel-pickups
+### /address-validations
+**POST** /address-validations
 
 ```java
-    PostCancelPickupsRequest request = new PostCancelPickupsRequest();
-    PostCancelPickupsRequestPickup pickup = new PostCancelPickupsRequestPickup();
-    request.setPickup(pickup);
-    PostCancelPickupsResponse response = CancelPickupsResource.postCancelPickups()
-        .setPostCancelPickupsRequest(request)
+    PostAddressValidationsRequest request = new PostAddressValidationsRequest();
+    PostAddressValidationsResponse response = AddressValidationsBetaResource.postAddressValidations()
+        .setPostAddressValidationsRequest(request)
         .create();
     System.out.println(response.getData());
 ```
 
-**GET** /cancel-pickups/{id}
-
-```java
-    GetCancelPickupResponse response = CancelPickupsResource.getCancelPickup()
-        .setId("valid_value")
-        .fetch();
-    System.out.println(response.getData());
-```
-
-### /locations
-**GET** /locations
-
-```java
-    GetLocationsResponse response = LocationsResource.getLocations()
-        .fetch();
-    System.out.println(response.getData());
-```
-
 ### /manifests
 **GET** /manifests
 
@@ -473,6 +443,36 @@ The AfterShip SDK has the following resource which are exactly the same as the A
     System.out.println(response.getData());
 ```
 
+### /cancel-pickups
+**GET** /cancel-pickups
+
+```java
+    GetCancelPickupsResponse response = CancelPickupsResource.getCancelPickups()
+        .fetch();
+    System.out.println(response.getData());
+```
+
+**POST** /cancel-pickups
+
+```java
+    PostCancelPickupsRequest request = new PostCancelPickupsRequest();
+    PostCancelPickupsRequestPickup pickup = new PostCancelPickupsRequestPickup();
+    request.setPickup(pickup);
+    PostCancelPickupsResponse response = CancelPickupsResource.postCancelPickups()
+        .setPostCancelPickupsRequest(request)
+        .create();
+    System.out.println(response.getData());
+```
+
+**GET** /cancel-pickups/{id}
+
+```java
+    GetCancelPickupResponse response = CancelPickupsResource.getCancelPickup()
+        .setId("valid_value")
+        .fetch();
+    System.out.println(response.getData());
+```
+
 
 ## Help
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.aftership</groupId>
     <artifactId>shipping-sdk</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
 
     <name>AfterShip Shipping SDK</name>
     <description>The official AfterShip Shipping Java API library</description>

src/main/java/com/aftership/shipping/http/HttpClient.java

@@ -19,16 +19,18 @@
 import org.apache.http.message.BasicHeader;
 import org.apache.http.util.EntityUtils;
 
+import java.net.SocketException;
 import java.net.SocketTimeoutException;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 public class HttpClient {
 
-    private static final String DEFAULT_USER_AGENT = "shipping-sdk-java/3.0.0 (https://www.aftership.com) apache-httpclient/4.5.14";
+    private static final String DEFAULT_USER_AGENT = "shipping-sdk-java/3.0.1 (https://www.aftership.com) apache-httpclient/4.5.14";
     protected final org.apache.http.client.HttpClient client;
 
     public HttpClient(final RequestConfig requestConfig, String userAgent) {
@@ -46,6 +48,9 @@ public HttpClient(final RequestConfig requestConfig, String userAgent) {
         client = clientBuilder
                 .setDefaultHeaders(headers)
                 .setDefaultRequestConfig(requestConfig)
+                .setMaxConnPerRoute(20)
+                .setMaxConnTotal(100)
+                .setConnectionTimeToLive(300, TimeUnit.SECONDS).evictExpiredConnections()
                 .build();
     }
 
@@ -66,6 +71,17 @@ public Response request(final Request request, int retries) throws Exception {
                             "Request timed out."
                     );
                 }
+            } catch (SocketException e) {
+                if (e.getMessage().equals("Connection reset")) {
+                    if (i > retries) {
+                        throw new ApiException(
+                                ErrorEnum.TIMED_OUT.name(),
+                                "Request timed out."
+                        );
+                    }
+                } else {
+                    throw e;
+                }
             } catch (Exception e) {
                 throw e;
             }
@@ -115,7 +131,7 @@ private boolean shouldRetry(Response response) {
 
     private int delay(int retryAttempt) {
         int delayBase = 3;
-        int delay = delayBase * (2 ^ (retryAttempt - 1));
+        int delay = delayBase * (1 << (retryAttempt - 1));
         double jitter = delay * (Math.random() - 0.5);
         return (int) (Math.max(1, delay + jitter) * 1000);
     }