fix: handle ws reconnection in loop

Author: pbourseau

ocpp-wamp/src/main/kotlin/com/izivia/ocpp/wamp/client/autoreconnect/AutoReconnectHandler.kt

@@ -43,6 +43,10 @@ internal class AutoReconnectHandler(
         planConnectionAttempt(clock.now())
     }
 
+    fun planConnectionAttemptAfterDelay(delay: Duration) {
+        planConnectionAttempt(clock.now() + delay)
+    }
+
     fun planConnectionAttempt(scheduleAt: Instant, checkCurrentAttempt: Boolean = true) {
         withLock {
             val lastAttemptOrNull = lastConnectionAttempts.lastOrNull()

ocpp-wamp/src/main/kotlin/com/izivia/ocpp/wamp/client/autoreconnect/AutoReconnectOcppWampClient.kt

@@ -103,7 +103,7 @@ class AutoReconnectOcppWampClient(
         autoReconnectState.onDisconnected()
         when (autoReconnectState) {
             is AutoReconnectIdleState, is AutoReconnectConnectingState -> {}
-            is AutoReconnectConnectedState -> moveTo(autoReconnectState, connectingState())
+            is AutoReconnectConnectedState -> moveTo(autoReconnectState, connectingState(isReconnect = true))
         }
         connectionListener?.onConnectionLost(t)
     }
@@ -117,7 +117,7 @@ class AutoReconnectOcppWampClient(
         connectionListener?.onConnectionFailure(t)
     }
 
-    private fun connectingState() =
+    private fun connectingState(isReconnect: Boolean = false) =
         AutoReconnectConnectingState(
             debugContext,
             config,
@@ -134,7 +134,8 @@ class AutoReconnectOcppWampClient(
                 override fun onConnectionLost(t: Throwable?) {
                     emitConnectionLost(t)
                 }
-            }
+            },
+            isReconnect = isReconnect
         )
 
     private fun moveTo(from: AutoReconnectState, to: AutoReconnectState) {

ocpp-wamp/src/main/kotlin/com/izivia/ocpp/wamp/client/autoreconnect/AutoReconnectState.kt

@@ -49,7 +49,8 @@ internal class AutoReconnectConnectingState(
     private val debugContext: String,
     private val config: AutoReconnectConfig,
     doConnect: (l: ConnectionListener) -> Unit,
-    connectionListener: ConnectionListener
+    connectionListener: ConnectionListener,
+    private val isReconnect: Boolean = false
 ) : AutoReconnectState {
     private val handler = AutoReconnectHandler(
         debugContext,
@@ -83,7 +84,11 @@ internal class AutoReconnectConnectingState(
         }
 
         logger.info("[$debugContext] connecting [auto-reconnect ON]")
-        handler.planConnectionAttemptNow()
+        if (isReconnect) {
+            handler.planConnectionAttemptAfterDelay(config.baseAutoReconnectDelay)
+        } else {
+            handler.planConnectionAttemptNow()
+        }
     }
 
     override fun onConnected() {

ocpp-wamp/src/main/kotlin/com/izivia/ocpp/wamp/client/impl/OkHttpOcppWampClient.kt

@@ -141,12 +141,15 @@ class OkHttpOcppWampClient(
                     logger.warn("[$ocppId] web socket closing $code $reason - state = $connectionState")
                     if (code == CLEANUP_CLOSURE_STATUS) {
                         logger.info("[$ocppId] connection closed to $serverUri due to reconnection")
+                        closingWebSocket.close(code, reason)
                         return
                     }
 
+                    closingWebSocket.close(code, reason)
+                    val previousState = connectionState
                     connectionState = ConnectionState.DISCONNECTED
                     wampConnection = null
-                    when (connectionState) {
+                    when (previousState) {
                         ConnectionState.CONNECTING -> {
                             listener.onConnectionFailure(
                                 IOException(