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

Removes the choice of Dispatchers from Quartz

Browse Source
This commit is contained in:
Vitor Pamplona
2025-10-21 20:15:05 -04:00
parent db1d5c7e82
commit c21b2ca60f
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/NostrClient.kt
View File

@@ -37,13 +37,11 @@ import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
import com.vitorpamplona.quartz.nip01Core.relay.sockets.WebsocketBuilder
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.FlowPreview
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.debounce
import kotlinx.coroutines.flow.flowOn
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.sample
import kotlinx.coroutines.flow.stateIn
@@ -108,8 +106,7 @@ class NostrClient(
}.sample(300)
.onEach {
relayPool.updatePool(it)
}.flowOn(Dispatchers.IO)
.stateIn(
}.stateIn(
scope,
SharingStarted.Eagerly,
activeRequests.desiredRelays.value + activeCounts.relays.value + eventOutbox.relays.value,
@@ -229,7 +226,7 @@ class NostrClient(
override fun renewFilters(relay: IRelayClient) {
if (isActive) {
scope.launch(Dispatchers.IO) {
scope.launch {
activeRequests.syncState(relay.url, relay::sendOrConnectAndSync)
activeCounts.syncState(relay.url, relay::sendOrConnectAndSync)
eventOutbox.syncState(relay.url, relay::sendOrConnectAndSync)

4
quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/accessories/NostrClientSendAndWaitExt.kt
View File

@@ -29,8 +29,6 @@ import com.vitorpamplona.quartz.nip01Core.relay.commands.toClient.OkMessage
import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
import com.vitorpamplona.quartz.utils.Log
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.IO
import kotlinx.coroutines.async
import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.channels.Channel.Factory.UNLIMITED
@@ -95,7 +93,7 @@ suspend fun INostrClient.sendAndWaitForResponse(
val resultSubscription =
coroutineScope {
val result =
async(Dispatchers.IO) {
async {
val receivedResults = mutableMapOf<NormalizedRelayUrl, Boolean>()
// The withTimeout block will cancel the coroutine if the loop takes too long
withTimeoutOrNull(timeoutInSeconds * 1000) {