Remove unattached_media table, replace with LRUCache, fix media upload order problem

src/db/DittoTables.ts

@@ -1,6 +1,5 @@
 export interface DittoTables {
   nip46_tokens: NIP46TokenRow;
-  unattached_media: UnattachedMediaRow;
   author_stats: AuthorStatsRow;
   event_stats: EventStatsRow;
   pubkey_domains: PubkeyDomainRow;
@@ -33,14 +32,6 @@ interface NIP46TokenRow {
   connected_at: Date;
 }
 
-interface UnattachedMediaRow {
-  id: string;
-  pubkey: string;
-  url: string;
-  data: string;
-  uploaded_at: number;
-}
-
 interface PubkeyDomainRow {
   pubkey: string;
   domain: string;

src/db/migrations/031_rm_unattached_media.ts

@@ -0,0 +1,34 @@
+import { Kysely } from 'kysely';
+
+export async function up(db: Kysely<any>): Promise<void> {
+  await db.schema.dropTable('unattached_media').execute();
+}
+
+export async function down(db: Kysely<any>): Promise<void> {
+  await db.schema
+    .createTable('unattached_media')
+    .addColumn('id', 'text', (c) => c.primaryKey())
+    .addColumn('pubkey', 'text', (c) => c.notNull())
+    .addColumn('url', 'text', (c) => c.notNull())
+    .addColumn('data', 'text', (c) => c.notNull())
+    .addColumn('uploaded_at', 'bigint', (c) => c.notNull())
+    .execute();
+
+  await db.schema
+    .createIndex('unattached_media_id')
+    .on('unattached_media')
+    .column('id')
+    .execute();
+
+  await db.schema
+    .createIndex('unattached_media_pubkey')
+    .on('unattached_media')
+    .column('pubkey')
+    .execute();
+
+  await db.schema
+    .createIndex('unattached_media_url')
+    .on('unattached_media')
+    .column('url')
+    .execute();
+}

src/db/unattached-media.ts

@@ -1,88 +0,0 @@
-import { Kysely } from 'kysely';
-
-import { DittoDB } from '@/db/DittoDB.ts';
-import { DittoTables } from '@/db/DittoTables.ts';
-
-interface UnattachedMedia {
-  id: string;
-  pubkey: string;
-  url: string;
-  /** NIP-94 tags. */
-  data: string[][];
-  uploaded_at: number;
-}
-
-/** Add unattached media into the database. */
-async function insertUnattachedMedia(media: UnattachedMedia) {
-  const { kysely } = await DittoDB.getInstance();
-  await kysely.insertInto('unattached_media')
-    .values({ ...media, data: JSON.stringify(media.data) })
-    .execute();
-
-  return media;
-}
-
-/** Select query for unattached media. */
-function selectUnattachedMediaQuery(kysely: Kysely<DittoTables>) {
-  return kysely.selectFrom('unattached_media')
-    .select([
-      'unattached_media.id',
-      'unattached_media.pubkey',
-      'unattached_media.url',
-      'unattached_media.data',
-      'unattached_media.uploaded_at',
-    ]);
-}
-
-/** Delete unattached media by URL. */
-async function deleteUnattachedMediaByUrl(url: string) {
-  const { kysely } = await DittoDB.getInstance();
-  return kysely.deleteFrom('unattached_media')
-    .where('url', '=', url)
-    .execute();
-}
-
-/** Get unattached media by IDs. */
-async function getUnattachedMediaByIds(kysely: Kysely<DittoTables>, ids: string[]): Promise<UnattachedMedia[]> {
-  if (!ids.length) return [];
-
-  const results = await selectUnattachedMediaQuery(kysely)
-    .where('id', 'in', ids)
-    .execute();
-
-  return results.map((row) => ({
-    ...row,
-    data: JSON.parse(row.data),
-  }));
-}
-
-async function setMediaDescription(id: string, desc = '') {
-  const { kysely } = await DittoDB.getInstance();
-  const existing = await selectUnattachedMediaQuery(kysely).where('id', '=', id).executeTakeFirst();
-  if (!existing) return false;
-  const parsed = (await JSON.parse(existing.data) as string[][]).filter((itm) => itm[0] !== 'alt');
-  parsed.push(['alt', desc]);
-  await kysely.updateTable('unattached_media')
-    .set({ data: JSON.stringify(parsed) })
-    .execute();
-  return true;
-}
-
-/** Delete rows as an event with media is being created. */
-async function deleteAttachedMedia(pubkey: string, urls: string[]): Promise<void> {
-  if (!urls.length) return;
-  const { kysely } = await DittoDB.getInstance();
-  await kysely.deleteFrom('unattached_media')
-    .where('pubkey', '=', pubkey)
-    .where('url', 'in', urls)
-    .execute();
-}
-
-export {
-  deleteAttachedMedia,
-  deleteUnattachedMediaByUrl,
-  getUnattachedMediaByIds,
-  insertUnattachedMedia,
-  setMediaDescription,
-  type UnattachedMedia,
-};