bullmq 6.3.11 → 6.3.13

package/dist/esm/classes/redis-connection.js

@@ -172,7 +172,7 @@ export class RedisConnection extends EventEmitter {
     }
     /**
      * Waits for a redis client to be ready.
-     * @param redis - client
+     * @param client - Redis client to wait for.
      */
     static async waitUntilReady(client) {
         if (client.status === 'ready') {

package/dist/esm/classes/redis-queue-backend.d.ts

@@ -353,8 +353,8 @@ export declare class RedisQueueBackend extends EventEmitter implements IQueueBac
      * This script is used when a job has been manually rate limited and needs
      * to be moved back to wait from active status.
      *
-     * @param client - Redis client
      * @param jobId - Job id
+     * @param token - Lock token of the job. Defaults to '0'.
      * @returns
      */
     moveJobFromActiveToWait(jobId: string, token?: string): Promise<any>;

package/dist/esm/classes/redis-queue-backend.js

@@ -1435,8 +1435,8 @@ export class RedisQueueBackend extends EventEmitter {
      * This script is used when a job has been manually rate limited and needs
      * to be moved back to wait from active status.
      *
-     * @param client - Redis client
      * @param jobId - Job id
+     * @param token - Lock token of the job. Defaults to '0'.
      * @returns
      */
     async moveJobFromActiveToWait(jobId, token = '0') {

package/dist/esm/commands/includes/moveChildBackToParentDependencies.lua

@@ -0,0 +1,20 @@
+--[[
+  Function to move a retried child back to its parent's dependencies.
+  This does not move a parent that has already left waiting-children back to that state.
+]]
+local function moveChildBackToParentDependencies(jobKey, prevState)
+  local parentKey = rcall("HGET", jobKey, "parentKey")
+
+  if parentKey and rcall("EXISTS", parentKey) == 1 then
+    if prevState == "failed" then
+      if rcall("ZREM", parentKey .. ":unsuccessful", jobKey) == 1 or
+        rcall("HDEL", parentKey .. ":failed", jobKey) == 1 then
+        rcall("SADD", parentKey .. ":dependencies", jobKey)
+      end
+    else
+      if rcall("HDEL", parentKey .. ":processed", jobKey) == 1 then
+        rcall("SADD", parentKey .. ":dependencies", jobKey)
+      end
+    end
+  end
+end

package/dist/esm/commands/moveJobsToWait-8.lua

@@ -31,6 +31,7 @@ local rcall = redis.call;
 --- @include "includes/batches"
 --- @include "includes/getOrSetMaxEvents"
 --- @include "includes/isQueuePausedOrMaxed"
+--- @include "includes/moveChildBackToParentDependencies"
 
 local metaKey = KEYS[6]
 local isPausedOrMaxed = isQueuePausedOrMaxed(metaKey, KEYS[7])
@@ -42,11 +43,13 @@ if (#jobs > 0) then
         for i, key in ipairs(jobs) do
             local jobKey = KEYS[1] .. key
             rcall("HDEL", jobKey, "finishedOn", "processedOn", "failedReason")
+            moveChildBackToParentDependencies(jobKey, ARGV[3])
         end
     elseif ARGV[3] == "completed" then
         for i, key in ipairs(jobs) do
             local jobKey = KEYS[1] .. key
             rcall("HDEL", jobKey, "finishedOn", "processedOn", "returnvalue")
+            moveChildBackToParentDependencies(jobKey, ARGV[3])
         end
     end
 

package/dist/esm/commands/reprocessJob-7.lua

@@ -28,6 +28,7 @@ local rcall = redis.call;
 --- @include "includes/addJobInTargetList"
 --- @include "includes/getOrSetMaxEvents"
 --- @include "includes/isQueuePausedOrMaxed"
+--- @include "includes/moveChildBackToParentDependencies"
 
 local jobKey = KEYS[1]
 if rcall("EXISTS", jobKey) == 1 then
@@ -48,20 +49,7 @@ if rcall("EXISTS", jobKey) == 1 then
     local isPausedOrMaxed = isQueuePausedOrMaxed(KEYS[5], KEYS[6])
     addJobInTargetList(KEYS[4], KEYS[7], ARGV[2], isPausedOrMaxed, jobId)
 
-    local parentKey = rcall("HGET", jobKey, "parentKey")
-
-    if parentKey and rcall("EXISTS", parentKey) == 1 then
-      if ARGV[4] == "failed" then
-        if rcall("ZREM", parentKey .. ":unsuccessful", jobKey) == 1 or
-          rcall("HDEL", parentKey .. ":failed", jobKey) == 1 then
-          rcall("SADD", parentKey .. ":dependencies", jobKey)
-        end
-      else
-        if rcall("HDEL", parentKey .. ":processed", jobKey) == 1 then
-          rcall("SADD", parentKey .. ":dependencies", jobKey)
-        end
-      end
-    end
+    moveChildBackToParentDependencies(jobKey, ARGV[4])
 
     local maxEvents = getOrSetMaxEvents(KEYS[5])
     -- Emit waiting event

package/dist/esm/postgres/sql-loader.d.ts

@@ -1,6 +1,11 @@
 export declare function loadMigrationSql(file: string): string;
 /**
  * Loads a runtime command's SQL by name (without the `.sql` extension), cached
- * after the first read.
+ * after the first lookup. Runtime queries contain NO schema/namespace
+ * references — the connection's `search_path` selects the schema — so they are
+ * portable verbatim to the Python/Elixir/PHP/Rust ports (mirroring how the
+ * Redis backend's `.lua` scripts never hardcode the key prefix).
+ *
+ * @param name - Command name, e.g. `add_job`.
  */
 export declare function loadCommandSql(name: string): string;

package/dist/esm/postgres/sql-loader.js

@@ -1,62 +1,48 @@
-import { readFileSync } from 'fs';
-import { dirname, join } from 'path';
-import { fileURLToPath } from 'url';
-function getDirname() {
-    if (typeof __dirname !== 'undefined' && __dirname) {
-        return __dirname;
-    }
-    const stack = new Error().stack || '';
-    for (const line of stack.split('\n')) {
-        const match = line.match(/(file:\/\/\/[^\s)]+)/);
-        if (match) {
-            try {
-                return dirname(fileURLToPath(match[1]));
-            }
-            catch (_a) {
-                // continue searching
-            }
-        }
-    }
-    throw new Error('Could not determine sql-loader directory path');
-}
-const currentDir = getDirname();
+import { SQL_COMMANDS, SQL_MIGRATIONS } from './sql-scripts';
 /**
- * Loads a migration's SQL from its `.sql` file — the portable source of truth
- * shared with the Elixir/Python ports. Results are cached after the first read.
+ * Loads a migration's SQL — the portable source of truth shared with the
+ * Elixir/Python ports. Results are cached after the first lookup.
  *
- * The `.sql` files live next to this module under `migrations/`. The published
- * build copies them alongside the compiled output (a `copy:sql` build step,
- * analogous to how the Lua scripts are bundled), so the same relative lookup
- * works at runtime.
- */
-const MIGRATIONS_DIR = join(currentDir, 'migrations');
-/**
- * Runtime queries live under `commands/`. Each `.sql` file is one parameterized
- * statement (a `SELECT fn(...)` for the PL/pgSQL operations, or a direct
- * query). They contain NO schema/namespace references — the connection's
- * `search_path` selects the schema — so they are portable verbatim to the
- * Python/Elixir/PHP/Rust ports (mirroring how the Redis backend's `.lua`
- * scripts never hardcode the key prefix).
+ * The SQL is inlined into the published JavaScript at build time (see
+ * scripts/generateSqlScripts.js), exactly like the Redis backend's `.lua`
+ * scripts, so no filesystem access is needed at runtime. This keeps the
+ * PostgreSQL backend usable from single-file bundles (bun build --compile,
+ * esbuild --bundle, pkg, Node SEA, deno compile) where the `.sql` files are
+ * not shipped alongside the code:
+ *
+ * @see https://github.com/taskforcesh/bullmq/issues/4603
+ *
+ * @param file - Migration filename, e.g. `0001_schema.sql`.
  */
-const COMMANDS_DIR = join(currentDir, 'commands');
 const migrationCache = new Map();
 const commandCache = new Map();
 export function loadMigrationSql(file) {
     let sql = migrationCache.get(file);
     if (sql === undefined) {
-        sql = readFileSync(join(MIGRATIONS_DIR, file), 'utf8');
+        sql = SQL_MIGRATIONS[file];
+        if (sql === undefined) {
+            throw new Error(`Could not find migration SQL for '${file}'`);
+        }
         migrationCache.set(file, sql);
     }
     return sql;
 }
 /**
  * Loads a runtime command's SQL by name (without the `.sql` extension), cached
- * after the first read.
+ * after the first lookup. Runtime queries contain NO schema/namespace
+ * references — the connection's `search_path` selects the schema — so they are
+ * portable verbatim to the Python/Elixir/PHP/Rust ports (mirroring how the
+ * Redis backend's `.lua` scripts never hardcode the key prefix).
+ *
+ * @param name - Command name, e.g. `add_job`.
  */
 export function loadCommandSql(name) {
     let sql = commandCache.get(name);
     if (sql === undefined) {
-        sql = readFileSync(join(COMMANDS_DIR, `${name}.sql`), 'utf8');
+        sql = SQL_COMMANDS[`${name}.sql`];
+        if (sql === undefined) {
+            throw new Error(`Could not find command SQL for '${name}'`);
+        }
         commandCache.set(name, sql);
     }
     return sql;

package/dist/esm/postgres/sql-scripts.d.ts

@@ -0,0 +1,10 @@
+/**
+ * Runtime query SQL, keyed by command name (filename without the .sql
+ * extension), matching the keys used by loadCommandSql().
+ */
+export declare const SQL_COMMANDS: Record<string, string>;
+/**
+ * Schema migration SQL, keyed by filename (e.g. '0001_schema.sql'), matching
+ * the keys used by loadMigrationSql().
+ */
+export declare const SQL_MIGRATIONS: Record<string, string>;