highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-11-10 15:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

better relay reconnecting logic

Browse Source
This commit is contained in:
Vitor Pamplona
2025-04-25 17:02:58 -04:00
parent 0c54f9aa10
commit b51e5f4383
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relay/SimpleClientRelay.kt
View File

@@ -55,14 +55,15 @@ class SimpleClientRelay(
) { ) {
companion object { companion object {
// waits 3 minutes to reconnect once things fail // waits 3 minutes to reconnect once things fail
const val RECONNECTING_IN_SECONDS = 60 * 3 const val DELAY_TO_RECONNECT_IN_MSECS = 500L
} }
private var socket: WebSocket? = null private var socket: WebSocket? = null
private var isReady: Boolean = false private var isReady: Boolean = false
private var usingCompression: Boolean = false private var usingCompression: Boolean = false
private var lastConnectTentative: Long = 0L private var lastConnectTentative: Long = 0L // the beginning of time.
private var delayToConnect = DELAY_TO_RECONNECT_IN_MSECS
private var afterEOSEPerSubscription = mutableMapOf<String, Boolean>() private var afterEOSEPerSubscription = mutableMapOf<String, Boolean>()
@@ -217,6 +218,9 @@ class SimpleClientRelay(
this.isReady = true this.isReady = true
this.usingCompression = usingCompression this.usingCompression = usingCompression
// resets any extra delays added during on offline state
this.delayToConnect = DELAY_TO_RECONNECT_IN_MSECS
stats.pingInMs = pingInMs stats.pingInMs = pingInMs
} }
@@ -292,6 +296,7 @@ class SimpleClientRelay(
fun disconnect() { fun disconnect() {
Log.d("Relay", "Relay.disconnect $url") Log.d("Relay", "Relay.disconnect $url")
lastConnectTentative = 0L // this is not an error, so prepare to reconnect as soon as requested. lastConnectTentative = 0L // this is not an error, so prepare to reconnect as soon as requested.
delayToConnect = DELAY_TO_RECONNECT_IN_MSECS
socket?.cancel() socket?.cancel()
socket = null socket = null
isReady = false isReady = false
@@ -319,7 +324,8 @@ class SimpleClientRelay(
} }
} else { } else {
// waits 60 seconds to reconnect after disconnected. // waits 60 seconds to reconnect after disconnected.
if (TimeUtils.now() > lastConnectTentative + RECONNECTING_IN_SECONDS) { if (TimeUtils.now() > lastConnectTentative + delayToConnect) {
delayToConnect = delayToConnect * 2
// sends all filters after connection is successful. // sends all filters after connection is successful.
connect() connect()
} }
@@ -339,8 +345,9 @@ class SimpleClientRelay(
} }
} else { } else {
// waits 60 seconds to reconnect after disconnected. // waits 60 seconds to reconnect after disconnected.
if (TimeUtils.now() > lastConnectTentative + RECONNECTING_IN_SECONDS) { if (TimeUtils.now() > lastConnectTentative + delayToConnect) {
// sends all filters after connection is successful. // sends all filters after connection is successful.
delayToConnect = delayToConnect * 2
connect() connect()
} }
} }
@@ -349,7 +356,8 @@ class SimpleClientRelay(
fun connectAndSendFiltersIfDisconnected() { fun connectAndSendFiltersIfDisconnected() {
if (socket == null) { if (socket == null) {
// waits 60 seconds to reconnect after disconnected. // waits 60 seconds to reconnect after disconnected.
if (TimeUtils.now() > lastConnectTentative + RECONNECTING_IN_SECONDS) { if (TimeUtils.now() > lastConnectTentative + delayToConnect) {
delayToConnect = delayToConnect * 2
connect() connect()
} }
} }