@engenty/wizards-runtime 0.7.7 → 0.7.9

package/apps/runtime/dist/db/client.js

@@ -21,8 +21,10 @@ function open(url, authToken) {
 }
 async function prepare(client, url) {
     if (url.startsWith("file:")) {
-        await client.execute("PRAGMA journal_mode = WAL");
+        // The wait first: studio, doors and runner share the files, and switching to WAL waits
+        // too while another process recovers the log after a restart.
         await client.execute("PRAGMA busy_timeout = 5000");
+        await client.execute("PRAGMA journal_mode = WAL");
     }
     await client.execute("PRAGMA foreign_keys = ON");
 }
@@ -52,6 +54,28 @@ function tenantUrl(id, dbUrl) {
     }
     return `file:${join(env.dataDir, "tenants", `${id}.db`)}`;
 }
+function isBusy(err) {
+    for (let e = err; e; e = e.cause) {
+        if (String(e.code ?? "").startsWith("SQLITE_BUSY")) {
+            return true;
+        }
+    }
+    return false;
+}
+/** `fn` again while another process holds the database: 1, 2, 4, 8 and 16 seconds apart. */
+async function whileBusy(fn) {
+    for (let attempt = 0;; attempt++) {
+        try {
+            return await fn();
+        }
+        catch (err) {
+            if (attempt >= 5 || !isBusy(err)) {
+                throw err;
+            }
+            await new Promise((resolve) => setTimeout(resolve, 1000 * 2 ** attempt));
+        }
+    }
+}
 async function openTenant(id) {
     let row = await controlDb.query.tenant.findFirst({ where: eq(control.tenant.id, id) });
     if (!row) {
@@ -61,10 +85,20 @@ async function openTenant(id) {
     const url = tenantUrl(id, row.dbUrl);
     const client = open(url, url.startsWith("file:") ? "" : env.tenantDbAuthToken);
     clients.set(id, client);
-    await prepare(client, url);
     const db = makeTenantDb(client);
     // Every database is brought to the current schema when it is first opened.
-    await migrate(db, { migrationsFolder: migrationsFolder("tenant") });
+    try {
+        await whileBusy(async () => {
+            await prepare(client, url);
+            await migrate(db, { migrationsFolder: migrationsFolder("tenant") });
+        });
+    }
+    catch (err) {
+        // The next use opens it afresh (tenantDb forgets the failed attempt).
+        clients.delete(id);
+        client.close();
+        throw err;
+    }
     for (const hook of openHooks) {
         await hook(id, client);
     }

package/apps/runtime/dist/db/migrations/tenant/0017_run_client.sql

@@ -0,0 +1 @@
+ALTER TABLE `run` ADD `client` text;