@holo-js/queue-db 0.3.27 → 0.4.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 Holo-JS contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/.holo-build-fingerprint

@@ -0,0 +1 @@
+30d0df260f628005bfe477f720793dcd4215e7fbc0ddc40115301d322466634a

package/dist/index.d.ts

@@ -64,12 +64,15 @@ declare class DatabaseQueueDriver implements QueueAsyncDriver {
     readonly name: string;
     readonly driver: "database";
     readonly mode: "async";
+    readonly acceptsJobId = true;
     private readonly tableName;
     constructor(connection: NormalizedQueueDatabaseConnectionConfig, context: QueueDriverFactoryContext);
     private getConnection;
     private getQuotedTable;
     private getExpiredReservationCutoff;
     private createReservedJob;
+    private lockNextJob;
+    private selectReservationCandidates;
     dispatch<TPayload extends QueueJsonValue = QueueJsonValue, TResult = unknown>(job: QueueJobEnvelope<TPayload>): Promise<QueueDriverDispatchResult<TResult>>;
     reserve<TPayload extends QueueJsonValue = QueueJsonValue>(input: {
         readonly queueNames: readonly string[];
@@ -112,4 +115,5 @@ declare function createQueueDbRuntimeOptions(): Readonly<{
     failedJobStore: _holo_js_queue.QueueFailedJobStore;
 }>;
 
-export { DatabaseQueueDriver, DatabaseQueueDriverError, type StoredFailedQueueJobRow, type StoredQueueJobRow, createQueueDbRuntimeOptions, databaseQueueDriverFactory, databaseQueueDriverInternals, queueDatabaseInternals, queueDbFailedJobStore, queueDbFailedStoreInternals };
+export { DatabaseQueueDriver, DatabaseQueueDriverError, createQueueDbRuntimeOptions, databaseQueueDriverFactory, databaseQueueDriverInternals, queueDatabaseInternals, queueDbFailedJobStore, queueDbFailedStoreInternals };
+export type { StoredFailedQueueJobRow, StoredQueueJobRow };

package/dist/index.mjs

@@ -190,6 +190,7 @@ function wrapDatabaseError(connectionName, action, error) {
   }
   return new DatabaseQueueDriverError(connectionName, action, error);
 }
+var RESERVATION_CANDIDATE_PAGE_SIZE = 100;
 function normalizeQueueNames(queueNames, fallbackQueueName) {
   if (!queueNames || queueNames.length === 0) {
     return Object.freeze([fallbackQueueName]);
@@ -207,9 +208,12 @@ var DatabaseQueueDriver = class {
     this.name = connection.name;
     this.tableName = normalizeIdentifierPath(connection.table, "Queue table name");
   }
+  connection;
+  context;
   name;
   driver = "database";
   mode = "async";
+  acceptsJobId = true;
   tableName;
   async getConnection() {
     return ensureConnectionReady(resolveDatabaseConnection(this.connection.connection));
@@ -227,6 +231,45 @@ var DatabaseQueueDriver = class {
       envelope: parseStoredQueueJobRow(row)
     });
   }
+  async lockNextJob(tx, quotedTable, queueName, now) {
+    const expiredReservationCutoff = this.getExpiredReservationCutoff(now);
+    const lockClause = tx.getCapabilities().lockForUpdate ? " FOR UPDATE SKIP LOCKED" : "";
+    let after;
+    while (true) {
+      const candidates = await this.selectReservationCandidates(tx, quotedTable, queueName, now, expiredReservationCutoff, after);
+      for (const candidate of candidates) {
+        const [idPlaceholder, availablePlaceholder, expiredPlaceholder] = createPlaceholders(tx, 3);
+        const locked = await tx.queryCompiled({
+          sql: `SELECT id, job, connection, queue, payload, attempts, max_attempts, available_at, created_at FROM ${quotedTable} WHERE id = ${idPlaceholder} AND available_at <= ${availablePlaceholder} AND (reserved_at IS NULL OR reserved_at <= ${expiredPlaceholder})${lockClause}`,
+          bindings: [candidate.id, now, expiredReservationCutoff],
+          source: `queue:${this.name}:reserve:lock`
+        });
+        if (locked.rows[0]) {
+          return locked.rows[0];
+        }
+      }
+      after = candidates.at(-1);
+      if (!after || candidates.length < RESERVATION_CANDIDATE_PAGE_SIZE) {
+        return void 0;
+      }
+    }
+  }
+  async selectReservationCandidates(tx, quotedTable, queueName, now, expiredReservationCutoff, after) {
+    const placeholders = createPlaceholders(tx, after ? 6 : 3);
+    const [queuePlaceholder, availablePlaceholder, expiredPlaceholder] = placeholders;
+    const cursorCondition = after ? `AND (available_at, created_at, id) > (${placeholders.slice(3).join(", ")}) ` : "";
+    const result = await tx.queryCompiled({
+      sql: `SELECT id, available_at, created_at FROM ${quotedTable} WHERE queue = ${queuePlaceholder} AND available_at <= ${availablePlaceholder} AND (reserved_at IS NULL OR reserved_at <= ${expiredPlaceholder}) ` + cursorCondition + `ORDER BY available_at ASC, created_at ASC, id ASC LIMIT ${RESERVATION_CANDIDATE_PAGE_SIZE}`,
+      bindings: [
+        queueName,
+        now,
+        expiredReservationCutoff,
+        ...after ? [after.available_at, after.created_at, after.id] : []
+      ],
+      source: `queue:${this.name}:reserve:candidates`
+    });
+    return result.rows;
+  }
   async dispatch(job) {
     try {
       const connection = await this.getConnection();
@@ -262,38 +305,20 @@ var DatabaseQueueDriver = class {
       const queueNames = normalizeQueueNames(input.queueNames, this.connection.queue);
       return await connection.transaction(async (tx) => {
         for (const queueName of queueNames) {
-          while (true) {
-            const now = Date.now();
-            const expiredReservationCutoff = this.getExpiredReservationCutoff(now);
-            const [queuePlaceholder, availablePlaceholder, expiredPlaceholder] = createPlaceholders(tx, 3);
-            const selected = await tx.queryCompiled({
-              sql: `SELECT id, job, connection, queue, payload, attempts, max_attempts, available_at, created_at FROM ${quotedTable} WHERE queue = ${queuePlaceholder} AND available_at <= ${availablePlaceholder} AND (reserved_at IS NULL OR reserved_at <= ${expiredPlaceholder}) ORDER BY available_at ASC, created_at ASC, id ASC LIMIT 1`,
-              bindings: [queueName, now, expiredReservationCutoff],
-              source: `queue:${this.name}:reserve:select`
-            });
-            const row = selected.rows[0];
-            if (!row) {
-              break;
-            }
-            const reservationId = `${input.workerId}:${randomUUID()}`;
-            const nextAttempts = coerceRequiredInteger(row.attempts, "Stored queue job attempts") + 1;
-            const [
-              reservedAtPlaceholder,
-              reservationPlaceholder,
-              attemptsPlaceholder,
-              idPlaceholder,
-              queueNamePlaceholder,
-              expiredCutoffPlaceholder
-            ] = createPlaceholders(tx, 6);
-            const updated = await tx.executeCompiled({
-              sql: `UPDATE ${quotedTable} SET reserved_at = ${reservedAtPlaceholder}, reservation_id = ${reservationPlaceholder}, attempts = ${attemptsPlaceholder} WHERE id = ${idPlaceholder} AND queue = ${queueNamePlaceholder} AND (reserved_at IS NULL OR reserved_at <= ${expiredCutoffPlaceholder})`,
-              bindings: [now, reservationId, nextAttempts, row.id, queueName, expiredReservationCutoff],
-              source: `queue:${this.name}:reserve:update`
-            });
-            if ((updated.affectedRows ?? 0) === 1) {
-              return this.createReservedJob(row, reservationId, now);
-            }
+          const now = Date.now();
+          const row = await this.lockNextJob(tx, quotedTable, queueName, now);
+          if (!row) {
+            continue;
           }
+          const reservationId = `${input.workerId}:${randomUUID()}`;
+          const nextAttempts = coerceRequiredInteger(row.attempts, "Stored queue job attempts") + 1;
+          const [reservedAtPlaceholder, reservationPlaceholder, attemptsPlaceholder, idPlaceholder] = createPlaceholders(tx, 4);
+          await tx.executeCompiled({
+            sql: `UPDATE ${quotedTable} SET reserved_at = ${reservedAtPlaceholder}, reservation_id = ${reservationPlaceholder}, attempts = ${attemptsPlaceholder} WHERE id = ${idPlaceholder}`,
+            bindings: [now, reservationId, nextAttempts, row.id],
+            source: `queue:${this.name}:reserve:update`
+          });
+          return this.createReservedJob(row, reservationId, now);
         }
         return null;
       });

package/package.json

@@ -1,9 +1,14 @@
 {
   "name": "@holo-js/queue-db",
-  "version": "0.3.27",
+  "version": "0.4.0",
   "description": "Holo-JS Framework - DB-backed integrations for @holo-js/queue",
   "type": "module",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/cobraprojects/holo-js.git",
+    "directory": "packages/queue-db"
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -14,7 +19,8 @@
   "main": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
-    "dist"
+    "dist",
+    "LICENSE"
   ],
   "scripts": {
     "build": "tsup",
@@ -23,17 +29,19 @@
     "test": "vitest --run"
   },
   "dependencies": {
-    "@holo-js/db": "^0.3.27",
-    "@holo-js/queue": "^0.3.27"
+    "@holo-js/db": "^0.4.0",
+    "@holo-js/queue": "^0.4.0"
   },
   "devDependencies": {
-    "@holo-js/db-sqlite": "^0.3.27",
-    "@types/node": "^22.10.2",
-    "tsup": "^8.3.5",
-    "typescript": "^5.7.2",
-    "vitest": "^4.1.5"
+    "@holo-js/db-mysql": "^0.4.0",
+    "@holo-js/db-postgres": "^0.4.0",
+    "@holo-js/db-sqlite": "^0.4.0",
+    "@types/node": "^22.20.5",
+    "tsup": "^9.0.0",
+    "typescript": "^6.0.3",
+    "vitest": "^5.0.5"
   },
   "engines": {
-    "node": "^22.12.0 || ^24.0.0 || ^26.0.0"
+    "node": "^22.18.0 || ^24.0.0 || ^26.0.0"
   }
 }