Initialize persistence service directly from Effect SQLite adapter

Cursor Agent committed 8 months ago

Commit aa2d6e71 parent 91128181 file · +37 −11Browse files

Unified · Split

apps/server/src/persistenceService.ts+37−11

   threadsUpdateResultSchema,
 } from "@t3tools/contracts";
-import { StateDb } from "./stateDb";
 import {
   countMessagesForThread as countMessagesForThreadEffect,
   deleteDocumentByIdAndKind as deleteDocumentByIdAndKindEffect,
   readMetadataValue as readMetadataValueEffect,
   writeMetadataValue as writeMetadataValueEffect,
 } from "./persistence/metadataRepo";
-import type { EffectSqliteDatabaseAdapter } from "./sqliteAdapter";
+import { openSqliteDatabase, type EffectSqliteDatabaseAdapter, type SqliteDatabase } from "./sqliteAdapter";
+import { runStateMigrations } from "./stateMigrations";
 const METADATA_KEY_PROJECTS_JSON_IMPORTED = "migration.projects_json_imported";
 const METADATA_KEY_APP_SETTINGS = "app.settings.v1";
 }
 export class PersistenceService extends EventEmitter<PersistenceServiceEvents> {
-  private readonly stateDb: StateDb;
+  private readonly db: SqliteDatabase;
-  private readonly db: StateDb["db"];
   private readonly sessionThreadIds = new Map<string, string>();
   private readonly runtimeThreadIds = new Map<string, string>();
   constructor(options: PersistenceServiceOptions) {
     super();
-    this.stateDb = new StateDb({ dbPath: options.dbPath });
+    const dbPath = path.resolve(options.dbPath);
-    this.db = this.stateDb.db;
+    fs.mkdirSync(path.dirname(dbPath), { recursive: true });
+    this.db = openSqliteDatabase(dbPath);
+    try {
+      runStateMigrations(this.db);
+    } catch (error) {
+      try {
+        this.db.close();
+      } catch {
+        // Best effort close on failed initialization.
+      }
+      throw error;
+    }
     if (options.legacyProjectsJsonPath) {
       this.importProjectsJsonIfNeeded(options.legacyProjectsJsonPath);
     }
   }
   close(): void {
-    this.stateDb.close();
+    this.db.close();
   }
   getAppSettings(): AppSettings {
     }
     let importedCount = 0;
-    this.stateDb.transaction(() => {
+    this.runDbTransaction(() => {
       try {
         const raw = fs.readFileSync(normalizedPath, "utf8");
         const payload = JSON.parse(raw) as { projects?: unknown };
     });
   }
+  private runDbTransaction<T>(fn: () => T): T {
+    this.db.exec("BEGIN IMMEDIATE;");
+    try {
+      const result = fn();
+      this.db.exec("COMMIT;");
+      return result;
+    } catch (error) {
+      try {
+        this.db.exec("ROLLBACK;");
+      } catch {
+        // Preserve the original transactional failure.
+      }
+      throw error;
+    }
+  }
   private withTransaction<T>(fn: (pendingEvents: StateEvent[]) => T): T {
     const pendingEvents: StateEvent[] = [];
-    const result = this.stateDb.transaction(() => fn(pendingEvents));
+    const result = this.runDbTransaction(() => fn(pendingEvents));
     for (const event of pendingEvents) {
       try {
         this.emit("stateEvent", event);
       write();
       return;
     }
-    this.stateDb.transaction(write);
+    this.runDbTransaction(write);
   }
   private runWithEffectSql<A>(
   }
 }
-function isEffectSqliteDatabase(db: StateDb["db"]): db is EffectSqliteDatabaseAdapter {
+function isEffectSqliteDatabase(db: SqliteDatabase): db is EffectSqliteDatabaseAdapter {
   return "runWithSqlClient" in db && typeof db.runWithSqlClient === "function";
 }

Initialize persistence service directly from Effect SQLite adapter

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code