limit reconnecting to 1 minute max.

Also fix bug where always did full reconnect

@@ -18,6 +18,7 @@ import livekit.LivekitRtc
 import org.webrtc.*
 import org.webrtc.*
 import java.net.ConnectException
 import java.net.ConnectException
 import java.nio.ByteBuffer
 import java.nio.ByteBuffer
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import javax.inject.Inject
 import javax.inject.Named
 import javax.inject.Named
 import javax.inject.Singleton
 import javax.inject.Singleton
@@ -324,17 +325,18 @@ internal constructor(
             connectionState = ConnectionState.RECONNECTING
             connectionState = ConnectionState.RECONNECTING
             listener?.onEngineReconnecting()
             listener?.onEngineReconnecting()
 
 
-            for (wsRetries in 0 until MAX_SIGNAL_RETRIES) {
-                var startDelay = wsRetries.toLong() * wsRetries * 500
+            val reconnectStartTime = SystemClock.elapsedRealtime()
+            for (retries in 0 until MAX_RECONNECT_RETRIES) {
+                var startDelay = retries.toLong() * retries * 500
                 if (startDelay > 5000) {
                 if (startDelay > 5000) {
                     startDelay = 5000
                     startDelay = 5000
                 }
                 }
 
 
-                LKLog.i { "Reconnecting to signal, attempt ${wsRetries + 1}" }
+                LKLog.i { "Reconnecting to signal, attempt ${retries + 1}" }
                 delay(startDelay)
                 delay(startDelay)
 
 
                 // full reconnect after first try.
                 // full reconnect after first try.
-                val isFullReconnect = true
+                val isFullReconnect = retries != 0
 
 
                 if (isFullReconnect) {
                 if (isFullReconnect) {
                     try {
                     try {
@@ -383,6 +385,11 @@ internal constructor(
                     }
                     }
                     return@launch
                     return@launch
                 }
                 }
+
+                val curReconnectTime = SystemClock.elapsedRealtime() - reconnectStartTime
+                if(curReconnectTime > MAX_RECONNECT_TIMEOUT){
+                    break
+                }
             }
             }
 
 
             close()
             close()
@@ -518,7 +525,8 @@ internal constructor(
         private const val RELIABLE_DATA_CHANNEL_LABEL = "_reliable"
         private const val RELIABLE_DATA_CHANNEL_LABEL = "_reliable"
         private const val LOSSY_DATA_CHANNEL_LABEL = "_lossy"
         private const val LOSSY_DATA_CHANNEL_LABEL = "_lossy"
         internal const val MAX_DATA_PACKET_SIZE = 15000
         internal const val MAX_DATA_PACKET_SIZE = 15000
-        private const val MAX_SIGNAL_RETRIES = 5
+        private const val MAX_RECONNECT_RETRIES = 10
+        private const val MAX_RECONNECT_TIMEOUT = 60 * 1000
         private const val MAX_ICE_CONNECT_TIMEOUT_MS = 20000
         private const val MAX_ICE_CONNECT_TIMEOUT_MS = 20000
 
 
         internal val CONN_CONSTRAINTS = MediaConstraints().apply {
         internal val CONN_CONSTRAINTS = MediaConstraints().apply {

@@ -91,14 +91,14 @@ constructor(
         token: String,
         token: String,
         options: ConnectOptions
         options: ConnectOptions
     ): Either<LivekitRtc.JoinResponse, Unit> {
     ): Either<LivekitRtc.JoinResponse, Unit> {
+        // Clean up any pre-existing connection.
+        close()
+
         val wsUrlString = "$url/rtc" + createConnectionParams(token, getClientInfo(), options)
         val wsUrlString = "$url/rtc" + createConnectionParams(token, getClientInfo(), options)
         isReconnecting = options.reconnect
         isReconnecting = options.reconnect
 
 
         LKLog.i { "connecting to $wsUrlString" }
         LKLog.i { "connecting to $wsUrlString" }
 
 
-        // Clean up any pre-existing connection.
-        close()
-
         coroutineScope = CloseableCoroutineScope(SupervisorJob() + ioDispatcher)
         coroutineScope = CloseableCoroutineScope(SupervisorJob() + ioDispatcher)
         lastUrl = wsUrlString
         lastUrl = wsUrlString
 
 
@@ -518,6 +518,7 @@ constructor(
      */
      */
     fun close(code: Int = 1000, reason: String = "Normal Closure") {
     fun close(code: Int = 1000, reason: String = "Normal Closure") {
         isConnected = false
         isConnected = false
+        isReconnecting = false
         if (::coroutineScope.isInitialized) {
         if (::coroutineScope.isInitialized) {
             coroutineScope.close()
             coroutineScope.close()
         }
         }