highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-10-10 23:24:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Uses a separate okhttp for DM relays

Browse Source
This commit is contained in:
Vitor Pamplona
2025-08-22 13:50:28 -04:00
parent f9ea1270fa
commit fa80912db2
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
View File

@@ -102,13 +102,27 @@ class Amethyst : Application() {
scope = applicationIOScope, scope = applicationIOScope,
) )
// manages all relay connections
val okHttpClientForRelaysForDms =
DualHttpClientManager(
userAgent = appAgent,
proxyPortProvider = torManager.activePortOrNull,
isMobileDataProvider = connManager.isMobileOrNull,
keyCache = keyCache,
scope = applicationIOScope,
)
val torProxySettingsAnchor = ProxySettingsAnchor() val torProxySettingsAnchor = ProxySettingsAnchor()
// Connects the NostrClient class with okHttp // Connects the NostrClient class with okHttp
val websocketBuilder = val websocketBuilder =
OkHttpWebSocket.Builder { url -> OkHttpWebSocket.Builder { url ->
if (torProxySettingsAnchor.isDM(url)) {
okHttpClientForRelaysForDms.getHttpClient(torProxySettingsAnchor.useProxy(url))
} else {
okHttpClientForRelays.getHttpClient(torProxySettingsAnchor.useProxy(url)) okHttpClientForRelays.getHttpClient(torProxySettingsAnchor.useProxy(url))
} }
}
// Caches all events in Memory // Caches all events in Memory
val cache: LocalCache = LocalCache val cache: LocalCache = LocalCache

1
amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/ProxySettingsAnchor.kt
View File

@@ -38,5 +38,6 @@ class ProxySettingsAnchor {
), ),
) )
var isDM: (NormalizedRelayUrl) -> Boolean = { it in flow.value.value.dmRelayList }
var useProxy: (NormalizedRelayUrl) -> Boolean = { flow.value.value.useTor(it) } var useProxy: (NormalizedRelayUrl) -> Boolean = { flow.value.value.useTor(it) }
} }