cojson-storage-sqlite 0.14.1 → 0.14.18

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> cojson-storage-sqlite@0.14.1 build /home/runner/_work/jazz/jazz/packages/cojson-storage-sqlite
+> cojson-storage-sqlite@0.14.18 build /home/runner/_work/jazz/jazz/packages/cojson-storage-sqlite
 > rm -rf ./dist && tsc --sourceMap --outDir dist
 

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # cojson-storage-sqlite
 
+## 0.14.18
+
+### Patch Changes
+
+- Updated dependencies [0d5ee3e]
+- Updated dependencies [be7c4c2]
+  - cojson@0.14.18
+  - cojson-storage@0.14.18
+
+## 0.14.16
+
+### Patch Changes
+
+- Updated dependencies [5e253cc]
+  - cojson@0.14.16
+  - cojson-storage@0.14.16
+
+## 0.14.15
+
+### Patch Changes
+
+- Updated dependencies [23daa7c]
+  - cojson-storage@0.14.15
+  - cojson@0.14.15
+
 ## 0.14.1
 
 ### Patch Changes

package/dist/betterSqliteDriver.d.ts

@@ -0,0 +1,10 @@
+import type { SQLiteDatabaseDriver } from "cojson-storage";
+export declare class BetterSqliteDriver implements SQLiteDatabaseDriver {
+    private readonly db;
+    constructor(filename: string);
+    run(sql: string, params: unknown[]): void;
+    query<T>(sql: string, params: unknown[]): T[];
+    get<T>(sql: string, params: unknown[]): T | undefined;
+    transaction(callback: () => unknown): unknown;
+}
+//# sourceMappingURL=betterSqliteDriver.d.ts.map

package/dist/betterSqliteDriver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"betterSqliteDriver.d.ts","sourceRoot":"","sources":["../src/betterSqliteDriver.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAE3D,qBAAa,kBAAmB,YAAW,oBAAoB;IAC7D,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAY;gBAEnB,QAAQ,EAAE,MAAM;IAM5B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAIlC,KAAK,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE;IAI7C,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,GAAG,SAAS;IAIrD,WAAW,CAAC,QAAQ,EAAE,MAAM,OAAO;CAGpC"}

package/dist/betterSqliteDriver.js

@@ -0,0 +1,21 @@
+import Database from "better-sqlite3";
+export class BetterSqliteDriver {
+    constructor(filename) {
+        const db = new Database(filename);
+        this.db = db;
+        db.pragma("journal_mode = WAL");
+    }
+    run(sql, params) {
+        this.db.prepare(sql).run(params);
+    }
+    query(sql, params) {
+        return this.db.prepare(sql).all(params);
+    }
+    get(sql, params) {
+        return this.db.prepare(sql).get(params);
+    }
+    transaction(callback) {
+        return this.db.transaction(callback)();
+    }
+}
+//# sourceMappingURL=betterSqliteDriver.js.map

package/dist/betterSqliteDriver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"betterSqliteDriver.js","sourceRoot":"","sources":["../src/betterSqliteDriver.ts"],"names":[],"mappings":"AAAA,OAAO,QAAwC,MAAM,gBAAgB,CAAC;AAGtE,MAAM,OAAO,kBAAkB;IAG7B,YAAY,QAAgB;QAC1B,MAAM,EAAE,GAAG,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,EAAE,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IAClC,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,MAAiB;QAChC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED,KAAK,CAAI,GAAW,EAAE,MAAiB;QACrC,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAQ,CAAC;IACjD,CAAC;IAED,GAAG,CAAI,GAAW,EAAE,MAAiB;QACnC,OAAO,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAkB,CAAC;IAC3D,CAAC;IAED,WAAW,CAAC,QAAuB;QACjC,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC;IACzC,CAAC;CACF"}

package/dist/sqliteNode.d.ts

