Compare commits

...

1 Commits

Author SHA1 Message Date
fiatjaf
4f0cae0eb8 add missing id arguments. 2021-12-13 21:22:23 -03:00
3 changed files with 11 additions and 8 deletions

View File

@@ -1,6 +1,6 @@
{ {
"name": "nostr-tools", "name": "nostr-tools",
"version": "0.9.0", "version": "0.9.1",
"description": "Tools for making a Nostr client.", "description": "Tools for making a Nostr client.",
"repository": { "repository": {
"type": "git", "type": "git",

View File

@@ -21,7 +21,7 @@ export function relayPool(globalPrivateKey) {
.filter(({policy}) => policy.read) .filter(({policy}) => policy.read)
.map(({relay}) => [ .map(({relay}) => [
relay.url, relay.url,
relay.sub({filter, cb: event => cb(event, relay.url)}) relay.sub({filter, cb: event => cb(event, relay.url)}, id)
]) ])
) )
@@ -37,7 +37,7 @@ export function relayPool(globalPrivateKey) {
return activeSubscriptions[id] return activeSubscriptions[id]
}, },
addRelay: relay => { addRelay: relay => {
subControllers[relay.url] = relay.sub({cb, filter}) subControllers[relay.url] = relay.sub({cb, filter}, id)
return activeSubscriptions[id] return activeSubscriptions[id]
}, },
removeRelay: relayURL => { removeRelay: relayURL => {

View File

@@ -145,12 +145,15 @@ export function relayConnect(url, onNotice) {
try { try {
await trySend(['EVENT', event]) await trySend(['EVENT', event])
statusCallback(0) statusCallback(0)
let {unsub} = relay.sub({ let {unsub} = relay.sub(
{
cb: () => { cb: () => {
statusCallback(1) statusCallback(1)
}, },
filter: {id: event.id} filter: {id: event.id}
}) },
`monitor-${event.id.slice(0, 5)}`
)
setTimeout(unsub, 5000) setTimeout(unsub, 5000)
} catch (err) { } catch (err) {
statusCallback(-1) statusCallback(-1)