Merge pull request #27 from monlovesmango/Expose-EOSE-Relay-URL

This commit is contained in:
fiatjaf
2022-11-21 20:24:01 -03:00
committed by GitHub
2 changed files with 4 additions and 3 deletions

View File

@@ -35,7 +35,7 @@ export function relayPool() {
.map(({relay}) => [ .map(({relay}) => [
relay.url, relay.url,
relay.sub({cb: event => cb(event, relay.url), filter, beforeSend}, id, relay.sub({cb: event => cb(event, relay.url), filter, beforeSend}, id,
cbEose) () => cbEose(relay.url))
]) ])
) )
@@ -54,7 +54,8 @@ export function relayPool() {
}) => { }) => {
Object.entries(subControllers).map(([relayURL, sub]) => [ Object.entries(subControllers).map(([relayURL, sub]) => [
relayURL, relayURL,
sub.sub({cb: event => cb(event, relayURL), filter, beforeSend}, id) sub.sub({cb: event => cb(event, relayURL), filter, beforeSend}, id,
() => cbEose(relayURL))
]) ])
return activeSubscriptions[id] return activeSubscriptions[id]
} }

View File

@@ -164,7 +164,7 @@ export function relayConnect(url, onNotice = () => {}, onError = () => {}) {
cb = activeCallback, cb = activeCallback,
filter = activeFilters, filter = activeFilters,
beforeSend = activeBeforeSend beforeSend = activeBeforeSend
}) => sub({cb, filter, beforeSend, skipVerification}, channel), }) => sub({cb, filter, beforeSend, skipVerification}, channel, eoseCb),
unsub: () => { unsub: () => {
delete openSubs[channel] delete openSubs[channel]
delete eventListeners[channel] delete eventListeners[channel]