mirror of
https://github.com/nbd-wtf/nostr-tools.git
synced 2025-12-10 09:08:50 +00:00
fix: clear timeout in publish and auth
This commit is contained in:
@@ -200,6 +200,7 @@ export class AbstractRelay {
|
|||||||
const reason: string = data[3]
|
const reason: string = data[3]
|
||||||
const ep = this.openEventPublishes.get(id) as EventPublishResolver
|
const ep = this.openEventPublishes.get(id) as EventPublishResolver
|
||||||
if (ep) {
|
if (ep) {
|
||||||
|
clearTimeout(ep.timeout)
|
||||||
if (ok) ep.resolve(reason)
|
if (ok) ep.resolve(reason)
|
||||||
else ep.reject(new Error(reason))
|
else ep.reject(new Error(reason))
|
||||||
this.openEventPublishes.delete(id)
|
this.openEventPublishes.delete(id)
|
||||||
@@ -240,7 +241,14 @@ export class AbstractRelay {
|
|||||||
if (!this.challenge) throw new Error("can't perform auth, no challenge was received")
|
if (!this.challenge) throw new Error("can't perform auth, no challenge was received")
|
||||||
const evt = await signAuthEvent(makeAuthEvent(this.url, this.challenge))
|
const evt = await signAuthEvent(makeAuthEvent(this.url, this.challenge))
|
||||||
const ret = new Promise<string>((resolve, reject) => {
|
const ret = new Promise<string>((resolve, reject) => {
|
||||||
this.openEventPublishes.set(evt.id, { resolve, reject })
|
const timeout = setTimeout(() => {
|
||||||
|
const ep = this.openEventPublishes.get(evt.id) as EventPublishResolver
|
||||||
|
if (ep) {
|
||||||
|
ep.reject(new Error('auth timed out'))
|
||||||
|
this.openEventPublishes.delete(evt.id)
|
||||||
|
}
|
||||||
|
}, this.publishTimeout)
|
||||||
|
this.openEventPublishes.set(evt.id, { resolve, reject, timeout })
|
||||||
})
|
})
|
||||||
this.send('["AUTH",' + JSON.stringify(evt) + ']')
|
this.send('["AUTH",' + JSON.stringify(evt) + ']')
|
||||||
return ret
|
return ret
|
||||||
@@ -248,16 +256,16 @@ export class AbstractRelay {
|
|||||||
|
|
||||||
public async publish(event: Event): Promise<string> {
|
public async publish(event: Event): Promise<string> {
|
||||||
const ret = new Promise<string>((resolve, reject) => {
|
const ret = new Promise<string>((resolve, reject) => {
|
||||||
this.openEventPublishes.set(event.id, { resolve, reject })
|
const timeout = setTimeout(() => {
|
||||||
|
const ep = this.openEventPublishes.get(event.id) as EventPublishResolver
|
||||||
|
if (ep) {
|
||||||
|
ep.reject(new Error('publish timed out'))
|
||||||
|
this.openEventPublishes.delete(event.id)
|
||||||
|
}
|
||||||
|
}, this.publishTimeout)
|
||||||
|
this.openEventPublishes.set(event.id, { resolve, reject, timeout })
|
||||||
})
|
})
|
||||||
this.send('["EVENT",' + JSON.stringify(event) + ']')
|
this.send('["EVENT",' + JSON.stringify(event) + ']')
|
||||||
setTimeout(() => {
|
|
||||||
const ep = this.openEventPublishes.get(event.id) as EventPublishResolver
|
|
||||||
if (ep) {
|
|
||||||
ep.reject(new Error('publish timed out'))
|
|
||||||
this.openEventPublishes.delete(event.id)
|
|
||||||
}
|
|
||||||
}, this.publishTimeout)
|
|
||||||
return ret
|
return ret
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -381,4 +389,5 @@ export type CountResolver = {
|
|||||||
export type EventPublishResolver = {
|
export type EventPublishResolver = {
|
||||||
resolve: (reason: string) => void
|
resolve: (reason: string) => void
|
||||||
reject: (err: Error) => void
|
reject: (err: Error) => void
|
||||||
|
timeout: ReturnType<typeof setTimeout>
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user