laantungir/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2026-08-10 16:33:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into claude/amazing-volta-UJrwo

Browse Source
This commit is contained in:
Claude
2026-05-30 00:26:26 +00:00
parent 7bda12f047 b9bee7301f
commit fea00f5707
2 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/AppModules.kt
+4 -3
View File
@@ -475,9 +475,10 @@ class AppModules(
val relayProxyClientConnector =
RelayProxyClientConnector(
torEvaluatorFlow.flow,
okHttpClientForRelays,
connManager,
torManager,
okHttpClientForRelays.defaultHttpClient,
okHttpClientForRelays.defaultHttpClientWithoutProxy,
connManager.status,
torManager.status,
client,
applicationIOScope,
)
amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/RelayProxyClientConnector.kt
+26 -12
View File
@@ -21,10 +21,7 @@
package com.vitorpamplona.amethyst.service.relayClient
import com.vitorpamplona.amethyst.model.torState.TorRelayEvaluation
import com.vitorpamplona.amethyst.service.connectivity.ConnectivityManager
import com.vitorpamplona.amethyst.service.connectivity.ConnectivityStatus
import com.vitorpamplona.amethyst.service.okhttp.DualHttpClientManagerForRelays
import com.vitorpamplona.amethyst.ui.tor.TorManager
import com.vitorpamplona.amethyst.ui.tor.TorServiceStatus
import com.vitorpamplona.quartz.nip01Core.relay.client.INostrClient
import com.vitorpamplona.quartz.utils.Log
@@ -44,9 +41,10 @@ import okhttp3.OkHttpClient
class RelayProxyClientConnector(
val torEvaluator: StateFlow<TorRelayEvaluation>,
val okHttpClients: DualHttpClientManagerForRelays,
val connManager: ConnectivityManager,
val torManager: TorManager,
val torConnection: StateFlow<OkHttpClient>,
val clearConnection: StateFlow<OkHttpClient>,
val connectivityStatus: StateFlow<ConnectivityStatus>,
val torStatus: StateFlow<TorServiceStatus>,
val client: INostrClient,
val scope: CoroutineScope,
) {
@@ -58,14 +56,21 @@ class RelayProxyClientConnector(
val torStatus: TorServiceStatus,
)
// The OkHttp clients in use the last time we forced a reconnect. These are only
// rebuilt when something connection-relevant changes (Tor's SOCKS port appears,
// wifi<->cellular switch), so comparing them tells us whether a wakeup is a real
// transport change or just noise (Tor bootstrap status churn, connectivity blips).
private var lastTorConnection: OkHttpClient? = null
private var lastClearConnection: OkHttpClient? = null
@OptIn(FlowPreview::class)
val relayServices =
combine(
torEvaluator,
okHttpClients.defaultHttpClient,
okHttpClients.defaultHttpClientWithoutProxy,
connManager.status,
torManager.status,
torConnection,
clearConnection,
connectivityStatus,
torStatus,
) { torSettings, torConnection, clearConnection, connectivity, torStatus ->
RelayServiceInfra(torSettings, torConnection, clearConnection, connectivity, torStatus)
}.debounce(100)
@@ -97,10 +102,19 @@ class RelayProxyClientConnector(
}
else -> {
Log.d("ManageRelayServices", "Relay Services have changed, reconnecting relays that need to")
// Only skip the per-relay exponential backoff when the actual HTTP
// transport changed. Otherwise (e.g. Tor still bootstrapping, the SOCKS
// port not yet listening) honor each relay's backoff so we don't
// reconnect-fail-reconnect on every unrelated infrastructure event.
val transportChanged =
it.torConnection !== lastTorConnection || it.clearConnection !== lastClearConnection
lastTorConnection = it.torConnection
lastClearConnection = it.clearConnection
Log.d("ManageRelayServices", "Relay Services have changed, reconnecting relays that need to (transportChanged=$transportChanged)")
client.reconnect(
onlyIfChanged = true,
ignoreRetryDelays = true,
ignoreRetryDelays = transportChanged,
)
}
}