Expose relay messages and connection state #54
Conversation
| @@ -1,6 +1,6 @@ | |||
| [versions] | |||
| acinqSecp256 = "0.10.1" | |||
| guava = "32.1.1-jre" | |||
| guava = "31.1-jre" | |||
There was a problem hiding this comment.
My Android builds were hanging on the newer version of guava. (historically, android and guava don't get along very well)
Any appetite for finding a different solution for the cache?
| private val subscriptions: MutableMap<Subscription, Set<Filter>> = Collections.synchronizedMap(mutableMapOf()) | ||
|
|
||
| private var connectionState = Disconnected | ||
| private var _connectionState = MutableStateFlow(Disconnected) | ||
| val connectionState : StateFlow<ConnectionState> get() = _connectionState.asStateFlow() // TODO add tests |
There was a problem hiding this comment.
This is important so we can show users the current state of the relays
| get() = sent.map { event -> | ||
| EventMessage(arbSubscriptionId.next(), event) | ||
| }.asFlow() |
There was a problem hiding this comment.
Is there a better way to handle the arb relay messages in this test?
There was a problem hiding this comment.
sent.asSequence()
.zip(arbSubscriptionId.samples())
.map { (event, id) -> EventMessage(id, event) }
.asFlow()
| @@ -52,18 +54,21 @@ abstract class Relay { | |||
| /** Unsubscribe from a subscription */ | |||
| abstract fun unsubscribe(subscription: Subscription) | |||
|
|
|||
| /** All events transmitted by this relay for our active subscriptions */ | |||
| /** All messages transmitted by this relay for our active subscriptions */ | |||
| abstract val relayMessages : Flow<RelayMessage> | |||
There was a problem hiding this comment.
Exposing all messages so we can handle them on the app-side.
It's also important to expose the subscription ID where the message was received so that the correct observer knows the message is for them.
| .filterNot { | ||
| it is EventMessage && cache.get(it.event.id) | ||
| } | ||
| .map { | ||
| cache.put(it.id, true) | ||
| if(it is EventMessage) { | ||
| cache.put(it.event.id, true) | ||
| } | ||
| it |
There was a problem hiding this comment.
I'll have to find a better way to do this.
If multiple subscriptions share the same message, only one of them will receive it
jmateoac
force-pushed
the
jmateo/expose_relay_events
branch
from
a09a960 to
1486398
Compare
|
|
jmateoac
changed the title
I was able to hook up Nostrino relays into Plasma with these changes. It's still a WIP, but I wanted to start some conversations around a few of the changes