Merge branch 'main' into new_package_relay

This commit is contained in:
greenart7c3
2024-06-24 11:16:03 -03:00
33 changed files with 772 additions and 489 deletions

View File

@@ -178,9 +178,7 @@ object Client : RelayPool.Listener {
subscriptions = subscriptions.minus(subscriptionId)
}
fun isActive(subscriptionId: String): Boolean {
return subscriptions.contains(subscriptionId)
}
fun isActive(subscriptionId: String): Boolean = subscriptions.contains(subscriptionId)
@OptIn(DelicateCoroutinesApi::class)
override fun onEvent(
@@ -204,9 +202,9 @@ object Client : RelayPool.Listener {
) {
// Releases the Web thread for the new payload.
// May need to add a processing queue if processing new events become too costly.
GlobalScope.launch(Dispatchers.Default) {
listeners.forEach { it.onRelayStateChange(type, relay, channel) }
}
// GlobalScope.launch(Dispatchers.Default) {
listeners.forEach { it.onRelayStateChange(type, relay, channel) }
// }
}
@OptIn(DelicateCoroutinesApi::class)
@@ -281,21 +279,15 @@ object Client : RelayPool.Listener {
listeners = listeners.plus(listener)
}
fun isSubscribed(listener: Listener): Boolean {
return listeners.contains(listener)
}
fun isSubscribed(listener: Listener): Boolean = listeners.contains(listener)
fun unsubscribe(listener: Listener) {
listeners = listeners.minus(listener)
}
fun allSubscriptions(): Map<String, List<TypedFilter>> {
return subscriptions
}
fun allSubscriptions(): Map<String, List<TypedFilter>> = subscriptions
fun getSubscriptionFilters(subId: String): List<TypedFilter> {
return subscriptions[subId] ?: emptyList()
}
fun getSubscriptionFilters(subId: String): List<TypedFilter> = subscriptions[subId] ?: emptyList()
abstract class Listener {
/** A new message was received */