mirror/ditto
mirror/ditto
1
0
Fork 0
mirror of https://gitlab.com/soapbox-pub/ditto.git synced 2025-12-06 11:29:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add an initial limit back to the relay

Browse source
This commit is contained in:
Alex Gleason 2025-02-19 20:51:07 -06:00
parent 9401c0e013
commit aefa6bed6e
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/ditto/controllers/nostr/relay.ts
View file

@ -125,7 +125,7 @@ function connectStream(socket: WebSocket, ip: string | undefined, conf: DittoCon
const store = await Storages.db(); const store = await Storages.db();
try { try {
for await (const [verb, , ...rest] of store.req(filters, { timeout: conf.db.timeouts.relay })) { for await (const [verb, , ...rest] of store.req(filters, { limit: 100, timeout: conf.db.timeouts.relay })) {
send([verb, subId, ...rest] as NostrRelayMsg); send([verb, subId, ...rest] as NostrRelayMsg);
} }
} catch (e) { } catch (e) {

14
packages/ditto/storages/DittoPgStore.ts
View file

@ -262,10 +262,10 @@ export class DittoPgStore extends NPostgres {
override async *req( override async *req(
filters: NostrFilter[], filters: NostrFilter[],
opts: { timeout?: number; signal?: AbortSignal } = {}, opts: { timeout?: number; signal?: AbortSignal; limit?: number } = {},
): AsyncIterable<NostrRelayEVENT | NostrRelayEOSE | NostrRelayCLOSED> { ): AsyncIterable<NostrRelayEVENT | NostrRelayEOSE | NostrRelayCLOSED> {
const { db, chunkSize = 20 } = this.opts; const { db, chunkSize = 20 } = this.opts;
const { timeout = this.opts.timeout, signal } = opts; const { limit, timeout = this.opts.timeout, signal } = opts;
filters = await this.expandFilters(filters); filters = await this.expandFilters(filters);
@ -273,11 +273,15 @@ export class DittoPgStore extends NPostgres {
const normalFilters = this.normalizeFilters(filters); const normalFilters = this.normalizeFilters(filters);
const machina = new Machina<NostrRelayEVENT | NostrRelayEOSE | NostrRelayCLOSED>(signal); const machina = new Machina<NostrRelayEVENT | NostrRelayEOSE | NostrRelayCLOSED>(signal);
if (normalFilters.length) { if (normalFilters.length && limit !== 0) {
this.withTimeout(db.kysely as unknown as Kysely<NPostgresSchema>, timeout, async (trx) => { this.withTimeout(db.kysely as unknown as Kysely<NPostgresSchema>, timeout, async (trx) => {
const rows = this.getEventsQuery(trx, normalFilters).stream(chunkSize); let query = this.getEventsQuery(trx, normalFilters);
for await (const row of rows) { if (typeof opts.limit === 'number') {
query = query.limit(opts.limit);
}
for await (const row of query.stream(chunkSize)) {
const event = this.parseEventRow(row); const event = this.parseEventRow(row);
machina.push(['EVENT', subId, event]); machina.push(['EVENT', subId, event]);
} }