@easy-cms/drizzle 0.9.0 → 0.9.1

package/dist/index.d.ts

@@ -85,6 +85,11 @@ interface DrizzleAdapterOptions {
 interface Connection {
     readonly db: DrizzleDb;
     readonly runner: SqlRunner;
+    /**
+     * With a single-writer dialect: identifies the database (e.g. the SQLite file), so every
+     * instance in this process that writes to it shares one queue.
+     */
+    readonly writeQueue?: string;
     close(): Promise<void>;
 }
 /**

package/dist/index.js

@@ -993,6 +993,7 @@ var WhereBuilder = class {
 // src/database.ts
 var DEFAULT_TABLE_PREFIX = "ecms_";
 var DEFAULT_MIGRATION_DIR = "easy-cms/migrations";
+var writeQueues = /* @__PURE__ */ new Map();
 async function connectDatabase(dialect, connection, args, options = {}) {
   const prefix = options.tablePrefix ?? DEFAULT_TABLE_PREFIX;
   try {
@@ -1084,12 +1085,23 @@ var DrizzleDatabase = class {
     const [row] = await this.db.select({ total: count() }).from(model.root.table).where(this.where(args.collection, args.where));
     return Number(row?.total ?? 0);
   }
-  writing = Promise.resolve();
-  /** Runs a write; with a single-writer database, after the writes before it are done. */
+  /**
+   * Runs a write; with a single-writer database, after the writes before it in this process are
+   * done. (Other processes are waited for by the database's busy timeout.)
+   */
   write(run) {
     if (!this.dialect.singleWriter) return run();
-    const result = this.writing.then(() => retryWhileBusy(run));
-    this.writing = result.catch(() => {
+    const key = this.connection.writeQueue ?? "";
+    const result = (writeQueues.get(key) ?? Promise.resolve()).then(run);
+    const settled = result.then(
+      () => {
+      },
+      () => {
+      }
+    );
+    writeQueues.set(key, settled);
+    void settled.then(() => {
+      if (writeQueues.get(key) === settled) writeQueues.delete(key);
     });
     return result;
   }
@@ -1154,26 +1166,6 @@ var DrizzleDatabase = class {
     await this.connection.close();
   }
 };
-var BUSY_TIMEOUT = 1e4;
-async function retryWhileBusy(run) {
-  const until = Date.now() + BUSY_TIMEOUT;
-  for (let delay = 5; ; delay = Math.min(delay * 2, 250)) {
-    try {
-      return await run();
-    } catch (error) {
-      if (!isBusy(error) || Date.now() + delay > until) throw error;
-      await new Promise((resolve2) => setTimeout(resolve2, delay + Math.random() * delay));
-    }
-  }
-}
-function isBusy(error) {
-  for (let e = error; e; e = e.cause) {
-    const code = e.code;
-    if (typeof code === "string" && code.startsWith("SQLITE_BUSY")) return true;
-    if (e === e.cause) break;
-  }
-  return false;
-}
 export {
   DEFAULT_MIGRATION_DIR,
   DEFAULT_TABLE_PREFIX,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@easy-cms/drizzle",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Shared Drizzle ORM layer for Easy CMS database adapters",
   "license": "MIT",
   "type": "module",
@@ -23,10 +23,10 @@
     "drizzle-orm": "0.45.3"
   },
   "peerDependencies": {
-    "@easy-cms/core": "^0.9.0"
+    "@easy-cms/core": "^0.9.1"
   },
   "devDependencies": {
-    "@easy-cms/core": "^0.9.0"
+    "@easy-cms/core": "^0.9.1"
   },
   "publishConfig": {
     "access": "public"