laantungir/nostr-tools
1
0
Fork 0
mirror of https://github.com/nbd-wtf/nostr-tools.git synced 2026-02-13 11:24:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

pool: prevent edge case with undefined subcloser.

Browse Source
This commit is contained in:
fiatjaf
2026-02-12 15:06:27 -03:00
parent 0c2c2cd4d8
commit e45a9987e2
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
abstract-pool.ts
View File

@@ -16,8 +16,7 @@ import { Relay } from './relay.ts'
export type SubCloser = { close: (reason?: string) => void }
export type AbstractPoolConstructorOptions = AbstractRelayConstructorOptions & {
// automaticallyAuth takes a relay URL and should return null
// in case that relay shouldn't be authenticated against
// automaticallyAuth takes a relay URL and should return null in case that relay shouldn't be authenticated against
// or a function to sign the AUTH event template otherwise (that function may still throw in case of failure)
automaticallyAuth?: (relayURL: string) => null | ((event: EventTemplate) => Promise<VerifiedEvent>)
// onRelayConnectionFailure is called with the URL of a relay that failed the initial connection
@@ -269,10 +268,13 @@ export class AbstractSimplePool {
filter: Filter,
params: Pick<SubscribeManyParams, 'label' | 'id' | 'onevent' | 'onclose' | 'maxWait' | 'onauth'>,
): SubCloser {
const subcloser = this.subscribe(relays, filter, {
let subcloser: SubCloser
subcloser = this.subscribe(relays, filter, {
...params,
oneose() {
subcloser.close('closed automatically on eose')
const reason = 'closed automatically on eose'
if (subcloser) subcloser.close(reason)
else params.onclose?.(relays.map(_ => reason))
},
})
return subcloser