From e85e89e0affe9aadfd2e3fa3abb64beb301bfc77 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 6 Mar 2025 14:55:40 -0600
Subject: [PATCH] Automatically fetch missing authors from pool

---
 packages/db/adapters/DittoPostgres.ts         |  2 +-
 .../ditto/storages/DittoRelayStore.test.ts    | 18 +++++++++++
 packages/ditto/storages/DittoRelayStore.ts    | 31 ++++++++++++++-----
 3 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/packages/db/adapters/DittoPostgres.ts b/packages/db/adapters/DittoPostgres.ts
index ba16b09e..4623bcf3 100644
--- a/packages/db/adapters/DittoPostgres.ts
+++ b/packages/db/adapters/DittoPostgres.ts
@@ -58,7 +58,7 @@ export class DittoPostgres implements DittoDB {
   }
 
   async [Symbol.asyncDispose](): Promise<void> {
-    await this.pg.end();
+    await this.pg.end({ timeout: 0 }); // force-close the connections
     await this.kysely.destroy();
   }
 }
diff --git a/packages/ditto/storages/DittoRelayStore.test.ts b/packages/ditto/storages/DittoRelayStore.test.ts
index bdf59dab..bae98f23 100644
--- a/packages/ditto/storages/DittoRelayStore.test.ts
+++ b/packages/ditto/storages/DittoRelayStore.test.ts
@@ -156,6 +156,24 @@ Deno.test('fetchRelated', async () => {
   }, 3000);
 });
 
+Deno.test('event author is fetched', async () => {
+  await using test = setupTest();
+  const { pool, store } = test;
+
+  const sk = generateSecretKey();
+  const pubkey = getPublicKey(sk);
+
+  const post = genEvent({ kind: 1 }, sk);
+  const author = genEvent({ kind: 0 }, sk);
+
+  await pool.event(author);
+  await store.event(post);
+
+  const [result] = await store.query([{ kinds: [0], authors: [pubkey] }]);
+
+  assertEquals(result?.id, author.id);
+});
+
 function setupTest(cb?: (req: Request) => Response | Promise<Response>) {
   const conf = new DittoConf(Deno.env);
   const db = new DittoPolyPg(conf.databaseUrl);
diff --git a/packages/ditto/storages/DittoRelayStore.ts b/packages/ditto/storages/DittoRelayStore.ts
index 3b8db534..9fb232ac 100644
--- a/packages/ditto/storages/DittoRelayStore.ts
+++ b/packages/ditto/storages/DittoRelayStore.ts
@@ -55,6 +55,7 @@ interface DittoRelayStoreOpts {
 export class DittoRelayStore implements NRelay {
   private push: DittoPush;
   private encounters = new LRUCache<string, true>({ max: 5000 });
+  private authorEncounters = new LRUCache<string, true>({ max: 5000, ttl: Time.hours(4) });
   private controller = new AbortController();
   private policyWorker: PolicyWorker;
 
@@ -130,8 +131,8 @@ export class DittoRelayStore implements NRelay {
    * Common pipeline function to process (and maybe store) events.
    * It is idempotent, so it can be called multiple times for the same event.
    */
-  async event(event: DittoEvent, opts: { publish?: boolean; signal?: AbortSignal } = {}): Promise<void> {
-    const { conf, relay } = this.opts;
+  async event(event: DittoEvent, opts: { signal?: AbortSignal } = {}): Promise<void> {
+    const { conf, relay, pool } = this.opts;
     const { signal } = opts;
 
     // Skip events that have already been encountered.
@@ -177,15 +178,31 @@ export class DittoRelayStore implements NRelay {
       await relay.event(event, { signal });
     }
 
-    // Ensure the event doesn't violate the policy.
-    if (event.pubkey !== await conf.signer.getPublicKey()) {
-      await this.policyFilter(event, signal);
-    }
-
     // Prepare the event for additional checks.
     // FIXME: This is kind of hacky. Should be reorganized to fetch only what's needed for each stage.
     await this.hydrateEvent(event, signal);
 
+    // Try to fetch a kind 0 for the user if we don't have one yet.
+    // TODO: Create a more elaborate system to refresh all replaceable events by addr.
+    if (event.kind !== 0 && !event.author?.sig && !this.authorEncounters.get(event.pubkey)) {
+      this.authorEncounters.set(event.pubkey, true);
+
+      const [author] = await pool.query(
+        [{ kinds: [0], authors: [event.pubkey], limit: 1 }],
+        { signal: AbortSignal.timeout(1000) },
+      );
+
+      if (author) {
+        // await because it's important to have the kind 0 before the policy filter.
+        await this.event(author, { signal });
+      }
+    }
+
+    // Ensure the event doesn't violate the policy.
+    if (event.pubkey !== await conf.signer.getPublicKey()) {
+      await this.policyFilter(purifyEvent(event), signal);
+    }
+
     // Ensure that the author is not banned.
     const n = getTagSet(event.user?.tags ?? [], 'n');
     if (n.has('disabled')) {