@pauldeng/node-red-contrib-bullmq 1.0.2 → 1.0.3

package/README.md

@@ -8,7 +8,7 @@
 
 Node-RED nodes for BullMQ-backed Redis job queues.
 
-This package targets BullMQ 5.80.2 and Node-RED 4.1 or 5.x. It preserves the legacy `bull-queue-server`, `bull cmd`, and `bull run` node types where BullMQ has compatible behavior, and adds `bull job`, `bull events`, and `bull flow`.
+This package targets BullMQ 5.80.9 and Node-RED 4.1 or 5.x. It preserves the legacy `bull-queue-server`, `bull cmd`, and `bull run` node types where BullMQ has compatible behavior, and adds `bull job`, `bull events`, and `bull flow`.
 
 ## Installation
 
@@ -26,7 +26,7 @@ Repository: <https://github.com/pauldeng/node-red-contrib-bullmq>
 - Node-RED 4.1.x or 5.x
 - Node.js 18+ with Node-RED 4.1.x, or Node.js 22.9+ with Node-RED 5.x
 - Redis with `maxmemory-policy=noeviction`
-- BullMQ 5.80.2
+- BullMQ 5.80.9
 
 Bull v4 Redis data is not automatically migrated. Drain, retire, or otherwise handle old Bull queues before upgrading the runtime dependency.
 
