@omg-dev/server 0.4.34 → 0.4.37

package/dist/index.mjs

@@ -831,6 +831,7 @@ var VibesAuthRequiredError = class extends Error {
 function openDb(path) {
 	const bun = new Database(path, { create: true });
 	bun.exec("PRAGMA journal_mode=WAL;");
+	bun.exec("PRAGMA busy_timeout=5000;");
 	function now() {
 		return (/* @__PURE__ */ new Date()).toISOString();
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@omg-dev/server",
-  "version": "0.4.34",
+  "version": "0.4.37",
   "type": "module",
   "exports": {
     ".": {
@@ -14,9 +14,9 @@
   },
   "dependencies": {
     "@restatedev/restate-sdk": "1.14.5",
-    "@omg-dev/auth": "0.4.34",
-    "@omg-dev/schema": "0.4.34",
-    "@omg-dev/stream": "0.4.34",
+    "@omg-dev/auth": "0.4.37",
+    "@omg-dev/schema": "0.4.37",
+    "@omg-dev/stream": "0.4.37",
     "web-push": "^3.6.7"
   },
   "scripts": {

package/src/db.ts

@@ -68,6 +68,13 @@ export function openDb(path: string): VibesDb {
   const bun = new Database(path, { create: true })
   // Enable WAL mode for better concurrency
   bun.exec("PRAGMA journal_mode=WAL;")
+  // Litestream is a second SQLite process, not a passive file reader. Its
+  // periodic checkpoint briefly owns SQLite's write lock. A connection with
+  // the default zero busy timeout turns that valid handoff into SQLITE_BUSY,
+  // which made unrelated control-plane writes fail at the checkpoint boundary.
+  // Put all writers through SQLite's process-safe lock queue instead of trying
+  // to coordinate selected JavaScript call sites inside this process.
+  bun.exec("PRAGMA busy_timeout=5000;")
 
   function now(): string {
     return new Date().toISOString()

package/src/test/db-contention.test.ts

@@ -0,0 +1,63 @@
+import { afterEach, describe, expect, it } from "bun:test"
+import fs from "node:fs"
+import os from "node:os"
+import path from "node:path"
+import { openDb, type VibesDb } from "../db.ts"
+
+const dbPaths: string[] = []
+
+function tmpDbPath(): string {
+  const dbPath = path.join(os.tmpdir(), `vibes-contention-${crypto.randomUUID()}.db`)
+  dbPaths.push(dbPath)
+  return dbPath
+}
+
+afterEach(() => {
+  for (const dbPath of dbPaths.splice(0)) {
+    for (const suffix of ["", "-shm", "-wal"]) {
+      try {
+        fs.unlinkSync(dbPath + suffix)
+      } catch {}
+    }
+  }
+})
+
+describe("SQLite writer coordination", () => {
+  it("waits for a second process to release Litestream's write lock", async () => {
+    const dbPath = tmpDbPath()
+    const app: VibesDb = openDb(dbPath)
+    app.raw().exec("CREATE TABLE writes (value TEXT)")
+
+    const locker = Bun.spawn(
+      [
+        process.execPath,
+        "-e",
+        `
+          import { Database } from "bun:sqlite";
+          const db = new Database(process.argv[1]);
+          db.exec("BEGIN IMMEDIATE");
+          console.log("locked");
+          await Bun.sleep(150);
+          db.exec("COMMIT");
+          db.close();
+        `,
+        dbPath,
+      ],
+      { stdout: "pipe", stderr: "pipe" },
+    )
+
+    const reader = locker.stdout.getReader()
+    const firstOutput = await reader.read()
+    expect(new TextDecoder().decode(firstOutput.value)).toContain("locked")
+
+    expect(() =>
+      app.raw().prepare("INSERT INTO writes (value) VALUES (?)").run("saved"),
+    ).not.toThrow()
+    expect(await locker.exited).toBe(0)
+    expect(
+      app.raw().prepare("SELECT value FROM writes").get() as { value: string },
+    ).toEqual({ value: "saved" })
+
+    app.close()
+  })
+})