arcway 0.4.4 → 0.4.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcway",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "A convention-based framework for building modular monoliths with strict domain boundaries.",
   "license": "MIT",
   "type": "module",
@@ -131,6 +131,7 @@
     "eslint-plugin-storybook": "^10.2.8",
     "happy-dom": "^20.6.1",
     "jsdom": "^28.0.0",
+    "mysql2": "^3.23.3",
     "playwright": "^1.58.2",
     "prettier": "^3.8.1",
     "react": "^19.2.4",

package/server/callbacks/store.js

@@ -8,6 +8,11 @@ function toIso(value) {
   return new Date(value).toISOString();
 }
 
+function toDatabaseTimestamp(db, value) {
+  const client = db?.client?.config?.client;
+  return client === 'mysql' || client === 'mysql2' ? new Date(value) : toIso(value);
+}
+
 function serializePayload(payload) {
   return JSON.stringify(payload ?? null);
 }
@@ -21,7 +26,7 @@ function parseRow(row) {
     oneTime: Boolean(row.one_time),
     used: Boolean(row.used),
     boundToSession: row.bound_to_session ?? null,
-    expiresAt: row.expires_at,
+    expiresAt: toIso(row.expires_at),
   };
 }
 
@@ -66,23 +71,23 @@ class CallbackStore {
       one_time: oneTime !== false,
       used: false,
       bound_to_session: boundToSession ?? null,
-      expires_at: toIso(now + ttlSeconds * 1000),
-      created_at: toIso(now),
-      updated_at: toIso(now),
+      expires_at: toDatabaseTimestamp(this.db, now + ttlSeconds * 1000),
+      created_at: toDatabaseTimestamp(this.db, now),
+      updated_at: toDatabaseTimestamp(this.db, now),
     };
     await this.db(this.tableName).insert(row);
     return parseRow(row);
   }
 
   async claim(id, now = new Date()) {
-    const nowIso = toIso(now);
+    const nowTimestamp = toDatabaseTimestamp(this.db, now);
     return this.db.transaction(async (trx) => {
       const updated = await trx(this.tableName)
         .where('id', id)
         .andWhere('one_time', true)
         .andWhere('used', false)
-        .andWhere('expires_at', '>', nowIso)
-        .update({ used: true, updated_at: nowIso });
+        .andWhere('expires_at', '>', nowTimestamp)
+        .update({ used: true, updated_at: nowTimestamp });
       if (updated === 0) return null;
       const row = await trx(this.tableName).where('id', id).first();
       return parseRow(row);
@@ -93,7 +98,7 @@ class CallbackStore {
     const row = await this.db(this.tableName)
       .where('id', id)
       .andWhere('one_time', false)
-      .andWhere('expires_at', '>', toIso(now))
+      .andWhere('expires_at', '>', toDatabaseTimestamp(this.db, now))
       .first();
     if (!row || row.used) return null;
     return parseRow(row);
@@ -107,8 +112,8 @@ class CallbackStore {
 
   async cleanup({ graceSeconds = DEFAULT_CLEANUP_GRACE_SECONDS } = {}) {
     const now = Date.now();
-    const expiredCutoff = toIso(now);
-    const usedCutoff = toIso(now - graceSeconds * 1000);
+    const expiredCutoff = toDatabaseTimestamp(this.db, now);
+    const usedCutoff = toDatabaseTimestamp(this.db, now - graceSeconds * 1000);
     return this.db(this.tableName)
       .where('expires_at', '<=', expiredCutoff)
       .orWhere(function () {

package/server/queue/drivers/knex.js

@@ -1,3 +1,10 @@
+function toDatabaseTimestamp(db, value) {
+  const client = db?.client?.config?.client;
+  return client === 'mysql' || client === 'mysql2'
+    ? new Date(value)
+    : new Date(value).toISOString();
+}
+
 class KnexQueueDriver {
   tableName;
   constructor(db, tableName = 'arcway_queue') {
@@ -37,10 +44,10 @@ class KnexQueueDriver {
     await this.db(this.tableName).insert(rows);
   }
   async pop(namespace, topic, count, lockCooldownMs) {
-    const cutoff = new Date(Date.now() - lockCooldownMs).toISOString();
-    const now = new Date().toISOString();
+    const cutoff = toDatabaseTimestamp(this.db, Date.now() - lockCooldownMs);
+    const now = toDatabaseTimestamp(this.db, Date.now());
     return this.db.transaction(async (trx) => {
-      const subquery = trx(this.tableName)
+      let readyQuery = trx(this.tableName)
         .where('namespace', namespace)
         .andWhere('topic', topic)
         .andWhere(function () {
@@ -50,22 +57,21 @@ class KnexQueueDriver {
         })
         .orderBy('id', 'asc')
         .limit(count)
-        .select('id');
-      const updatedCount = await trx(this.tableName)
-        .whereIn('id', subquery)
-        .update({ status: 'locked', locked_at: now });
-      if (updatedCount === 0) {
-        return [];
-      }
-      const rows = await trx(this.tableName)
-        .where('namespace', namespace)
-        .andWhere('topic', topic)
-        .andWhere('status', 'locked')
-        .andWhere('locked_at', now)
-        .orderBy('id', 'asc')
-        .limit(count)
         .select('id', 'payload');
-      return rows.map((r) => ({ id: r.id, payload: r.payload }));
+      const client = trx.client.config.client;
+      if (client === 'mysql' || client === 'mysql2' || client === 'pg') {
+        readyQuery = readyQuery.forUpdate().skipLocked();
+      }
+      const rows = await readyQuery;
+      if (rows.length === 0) return [];
+
+      await trx(this.tableName)
+        .whereIn(
+          'id',
+          rows.map((row) => row.id),
+        )
+        .update({ status: 'locked', locked_at: now });
+      return rows.map((row) => ({ id: row.id, payload: row.payload }));
     });
   }
   async remove(namespace, ids) {