mirror of
https://github.com/nbd-wtf/nostr-tools.git
synced 2026-02-04 07:44:32 +00:00
subscribeMany and subscribeManyEose are the same as subscribe/subscribeEose.
This commit is contained in:
@@ -119,10 +119,14 @@ export class AbstractSimplePool {
|
|||||||
|
|
||||||
subscribe(relays: string[], filter: Filter, params: SubscribeManyParams): SubCloser {
|
subscribe(relays: string[], filter: Filter, params: SubscribeManyParams): SubCloser {
|
||||||
const request: { url: string; filter: Filter }[] = []
|
const request: { url: string; filter: Filter }[] = []
|
||||||
|
const uniqUrls: string[] = []
|
||||||
for (let i = 0; i < relays.length; i++) {
|
for (let i = 0; i < relays.length; i++) {
|
||||||
const url = normalizeURL(relays[i])
|
const url = normalizeURL(relays[i])
|
||||||
if (!request.find(r => r.url === url)) {
|
if (!request.find(r => r.url === url)) {
|
||||||
request.push({ url, filter: filter })
|
if (uniqUrls.indexOf(url) === -1) {
|
||||||
|
uniqUrls.push(url)
|
||||||
|
request.push({ url, filter: filter })
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -130,17 +134,7 @@ export class AbstractSimplePool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
subscribeMany(relays: string[], filter: Filter, params: SubscribeManyParams): SubCloser {
|
subscribeMany(relays: string[], filter: Filter, params: SubscribeManyParams): SubCloser {
|
||||||
const request: { url: string; filter: Filter }[] = []
|
return this.subscribe(relays, filter, params)
|
||||||
const uniqUrls: string[] = []
|
|
||||||
for (let i = 0; i < relays.length; i++) {
|
|
||||||
const url = normalizeURL(relays[i])
|
|
||||||
if (uniqUrls.indexOf(url) === -1) {
|
|
||||||
uniqUrls.push(url)
|
|
||||||
request.push({ url, filter: filter })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.subscribeMap(request, params)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
subscribeMap(requests: { url: string; filter: Filter }[], params: SubscribeManyParams): SubCloser {
|
subscribeMap(requests: { url: string; filter: Filter }[], params: SubscribeManyParams): SubCloser {
|
||||||
@@ -286,13 +280,7 @@ export class AbstractSimplePool {
|
|||||||
filter: Filter,
|
filter: Filter,
|
||||||
params: Pick<SubscribeManyParams, 'label' | 'id' | 'onevent' | 'onclose' | 'maxWait' | 'onauth'>,
|
params: Pick<SubscribeManyParams, 'label' | 'id' | 'onevent' | 'onclose' | 'maxWait' | 'onauth'>,
|
||||||
): SubCloser {
|
): SubCloser {
|
||||||
const subcloser = this.subscribeMany(relays, filter, {
|
return this.subscribeEose(relays, filter, params)
|
||||||
...params,
|
|
||||||
oneose() {
|
|
||||||
subcloser.close('closed automatically on eose')
|
|
||||||
},
|
|
||||||
})
|
|
||||||
return subcloser
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async querySync(
|
async querySync(
|
||||||
|
|||||||
Reference in New Issue
Block a user