@@ -1,13 +1,9 @@
-import { type Database as DatabaseT } from "better-sqlite3";
-import { type IncomingSyncStream, type OutgoingSyncQueue, type Peer } from "cojson";
-export declare class SQLiteNode {
-    private readonly syncManager;
-    private readonly dbClient;
-    constructor(db: DatabaseT, fromLocalNode: IncomingSyncStream, toLocalNode: OutgoingSyncQueue);
+import type { Peer } from "cojson";
+import { SQLiteNodeBase } from "cojson-storage";
+export declare class SQLiteNode extends SQLiteNodeBase {
     static asPeer({ filename, localNodeName, }: {
         filename: string;
         localNodeName?: string;
     }): Promise<Peer>;
-    static open(filename: string, fromLocalNode: IncomingSyncStream, toLocalNode: OutgoingSyncQueue): Promise<SQLiteNode>;
 }
 //# sourceMappingURL=sqliteNode.d.ts.map

package/dist/sqliteNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sqliteNode.d.ts","sourceRoot":"","sources":["../src/sqliteNode.ts"],"names":[],"mappings":"AAAA,OAAiB,EAAE,KAAK,QAAQ,IAAI,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,iBAAiB,EACtB,KAAK,IAAI,EAGV,MAAM,QAAQ,CAAC;AAIhB,qBAAa,UAAU;IACrB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAqB;IACjD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAe;gBAGtC,EAAE,EAAE,SAAS,EACb,aAAa,EAAE,kBAAkB,EACjC,WAAW,EAAE,iBAAiB;WAgDnB,MAAM,CAAC,EAClB,QAAQ,EACR,aAAuB,GACxB,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,GAAG,OAAO,CAAC,IAAI,CAAC;WAgBJ,IAAI,CACf,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,kBAAkB,EACjC,WAAW,EAAE,iBAAiB;CAwFjC"}
+{"version":3,"file":"sqliteNode.d.ts","sourceRoot":"","sources":["../src/sqliteNode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAGhD,qBAAa,UAAW,SAAQ,cAAc;WAC/B,MAAM,CAAC,EAClB,QAAQ,EACR,aAAuB,GACxB,EAAE;QACD,QAAQ,EAAE,MAAM,CAAC;QACjB,aAAa,CAAC,EAAE,MAAM,CAAC;KACxB,GAAG,OAAO,CAAC,IAAI,CAAC;CASlB"}

package/dist/sqliteNode.js

@@ -1,102 +1,13 @@
-import Database from "better-sqlite3";
-import { cojsonInternals, logger, } from "cojson";
-import { StorageManagerSync } from "cojson-storage";
-import { SQLiteClient } from "./sqliteClient.js";
-export class SQLiteNode {
-    constructor(db, fromLocalNode, toLocalNode) {
-        this.dbClient = new SQLiteClient(db, toLocalNode);
-        this.syncManager = new StorageManagerSync(this.dbClient, toLocalNode);
-        const processMessages = async () => {
-            let lastTimer = performance.now();
-            let runningTimer = false;
-            for await (const msg of fromLocalNode) {
-                try {
-                    if (msg === "Disconnected" || msg === "PingTimeout") {
-                        throw new Error("Unexpected Disconnected message");
-                    }
-                    if (!runningTimer) {
-                        runningTimer = true;
-                        lastTimer = performance.now();
-                        setTimeout(() => {
-                            runningTimer = false;
-                        }, 10);
-                    }
-                    this.syncManager.handleSyncMessage(msg);
-                    // Since the DB APIs are synchronous there may be the case
-                    // where a bulk of messages are processed without interruptions
-                    // which may block other peers from sending messages.
-                    // To avoid this we schedule a timer to downgrade the priority of the storage peer work
-                    if (performance.now() - lastTimer > 500) {
-                        lastTimer = performance.now();
-                        await new Promise((resolve) => setTimeout(resolve, 0));
-                    }
-                }
-                catch (e) {
-                    logger.error("Error reading from localNode, handling msg", {
-                        msg,
-                        err: e,
-                    });
-                }
-            }
-        };
-        processMessages().catch((e) => logger.error("Error in processMessages in sqlite", { err: e }));
-    }
+import { SQLiteNodeBase } from "cojson-storage";
+import { BetterSqliteDriver } from "./betterSqliteDriver.js";
+export class SQLiteNode extends SQLiteNodeBase {
     static async asPeer({ filename, localNodeName = "local", }) {
-        const [localNodeAsPeer, storageAsPeer] = cojsonInternals.connectedPeers(localNodeName, "storage", { peer1role: "client", peer2role: "storage", crashOnClose: true });
-        await SQLiteNode.open(filename, localNodeAsPeer.incoming, localNodeAsPeer.outgoing);
-        return { ...storageAsPeer, priority: 100 };
-    }
-    static async open(filename, fromLocalNode, toLocalNode) {
-        const db = Database(filename);
-        db.pragma("journal_mode = WAL");
-        const oldVersion = db.pragma("user_version")[0].user_version;
-        if (oldVersion === 0) {
-            db.prepare(`CREATE TABLE IF NOT EXISTS transactions (
-                    ses INTEGER,
-                    idx INTEGER,
-                    tx TEXT NOT NULL,
-                    PRIMARY KEY (ses, idx)
-                ) WITHOUT ROWID;`).run();
-            db.prepare(`CREATE TABLE IF NOT EXISTS sessions (
-                    rowID INTEGER PRIMARY KEY,
-                    coValue INTEGER NOT NULL,
-                    sessionID TEXT NOT NULL,
-                    lastIdx INTEGER,
-                    lastSignature TEXT,
-                    UNIQUE (sessionID, coValue)
-                );`).run();
-            db.prepare("CREATE INDEX IF NOT EXISTS sessionsByCoValue ON sessions (coValue);").run();
-            db.prepare(`CREATE TABLE IF NOT EXISTS coValues (
-                    rowID INTEGER PRIMARY KEY,
-                    id TEXT NOT NULL UNIQUE,
-                    header TEXT NOT NULL UNIQUE
-                );`).run();
-            db.prepare("CREATE INDEX IF NOT EXISTS coValuesByID ON coValues (id);").run();
-            db.pragma("user_version = 1");
-        }
-        if (oldVersion <= 1) {
-            // fix embarrassing off-by-one error for transaction indices
-            const txs = db
-                .prepare("SELECT * FROM transactions")
-                .all();
-            for (const tx of txs) {
-                db.prepare("DELETE FROM transactions WHERE ses = ? AND idx = ?").run(tx.ses, tx.idx);
-                tx.idx -= 1;
-                db.prepare("INSERT INTO transactions (ses, idx, tx) VALUES (?, ?, ?)").run(tx.ses, tx.idx, tx.tx);
-            }
-            db.pragma("user_version = 2");
-        }
-        if (oldVersion <= 2) {
-            db.prepare(`CREATE TABLE IF NOT EXISTS signatureAfter (
-                    ses INTEGER,
-                    idx INTEGER,
-                    signature TEXT NOT NULL,
-                    PRIMARY KEY (ses, idx)
-                ) WITHOUT ROWID;`).run();
-            db.prepare("ALTER TABLE sessions ADD COLUMN bytesSinceLastSignature INTEGER;").run();
-            db.pragma("user_version = 3");
-        }
-        return new SQLiteNode(db, fromLocalNode, toLocalNode);
+        const db = new BetterSqliteDriver(filename);
+        return SQLiteNodeBase.create({
+            db,
+            localNodeName,
+            maxBlockingTime: 500,
+        });
     }
 }
 //# sourceMappingURL=sqliteNode.js.map

package/dist/sqliteNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"sqliteNode.js","sourceRoot":"","sources":["../src/sqliteNode.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sqliteNode.js","sourceRoot":"","sources":["../src/sqliteNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAE7D,MAAM,OAAO,UAAW,SAAQ,cAAc;IAC5C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAClB,QAAQ,EACR,aAAa,GAAG,OAAO,GAIxB;QACC,MAAM,EAAE,GAAG,IAAI,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAE5C,OAAO,cAAc,CAAC,MAAM,CAAC;YAC3B,EAAE;YACF,aAAa;YACb,eAAe,EAAE,GAAG;SACrB,CAAC,CAAC;IACL,CAAC;CACF"}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "cojson-storage-sqlite",
   "type": "module",
-  "version": "0.14.1",
+  "version": "0.14.18",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",
   "dependencies": {
     "better-sqlite3": "^11.7.0",
-    "cojson": "0.14.1",
-    "cojson-storage": "0.14.1"
+    "cojson": "0.14.18",
+    "cojson-storage": "0.14.18"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.12",

package/src/betterSqliteDriver.ts

@@ -0,0 +1,28 @@
+import Database, { type Database as DatabaseT } from "better-sqlite3";
+import type { SQLiteDatabaseDriver } from "cojson-storage";
+
+export class BetterSqliteDriver implements SQLiteDatabaseDriver {
+  private readonly db: DatabaseT;
+
+  constructor(filename: string) {
+    const db = new Database(filename);
+    this.db = db;
+    db.pragma("journal_mode = WAL");
+  }
+
+  run(sql: string, params: unknown[]) {
+    this.db.prepare(sql).run(params);
+  }
+
+  query<T>(sql: string, params: unknown[]): T[] {
+    return this.db.prepare(sql).all(params) as T[];
+  }
+
+  get<T>(sql: string, params: unknown[]): T | undefined {
+    return this.db.prepare(sql).get(params) as T | undefined;
+  }
+
+  transaction(callback: () => unknown) {
+    return this.db.transaction(callback)();
+  }
+}

package/src/sqliteNode.ts

@@ -1,69 +1,8 @@
-import Database, { type Database as DatabaseT } from "better-sqlite3";
-import {
-  type IncomingSyncStream,
-  type OutgoingSyncQueue,
-  type Peer,
-  cojsonInternals,
-  logger,
-} from "cojson";
-import { StorageManagerSync, type TransactionRow } from "cojson-storage";
-import { SQLiteClient } from "./sqliteClient.js";
-
-export class SQLiteNode {
-  private readonly syncManager: StorageManagerSync;
-  private readonly dbClient: SQLiteClient;
-
-  constructor(
-    db: DatabaseT,
-    fromLocalNode: IncomingSyncStream,
-    toLocalNode: OutgoingSyncQueue,
-  ) {
-    this.dbClient = new SQLiteClient(db, toLocalNode);
-    this.syncManager = new StorageManagerSync(this.dbClient, toLocalNode);
-
-    const processMessages = async () => {
-      let lastTimer = performance.now();
-      let runningTimer = false;
-
-      for await (const msg of fromLocalNode) {
-        try {
-          if (msg === "Disconnected" || msg === "PingTimeout") {
-            throw new Error("Unexpected Disconnected message");
-          }
-
-          if (!runningTimer) {
-            runningTimer = true;
-            lastTimer = performance.now();
-            setTimeout(() => {
-              runningTimer = false;
-            }, 10);
-          }
-
-          this.syncManager.handleSyncMessage(msg);
-
-          // Since the DB APIs are synchronous there may be the case
-          // where a bulk of messages are processed without interruptions
-          // which may block other peers from sending messages.
-
-          // To avoid this we schedule a timer to downgrade the priority of the storage peer work
-          if (performance.now() - lastTimer > 500) {
-            lastTimer = performance.now();
-            await new Promise((resolve) => setTimeout(resolve, 0));
-          }
-        } catch (e) {
-          logger.error("Error reading from localNode, handling msg", {
-            msg,
-            err: e,
-          });
-        }
-      }
-    };
-
-    processMessages().catch((e) =>
-      logger.error("Error in processMessages in sqlite", { err: e }),
-    );
-  }
+import type { Peer } from "cojson";
+import { SQLiteNodeBase } from "cojson-storage";
+import { BetterSqliteDriver } from "./betterSqliteDriver.js";
 
+export class SQLiteNode extends SQLiteNodeBase {
   static async asPeer({
     filename,
     localNodeName = "local",
@@ -71,110 +10,12 @@ export class SQLiteNode {
     filename: string;
     localNodeName?: string;
   }): Promise<Peer> {
-    const [localNodeAsPeer, storageAsPeer] = cojsonInternals.connectedPeers(
-      localNodeName,
-      "storage",
-      { peer1role: "client", peer2role: "storage", crashOnClose: true },
-    );
-
-    await SQLiteNode.open(
-      filename,
-      localNodeAsPeer.incoming,
-      localNodeAsPeer.outgoing,
-    );
-
-    return { ...storageAsPeer, priority: 100 };
-  }
-
-  static async open(
-    filename: string,
-    fromLocalNode: IncomingSyncStream,
-    toLocalNode: OutgoingSyncQueue,
-  ) {
-    const db = Database(filename);
-    db.pragma("journal_mode = WAL");
+    const db = new BetterSqliteDriver(filename);
 
-    const oldVersion = (
-      db.pragma("user_version") as [{ user_version: number }]
-    )[0].user_version as number;
-
-    if (oldVersion === 0) {
-      db.prepare(
-        `CREATE TABLE IF NOT EXISTS transactions (
-                    ses INTEGER,
-                    idx INTEGER,
-                    tx TEXT NOT NULL,
-                    PRIMARY KEY (ses, idx)
-                ) WITHOUT ROWID;`,
-      ).run();
-
-      db.prepare(
-        `CREATE TABLE IF NOT EXISTS sessions (
-                    rowID INTEGER PRIMARY KEY,
-                    coValue INTEGER NOT NULL,
-                    sessionID TEXT NOT NULL,
-                    lastIdx INTEGER,
-                    lastSignature TEXT,
-                    UNIQUE (sessionID, coValue)
-                );`,
-      ).run();
-
-      db.prepare(
-        "CREATE INDEX IF NOT EXISTS sessionsByCoValue ON sessions (coValue);",
-      ).run();
-
-      db.prepare(
-        `CREATE TABLE IF NOT EXISTS coValues (
-                    rowID INTEGER PRIMARY KEY,
-                    id TEXT NOT NULL UNIQUE,
-                    header TEXT NOT NULL UNIQUE
-                );`,
-      ).run();
-
-      db.prepare(
-        "CREATE INDEX IF NOT EXISTS coValuesByID ON coValues (id);",
-      ).run();
-
-      db.pragma("user_version = 1");
-    }
-
-    if (oldVersion <= 1) {
-      // fix embarrassing off-by-one error for transaction indices
-      const txs = db
-        .prepare("SELECT * FROM transactions")
-        .all() as TransactionRow[];
-
-      for (const tx of txs) {
-        db.prepare("DELETE FROM transactions WHERE ses = ? AND idx = ?").run(
-          tx.ses,
-          tx.idx,
-        );
-        tx.idx -= 1;
-        db.prepare(
-          "INSERT INTO transactions (ses, idx, tx) VALUES (?, ?, ?)",
-        ).run(tx.ses, tx.idx, tx.tx);
-      }
-
-      db.pragma("user_version = 2");
-    }
-
-    if (oldVersion <= 2) {
-      db.prepare(
-        `CREATE TABLE IF NOT EXISTS signatureAfter (
-                    ses INTEGER,
-                    idx INTEGER,
-                    signature TEXT NOT NULL,
-                    PRIMARY KEY (ses, idx)
-                ) WITHOUT ROWID;`,
-      ).run();
-
-      db.prepare(
-        "ALTER TABLE sessions ADD COLUMN bytesSinceLastSignature INTEGER;",
-      ).run();
-
-      db.pragma("user_version = 3");
-    }
-
-    return new SQLiteNode(db, fromLocalNode, toLocalNode);
+    return SQLiteNodeBase.create({
+      db,
+      localNodeName,
+      maxBlockingTime: 500,
+    });
   }
 }

package/dist/sqliteClient.d.ts

@@ -1,40 +0,0 @@
-import type { Database as DatabaseT } from "better-sqlite3";
-import { type CojsonInternalTypes, type OutgoingSyncQueue, type SessionID } from "cojson";
-import type { DBClientInterfaceSync, SessionRow, SignatureAfterRow, StoredCoValueRow, StoredSessionRow, TransactionRow } from "cojson-storage";
-type RawCoID = CojsonInternalTypes.RawCoID;
-type Signature = CojsonInternalTypes.Signature;
-type Transaction = CojsonInternalTypes.Transaction;
-export type RawCoValueRow = {
-    id: CojsonInternalTypes.RawCoID;
-    header: string;
-};
-export type RawTransactionRow = {
-    ses: number;
-    idx: number;
-    tx: string;
-};
-export declare function getErrorMessage(error: unknown): string;
-export declare class SQLiteClient implements DBClientInterfaceSync {
-    private readonly db;
-    private readonly toLocalNode;
-    constructor(db: DatabaseT, toLocalNode: OutgoingSyncQueue);
-    getCoValue(coValueId: RawCoID): StoredCoValueRow | undefined;
-    getCoValueSessions(coValueRowId: number): StoredSessionRow[];
-    getSingleCoValueSession(coValueRowId: number, sessionID: SessionID): StoredSessionRow | undefined;
-    getNewTransactionInSession(sessionRowId: number, fromIdx: number, toIdx: number): TransactionRow[];
-    getSignatures(sessionRowId: number, firstNewTxIdx: number): SignatureAfterRow[];
-    addCoValue(msg: CojsonInternalTypes.NewContentMessage): number;
-    addSessionUpdate({ sessionUpdate, sessionRow, }: {
-        sessionUpdate: SessionRow;
-        sessionRow?: StoredSessionRow;
-    }): number;
-    addTransaction(sessionRowID: number, nextIdx: number, newTransaction: Transaction): void;
-    addSignatureAfter({ sessionRowID, idx, signature, }: {
-        sessionRowID: number;
-        idx: number;
-        signature: Signature;
-    }): void;
-    transaction(operationsCallback: () => unknown): undefined;
-}
-export {};
-//# sourceMappingURL=sqliteClient.d.ts.map

package/dist/sqliteClient.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sqliteClient.d.ts","sourceRoot":"","sources":["../src/sqliteClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,IAAI,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC5D,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,iBAAiB,EACtB,KAAK,SAAS,EAEf,MAAM,QAAQ,CAAC;AAChB,OAAO,KAAK,EACV,qBAAqB,EACrB,UAAU,EACV,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,cAAc,EACf,MAAM,gBAAgB,CAAC;AAExB,KAAK,OAAO,GAAG,mBAAmB,CAAC,OAAO,CAAC;AAC3C,KAAK,SAAS,GAAG,mBAAmB,CAAC,SAAS,CAAC;AAC/C,KAAK,WAAW,GAAG,mBAAmB,CAAC,WAAW,CAAC;AAEnD,MAAM,MAAM,aAAa,GAAG;IAC1B,EAAE,EAAE,mBAAmB,CAAC,OAAO,CAAC;IAChC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEF,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,UAE7C;AAED,qBAAa,YAAa,YAAW,qBAAqB;IACxD,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAY;IAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoB;gBAEpC,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,iBAAiB;IAKzD,UAAU,CAAC,SAAS,EAAE,OAAO,GAAG,gBAAgB,GAAG,SAAS;IAyB5D,kBAAkB,CAAC,YAAY,EAAE,MAAM,GAAG,gBAAgB,EAAE;IAM5D,uBAAuB,CACrB,YAAY,EAAE,MAAM,EACpB,SAAS,EAAE,SAAS,GACnB,gBAAgB,GAAG,SAAS;IAQ/B,0BAA0B,CACxB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACZ,cAAc,EAAE;IAkBnB,aAAa,CACX,YAAY,EAAE,MAAM,EACpB,aAAa,EAAE,MAAM,GACpB,iBAAiB,EAAE;IAQtB,UAAU,CAAC,GAAG,EAAE,mBAAmB,CAAC,iBAAiB,GAAG,MAAM;IAQ9D,gBAAgB,CAAC,EACf,aAAa,EACb,UAAU,GACX,EAAE;QACD,aAAa,EAAE,UAAU,CAAC;QAC1B,UAAU,CAAC,EAAE,gBAAgB,CAAC;KAC/B,GAAG,MAAM;IAkBV,cAAc,CACZ,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,WAAW;IAS7B,iBAAiB,CAAC,EAChB,YAAY,EACZ,GAAG,EACH,SAAS,GACV,EAAE;QAAE,YAAY,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,SAAS,CAAA;KAAE;IAQ9D,WAAW,CAAC,kBAAkB,EAAE,MAAM,OAAO;CAI9C"}

package/dist/sqliteClient.js

@@ -1,90 +0,0 @@
-import { logger, } from "cojson";
-export function getErrorMessage(error) {
-    return error instanceof Error ? error.message : "Unknown error";
-}
-export class SQLiteClient {
-    constructor(db, toLocalNode) {
-        this.db = db;
-        this.toLocalNode = toLocalNode;
-    }
-    getCoValue(coValueId) {
-        const coValueRow = this.db
-            .prepare("SELECT * FROM coValues WHERE id = ?")
-            .get(coValueId);
-        if (!coValueRow)
-            return;
-        try {
-            const parsedHeader = (coValueRow?.header &&
-                JSON.parse(coValueRow.header));
-            return {
-                ...coValueRow,
-                header: parsedHeader,
-            };
-        }
-        catch (e) {
-            const headerValue = coValueRow?.header ?? "";
-            logger.warn(`Invalid JSON in header: ${headerValue}`, {
-                id: coValueId,
-                err: e,
-            });
-            return;
-        }
-    }
-    getCoValueSessions(coValueRowId) {
-        return this.db
-            .prepare("SELECT * FROM sessions WHERE coValue = ?")
-            .all(coValueRowId);
-    }
-    getSingleCoValueSession(coValueRowId, sessionID) {
-        return this.db
-            .prepare("SELECT * FROM sessions WHERE coValue = ? AND sessionID = ?")
-            .get(coValueRowId, sessionID);
-    }
-    getNewTransactionInSession(sessionRowId, fromIdx, toIdx) {
-        const txs = this.db
-            .prepare("SELECT * FROM transactions WHERE ses = ? AND idx >= ? AND idx <= ?")
-            .all(sessionRowId, fromIdx, toIdx);
-        try {
-            return txs.map((transactionRow) => ({
-                ...transactionRow,
-                tx: JSON.parse(transactionRow.tx),
-            }));
-        }
-        catch (e) {
-            logger.warn("Invalid JSON in transaction", { err: e });
-            return [];
-        }
-    }
-    getSignatures(sessionRowId, firstNewTxIdx) {
-        return this.db
-            .prepare("SELECT * FROM signatureAfter WHERE ses = ? AND idx >= ?")
-            .all(sessionRowId, firstNewTxIdx);
-    }
-    addCoValue(msg) {
-        return this.db
-            .prepare("INSERT INTO coValues (id, header) VALUES (?, ?)")
-            .run(msg.id, JSON.stringify(msg.header)).lastInsertRowid;
-    }
-    addSessionUpdate({ sessionUpdate, sessionRow, }) {
-        return this.db
-            .prepare(`INSERT INTO sessions (coValue, sessionID, lastIdx, lastSignature, bytesSinceLastSignature) VALUES (?, ?, ?, ?, ?)
-                            ON CONFLICT(coValue, sessionID) DO UPDATE SET lastIdx=excluded.lastIdx, lastSignature=excluded.lastSignature, bytesSinceLastSignature=excluded.bytesSinceLastSignature
-                            RETURNING rowID`)
-            .get(sessionUpdate.coValue, sessionUpdate.sessionID, sessionUpdate.lastIdx, sessionUpdate.lastSignature, sessionUpdate.bytesSinceLastSignature).rowID;
-    }
-    addTransaction(sessionRowID, nextIdx, newTransaction) {
-        this.db
-            .prepare("INSERT INTO transactions (ses, idx, tx) VALUES (?, ?, ?)")
-            .run(sessionRowID, nextIdx, JSON.stringify(newTransaction));
-    }
-    addSignatureAfter({ sessionRowID, idx, signature, }) {
-        this.db
-            .prepare("INSERT INTO signatureAfter (ses, idx, signature) VALUES (?, ?, ?)")
-            .run(sessionRowID, idx, signature);
-    }
-    transaction(operationsCallback) {
-        this.db.transaction(operationsCallback)();
-        return undefined;
-    }
-}
-//# sourceMappingURL=sqliteClient.js.map

package/dist/sqliteClient.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"sqliteClient.js","sourceRoot":"","sources":["../src/sqliteClient.ts"],"names":[],"mappings":"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"}

package/src/sqliteClient.ts

@@ -1,180 +0,0 @@
-import type { Database as DatabaseT } from "better-sqlite3";
-import {
-  type CojsonInternalTypes,
-  type OutgoingSyncQueue,
-  type SessionID,
-  logger,
-} from "cojson";
-import type {
-  DBClientInterfaceSync,
-  SessionRow,
-  SignatureAfterRow,
-  StoredCoValueRow,
-  StoredSessionRow,
-  TransactionRow,
-} from "cojson-storage";
-
-type RawCoID = CojsonInternalTypes.RawCoID;
-type Signature = CojsonInternalTypes.Signature;
-type Transaction = CojsonInternalTypes.Transaction;
-
-export type RawCoValueRow = {
-  id: CojsonInternalTypes.RawCoID;
-  header: string;
-};
-
-export type RawTransactionRow = {
-  ses: number;
-  idx: number;
-  tx: string;
-};
-
-export function getErrorMessage(error: unknown) {
-  return error instanceof Error ? error.message : "Unknown error";
-}
-
-export class SQLiteClient implements DBClientInterfaceSync {
-  private readonly db: DatabaseT;
-  private readonly toLocalNode: OutgoingSyncQueue;
-
-  constructor(db: DatabaseT, toLocalNode: OutgoingSyncQueue) {
-    this.db = db;
-    this.toLocalNode = toLocalNode;
-  }
-
-  getCoValue(coValueId: RawCoID): StoredCoValueRow | undefined {
-    const coValueRow = this.db
-      .prepare("SELECT * FROM coValues WHERE id = ?")
-      .get(coValueId) as RawCoValueRow & { rowID: number };
-
-    if (!coValueRow) return;
-
-    try {
-      const parsedHeader = (coValueRow?.header &&
-        JSON.parse(coValueRow.header)) as CojsonInternalTypes.CoValueHeader;
-
-      return {
-        ...coValueRow,
-        header: parsedHeader,
-      };
-    } catch (e) {
-      const headerValue = coValueRow?.header ?? "";
-      logger.warn(`Invalid JSON in header: ${headerValue}`, {
-        id: coValueId,
-        err: e,
-      });
-      return;
-    }
-  }
-
-  getCoValueSessions(coValueRowId: number): StoredSessionRow[] {
-    return this.db
-      .prepare<number>("SELECT * FROM sessions WHERE coValue = ?")
-      .all(coValueRowId) as StoredSessionRow[];
-  }
-
-  getSingleCoValueSession(
-    coValueRowId: number,
-    sessionID: SessionID,
-  ): StoredSessionRow | undefined {
-    return this.db
-      .prepare<[number, string]>(
-        "SELECT * FROM sessions WHERE coValue = ? AND sessionID = ?",
-      )
-      .get(coValueRowId, sessionID) as StoredSessionRow | undefined;
-  }
-
-  getNewTransactionInSession(
-    sessionRowId: number,
-    fromIdx: number,
-    toIdx: number,
-  ): TransactionRow[] {
-    const txs = this.db
-      .prepare<[number, number, number]>(
-        "SELECT * FROM transactions WHERE ses = ? AND idx >= ? AND idx <= ?",
-      )
-      .all(sessionRowId, fromIdx, toIdx) as RawTransactionRow[];
-
-    try {
-      return txs.map((transactionRow) => ({
-        ...transactionRow,
-        tx: JSON.parse(transactionRow.tx) as Transaction,
-      }));
-    } catch (e) {
-      logger.warn("Invalid JSON in transaction", { err: e });
-      return [];
-    }
-  }
-
-  getSignatures(
-    sessionRowId: number,
-    firstNewTxIdx: number,
-  ): SignatureAfterRow[] {
-    return this.db
-      .prepare<[number, number]>(
-        "SELECT * FROM signatureAfter WHERE ses = ? AND idx >= ?",
-      )
-      .all(sessionRowId, firstNewTxIdx) as SignatureAfterRow[];
-  }
-
-  addCoValue(msg: CojsonInternalTypes.NewContentMessage): number {
-    return this.db
-      .prepare<[CojsonInternalTypes.RawCoID, string]>(
-        "INSERT INTO coValues (id, header) VALUES (?, ?)",
-      )
-      .run(msg.id, JSON.stringify(msg.header)).lastInsertRowid as number;
-  }
-
-  addSessionUpdate({
-    sessionUpdate,
-    sessionRow,
-  }: {
-    sessionUpdate: SessionRow;
-    sessionRow?: StoredSessionRow;
-  }): number {
-    return (
-      this.db
-        .prepare<[number, string, number, string, number | undefined]>(
-          `INSERT INTO sessions (coValue, sessionID, lastIdx, lastSignature, bytesSinceLastSignature) VALUES (?, ?, ?, ?, ?)
-                            ON CONFLICT(coValue, sessionID) DO UPDATE SET lastIdx=excluded.lastIdx, lastSignature=excluded.lastSignature, bytesSinceLastSignature=excluded.bytesSinceLastSignature
-                            RETURNING rowID`,
-        )
-        .get(
-          sessionUpdate.coValue,
-          sessionUpdate.sessionID,
-          sessionUpdate.lastIdx,
-          sessionUpdate.lastSignature,
-          sessionUpdate.bytesSinceLastSignature,
-        ) as { rowID: number }
-    ).rowID;
-  }
-
-  addTransaction(
-    sessionRowID: number,
-    nextIdx: number,
-    newTransaction: Transaction,
-  ) {
-    this.db
-      .prepare<[number, number, string]>(
-        "INSERT INTO transactions (ses, idx, tx) VALUES (?, ?, ?)",
-      )
-      .run(sessionRowID, nextIdx, JSON.stringify(newTransaction));
-  }
-
-  addSignatureAfter({
-    sessionRowID,
-    idx,
-    signature,
-  }: { sessionRowID: number; idx: number; signature: Signature }) {
-    this.db
-      .prepare<[number, number, string]>(
-        "INSERT INTO signatureAfter (ses, idx, signature) VALUES (?, ?, ?)",
-      )
-      .run(sessionRowID, idx, signature);
-  }
-
-  transaction(operationsCallback: () => unknown) {
-    this.db.transaction(operationsCallback)();
-    return undefined;
-  }
-}