@@ -66,11 +66,11 @@ msg.jobopts = {
 return msg;
 ```
 
-The scheduler id is `msg.schedulerId` when present, otherwise `msg.jobopts.jobId`. `repeat.cron` is translated to `repeat.pattern`; conflicting `cron` and `pattern` values are rejected.
+When adding a legacy repeat job, the scheduler id is `msg.schedulerId` when present, otherwise `msg.jobopts.jobId`. `repeat.cron` is translated to `repeat.pattern`; conflicting `cron` and `pattern` values are rejected. Lookup and removal commands require the exact scheduler id in `msg.schedulerId`, `msg.jobid`, or `msg.jobId`.
 
 ## Commands
 
-`bull cmd` reads `msg.cmd`. The default command is `add`.
+`bull cmd` reads `msg.cmd`. The legacy `msg.command` alias is also accepted, but new flows should use `msg.cmd`. The default command is `add`.
 
 Core supported command families include:
 
@@ -98,14 +98,11 @@ See [docs/COMMANDS.md](docs/COMMANDS.md).
 
 ## Examples
 
-Import [examples/example_flow.json](examples/example_flow.json) into Node-RED. It includes:
+Import any of these flows into Node-RED:
 
-- simple add and run
-- required `basecasts` scheduled job
-- delayed and prioritized jobs
-- manual acknowledgement
-- QueueEvents
-- parent/child flow producer
+- [examples/example_flow.json](examples/example_flow.json): an end-to-end flow with add/run, a legacy scheduler compatibility case, delayed and prioritized jobs, manual acknowledgement, QueueEvents, and a parent/child flow.
+- [examples/bullmq_features.json](examples/bullmq_features.json): focused examples of common BullMQ features.
+- [examples/repeatable_jobs.json](examples/repeatable_jobs.json): legacy repeat-command and Job Scheduler compatibility examples.
 
 The examples do not contain secrets.
 

package/bull-queue.html

@@ -1,7 +1,7 @@
 <script type="text/html" data-template-name="bull-queue-server">
   <div class="form-row">
     <label for="node-config-input-name"><i class="fa fa-tasks"></i> Queue</label>
-    <input type="text" id="node-config-input-name" placeholder="basecasts">
+    <input type="text" id="node-config-input-name" placeholder="email-jobs">
   </div>
   <div class="form-row">
     <label for="node-config-input-deployment"><i class="fa fa-server"></i> Deployment</label>
@@ -31,7 +31,7 @@
     <label for="node-config-input-sentinelMasterName"><i class="fa fa-tag"></i> Master</label>
     <input type="text" id="node-config-input-sentinelMasterName" placeholder="mymaster">
   </div>
-  <div class="form-row">
+  <div class="form-row bull-db-row">
     <label for="node-config-input-db"><i class="fa fa-database"></i> Database</label>
     <input type="number" id="node-config-input-db" placeholder="0">
   </div>
@@ -95,6 +95,7 @@
       $(".bull-single-row").toggle(deployment === "single");
       $(".bull-cluster-row").toggle(deployment === "cluster");
       $(".bull-sentinel-row").toggle(deployment === "sentinel");
+      $(".bull-db-row").toggle(deployment !== "cluster");
       $(".bull-tls-row").toggle($("#node-config-input-tls").is(":checked"));
     }
 
@@ -269,7 +270,7 @@ return msg;</pre>
       <option value="manual">Manual acknowledgement</option>
     </select>
   </div>
-  <div class="form-row">
+  <div class="form-row bull-ack-timeout-row">
     <label for="node-input-ackTimeout"><i class="fa fa-clock-o"></i> Ack Timeout</label>
     <input type="number" id="node-input-ackTimeout" placeholder="300000">
   </div>
@@ -315,26 +316,62 @@ return msg;</pre>
 </script>
 
 <script type="text/javascript">
-  RED.nodes.registerType("bull run", {
-    color: "#ffffff",
-    category: "function",
-    defaults: {
-      name: { value: "" },
-      queue: { type: "bull-queue-server", required: true },
-      completionMode: { value: "immediate" },
-      ackTimeout: { value: 300000, validate: RED.validators.number() },
-      concurrency: { value: 1, validate: RED.validators.number() },
-      limiterMax: { value: "" },
-      limiterDuration: { value: "" }
-    },
-    inputs: 0,
-    outputs: 1,
-    align: "left",
-    icon: "bull_icon.png",
-    label: function() {
-      return this.name || "bull run";
+  (function() {
+    function updateBullRunRows() {
+      $(".bull-ack-timeout-row").toggle(
+        $("#node-input-completionMode").val() === "manual"
+      );
     }
-  });
+
+    function positiveInteger(value) {
+      var parsed = Number(value);
+      return value !== "" && Number.isInteger(parsed) && parsed > 0;
+    }
+
+    function optionalPositivePair(value, otherProperty) {
+      var input = $("#node-input-" + otherProperty);
+      var other = input.length ? input.val() : this[otherProperty];
+      return (
+        ((value === "" || value == null) && (other === "" || other == null)) ||
+        (positiveInteger(value) && positiveInteger(other))
+      );
+    }
+
+    RED.nodes.registerType("bull run", {
+      color: "#ffffff",
+      category: "function",
+      defaults: {
+        name: { value: "" },
+        queue: { type: "bull-queue-server", required: true },
+        completionMode: { value: "immediate" },
+        ackTimeout: { value: 300000, validate: RED.validators.number() },
+        concurrency: { value: 1, validate: positiveInteger },
+        limiterMax: {
+          value: "",
+          validate: function(value) {
+            return optionalPositivePair.call(this, value, "limiterDuration");
+          }
+        },
+        limiterDuration: {
+          value: "",
+          validate: function(value) {
+            return optionalPositivePair.call(this, value, "limiterMax");
+          }
+        }
+      },
+      inputs: 0,
+      outputs: 1,
+      align: "left",
+      icon: "bull_icon.png",
+      label: function() {
+        return this.name || "bull run";
+      },
+      oneditprepare: function() {
+        $("#node-input-completionMode").on("change", updateBullRunRows);
+        updateBullRunRows();
+      }
+    });
+  })();
 </script>
 
 <script type="text/html" data-template-name="bull job">
@@ -386,7 +423,11 @@ return msg;</pre>
   <pre>msg.cmd = "progress";
 msg.progress = 50;
 return msg;</pre>
-  <p>Wire that message into another <code>bull job</code> node with <b>Action</b> <code>complete</code>, or set:</p>
+  <p>To use another <code>bull job</code> node with configured <b>Action</b> <code>complete</code>, pass the progress output through a Function node that removes the per-message override:</p>
+  <pre>delete msg.cmd;
+msg.payload = { ok: true };
+return msg;</pre>
+  <p>Alternatively, override the downstream action explicitly:</p>
   <pre>msg.cmd = "complete";
 msg.payload = { ok: true };
 return msg;</pre>

package/bull-queue.js

@@ -47,22 +47,22 @@ const DEFAULT_EVENTS = [
 // an unreachable Redis server.
 const CLOSE_GRACE_MS = 1000;
 
-async function settleWithin(promise, ms) {
-  let settled = false;
-  (async () => {
-    try {
-      await promise;
-    } catch (err) {
-      // a failed graceful close still counts as settled
-    }
-    settled = true;
-  })();
-
-  const deadline = Date.now() + ms;
-  while (!settled && Date.now() < deadline) {
-    await sleep(25);
+async function settled(promise) {
+  try {
+    await promise;
+  } catch (err) {
+    // a failed graceful close still counts as settled
   }
-  return settled ? "settled" : "timeout";
+  return "settled";
+}
+
+async function timedOut(ms) {
+  await sleep(ms);
+  return "timeout";
+}
+
+async function settleWithin(promise, ms) {
+  return await Promise.race([settled(promise), timedOut(ms)]);
 }
 
 function disconnectClient(client) {
@@ -86,7 +86,7 @@ function forceDisconnect(resource) {
   }
   // BullMQ resource. Its public disconnect() awaits a connection promise that
   // never settles while Redis is unreachable, so reach for the underlying
-  // ioredis clients directly (BullMQ is pinned to exactly 5.80.2).
+  // ioredis clients directly (BullMQ is pinned to exactly 5.80.9).
   if (resource.connection) {
     disconnectClient(resource.connection._client);
   }
@@ -122,6 +122,23 @@ async function closeResource(resource) {
   }
 }
 
+async function closeResourcePair(owner, connection) {
+  let firstError;
+  try {
+    await closeResource(owner);
+  } catch (err) {
+    firstError = err;
+  }
+  try {
+    await closeResource(connection);
+  } catch (err) {
+    firstError ||= err;
+  }
+  if (firstError) {
+    throw firstError;
+  }
+}
+
 function nodeSend(node, send, msg) {
   (send || node.send).call(node, msg);
 }
@@ -134,13 +151,17 @@ function nodeDone(node, done, err, msg) {
   }
 }
 
-function parsePositiveInteger(value, defaultValue) {
-  if (value === undefined || value === null || value === "") {
+function isPresent(value) {
+  return value !== undefined && value !== null && value !== "";
+}
+
+function parsePositiveInteger(value, defaultValue, field = "Value") {
+  if (!isPresent(value)) {
     return defaultValue;
   }
   const parsed = Number(value);
   if (!Number.isInteger(parsed) || parsed < 1) {
-    throw new Error(`Expected a positive integer, got ${value}`);
+    throw new Error(`${field} must be a positive integer`);
   }
   return parsed;
 }
@@ -203,7 +224,7 @@ module.exports = function registerBullMQNodes(RED) {
     const node = this;
 
     node.users = {};
-    node.resources = new Set();
+    node.resources = new Map();
     node.config = normalizeQueueConfig(n, node.credentials || {});
     node.queue = null;
     node.producerConnection = null;
@@ -229,17 +250,27 @@ module.exports = function registerBullMQNodes(RED) {
       const descriptor = buildRedisDescriptor(node.config, role);
       const connection = createRedisConnection(descriptor, IORedis);
       attachErrorListener(connection, owner);
-      node.resources.add(connection);
       return connection;
     };
 
+    node.releaseResource = async function releaseResource(owner) {
+      if (!node.resources.has(owner)) {
+        return;
+      }
+      const connection = node.resources.get(owner);
+      node.resources.delete(owner);
+      await closeResourcePair(owner, connection);
+    };
+
     node.getQueue = function getQueue() {
       if (!node.queue) {
         node.producerConnection = node.createConnection("producer");
+        node.producerConnection.setMaxListeners(0);
         node.queue = new Queue(
           node.config.queueName,
           buildBullMQOptions(node.config, node.producerConnection)
         );
+        node.resources.set(node.queue, node.producerConnection);
         attachErrorListener(node.queue, node);
       }
       return node.queue;
@@ -261,7 +292,7 @@ module.exports = function registerBullMQNodes(RED) {
         ...buildBullMQOptions(node.config, connection),
         ...options,
       });
-      node.resources.add(worker);
+      node.resources.set(worker, connection);
       return worker;
     };
 
@@ -271,7 +302,7 @@ module.exports = function registerBullMQNodes(RED) {
         node.config.queueName,
         buildBullMQOptions(node.config, connection)
       );
-      node.resources.add(queueEvents);
+      node.resources.set(queueEvents, connection);
       return queueEvents;
     };
 
@@ -280,19 +311,19 @@ module.exports = function registerBullMQNodes(RED) {
       const flowProducer = new FlowProducer(
         buildBullMQOptions(node.config, connection)
       );
-      node.resources.add(flowProducer);
+      node.resources.set(flowProducer, connection);
       return flowProducer;
     };
 
     node.on("close", async function onClose(removed, done) {
       try {
-        if (node.queue) {
-          await closeResource(node.queue);
-        }
-        const resources = Array.from(node.resources).reverse();
-        for (const resource of resources) {
-          await closeResource(resource);
-        }
+        const resources = Array.from(node.resources.entries()).reverse();
+        node.resources.clear();
+        await Promise.all(
+          resources.map(([owner, connection]) =>
+            closeResourcePair(owner, connection)
+          )
+        );
         node.status({});
         done();
       } catch (err) {
@@ -377,12 +408,21 @@ module.exports = function registerBullMQNodes(RED) {
     node.bullQueue.register(node);
 
     const workerOptions = {
-      concurrency: parsePositiveInteger(n.concurrency, 1),
+      concurrency: parsePositiveInteger(n.concurrency, 1, "Concurrency"),
     };
-    if (n.limiterMax && n.limiterDuration) {
+    const hasLimiterMax = isPresent(n.limiterMax);
+    const hasLimiterDuration = isPresent(n.limiterDuration);
+    if (hasLimiterMax !== hasLimiterDuration) {
+      throw new Error("Limiter Max and Limiter Duration must be set together");
+    }
+    if (hasLimiterMax) {
       workerOptions.limiter = {
-        max: parsePositiveInteger(n.limiterMax),
-        duration: parsePositiveInteger(n.limiterDuration),
+        max: parsePositiveInteger(n.limiterMax, undefined, "Limiter Max"),
+        duration: parsePositiveInteger(
+          n.limiterDuration,
+          undefined,
+          "Limiter Duration"
+        ),
       };
     }
 
@@ -424,7 +464,7 @@ module.exports = function registerBullMQNodes(RED) {
         new Error("BullMQ run node closed before acknowledgement")
       );
       try {
-        await closeResource(node.worker);
+        await node.bullQueue.releaseResource(node.worker);
         node.bullQueue.deregister(node, () => {});
         done();
       } catch (err) {
@@ -555,7 +595,7 @@ module.exports = function registerBullMQNodes(RED) {
 
     node.on("close", async function onClose(removed, done) {
       try {
-        await closeResource(node.queueEvents);
+        await node.bullConn.releaseResource(node.queueEvents);
         node.bullConn.deregister(node, () => {});
         done();
       } catch (err) {
@@ -608,7 +648,7 @@ module.exports = function registerBullMQNodes(RED) {
 
     node.on("close", async function onClose(removed, done) {
       try {
-        await closeResource(node.flowProducer);
+        await node.bullConn.releaseResource(node.flowProducer);
         node.bullConn.deregister(node, () => {});
         done();
       } catch (err) {

package/docs/ARCHITECTURE.md

@@ -24,7 +24,9 @@ The runtime does Node-RED lifecycle work only: creating nodes, wiring input hand
 - QueueEvents uses a dedicated connection;
 - Cluster and MemoryDB use `{bull}` by default as the BullMQ prefix.
 
-Connection and resource errors are reported on the consuming runtime node's status (`bull run`, `bull events`, `bull flow`). The shared producer connection and queue used by `bull cmd` report on the config node.
+Each BullMQ owner (`Queue`, `Worker`, `QueueEvents`, or `FlowProducer`) is tracked with its owned ioredis connection. A runtime node releases its pair on redeploy; config-node shutdown closes independent pairs concurrently, always attempting the BullMQ owner before its raw connection.
+
+Connection and resource errors are reported on the consuming runtime node's status (`bull run`, `bull events`, `bull flow`). The config node owns the shared queue and its producer connection. Each `bull cmd` mirrors that shared producer connection on its visible status, while Queue errors report on the config node.
 
 Secrets are read from Node-RED credentials first, with legacy plain fields accepted only for backward compatibility.
 

package/docs/COMMANDS.md

@@ -1,6 +1,6 @@
 # Command Reference
 
-`bull cmd` reads `msg.cmd`. It writes the command result to `msg.payload`.
+`bull cmd` reads `msg.cmd`. The `msg.command` field is a legacy alias; use `msg.cmd` in new flows. The node writes the command result to `msg.payload`.
 
 ## Jobs
 

package/docs/CONNECTIONS.md

@@ -8,15 +8,15 @@ Producer commands use bounded retries so Node-RED input handlers fail instead of
 
 ## Redis Cluster
 
-Use deployment `cluster` and provide startup nodes as comma or newline separated `host:port` values.
+Use deployment `cluster` and provide startup nodes as a comma- or newline-separated endpoint list.
 
-Cluster auth and TLS are applied through ioredis `redisOptions`. The runtime sets a DNS lookup passthrough for TLS-enabled cluster discovery.
+Cluster auth and TLS are applied through ioredis `redisOptions`. The runtime always sets a DNS lookup passthrough for cluster discovery, including non-TLS deployments.
 
 The BullMQ prefix must contain a Redis hash tag, normally `{bull}`. Untagged Cluster prefixes are rejected to prevent `CROSSSLOT` failures.
 
 ## AWS MemoryDB
 
-Use deployment `cluster`.
+Use deployment `cluster`. The legacy `memorydb` deployment value remains a compatibility alias for `cluster` in imported flows.
 
 Typical settings:
 
@@ -41,14 +41,24 @@ Use deployment `sentinel` and configure:
 
 Sentinel authentication is separate from Redis data-node authentication.
 
+## Cluster And Sentinel Endpoint Lists
+
+Cluster startup nodes and Sentinel discovery lists accept host names, `host:port`, bare IPv6 with the default port, bracketed IPv6 such as `[2001:db8::1]:6379`, and `redis://` or `rediss://` URLs. Explicit URL schemes must agree with the applicable TLS setting: Cluster endpoints use `tls`, and Sentinel discovery endpoints use `sentinelTls`.
+
+URL credentials are rejected. Store Redis and Sentinel usernames/passwords in the config node credential fields instead of embedding them in an endpoint.
+
 ## TLS
 
-TLS options:
+TLS behavior and options:
 
-- verify unauthorized certificates by default;
+- rejects unauthorized certificates by default;
 - optional CA;
 - optional client certificate;
 - optional client private key;
 - optional server name.
 
 Disable verification only when the Redis deployment cannot be configured with a trusted CA and the risk is understood.
+
+## Secrets And Imported Flows
+
+Passwords, CA data, client certificates, and private keys are stored in Node-RED credentials. Plaintext config fields remain a migration-only fallback for older imported flows; edit and redeploy those config nodes so secrets move into the credential store.

package/docs/MIGRATION.md

@@ -9,7 +9,7 @@
 
 ## What Changes
 
-- Runtime dependency is BullMQ 5.80.2.
+- Runtime dependency is BullMQ 5.80.9.
 - `bull` and `sprintf-js` are removed.
 - Repeatable jobs use BullMQ Job Schedulers.
 - Scheduled jobs require a stable scheduler id.

package/docs/NODE_GUIDE.md

@@ -19,6 +19,7 @@ Input node for producer and administration commands.
 Input:
 
 - `msg.cmd`: command name. Defaults to `add`.
+- `msg.command`: legacy alias for `msg.cmd`; use `msg.cmd` in new flows.
 - `msg.payload`: compatibility payload.
 - `msg.jobData`: full BullMQ job data when supplied.
 - `msg.jobName`: BullMQ job name. Defaults to `default`.
@@ -44,6 +45,8 @@ Completion modes:
 - `immediate`: complete after sending the message.
 - `manual`: wait for downstream `bull job` acknowledgement. Fails the job after the ack timeout; set the timeout to `0` to wait indefinitely.
 
+Concurrency must be a positive integer. The optional limiter maximum and duration must either both be blank or both be positive integers.
+
 ## `bull job`
 
 Acts on manual-mode active jobs. Actions can be configured or supplied in `msg.cmd`.
@@ -65,7 +68,7 @@ Non-terminal actions:
 
 ## `bull events`
 
-QueueEvents source node. Empty event filter subscribes to the default documented event list.
+QueueEvents source node. An empty event filter subscribes to: `active`, `added`, `cleaned`, `completed`, `deduplicated`, `delayed`, `drained`, `duplicated`, `failed`, `paused`, `progress`, `removed`, `resumed`, `stalled`, `waiting`, and `waiting-children`.
 
 Output:
 

package/docs/REFERENCE_MAP.md

@@ -21,6 +21,8 @@
 - `test/scheduler.test.js`: repeat scheduler compatibility.
 - `test/commands.test.js`: command dispatch behavior.
 - `test/acknowledgements.test.js`: manual-acknowledgement registry lifecycle and leak prevention.
+- `test/shutdown.test.js`: BullMQ/ioredis resource ownership, partial redeploy cleanup, and concurrent shutdown.
+- `test/async-style.test.js`: bounded-close async implementation constraints.
 - `test/node-red-registration.test.js`: Node-RED node type registration.
 - `test/editor-contract.test.js`: static editor surface.
 - `test/docs-contract.test.js`: required docs and examples.

package/docs/RELEASE.md

@@ -13,7 +13,7 @@ used here only for the one-time first publish.)
 
 1. Confirm `package.json` has the intended `version` and the name `@pauldeng/node-red-contrib-bullmq`.
 2. Confirm the GitHub repository is `https://github.com/pauldeng/node-red-contrib-bullmq`.
