From c369e116b223f4c37b7054bb3f8af5cbe1679d6d Mon Sep 17 00:00:00 2001
From: smashyalts <smashyalts@gmail.com>
Date: Thu, 29 Feb 2024 14:21:59 +0100
Subject: [PATCH] added retrying and increased client timeout thresholds

---
 .../chunkydedicated/ChunkyDedicated.java      | 45 ++++++++++++++-----
 1 file changed, 33 insertions(+), 12 deletions(-)

diff --git a/chunky-dedicated/src/main/java/com/funniray/chunkydedicated/ChunkyDedicated.java b/chunky-dedicated/src/main/java/com/funniray/chunkydedicated/ChunkyDedicated.java
index 3c09d5f..aaf0e72 100644
--- a/chunky-dedicated/src/main/java/com/funniray/chunkydedicated/ChunkyDedicated.java
+++ b/chunky-dedicated/src/main/java/com/funniray/chunkydedicated/ChunkyDedicated.java
@@ -1,5 +1,6 @@
 package com.funniray.chunkydedicated;
 
+import com.amazonaws.ClientConfiguration;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
 import com.amazonaws.client.builder.AwsClientBuilder;
@@ -80,18 +81,23 @@ public void onEnable() {
         });
     }
 
-    public void multipartUploadWithS3Client(String filePath) {
-        AmazonS3 s3 = AmazonS3ClientBuilder.standard()
-                .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration("https://" + getConfig().getString("cloudflare-account-id") + ".r2.cloudflarestorage.com" + "/" + getConfig().getString("bucket-name"), "auto"))
-                .withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials(getConfig().getString("cloudflare-access-key"), getConfig().getString("cloudflare-secret-key"))))
-                .build();
+        public void multipartUploadWithS3Client(String filePath) {
+            ClientConfiguration clientConfiguration = new ClientConfiguration();
+            clientConfiguration.setSocketTimeout(60000); // 60-second socket timeout
+            clientConfiguration.setConnectionTimeout(60000); // 60-second connection timeout
+
+            AmazonS3 s3 = AmazonS3ClientBuilder.standard()
+                    .withEndpointConfiguration(new AwsClientBuilder.EndpointConfiguration("https://" + getConfig().getString("cloudflare-account-id") + ".r2.cloudflarestorage.com" + "/" + getConfig().getString("bucket-name"), "auto"))
+                    .withCredentials(new AWSStaticCredentialsProvider(new BasicAWSCredentials(getConfig().getString("cloudflare-access-key"), getConfig().getString("cloudflare-secret-key"))))
+                    .withClientConfiguration(clientConfiguration) // Pass the client configuration here
+                    .build();
 
         InitiateMultipartUploadRequest initRequest = new InitiateMultipartUploadRequest(bucketName, "World." + key + ".zip");
         InitiateMultipartUploadResult initResponse = s3.initiateMultipartUpload(initRequest);
 
         File file = new File(filePath);
         long contentLength = file.length();
-        long partSize = 5 * 1024 * 1024;
+        long partSize = 10 * 1024 * 1024; // Increased part size to 10MB
 
         try {
 
@@ -101,7 +107,6 @@ public void multipartUploadWithS3Client(String filePath) {
 
                 partSize = Math.min(partSize, (contentLength - filePosition));
 
-
                 UploadPartRequest uploadRequest = new UploadPartRequest()
                         .withBucketName(bucketName)
                         .withKey("World." + key + ".zip")
@@ -111,18 +116,34 @@ public void multipartUploadWithS3Client(String filePath) {
                         .withFile(file)
                         .withPartSize(partSize);
 
-
-                UploadPartResult uploadResult = s3.uploadPart(uploadRequest);
-                partETags.add(uploadResult.getPartETag());
+                // Retry logic
+                int retryCount = 0;
+                while (true) {
+                    try {
+                        UploadPartResult uploadResult = s3.uploadPart(uploadRequest);
+                        partETags.add(uploadResult.getPartETag());
+                        break;
+                    } catch (Exception e) {
+                        if (++retryCount > 3) { // Maximum of 3 retries
+                            throw e; // If still failing after 3 retries, rethrow the exception
+                        }
+                        // Wait before retrying
+                        try {
+                            Thread.sleep(1000 * retryCount); // Wait for an increasing amount of time before retrying
+                        } catch (InterruptedException ie) {
+                            Thread.currentThread().interrupt();
+                            throw new RuntimeException(ie);
+                        }
+                    }
+                }
 
                 filePosition += partSize;
             }
 
-
             CompleteMultipartUploadRequest compRequest = new CompleteMultipartUploadRequest(getConfig().getString("bucket-name"), "World." + key + ".zip",
                     initResponse.getUploadId(), partETags);
 
-            s3.completeMultipartUpload(compRequest);//Handle exception
+            s3.completeMultipartUpload(compRequest);
             getLogger().info("File uploaded successfully");
         } catch (Exception e) {
             s3.abortMultipartUpload(new AbortMultipartUploadRequest(bucketName, "World." + key + ".zip", initResponse.getUploadId()));