relay: make Nostr streaming work

This commit is contained in:
Alex Gleason 2023-08-23 23:25:38 -05:00
parent 0a4743b1cb
commit a676b71d23
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
3 changed files with 102 additions and 9 deletions

View File

@ -8,6 +8,7 @@ import {
clientMsgSchema, clientMsgSchema,
type ClientREQ, type ClientREQ,
} from '@/schemas/nostr.ts'; } from '@/schemas/nostr.ts';
import { Sub } from '@/subs.ts';
import type { AppController } from '@/app.ts'; import type { AppController } from '@/app.ts';
import type { Event, Filter } from '@/deps.ts'; import type { Event, Filter } from '@/deps.ts';
@ -49,15 +50,24 @@ function connectStream(socket: WebSocket) {
} }
/** Handle REQ. Start a subscription. */ /** Handle REQ. Start a subscription. */
async function handleReq([_, sub, ...filters]: ClientREQ) { async function handleReq([_, subId, ...filters]: ClientREQ): Promise<void> {
for (const event of await eventsDB.getFilters(prepareFilters(filters))) { const prepared = prepareFilters(filters);
send(['EVENT', sub, event]);
for (const event of await eventsDB.getFilters(prepared)) {
send(['EVENT', subId, event]);
} }
send(['EOSE', sub]);
send(['EOSE', subId]);
Sub.sub({
id: subId,
filters: prepared,
socket,
});
} }
/** Handle EVENT. Store the event. */ /** Handle EVENT. Store the event. */
async function handleEvent([_, event]: ClientEVENT) { async function handleEvent([_, event]: ClientEVENT): Promise<void> {
try { try {
// This will store it (if eligible) and run other side-effects. // This will store it (if eligible) and run other side-effects.
await pipeline.handleEvent(event); await pipeline.handleEvent(event);
@ -72,13 +82,12 @@ function connectStream(socket: WebSocket) {
} }
/** Handle CLOSE. Close the subscription. */ /** Handle CLOSE. Close the subscription. */
function handleClose([_, _sub]: ClientCLOSE) { function handleClose([_, subId]: ClientCLOSE): void {
// TODO: ??? Sub.unsub({ id: subId, socket });
return;
} }
/** Send a message back to the client. */ /** Send a message back to the client. */
function send(msg: RelayMsg) { function send(msg: RelayMsg): void {
return socket.send(JSON.stringify(msg)); return socket.send(JSON.stringify(msg));
} }
} }

View File

@ -3,6 +3,7 @@ import { addRelays } from '@/db/relays.ts';
import { findUser } from '@/db/users.ts'; import { findUser } from '@/db/users.ts';
import { type Event } from '@/deps.ts'; import { type Event } from '@/deps.ts';
import { isLocallyFollowed } from '@/queries.ts'; import { isLocallyFollowed } from '@/queries.ts';
import { Sub } from '@/subs.ts';
import { trends } from '@/trends.ts'; import { trends } from '@/trends.ts';
import { isRelay, nostrDate } from '@/utils.ts'; import { isRelay, nostrDate } from '@/utils.ts';
@ -15,6 +16,7 @@ async function handleEvent(event: Event): Promise<void> {
storeEvent(event), storeEvent(event),
trackRelays(event), trackRelays(event),
trackHashtags(event), trackHashtags(event),
streamOut(event),
]); ]);
} }
@ -63,6 +65,13 @@ function trackRelays(event: Event) {
return addRelays([...relays]); return addRelays([...relays]);
} }
/** Distribute the event through active subscriptions. */
function streamOut(event: Event) {
for (const sub of Sub.matches(event)) {
sub.socket.send(JSON.stringify(['EVENT', event]));
}
}
/** NIP-20 command line result. */ /** NIP-20 command line result. */
class RelayError extends Error { class RelayError extends Error {
constructor(prefix: 'duplicate' | 'pow' | 'blocked' | 'rate-limited' | 'invalid' | 'error', message: string) { constructor(prefix: 'duplicate' | 'pow' | 'blocked' | 'rate-limited' | 'invalid' | 'error', message: string) {

75
src/subs.ts Normal file
View File

@ -0,0 +1,75 @@
import { type Event, matchFilters } from '@/deps.ts';
import type { DittoFilter } from '@/types.ts';
/** Nostr subscription to receive realtime events. */
interface Subscription {
/** User-defined NIP-01 subscription ID. */
id: string;
/** Event filters for the subscription. */
filters: DittoFilter[];
/** WebSocket to deliver results to. */
socket: WebSocket;
}
/**
* Manages Ditto event subscriptions.
*
* Subscriptions can be added, removed, and matched against events.
*
* ```ts
* for (const sub of Sub.matches(event)) {
* // Send event to sub.socket
* sub.socket.send(JSON.stringify(event));
* }
* ```
*/
class SubscriptionStore {
#store = new Map<WebSocket, Map<string, Subscription>>();
/** Add a subscription to the store. */
sub(data: Subscription): void {
let subs = this.#store.get(data.socket);
if (!subs) {
subs = new Map();
this.#store.set(data.socket, subs);
}
subs.set(data.id, data);
}
/** Remove a subscription from the store. */
unsub(sub: Pick<Subscription, 'socket' | 'id'>): void {
this.#store.get(sub.socket)?.delete(sub.id);
}
/** Remove an entire socket. */
close(socket: WebSocket): void {
this.#store.delete(socket);
}
/**
* Loop through matching subscriptions to stream out.
*
* ```ts
* for (const sub of Sub.matches(event)) {
* // Send event to sub.socket
* sub.socket.send(JSON.stringify(event));
* }
* ```
*/
*matches(event: Event): Iterable<Subscription> {
for (const subs of this.#store.values()) {
for (const sub of subs.values()) {
if (matchFilters(sub.filters, event)) {
yield sub;
}
}
}
}
}
const Sub = new SubscriptionStore();
export { Sub };