-3. Confirm BullMQ is pinned to exactly `5.80.2`.
+3. Confirm BullMQ is pinned to exactly `5.80.9`.
 4. Confirm no examples, docs, fixtures, or logs contain Redis, Sentinel, or MemoryDB secrets.
 5. Update `CHANGELOG.md` for the new version.
 
@@ -56,7 +56,7 @@ Do these once, before the first release.
 - [ ] **Branch ruleset** on `master` (Settings -> Rules -> Rulesets): require a pull request with at least one review, require the CI status checks to pass, block force pushes, restrict deletions. Optionally require linear history and signed commits.
 - [ ] **Code security and analysis** (Settings): enable Dependabot alerts, Dependabot security updates, secret scanning, push protection, and private vulnerability reporting.
 - [ ] **Workflow permissions** (Settings -> Actions -> General): set the default `GITHUB_TOKEN` to read-only.
-- [ ] **CodeQL**: either rely on `.github/workflows/codeql.yml`, or enable Code scanning "default setup" in the Security tab.
+- [ ] **CodeQL**: enable Code scanning "default setup" in the Security tab.
 - [ ] **`release` environment** (Settings -> Environments -> New environment -> `release`): add yourself as a required reviewer so `publish.yml` waits for manual approval.
 
 ## 4. First publish (one time, manual)

