Merge pull request #2 from WalletConnect/connection_life_cycle

feat: Add conditional backoff
WalletConnect · Aug 30, 2024 · fd8ddc1 · fd8ddc1
2 parents c14d289 + 4b00662
commit fd8ddc1
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 16 deletions.
diff --git a/scarlet/src/main/java/com/tinder/scarlet/internal/connection/Connection.kt b/scarlet/src/main/java/com/tinder/scarlet/internal/connection/Connection.kt
@@ -106,15 +106,19 @@ internal class Connection(
                     transitionTo(Connected(session = session))
                 }
                 on<OnWebSocket.Terminate>() {
-                    val backoffDuration = backoffStrategy.backoffDurationMillisAt(retryCount)
-                    val timerDisposable = scheduleRetry(backoffDuration)
-                    transitionTo(
-                        WaitingToRetry(
-                            timerDisposable = timerDisposable,
-                            retryCount = retryCount,
-                            retryInMillis = backoffDuration
+                    if (backoffStrategy.shouldBackoff) {
+                        val backoffDuration = backoffStrategy.backoffDurationMillisAt(retryCount)
+                        val timerDisposable = scheduleRetry(backoffDuration)
+                        transitionTo(
+                            WaitingToRetry(
+                                timerDisposable = timerDisposable,
+                                retryCount = retryCount,
+                                retryInMillis = backoffDuration
+                            )
                         )
-                    )
+                    } else {
+                        transitionTo(Disconnected)
+                    }
                 }
             }
             state<Connected> {
@@ -135,15 +139,19 @@ internal class Connection(
                     transitionTo(Destroyed)
                 }
                 on<OnWebSocket.Terminate>() {
-                    val backoffDuration = backoffStrategy.backoffDurationMillisAt(0)
-                    val timerDisposable = scheduleRetry(backoffDuration)
-                    transitionTo(
-                        WaitingToRetry(
-                            timerDisposable = timerDisposable,
-                            retryCount = 0,
-                            retryInMillis = backoffDuration
+                    if (backoffStrategy.shouldBackoff) {
+                        val backoffDuration = backoffStrategy.backoffDurationMillisAt(0)
+                        val timerDisposable = scheduleRetry(backoffDuration)
+                        transitionTo(
+                            WaitingToRetry(
+                                timerDisposable = timerDisposable,
+                                retryCount = 0,
+                                retryInMillis = backoffDuration
+                            )
                         )
-                    )
+                    } else {
+                        transitionTo(Disconnected)
+                    }
                 }
             }
             state<Disconnecting> {

diff --git a/scarlet/src/main/java/com/tinder/scarlet/retry/BackoffStrategy.kt b/scarlet/src/main/java/com/tinder/scarlet/retry/BackoffStrategy.kt
@@ -12,4 +12,6 @@ interface BackoffStrategy {
      * Returns a duration in milliseconds.
      */
     fun backoffDurationMillisAt(retryCount: Int): Long
+
+    var shouldBackoff: Boolean
 }
diff --git a/scarlet/src/main/java/com/tinder/scarlet/retry/ExponentialBackoffStrategy.kt b/scarlet/src/main/java/com/tinder/scarlet/retry/ExponentialBackoffStrategy.kt
@@ -21,4 +21,6 @@ class ExponentialBackoffStrategy(
             initialDurationMillis.toDouble() * Math.pow(2.0, retryCount.toDouble())
         )
             .toLong()
+
+    override var shouldBackoff: Boolean = true
 }
diff --git a/scarlet/src/main/java/com/tinder/scarlet/retry/ExponentialWithJitterBackoffStrategy.kt b/scarlet/src/main/java/com/tinder/scarlet/retry/ExponentialWithJitterBackoffStrategy.kt
@@ -22,6 +22,8 @@ class ExponentialWithJitterBackoffStrategy(
         return duration.withJitter()
     }
 
+    override var shouldBackoff: Boolean = true
+
     private fun Long.withJitter(): Long = (0..this).random()
 
     private fun ClosedRange<Long>.random() = random.nextInt((endInclusive - start).toInt()) + start

diff --git a/scarlet/src/main/java/com/tinder/scarlet/retry/LinearBackoffStrategy.kt b/scarlet/src/main/java/com/tinder/scarlet/retry/LinearBackoffStrategy.kt
@@ -13,4 +13,6 @@ class LinearBackoffStrategy(
     }
 
     override fun backoffDurationMillisAt(retryCount: Int): Long = durationMillis
+
+    override var shouldBackoff: Boolean = true
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,4 +13,6 @@ class LinearBackoffStrategy( @@
         }
         override fun backoffDurationMillisAt(retryCount: Int): Long = durationMillis
+        override var shouldBackoff: Boolean = true
     }