@rotorsoft/act-sqlite 1.12.2 → 1.12.4

package/dist/index.js

@@ -1,6 +1,11 @@
 // src/sqlite-store.ts
 import { createClient } from "@libsql/client";
-import { is_literal_source, StoreError, ValidationError } from "@rotorsoft/act";
+import {
+  ConcurrencyError,
+  is_literal_source,
+  StoreError,
+  ValidationError
+} from "@rotorsoft/act";
 import {
   decrypt,
   encrypt,
@@ -9,8 +14,16 @@ import {
 var DEFAULT_CONFIG = {
   url: "file::memory:"
 };
+var ISO_8601 = /^(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])T([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])(\.\d+)?(Z|[+-][0-2][0-9]:[0-5][0-9])?$/;
+var date_reviver = (_key, value) => typeof value === "string" && ISO_8601.test(value) ? new Date(value) : value;
+var parse_json = (raw) => JSON.parse(raw, date_reviver);
+var SQLITE_CONSTRAINT_UNIQUE = 2067;
+var is_unique_violation = (e) => {
+  const err = e;
+  return err?.rawCode === SQLITE_CONSTRAINT_UNIQUE || typeof err?.message === "string" && err.message.includes("UNIQUE constraint failed");
+};
 var PORTABLE_BODY = /^(?:\.\*|\.|[^\\^$.()[\]{}|+?*])*$/;
-function streamPatternToLike(input) {
+function streamPatternToGlob(input) {
   let s = input;
   const start = s.startsWith("^");
   const end = s.endsWith("$");
@@ -18,27 +31,26 @@ function streamPatternToLike(input) {
   if (end) s = s.slice(0, -1);
   if (!PORTABLE_BODY.test(s))
     throw new ValidationError(
-      `stream filter pattern "${input}" \u2014 the SQLite adapter supports only the portable subset: "^" and "$" anchors, "." (any single character), ".*" (any run), and literal characters. Escapes, character classes, grouping, alternation, and quantifiers cannot be converted to LIKE; use stream_exact/source_exact for literal names`,
+      `stream filter pattern "${input}" \u2014 the SQLite adapter supports only the portable subset: "^" and "$" anchors, "." (any single character), ".*" (any run), and literal characters. Escapes, character classes, grouping, alternation, and quantifiers cannot be converted to GLOB; use stream_exact/source_exact for literal names`,
       input,
       "non-portable stream filter pattern"
     );
   const tokens = [];
-  if (!start) tokens.push("%");
+  if (!start) tokens.push("*");
   for (let i = 0; i < s.length; i++) {
     const c = s[i];
     if (c === ".") {
       if (s[i + 1] === "*") {
-        tokens.push("%");
+        tokens.push("*");
         i++;
-      } else tokens.push("_");
-    } else if (c === "%" || c === "_") tokens.push(`\\${c}`);
-    else tokens.push(c);
+      } else tokens.push("?");
+    } else tokens.push(c);
   }
-  if (!end) tokens.push("%");
+  if (!end) tokens.push("*");
   let out = "";
   let prev = "";
   for (const t of tokens) {
-    if (t === "%" && prev === "%") continue;
+    if (t === "*" && prev === "*") continue;
     out += t;
     prev = t;
   }
@@ -173,14 +185,14 @@ var SqliteStore = class {
   // --- commit: transaction + optimistic concurrency ---
   async commit(stream, msgs, meta, expectedVersion) {
     const tx = await this.client.transaction("write");
+    let current_version = -1;
     try {
       const version_row = await tx.execute({
         sql: "SELECT COALESCE(MAX(version), -1) as v FROM events WHERE stream = ?",
         args: [stream]
       });
-      const current_version = Number(version_row.rows[0].v);
+      current_version = Number(version_row.rows[0].v);
       if (typeof expectedVersion === "number" && current_version !== expectedVersion) {
-        const { ConcurrencyError } = await import("@rotorsoft/act");
         throw new ConcurrencyError(
           stream,
           current_version,
@@ -221,7 +233,15 @@ var SqliteStore = class {
       return committed;
     } catch (e) {
       await tx.rollback();
-      throw e;
+      if (e instanceof ConcurrencyError) throw e;
+      if (is_unique_violation(e))
+        throw new ConcurrencyError(
+          stream,
+          current_version,
+          msgs,
+          expectedVersion ?? -1
+        );
+      throw new StoreError("commit", { cause: e });
     }
   }
   // --- query: read-only, no transaction needed ---
@@ -233,11 +253,11 @@ var SqliteStore = class {
         sql += " AND stream = ?";
         args.push(query.stream);
       } else {
-        sql += " AND stream LIKE ? ESCAPE '\\'";
-        args.push(streamPatternToLike(query.stream));
+        sql += " AND stream GLOB ?";
+        args.push(streamPatternToGlob(query.stream));
       }
     }
-    if (query?.names) {
+    if (query?.names !== void 0) {
       sql += ` AND name IN (${query.names.map(() => "?").join(",")})`;
       args.push(...query.names);
     }
@@ -283,8 +303,8 @@ var SqliteStore = class {
           version: Number(row.version),
           created: new Date(row.created),
           name: row.name,
-          data: JSON.parse(row.data),
-          meta: JSON.parse(row.meta),
+          data: parse_json(row.data),
+          meta: parse_json(row.meta),
           pii: pii_value
         })
       );
@@ -299,7 +319,7 @@ var SqliteStore = class {
   async subscribe(streams) {
     for (const { source } of streams) {
       if (source !== void 0 && !is_literal_source(source))
-        streamPatternToLike(source);
+        streamPatternToGlob(source);
     }
     const tx = await this.client.transaction("write");
     try {
@@ -365,8 +385,8 @@ var SqliteStore = class {
             sql: `SELECT 1 FROM events WHERE id > ? AND name != '__snapshot__' AND stream = ? LIMIT 1`,
             args: [at, source]
           }) : await tx.execute({
-            sql: `SELECT 1 FROM events WHERE id > ? AND name != '__snapshot__' AND stream LIKE ? ESCAPE '\\' LIMIT 1`,
-            args: [at, streamPatternToLike(source)]
+            sql: `SELECT 1 FROM events WHERE id > ? AND name != '__snapshot__' AND stream GLOB ? LIMIT 1`,
+            args: [at, streamPatternToGlob(source)]
           });
           has_events = check.rows.length > 0;
         } else {
@@ -386,7 +406,14 @@ var SqliteStore = class {
           });
         }
       }
-      const lag = candidates.slice(0, lagging).map((c) => ({ ...c, lagging: true }));
+      const fair = lagging >= 2 ? Math.max(1, Math.floor(lagging / 4)) : 0;
+      const priority_slice = candidates.slice(0, lagging - fair);
+      const picked = new Set(priority_slice.map((c) => c.stream));
+      const fair_slice = [...candidates].sort((a, b) => a.at - b.at).filter((c) => !picked.has(c.stream)).slice(0, fair);
+      const lag = [...priority_slice, ...fair_slice].map((c) => ({
+        ...c,
+        lagging: true
+      }));
       const lead = [...candidates].sort((a, b) => b.at - a.at).slice(0, leading).map((c) => ({ ...c, lagging: false }));
       const seen = /* @__PURE__ */ new Set();
       const combined = [...lag, ...lead].filter((p) => {
@@ -507,8 +534,8 @@ var SqliteStore = class {
         conditions.push("stream = ?");
         args.push(filter.stream);
       } else {
-        conditions.push("stream LIKE ? ESCAPE '\\'");
-        args.push(streamPatternToLike(filter.stream));
+        conditions.push("stream GLOB ?");
+        args.push(streamPatternToGlob(filter.stream));
       }
     }
     if (filter.source !== void 0) {
@@ -517,8 +544,8 @@ var SqliteStore = class {
         conditions.push("source = ?");
         args.push(filter.source);
       } else {
-        conditions.push("source LIKE ? ESCAPE '\\'");
-        args.push(streamPatternToLike(filter.source));
+        conditions.push("source GLOB ?");
+        args.push(streamPatternToGlob(filter.source));
       }
     }
     if (filter.blocked !== void 0) {
@@ -600,15 +627,15 @@ var SqliteStore = class {
   // --- query_streams: read-only introspection with filters ---
   async query_streams(callback, query) {
     const limit = query?.limit ?? 100;
-    let sql = "SELECT stream, source, at, retry, blocked, error, leased_by, leased_until, priority, lane FROM streams WHERE 1=1";
+    let sql = "SELECT stream, source, at, retry, blocked, error, leased_by, leased_until, priority, lane, deferred_at FROM streams WHERE 1=1";
     const args = [];
     if (query?.stream !== void 0) {
       if (query.stream_exact) {
         sql += " AND stream = ?";
         args.push(query.stream);
       } else {
-        sql += " AND stream LIKE ? ESCAPE '\\'";
-        args.push(streamPatternToLike(query.stream));
+        sql += " AND stream GLOB ?";
+        args.push(streamPatternToGlob(query.stream));
       }
     }
     if (query?.source !== void 0) {
@@ -617,8 +644,8 @@ var SqliteStore = class {
         sql += " AND source = ?";
         args.push(query.source);
       } else {
-        sql += " AND source LIKE ? ESCAPE '\\'";
-        args.push(streamPatternToLike(query.source));
+        sql += " AND source GLOB ?";
+        args.push(streamPatternToGlob(query.source));
       }
     }
     if (query?.blocked !== void 0) {
@@ -642,6 +669,7 @@ var SqliteStore = class {
     let count = 0;
     for (const row of streamsResult.rows) {
       const leased_until = row.leased_until;
+      const deferred_at = row.deferred_at;
       callback({
         stream: row.stream,
         source: row.source ?? void 0,
@@ -652,7 +680,8 @@ var SqliteStore = class {
         priority: Number(row.priority),
         leased_by: row.leased_by ?? void 0,
         leased_until: leased_until ? new Date(leased_until) : void 0,
-        lane: row.lane
+        lane: row.lane,
+        deferred_at: deferred_at ? new Date(deferred_at).getTime() : void 0
       });
       count++;
     }
@@ -705,8 +734,8 @@ var SqliteStore = class {
         where.push(`e.stream = ?`);
         args.push(input.stream);
       } else {
-        where.push(`e.stream LIKE ? ESCAPE '\\'`);
-        args.push(streamPatternToLike(input.stream));
+        where.push(`e.stream GLOB ?`);
+        args.push(streamPatternToGlob(input.stream));
       }
     }
     if (exclude.length) {
@@ -775,8 +804,8 @@ var SqliteStore = class {
       stream: row.stream,
       version: Number(row.version),
       name: row.name,
-      data: JSON.parse(row.data),
-      meta: JSON.parse(row.meta),
+      data: parse_json(row.data),
+      meta: parse_json(row.meta),
       created: new Date(row.created),
       pii: await this._parse_pii_from_read(row.pii)
     });
@@ -848,8 +877,8 @@ var SqliteStore = class {
       stream,
       version: Number(version),
       name,
-      data: JSON.parse(data),
-      meta: JSON.parse(meta),
+      data: parse_json(data),
+      meta: parse_json(meta),
       created: new Date(created),
       pii: await this._parse_pii_from_read(pii)
     });
@@ -930,8 +959,8 @@ var SqliteStore = class {
             version: Number(row.version),
             created: new Date(row.created),
             name: row.name,
-            data: JSON.parse(row.data),
-            meta: JSON.parse(row.meta)
+            data: parse_json(row.data),
+            meta: parse_json(row.meta)
           },
           before
         });
@@ -1050,6 +1079,6 @@ var SqliteStore = class {
 };
 export {
   SqliteStore,
-  streamPatternToLike
+  streamPatternToGlob
 };
 //# sourceMappingURL=index.js.map