Added retry in S3 upload (#378)

* Added UploadFileEndpoint - AWS S3 upload to general retryConfiguration.
* Added PublishFileMessageEndpoint to general retryConfiguration instead of old retry.
* BREAKING CHANGE - config property fileMessagePublishRetryLimit is no longer used by PublishFileMessageEndpoint to retry failed attempts.

Author: marcin-cebo

pubnub-gson/pubnub-gson-api/src/main/java/com/pubnub/api/java/v2/PNConfiguration.kt

@@ -287,6 +287,10 @@ interface PNConfiguration : com.pubnub.api.v2.PNConfiguration {
          *
          * Defaults to `5`
          */
+        @Deprecated(
+            message = "This setting is deprecated. Use retryConfiguration instead",
+            level = DeprecationLevel.WARNING
+        )
         val fileMessagePublishRetryLimit: Int
 
         val dedupOnSubscribe: Boolean
@@ -535,6 +539,10 @@ interface PNConfiguration : com.pubnub.api.v2.PNConfiguration {
          *
          * Defaults to `5`
          */
+        @Deprecated(
+            message = "This setting is deprecated. Use retryConfiguration instead e.g. retryConfiguration = RetryConfiguration.Linear()",
+            level = DeprecationLevel.WARNING
+        )
         fun fileMessagePublishRetryLimit(fileMessagePublishRetryLimit: Int): Builder
 
         fun dedupOnSubscribe(dedupOnSubscribe: Boolean): Builder

pubnub-gson/pubnub-gson-impl/src/main/java/com/pubnub/internal/java/v2/PNConfigurationImpl.kt

@@ -55,7 +55,7 @@ class PNConfigurationImpl(
     override val x509ExtendedTrustManager: X509ExtendedTrustManager? = null,
     override val connectionSpec: ConnectionSpec? = null,
     override val hostnameVerifier: HostnameVerifier? = null,
-    override val fileMessagePublishRetryLimit: Int = 5,
+    override val fileMessagePublishRetryLimit: Int = 0,
     override val dedupOnSubscribe: Boolean = false,
     override val maximumMessagesCacheSize: Int = DEFAULT_DEDUPE_SIZE,
     override val pnsdkSuffixes: Map<String, String> = emptyMap(),
@@ -356,6 +356,10 @@ class PNConfigurationImpl(
 
             override var hostnameVerifier: HostnameVerifier? = defaultConfiguration.hostnameVerifier
 
+            @Deprecated(
+                message = "This setting is deprecated. Use retryConfiguration instead e.g. retryConfiguration = RetryConfiguration.Linear()",
+                level = DeprecationLevel.WARNING
+            )
             override fun fileMessagePublishRetryLimit(fileMessagePublishRetryLimit: Int): Builder {
                 this.fileMessagePublishRetryLimit = fileMessagePublishRetryLimit
                 return this

pubnub-kotlin/pubnub-kotlin-core-api/src/commonMain/kotlin/com/pubnub/api/PubNubError.kt

@@ -240,6 +240,16 @@ enum class PubNubError(private val code: Int, val message: String) {
         "Channel and/or ChannelGroup contains empty string which is not allowed.",
     ),
 
+    UPLOAD_URL_HAS_EXPIRED(
+        code = 182,
+        message = "The upload URL has expired.",
+    ),
+
+    FILE_TOO_LARGE(
+        code = 183,
+        message = "File size exceeds the maximum allowed size for upload.",
+    )
+
     ;
 
     override fun toString(): String {

pubnub-kotlin/pubnub-kotlin-core-api/src/jvmMain/kotlin/com/pubnub/api/v2/PNConfiguration.kt

@@ -273,6 +273,10 @@ actual interface PNConfiguration {
      *
      * Defaults to `5`
      */
+    @Deprecated(
+        message = "This setting is deprecated. Use retryConfiguration instead",
+        level = DeprecationLevel.WARNING
+    )
     val fileMessagePublishRetryLimit: Int
 
     val dedupOnSubscribe: Boolean
@@ -599,6 +603,10 @@ actual interface PNConfiguration {
          *
          * Defaults to `5`
          */
+        @Deprecated(
+            message = "This setting is deprecated. Use retryConfiguration instead e.g. retryConfiguration = RetryConfiguration.Linear()",
+            level = DeprecationLevel.WARNING
+        )
         var fileMessagePublishRetryLimit: Int
 
         var dedupOnSubscribe: Boolean

pubnub-kotlin/pubnub-kotlin-impl/src/main/kotlin/com/pubnub/internal/PubNubImpl.kt

@@ -1803,7 +1803,6 @@ open class PubNubImpl(
             executorService =
                 retrofitManager.getTransactionClientExecutorService()
                     ?: Executors.newSingleThreadExecutor(),
-            fileMessagePublishRetryLimit = configuration.fileMessagePublishRetryLimit,
             generateUploadUrlFactory = GenerateUploadUrlEndpoint.Factory(this),
             publishFileMessageFactory = PublishFileMessageEndpoint.Factory(this),
             sendFileToS3Factory = UploadFileEndpoint.Factory(this),

pubnub-kotlin/pubnub-kotlin-impl/src/main/kotlin/com/pubnub/internal/endpoints/files/SendFileEndpoint.kt

@@ -14,7 +14,6 @@ import com.pubnub.api.models.consumer.files.PNPublishFileMessageResult
 import com.pubnub.api.v2.callbacks.Result
 import com.pubnub.internal.PubNubImpl
 import com.pubnub.internal.crypto.cryptor.InputStreamSeparator
-import com.pubnub.internal.endpoints.remoteaction.RetryingRemoteAction
 import com.pubnub.internal.models.server.files.FileUploadRequestDetails
 import java.io.InputStream
 import java.net.HttpURLConnection
@@ -34,7 +33,6 @@ class SendFileEndpoint internal constructor(
     private val ttl: Int? = null,
     private val shouldStore: Boolean? = null,
     private val customMessageType: String? = null,
-    private val fileMessagePublishRetryLimit: Int,
     private val executorService: ExecutorService,
     generateUploadUrlFactory: GenerateUploadUrlEndpoint.Factory,
     publishFileMessageFactory: PublishFileMessageEndpoint.Factory,
@@ -98,20 +96,16 @@ class SendFileEndpoint internal constructor(
                 sendFileToS3Factory.create(fileName, content, res) // 2. upload to s3
             }.checkpoint().then {
                 val details = result.get()
-                RetryingRemoteAction.autoRetry(
-                    publishFileMessageFactory.create( // 3. PublishFileMessage
-                        channel = channel,
-                        fileName = details.data.name,
-                        fileId = details.data.id,
-                        message = message,
-                        meta = meta,
-                        ttl = ttl,
-                        shouldStore = shouldStore,
-                        customMessageType = customMessageType,
-                    ),
-                    fileMessagePublishRetryLimit,
-                    executorService,
-                ) // publish file message
+                publishFileMessageFactory.create( // 3. PublishFileMessage
+                    channel = channel,
+                    fileName = details.data.name,
+                    fileId = details.data.id,
+                    message = message,
+                    meta = meta,
+                    ttl = ttl,
+                    shouldStore = shouldStore,
+                    customMessageType = customMessageType,
+                )
             }.map { mapPublishFileMessageToFileUpload(result.get(), it) }
     }