mirror of
https://github.com/nbd-wtf/nostr-tools.git
synced 2025-12-09 16:48:50 +00:00
remove "seen" event from Pub.
too complicated. if anyone wants this they can do it themselves.
This commit is contained in:
@@ -104,9 +104,6 @@ let pub = relay.publish(event)
|
|||||||
pub.on('ok', () => {
|
pub.on('ok', () => {
|
||||||
console.log(`${relay.url} has accepted our event`)
|
console.log(`${relay.url} has accepted our event`)
|
||||||
})
|
})
|
||||||
pub.on('seen', () => {
|
|
||||||
console.log(`we saw the event on ${relay.url}`)
|
|
||||||
})
|
|
||||||
pub.on('failed', reason => {
|
pub.on('failed', reason => {
|
||||||
console.log(`failed to publish to ${relay.url}: ${reason}`)
|
console.log(`failed to publish to ${relay.url}: ${reason}`)
|
||||||
})
|
})
|
||||||
|
|||||||
41
relay.ts
41
relay.ts
@@ -19,8 +19,8 @@ export type Relay = {
|
|||||||
off: (type: RelayEvent, cb: any) => void
|
off: (type: RelayEvent, cb: any) => void
|
||||||
}
|
}
|
||||||
export type Pub = {
|
export type Pub = {
|
||||||
on: (type: 'ok' | 'seen' | 'failed', cb: any) => void
|
on: (type: 'ok' | 'failed', cb: any) => void
|
||||||
off: (type: 'ok' | 'seen' | 'failed', cb: any) => void
|
off: (type: 'ok' | 'failed', cb: any) => void
|
||||||
}
|
}
|
||||||
export type Sub = {
|
export type Sub = {
|
||||||
sub: (filters: Filter[], opts: SubscriptionOptions) => Sub
|
sub: (filters: Filter[], opts: SubscriptionOptions) => Sub
|
||||||
@@ -265,50 +265,17 @@ export function relayInit(url: string): Relay {
|
|||||||
if (!event.id) throw new Error(`event ${event} has no id`)
|
if (!event.id) throw new Error(`event ${event} has no id`)
|
||||||
let id = event.id
|
let id = event.id
|
||||||
|
|
||||||
var sent = false
|
|
||||||
var mustMonitor = false
|
|
||||||
|
|
||||||
trySend(['EVENT', event])
|
trySend(['EVENT', event])
|
||||||
.then(() => {
|
|
||||||
sent = true
|
|
||||||
if (mustMonitor) {
|
|
||||||
startMonitoring()
|
|
||||||
mustMonitor = false
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.catch(() => {})
|
|
||||||
|
|
||||||
const startMonitoring = () => {
|
|
||||||
let monitor = sub([{ids: [id]}], {
|
|
||||||
id: `monitor-${id.slice(0, 5)}`
|
|
||||||
})
|
|
||||||
let willUnsub = setTimeout(() => {
|
|
||||||
;(pubListeners[id]?.failed || []).forEach(cb =>
|
|
||||||
cb('event not seen after 5 seconds')
|
|
||||||
)
|
|
||||||
monitor.unsub()
|
|
||||||
}, 5000)
|
|
||||||
monitor.on('event', () => {
|
|
||||||
clearTimeout(willUnsub)
|
|
||||||
;(pubListeners[id]?.seen || []).forEach(cb => cb())
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
on: (type: 'ok' | 'seen' | 'failed', cb: any) => {
|
on: (type: 'ok' | 'failed', cb: any) => {
|
||||||
pubListeners[id] = pubListeners[id] || {
|
pubListeners[id] = pubListeners[id] || {
|
||||||
ok: [],
|
ok: [],
|
||||||
seen: [],
|
|
||||||
failed: []
|
failed: []
|
||||||
}
|
}
|
||||||
pubListeners[id][type].push(cb)
|
pubListeners[id][type].push(cb)
|
||||||
|
|
||||||
if (type === 'seen') {
|
|
||||||
if (sent) startMonitoring()
|
|
||||||
else mustMonitor = true
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
off: (type: 'ok' | 'seen' | 'failed', cb: any) => {
|
off: (type: 'ok' | 'failed', cb: any) => {
|
||||||
let listeners = pubListeners[id]
|
let listeners = pubListeners[id]
|
||||||
if (!listeners) return
|
if (!listeners) return
|
||||||
let idx = listeners[type].indexOf(cb)
|
let idx = listeners[type].indexOf(cb)
|
||||||
|
|||||||
Reference in New Issue
Block a user