Compare commits

...

2 commits

Author SHA1 Message Date
Alex Gleason
789b6c7e93
Guard against duplicate ephemeral events being streamed 2025-05-08 19:52:41 -05:00
Alex Gleason
984f76d184
DittoPgStore: remove fulfillment batching 2025-05-08 19:42:10 -05:00

View file

@ -61,8 +61,6 @@ interface DittoPgStoreOpts {
pure?: boolean; pure?: boolean;
/** Chunk size for streaming events. Defaults to 20. */ /** Chunk size for streaming events. Defaults to 20. */
chunkSize?: number; chunkSize?: number;
/** Batch size for fulfilling subscriptions. Defaults to 500. */
batchSize?: number;
/** Max age (in **seconds**) an event can be to be fulfilled to realtime subscribers. */ /** Max age (in **seconds**) an event can be to be fulfilled to realtime subscribers. */
maxAge?: number; maxAge?: number;
/** Whether to listen for events from the database with NOTIFY. */ /** Whether to listen for events from the database with NOTIFY. */
@ -133,6 +131,9 @@ export class DittoPgStore extends NPostgres {
dbEventsCounter.inc({ kind: event.kind }); dbEventsCounter.inc({ kind: event.kind });
if (NKinds.ephemeral(event.kind)) { if (NKinds.ephemeral(event.kind)) {
if (this.encounters.has(event.id)) return;
this.encounters.set(event.id, true);
return await this.fulfill(event); return await this.fulfill(event);
} }
@ -190,7 +191,7 @@ export class DittoPgStore extends NPostgres {
/** Fulfill active subscriptions with this event. */ /** Fulfill active subscriptions with this event. */
protected async fulfill(event: NostrEvent): Promise<void> { protected async fulfill(event: NostrEvent): Promise<void> {
const { maxAge = 60, batchSize = 500 } = this.opts; const { maxAge = 60 } = this.opts;
const now = Math.floor(Date.now() / 1000); const now = Math.floor(Date.now() / 1000);
const age = now - event.created_at; const age = now - event.created_at;
@ -205,21 +206,12 @@ export class DittoPgStore extends NPostgres {
} }
} }
let count = 0;
for (const [subId, { filters, machina }] of this.subs.entries()) { for (const [subId, { filters, machina }] of this.subs.entries()) {
for (const filter of filters) { for (const filter of filters) {
count++;
if (this.matchesFilter(event, filter)) { if (this.matchesFilter(event, filter)) {
machina.push(['EVENT', subId, event]); machina.push(['EVENT', subId, event]);
break; break;
} }
// Yield to event loop.
if (count % batchSize === 0) {
await new Promise((resolve) => setTimeout(resolve, 0));
}
} }
} }
} }