coracle/nostrlib
2
1
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow custom CheckDuplicate in pool subscriptions.

Browse Source
This commit is contained in:
fiatjaf
2025-05-02 15:19:16 -03:00
parent b7989084f2
commit 002dc1e84d
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pool.go
+21 -15
View File
@@ -246,12 +246,14 @@ func (pool *Pool) FetchMany(
) chan RelayEvent { ) chan RelayEvent {
seenAlready := xsync.NewMapOf[ID, struct{}]() seenAlready := xsync.NewMapOf[ID, struct{}]()
opts.CheckDuplicate = func(id ID, relay string) bool { if opts.CheckDuplicate == nil {
_, exists := seenAlready.LoadOrStore(id, struct{}{}) opts.CheckDuplicate = func(id ID, relay string) bool {
if exists && pool.duplicateMiddleware != nil { _, exists := seenAlready.LoadOrStore(id, struct{}{})
pool.duplicateMiddleware(relay, id) if exists && pool.duplicateMiddleware != nil {
pool.duplicateMiddleware(relay, id)
}
return exists
} }
return exists
} }
return pool.subManyEoseNonOverwriteCheckDuplicate(ctx, urls, filter, opts) return pool.subManyEoseNonOverwriteCheckDuplicate(ctx, urls, filter, opts)
@@ -393,12 +395,14 @@ func (pool *Pool) subMany(
}() }()
} }
opts.CheckDuplicate = func(id ID, relay string) bool { if opts.CheckDuplicate == nil {
_, exists := seenAlready.Load(id) opts.CheckDuplicate = func(id ID, relay string) bool {
if exists && pool.duplicateMiddleware != nil { _, exists := seenAlready.Load(id)
pool.duplicateMiddleware(relay, id) if exists && pool.duplicateMiddleware != nil {
pool.duplicateMiddleware(relay, id)
}
return exists
} }
return exists
} }
pending := xsync.NewCounter() pending := xsync.NewCounter()
@@ -691,12 +695,14 @@ func (pool *Pool) BatchedSubManyEose(
wg.Add(len(dfs)) wg.Add(len(dfs))
seenAlready := xsync.NewMapOf[ID, struct{}]() seenAlready := xsync.NewMapOf[ID, struct{}]()
opts.CheckDuplicate = func(id ID, relay string) bool { if opts.CheckDuplicate == nil {
_, exists := seenAlready.LoadOrStore(id, struct{}{}) opts.CheckDuplicate = func(id ID, relay string) bool {
if exists && pool.duplicateMiddleware != nil { _, exists := seenAlready.LoadOrStore(id, struct{}{})
pool.duplicateMiddleware(relay, id) if exists && pool.duplicateMiddleware != nil {
pool.duplicateMiddleware(relay, id)
}
return exists
} }
return exists
} }
for _, df := range dfs { for _, df := range dfs {