+

main.tsx

@@ -9,7 +9,6 @@ import { Policy } from "./resolvers/policy.ts";
 import { func_ResolvePolicyByKind } from "./resolvers/policy.ts";
 import { func_GetEventsByKinds, func_WriteEvent } from "./resolvers/event.ts";
 import { EventStore, func_GetEventsByIDs } from "./resolvers/event.ts";
-import { GetEventsByKinds } from "./resolvers/event.ts";
 import { NostrEvent, NostrKind, parseJSON, PublicKey, verifyEvent } from "./_libs.ts";
 import { PolicyStore } from "./resolvers/policy.ts";
 import { Policies } from "./resolvers/policy.ts";
@@ -81,7 +80,7 @@ export async function run(args: {
             resolvePolicyByKind: policyStore.resolvePolicyByKind,
             write_event: eventStore.write_event.bind(eventStore),
             get_events_by_IDs: eventStore.get_events_by_IDs.bind(eventStore),
-            get_events_by_kinds: GetEventsByKinds(args.kv),
+            get_events_by_kinds: eventStore.get_events_by_kinds.bind(eventStore),
             get_events_by_authors: eventStore.get_events_by_authors.bind(eventStore),
             policyStore,
             kv: args.kv,

resolvers/event.ts

@@ -17,19 +17,10 @@ export type interface_GetEventsByIDs = {
     get_events_by_IDs: func_GetEventsByIDs;
 };
 
-export type func_GetEventsByKinds = (kinds: NostrKind[]) => AsyncIterable<NostrEvent>;
-export const GetEventsByKinds = (kv: Deno.Kv): func_GetEventsByKinds =>
-    async function* x(kinds: NostrKind[]) {
-        for (const kind of kinds) {
-            const list = kv.list<NostrEvent>({ prefix: ["event", kind] });
-            for await (const entry of list) {
-                console.log(entry);
-                if (entry.value) {
-                    yield entry.value;
-                }
-            }
-        }
-    };
+export type func_GetEventsByKinds = (kinds: Set<NostrKind>) => AsyncIterable<NostrEvent>;
+export type interface_GetEventsByKinds = {
+    get_events_by_kinds: func_GetEventsByKinds;
+};
 
 export type func_GetEventsByAuthors = (authors: Set<string>) => AsyncIterable<NostrEvent>;
 export type interface_GetEventsByAuthors = {
@@ -42,7 +33,11 @@ export type interface_WriteEvent = {
 };
 
 export class EventStore
-    implements interface_GetEventsByAuthors, interface_WriteEvent, interface_GetEventsByIDs {
+    implements
+        interface_GetEventsByAuthors,
+        interface_WriteEvent,
+        interface_GetEventsByIDs,
+        interface_GetEventsByKinds {
     private constructor(
         private events: Map<string, NostrEvent>,
         private kv: Deno.Kv,
@@ -74,6 +69,14 @@ export class EventStore
         }
     }
 
+    async *get_events_by_kinds(kinds: Set<NostrKind>) {
+        for (const event of this.events.values()) {
+            if (kinds.has(event.kind)) {
+                yield event;
+            }
+        }
+    }
+
     async write_event(event: NostrEvent) {
         console.log("write_event", event);
         const result = await this.kv.atomic()

ws.ts

@@ -215,7 +215,7 @@ async function handle_filter(args: {
                 event_candidates.delete(key);
             }
         } else {
-            const events = get_events_by_kinds(filter.kinds);
+            const events = get_events_by_kinds(new Set(filter.kinds));
             for await (const event of events) {
                 console.log(event);
                 event_candidates.set(event.id, event);