package/docs/TESTING.md

@@ -6,7 +6,7 @@
 npm test
 ```
 
-This runs built-in `node:test` suites for package metadata, connection normalization, scheduler compatibility, command dispatch, editor surface, registration, Docker fixture contracts, docs, and examples.
+This runs built-in `node:test` suites for package metadata, connection normalization, scheduler compatibility, command dispatch, editor surface, registration, resource shutdown, async style, Docker fixture contracts, docs, and examples. The lifecycle checks live in `test/shutdown.test.js`; bounded-close implementation constraints live in `test/async-style.test.js`.
 
 ## Node-RED Runtime Tests
 
@@ -66,7 +66,7 @@ Current executable fixtures:
 - `sentinel-auth`: Redis master, two replicas, and three Sentinels with data-node ACL auth
 - `sentinel-tls`: Redis master, two replicas, and three TLS-enabled Sentinels
 
-The shared deployment test proves Node-RED load, connection, add/run delivery, required `basecasts` scheduler creation/removal, and absolute scheduler minute/second metadata. TLS fixtures use local self-signed test certificates and disable certificate verification for those Docker-only deployments. MemoryDB remains the certificate-verified TLS deployment path.
+The shared deployment test proves Node-RED load, connection, add/run delivery, legacy scheduler compatibility through `basecasts` creation/removal, and absolute scheduler minute/second metadata. TLS fixtures use local self-signed test certificates and disable certificate verification for those Docker-only deployments. MemoryDB remains the certificate-verified TLS deployment path.
 
 ## AWS MemoryDB
 

package/docs/TROUBLESHOOTING.md

@@ -21,7 +21,7 @@ Keep TLS verification enabled when possible. Provide the CA certificate or serve
 
 ## Repeat Job Is Not Found
 
-Legacy repeat lookup uses exact scheduler ids. Use `msg.schedulerId`, `msg.jobopts.jobId`, `msg.jobid`, or `msg.jobId` consistently.
+Legacy repeat lookup uses exact scheduler ids. Pass the id returned during creation in `msg.schedulerId`, `msg.jobid`, or `msg.jobId`. A job option id can help derive the scheduler id during creation, but it is not a separate lookup field.
 
 ## Bull v4 Queue Data Missing After Upgrade
 

package/lib/connections.js

@@ -1,5 +1,7 @@
 "use strict";
 
+const { isIP } = require("node:net");
+
 const DEFAULT_REDIS_HOST = "localhost";
 const DEFAULT_REDIS_PORT = 6379;
 const CLUSTER_PREFIX = "{bull}";
@@ -32,7 +34,12 @@ function toPort(value, defaultValue = DEFAULT_REDIS_PORT) {
   return port;
 }
 
-function parseEndpoint(endpoint, defaultPort = DEFAULT_REDIS_PORT) {
+function parseEndpoint(
+  endpoint,
+  defaultPort = DEFAULT_REDIS_PORT,
+  tls,
+  tlsName = "TLS",
+) {
   if (typeof endpoint === "object" && endpoint !== null) {
     const host = endpoint.host || endpoint.address;
     if (!isPresent(host)) {
@@ -48,36 +55,54 @@ function parseEndpoint(endpoint, defaultPort = DEFAULT_REDIS_PORT) {
   if (!text) {
     throw new Error("Redis endpoint cannot be empty");
   }
+  if (isIP(text)) {
+    return { host: text, port: defaultPort };
+  }
 
-  let host = text;
-  let port = defaultPort;
-  const urlMatch = text.match(
-    /^(?:redis|rediss):\/\/(?:[^@]+@)?([^/:]+)(?::(\d+))?/i,
-  );
-  if (urlMatch) {
-    host = urlMatch[1];
-    port = toPort(urlMatch[2], defaultPort);
-  } else if (text.includes(":")) {
-    const parts = text.split(":");
-    port = toPort(parts.pop(), defaultPort);
-    host = parts.join(":");
+  const hasScheme = /^[a-z][a-z\d+.-]*:\/\//i.test(text);
+  let url;
+  try {
+    url = new URL(hasScheme ? text : `redis://${text}`);
+  } catch {
+    throw new Error(`Invalid Redis endpoint: ${text}`);
+  }
+  if (url.protocol !== "redis:" && url.protocol !== "rediss:") {
+    throw new Error(`Unsupported Redis endpoint protocol: ${url.protocol}`);
+  }
+  if (url.username || url.password) {
+    throw new Error(
+      "Redis endpoint URLs cannot include credentials; use the config node credential fields",
+    );
+  }
+  if (hasScheme && tls !== undefined) {
+    const secure = url.protocol === "rediss:";
+    if (secure !== tls) {
+      throw new Error(
+        `${url.protocol}// endpoint requires ${tlsName} to be ${secure ? "enabled" : "disabled"}`,
+      );
+    }
   }
 
