Merge branch 'ditto-db' into 'main'

Add @ditto/db package

See merge request soapbox-pub/ditto!667

.gitlab-ci.yml

@@ -10,7 +10,7 @@ test:
   stage: test
   script:
     - deno fmt --check
-    - deno lint
+    - deno lint --allow-import
     - deno task check
     - deno task test --coverage=cov_profile
     - deno coverage cov_profile

deno.json

@@ -2,6 +2,7 @@
   "workspace": [
     "./packages/api",
     "./packages/conf",
+    "./packages/db",
     "./packages/ditto"
   ],
   "tasks": {

packages/db/DittoDB.test.ts

@@ -0,0 +1,6 @@
+import { DittoDB } from './DittoDB.ts';
+
+Deno.test('DittoDB', async () => {
+  const db = DittoDB.create('memory://');
+  await DittoDB.migrate(db.kysely);
+});

packages/db/DittoDB.ts

@@ -2,15 +2,17 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 
 import { logi } from '@soapbox/logi';
-import { JsonValue } from '@std/json';
+import { FileMigrationProvider, type Kysely, Migrator } from 'kysely';
-import { FileMigrationProvider, Kysely, Migrator } from 'kysely';
 
-import { DittoPglite } from '@/db/adapters/DittoPglite.ts';
-import { DittoPostgres } from '@/db/adapters/DittoPostgres.ts';
-import { DittoDatabase, DittoDatabaseOpts } from '@/db/DittoDatabase.ts';
-import { DittoTables } from '@/db/DittoTables.ts';
 import { errorJson } from '@/utils/log.ts';
 
+import { DittoPglite } from './adapters/DittoPglite.ts';
+import { DittoPostgres } from './adapters/DittoPostgres.ts';
+
+import type { JsonValue } from '@std/json';
+import type { DittoDatabase, DittoDatabaseOpts } from './DittoDatabase.ts';
+import type { DittoTables } from './DittoTables.ts';
+
 export class DittoDB {
   /** Open a new database connection. */
   static create(databaseUrl: string, opts?: DittoDatabaseOpts): DittoDatabase {

packages/db/DittoDatabase.ts

@@ -1,6 +1,6 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
-import { DittoTables } from '@/db/DittoTables.ts';
+import type { DittoTables } from './DittoTables.ts';
 
 export interface DittoDatabase {
   readonly kysely: Kysely<DittoTables>;

packages/db/DittoTables.ts

@@ -1,6 +1,5 @@
-import { Generated } from 'kysely';
+import type { NPostgresSchema } from '@nostrify/db';
-
+import type { Generated } from 'kysely';
-import { NPostgresSchema } from '@nostrify/db';
 
 export interface DittoTables extends NPostgresSchema {
   auth_tokens: AuthTokenRow;

packages/db/KyselyLogger.ts

@@ -1,8 +1,8 @@
-import { logi, LogiValue } from '@soapbox/logi';
+import { logi, type LogiValue } from '@soapbox/logi';
-import { Logger } from 'kysely';
 
 import { dbQueriesCounter, dbQueryDurationHistogram } from '@/metrics.ts';
-import { errorJson } from '@/utils/log.ts';
+
+import type { Logger } from 'kysely';
 
 /** Log the SQL for queries. */
 export const KyselyLogger: Logger = (event) => {
@@ -24,7 +24,7 @@ export const KyselyLogger: Logger = (event) => {
       ns: 'ditto.sql',
       sql,
       parameters: parameters as LogiValue,
-      error: errorJson(event.error),
+      error: event.error instanceof Error ? event.error : null,
       duration,
     });
   }

packages/db/adapters/DittoPglite.test.ts

@@ -0,0 +1,13 @@
+import { assertEquals } from '@std/assert';
+
+import { DittoPglite } from './DittoPglite.ts';
+
+Deno.test('DittoPglite.create', async () => {
+  const db = DittoPglite.create('memory://');
+
+  assertEquals(db.poolSize, 1);
+  assertEquals(db.availableConnections, 1);
+
+  await db.kysely.destroy();
+  await new Promise((resolve) => setTimeout(resolve, 100));
+});

packages/db/adapters/DittoPglite.ts

@@ -3,10 +3,11 @@ import { pg_trgm } from '@electric-sql/pglite/contrib/pg_trgm';
 import { PgliteDialect } from '@soapbox/kysely-pglite';
 import { Kysely } from 'kysely';
 
-import { DittoDatabase, DittoDatabaseOpts } from '@/db/DittoDatabase.ts';
+import { KyselyLogger } from '../KyselyLogger.ts';
-import { DittoTables } from '@/db/DittoTables.ts';
+import { isWorker } from '../utils/worker.ts';
-import { KyselyLogger } from '@/db/KyselyLogger.ts';
+
-import { isWorker } from '@/utils/worker.ts';
+import type { DittoDatabase, DittoDatabaseOpts } from '../DittoDatabase.ts';
+import type { DittoTables } from '../DittoTables.ts';
 
 export class DittoPglite {
   static create(databaseUrl: string, opts?: DittoDatabaseOpts): DittoDatabase {

packages/db/adapters/DittoPostgres.ts

@@ -1,5 +1,5 @@
 import {
-  BinaryOperationNode,
+  type BinaryOperationNode,
   FunctionNode,
   Kysely,
   OperatorNode,
@@ -9,12 +9,13 @@ import {
   PrimitiveValueListNode,
   ValueNode,
 } from 'kysely';
-import { PostgresJSDialectConfig, PostgresJSDriver } from 'kysely-postgres-js';
+import { type PostgresJSDialectConfig, PostgresJSDriver } from 'kysely-postgres-js';
 import postgres from 'postgres';
 
-import { DittoDatabase, DittoDatabaseOpts } from '@/db/DittoDatabase.ts';
+import { KyselyLogger } from '../KyselyLogger.ts';
-import { DittoTables } from '@/db/DittoTables.ts';
+
-import { KyselyLogger } from '@/db/KyselyLogger.ts';
+import type { DittoDatabase, DittoDatabaseOpts } from '../DittoDatabase.ts';
+import type { DittoTables } from '../DittoTables.ts';
 
 export class DittoPostgres {
   static create(databaseUrl: string, opts?: DittoDatabaseOpts): DittoDatabase {

packages/db/deno.json

@@ -0,0 +1,6 @@
+{
+  "name": "@ditto/db",
+  "exports": {
+    ".": "./mod.ts"
+  }
+}

packages/db/migrations/000_create_events.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/001_add_relays.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/002_events_fts.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(_db: Kysely<unknown>): Promise<void> {
   // This migration used to create an FTS table for SQLite, but SQLite support was removed.

packages/db/migrations/003_events_admin.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(_db: Kysely<unknown>): Promise<void> {
 }

packages/db/migrations/004_add_user_indexes.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(_db: Kysely<unknown>): Promise<void> {
 }

packages/db/migrations/005_rework_tags.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/006_pragma.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(_db: Kysely<unknown>): Promise<void> {
 }

packages/db/migrations/007_unattached_media.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/008_wal.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(_db: Kysely<unknown>): Promise<void> {
 }

packages/db/migrations/009_add_stats.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/010_drop_users.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema.dropTable('users').ifExists().execute();

packages/db/migrations/011_kind_author_index.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/012_tags_composite_index.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema.dropIndex('idx_tags_tag').execute();

packages/db/migrations/013_soft_deletion.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema.alterTable('events').addColumn('deleted_at', 'integer').execute();

packages/db/migrations/014_stats_indexes.ts.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema.createIndex('idx_author_stats_pubkey').on('author_stats').column('pubkey').execute();

packages/db/migrations/015_add_pubkey_domains.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/016_pubkey_domains_updated_at.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/017_rm_relays.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema.dropTable('relays').execute();

packages/db/migrations/018_events_created_at_kind_index.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/019_ndatabase_schema.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema.alterTable('events').renameTo('nostr_events').execute();

packages/db/migrations/020_drop_deleted_at.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 // deno-lint-ignore no-explicit-any
 export async function up(db: Kysely<any>): Promise<void> {

packages/db/migrations/020_pgfts.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema.createTable('nostr_pgfts')

packages/db/migrations/021_pgfts_index.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/022_event_stats_reactions.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/023_add_nip46_tokens.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/024_event_stats_quotes_count.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/025_event_stats_add_zap_count.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/026_tags_name_index.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/027_add_zap_events.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/028_stable_sort.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/029_tag_queries.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/030_pg_events_jsonb.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   // Create new table and indexes.

packages/db/migrations/031_rm_unattached_media.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema.dropTable('unattached_media').execute();

packages/db/migrations/032_add_author_search.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/033_add_language.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema.alterTable('nostr_events').addColumn('language', 'char(2)').execute();

packages/db/migrations/034_move_author_search_to_author_stats.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 // deno-lint-ignore no-explicit-any
 export async function up(db: Kysely<any>): Promise<void> {

packages/db/migrations/035_author_stats_followers_index.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/036_stats64.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 // deno-lint-ignore no-explicit-any
 export async function up(db: Kysely<any>): Promise<void> {

packages/db/migrations/037_auth_tokens.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 import { Conf } from '@/config.ts';
 import { aesEncrypt } from '@/utils/aes.ts';

packages/db/migrations/038_push_subscriptions.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/039_pg_notify.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await sql`

packages/db/migrations/040_add_bunker_pubkey.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 // deno-lint-ignore no-explicit-any
 export async function up(db: Kysely<any>): Promise<void> {

packages/db/migrations/041_pg_notify_id_only.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await sql`DROP TRIGGER IF EXISTS nostr_event_trigger ON nostr_events`.execute(db);

packages/db/migrations/042_add_search_ext.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/043_rm_language.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema.alterTable('nostr_events').dropColumn('language').execute();

packages/db/migrations/044_search_ext_drop_default.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema.alterTable('nostr_events').alterColumn('search_ext', (col) => col.dropDefault()).execute();

packages/db/migrations/045_streaks.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/046_author_stats_nip05.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/047_add_domain_favicons.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema

packages/db/migrations/048_rm_pubkey_domains.ts

@@ -1,4 +1,4 @@
-import { Kysely } from 'kysely';
+import type { Kysely } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await db.schema.dropTable('pubkey_domains').execute();

packages/db/migrations/049_author_stats_sorted.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 // deno-lint-ignore no-explicit-any
 export async function up(db: Kysely<any>): Promise<void> {

packages/db/migrations/050_notify_only_insert.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await sql`DROP TRIGGER IF EXISTS nostr_event_trigger ON nostr_events`.execute(db);

packages/db/migrations/051_notify_replaceable.ts

@@ -1,4 +1,4 @@
-import { Kysely, sql } from 'kysely';
+import { type Kysely, sql } from 'kysely';
 
 export async function up(db: Kysely<unknown>): Promise<void> {
   await sql`

packages/db/mod.ts

@@ -0,0 +1,4 @@
+export { DittoDB } from './DittoDB.ts';
+
+export type { DittoDatabase } from './DittoDatabase.ts';
+export type { DittoTables } from './DittoTables.ts';

packages/db/utils/worker.test.ts

@@ -1,14 +1,16 @@
 import { assertEquals } from '@std/assert';
 
-import { isWorker } from '@/utils/worker.ts';
+import { isWorker } from './worker.ts';
 
 Deno.test('isWorker from the main thread returns false', () => {
   assertEquals(isWorker(), false);
 });
 
 Deno.test('isWorker from a worker thread returns true', async () => {
+  const url = new URL('./worker.ts', import.meta.url);
+
   const script = `
-    import { isWorker } from '@/utils/worker.ts';
+    import { isWorker } from '${url.href}';
     postMessage(isWorker());
     self.close();
   `;

packages/ditto/app.ts

@@ -1,5 +1,6 @@
 import { confMw } from '@ditto/api/middleware';
 import { type DittoConf } from '@ditto/conf';
+import { DittoTables } from '@ditto/db';
 import { type Context, Env as HonoEnv, Handler, Hono, Input as HonoInput, MiddlewareHandler } from '@hono/hono';
 import { every } from '@hono/hono/combine';
 import { cors } from '@hono/hono/cors';
@@ -9,7 +10,6 @@ import { Kysely } from 'kysely';
 
 import '@/startup.ts';
 
-import { DittoTables } from '@/db/DittoTables.ts';
 import { Time } from '@/utils/time.ts';
 
 import {

packages/ditto/pipeline.ts

@@ -1,3 +1,4 @@
+import { DittoTables } from '@ditto/db';
 import { NKinds, NostrEvent, NSchema as n } from '@nostrify/nostrify';
 import { logi } from '@soapbox/logi';
 import { Kysely, UpdateObject } from 'kysely';
@@ -6,7 +7,6 @@ import { z } from 'zod';
 
 import { pipelineEncounters } from '@/caches/pipelineEncounters.ts';
 import { Conf } from '@/config.ts';
-import { DittoTables } from '@/db/DittoTables.ts';
 import { DittoPush } from '@/DittoPush.ts';
 import { DittoEvent } from '@/interfaces/DittoEvent.ts';
 import { pipelineEventsCounter, policyEventsCounter, webPushNotificationsCounter } from '@/metrics.ts';

packages/ditto/storages.ts

@@ -1,9 +1,8 @@
 // deno-lint-ignore-file require-await
+import { type DittoDatabase, DittoDB } from '@ditto/db';
 import { logi } from '@soapbox/logi';
 
 import { Conf } from '@/config.ts';
-import { DittoDatabase } from '@/db/DittoDatabase.ts';
-import { DittoDB } from '@/db/DittoDB.ts';
 import { internalSubscriptionsSizeGauge } from '@/metrics.ts';
 import { wsUrlSchema } from '@/schema.ts';
 import { AdminStore } from '@/storages/AdminStore.ts';

packages/ditto/storages/EventsDB.ts

@@ -1,5 +1,6 @@
 // deno-lint-ignore-file require-await
 
+import { DittoTables } from '@ditto/db';
 import { NPostgres, NPostgresSchema } from '@nostrify/db';
 import { NIP50, NKinds, NostrEvent, NostrFilter, NSchema as n } from '@nostrify/nostrify';
 import { logi } from '@soapbox/logi';
@@ -11,7 +12,6 @@ import { nip27 } from 'nostr-tools';
 import tldts from 'tldts';
 import { z } from 'zod';
 
-import { DittoTables } from '@/db/DittoTables.ts';
 import { dbEventsCounter } from '@/metrics.ts';
 import { RelayError } from '@/RelayError.ts';
 import { isNostrId } from '@/utils.ts';

packages/ditto/storages/hydrate.ts

@@ -1,10 +1,10 @@
+import { DittoTables } from '@ditto/db';
 import { NStore } from '@nostrify/nostrify';
 import { Kysely } from 'kysely';
 import { matchFilter } from 'nostr-tools';
 import { NSchema as n } from '@nostrify/nostrify';
 import { z } from 'zod';
 
-import { DittoTables } from '@/db/DittoTables.ts';
 import { Conf } from '@/config.ts';
 import { type DittoEvent } from '@/interfaces/DittoEvent.ts';
 import { fallbackAuthor } from '@/utils.ts';

packages/ditto/test.ts

@@ -1,10 +1,10 @@
+import { DittoDB } from '@ditto/db';
 import ISO6391, { LanguageCode } from 'iso-639-1';
 import lande from 'lande';
 import { NostrEvent } from '@nostrify/nostrify';
 import { finalizeEvent, generateSecretKey } from 'nostr-tools';
 
 import { Conf } from '@/config.ts';
-import { DittoDB } from '@/db/DittoDB.ts';
 import { EventsDB } from '@/storages/EventsDB.ts';
 import { purifyEvent } from '@/utils/purify.ts';
 import { sql } from 'kysely';

packages/ditto/trends.ts

@@ -1,9 +1,9 @@
+import { DittoTables } from '@ditto/db';
 import { NostrFilter } from '@nostrify/nostrify';
 import { logi } from '@soapbox/logi';
 import { Kysely, sql } from 'kysely';
 
 import { Conf } from '@/config.ts';
-import { DittoTables } from '@/db/DittoTables.ts';
 import { handleEvent } from '@/pipeline.ts';
 import { AdminSigner } from '@/signers/AdminSigner.ts';
 import { Storages } from '@/storages.ts';

packages/ditto/utils/favicon.ts

@@ -1,11 +1,11 @@
 import { DOMParser } from '@b-fuze/deno-dom';
+import { DittoTables } from '@ditto/db';
 import { logi } from '@soapbox/logi';
 import { safeFetch } from '@soapbox/safe-fetch';
 import { Kysely } from 'kysely';
 import tldts from 'tldts';
 
 import { Conf } from '@/config.ts';
-import { DittoTables } from '@/db/DittoTables.ts';
 import { cachedFaviconsSizeGauge } from '@/metrics.ts';
 import { Storages } from '@/storages.ts';
 import { nostrNow } from '@/utils.ts';

packages/ditto/utils/search.ts

@@ -1,7 +1,6 @@
+import { DittoTables } from '@ditto/db';
 import { Kysely, sql } from 'kysely';
 
-import { DittoTables } from '@/db/DittoTables.ts';
-
 /** Get pubkeys whose name and NIP-05 is similar to 'q' */
 export async function getPubkeysBySearch(
   kysely: Kysely<DittoTables>,

packages/ditto/utils/stats.ts

@@ -1,10 +1,10 @@
+import { DittoTables } from '@ditto/db';
 import { NostrEvent, NSchema as n, NStore } from '@nostrify/nostrify';
 import { Insertable, Kysely, UpdateObject } from 'kysely';
 import { SetRequired } from 'type-fest';
 import { z } from 'zod';
 
 import { Conf } from '@/config.ts';
-import { DittoTables } from '@/db/DittoTables.ts';
 import { findQuoteTag, findReplyTag, getTagSet } from '@/utils/tags.ts';
 
 interface UpdateStatsOpts {

packages/ditto/workers/policy.worker.ts

@@ -1,9 +1,9 @@
+import { DittoDB } from '@ditto/db';
 import '@soapbox/safe-fetch/load';
 import { NostrEvent, NostrRelayOK, NPolicy } from '@nostrify/nostrify';
 import { ReadOnlyPolicy } from '@nostrify/policies';
 import * as Comlink from 'comlink';
 
-import { DittoDB } from '@/db/DittoDB.ts';
 import { EventsDB } from '@/storages/EventsDB.ts';
 
 // @ts-ignore Don't try to access the env from this worker.