-  if (!host.trim()) {
+  const host = url.hostname.replace(/^\[|\]$/g, "");
+  if (!host) {
     throw new Error(`Redis endpoint requires a host: ${text}`);
   }
-
-  return { host: host.trim(), port };
+  return { host, port: toPort(url.port, defaultPort) };
 }
 
-function parseEndpointList(value, defaultPort = DEFAULT_REDIS_PORT) {
+function parseEndpointList(
+  value,
+  defaultPort = DEFAULT_REDIS_PORT,
+  tls,
+  tlsName = "TLS",
+) {
   if (Array.isArray(value)) {
     return value
       .flatMap((item) =>
         typeof item === "string" ? item.split(/[\n,]+/) : [item],
       )
       .filter((item) => isPresent(item))
-      .map((item) => parseEndpoint(item, defaultPort));
+      .map((item) => parseEndpoint(item, defaultPort, tls, tlsName));
   }
 
   if (!isPresent(value)) {
@@ -88,7 +113,7 @@ function parseEndpointList(value, defaultPort = DEFAULT_REDIS_PORT) {
     .split(/[\n,]+/)
     .map((item) => item.trim())
     .filter(Boolean)
-    .map((item) => parseEndpoint(item, defaultPort));
+    .map((item) => parseEndpoint(item, defaultPort, tls, tlsName));
 }
 
 function readSecret(config, credentials, name) {
@@ -115,6 +140,8 @@ function normalizeQueueConfig(config = {}, credentials = {}) {
   if (!queueName) {
     throw new Error("BullMQ queue name is required");
   }
+  const tls = toBoolean(config.tls, false);
+  const sentinelTls = toBoolean(config.sentinelTls, false);
 
   const normalized = {
     queueName,
@@ -124,21 +151,31 @@ function normalizeQueueConfig(config = {}, credentials = {}) {
     db: isPresent(config.db) ? Number(config.db) : undefined,
     username: config.username || undefined,
     password: readSecret(config, credentials, "password") || undefined,
-    tls: toBoolean(config.tls, false),
+    tls,
     tlsRejectUnauthorized: toBoolean(config.tlsRejectUnauthorized, true),
     tlsCa: readSecret(config, credentials, "tlsCa") || undefined,
     tlsCert: readSecret(config, credentials, "tlsCert") || undefined,
     tlsKey: readSecret(config, credentials, "tlsKey") || undefined,
     tlsServerName: config.tlsServerName || undefined,
     prefix: config.prefix || undefined,
-    clusterNodes: parseEndpointList(config.clusterNodes || config.startupNodes),
+    clusterNodes: parseEndpointList(
+      config.clusterNodes || config.startupNodes,
+      DEFAULT_REDIS_PORT,
+      tls,
+      "TLS",
+    ),
     sentinelMasterName:
       config.sentinelMasterName || config.masterName || config.nameOfMaster,
-    sentinels: parseEndpointList(config.sentinels, 26379),
+    sentinels: parseEndpointList(
+      config.sentinels,
+      26379,
+      sentinelTls,
+      "Sentinel TLS",
+    ),
     sentinelUsername: config.sentinelUsername || undefined,
     sentinelPassword:
       readSecret(config, credentials, "sentinelPassword") || undefined,
-    sentinelTls: toBoolean(config.sentinelTls, false),
+    sentinelTls,
   };
 
   if (deployment === "cluster") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pauldeng/node-red-contrib-bullmq",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "BullMQ-backed Redis job queue nodes for Node-RED",
   "main": "bull-queue.js",
   "files": [
@@ -25,8 +25,8 @@
     "validate": "npx --yes node-red-dev validate"
   },
   "dependencies": {
-    "bullmq": "5.80.2",
-    "ioredis": "5.10.1"
+    "bullmq": "5.80.9",
+    "ioredis": "5.11.1"
   },
   "license": "MIT",
   "keywords": [