@rvoh/psychic-workers 2.0.1 → 2.0.3

package/dist/cjs/src/background/index.js

@@ -525,10 +525,20 @@ export class Background {
         }
         if (!queueInstance)
             throw new Error(`missing queue: ${jobConfig?.queue?.toString() || 'N/A'}`);
+        const jobOptions = {};
+        if (delay)
+            jobOptions.delay = delay;
+        if (delay && jobId) {
+            jobOptions.deduplication = {
+                id: jobId,
+                ttl: delay,
+                extend: true,
+                replace: true,
+            };
+        }
         if (groupId && priority) {
             await queueInstance.add(jobType, jobData, {
-                delay,
-                jobId,
+                ...jobOptions,
                 group: {
                     ...this.groupIdToGroupConfig(groupId),
                     priority: this.mapPriorityWordToPriorityNumber(priority),
@@ -539,8 +549,7 @@ export class Background {
         }
         else {
             await queueInstance.add(jobType, jobData, {
-                delay,
-                jobId,
+                ...jobOptions,
                 group: this.groupIdToGroupConfig(groupId),
                 priority: this.mapPriorityWordToPriorityNumber(priority),
                 // explicitly typing as JobsOptions because Psychic can't be aware of BullMQ Pro options

package/dist/cjs/src/test-utils/WorkerTestUtils.js

@@ -1,5 +1,5 @@
-import background, { Background } from '../background/index.js';
 import parallelTestSafeQueueName from '../background/helpers/parallelTestSafeQueueName.js';
+import background, { Background } from '../background/index.js';
 const LOCK_TOKEN = 'psychic-test-worker';
 export default class WorkerTestUtils {
     /*
@@ -46,7 +46,7 @@ export default class WorkerTestUtils {
         if (opts.queue && !queues.length)
             throw new Error(`Expected to find queue with name: ${opts.queue}, but none were found by that name. The queue names available are: ${background.queues.map(queue => queue.name).join(', ')}`);
         for (const queue of queues) {
-            const jobs = (await queue.getDelayed());
+            const jobs = await queue.getDelayed();
             for (const job of jobs) {
                 const data = job.data;
                 if (opts.for) {

package/dist/esm/src/background/index.js

@@ -525,10 +525,20 @@ export class Background {
         }
         if (!queueInstance)
             throw new Error(`missing queue: ${jobConfig?.queue?.toString() || 'N/A'}`);
+        const jobOptions = {};
+        if (delay)
+            jobOptions.delay = delay;
+        if (delay && jobId) {
+            jobOptions.deduplication = {
+                id: jobId,
+                ttl: delay,
+                extend: true,
+                replace: true,
+            };
+        }
         if (groupId && priority) {
             await queueInstance.add(jobType, jobData, {
-                delay,
-                jobId,
+                ...jobOptions,
                 group: {
                     ...this.groupIdToGroupConfig(groupId),
                     priority: this.mapPriorityWordToPriorityNumber(priority),
@@ -539,8 +549,7 @@ export class Background {
         }
         else {
             await queueInstance.add(jobType, jobData, {
-                delay,
-                jobId,
+                ...jobOptions,
                 group: this.groupIdToGroupConfig(groupId),
                 priority: this.mapPriorityWordToPriorityNumber(priority),
                 // explicitly typing as JobsOptions because Psychic can't be aware of BullMQ Pro options

package/dist/esm/src/test-utils/WorkerTestUtils.js

@@ -1,5 +1,5 @@
-import background, { Background } from '../background/index.js';
 import parallelTestSafeQueueName from '../background/helpers/parallelTestSafeQueueName.js';
+import background, { Background } from '../background/index.js';
 const LOCK_TOKEN = 'psychic-test-worker';
 export default class WorkerTestUtils {
     /*
@@ -46,7 +46,7 @@ export default class WorkerTestUtils {
         if (opts.queue && !queues.length)
             throw new Error(`Expected to find queue with name: ${opts.queue}, but none were found by that name. The queue names available are: ${background.queues.map(queue => queue.name).join(', ')}`);
         for (const queue of queues) {
-            const jobs = (await queue.getDelayed());
+            const jobs = await queue.getDelayed();
             for (const job of jobs) {
                 const data = job.data;
                 if (opts.for) {

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic-workers",
   "description": "Background job system for Psychic applications",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "author": "RVO Health",
   "repository": {
     "type": "git",
@@ -54,8 +54,8 @@
   "peerDependencies": {
     "@rvoh/dream": "^2.0.0",
     "@rvoh/psychic": "^2.0.0",
-    "bullmq": "*",
-    "ioredis": "*"
+    "bullmq": "^5.64.0",
+    "ioredis": "^5.8.2"
   },
   "devDependencies": {
     "@eslint/js": "=9.0.0",
@@ -69,10 +69,10 @@
     "@types/node": "^22.5.1",
     "@types/pg": "^8",
     "@types/supertest": "^6.0.3",
-    "bullmq": "^5.52.0",
+    "bullmq": "^5.64.0",
     "eslint": "^9.9.1",
     "express": "^4.21.2",
-    "ioredis": "^5.4.1",
+    "ioredis": "^5.8.2",
     "kysely": "^0.28.7",
     "kysely-codegen": "^0.17.0",
     "luxon-jest-matchers": "^0.1.14",
@@ -87,7 +87,7 @@
     "typedoc": "^0.26.6",
     "typescript": "^5.8.2",
     "typescript-eslint": "=7.18.0",
-    "vitest": "^3.2.4"
+    "vitest": "^4.0.10"
   },
   "packageManager": "yarn@4.7.0"
-}
+}

package/CHANGELOG.md

@@ -1,20 +0,0 @@
-## 2.0.1
-
-bump glob to close dependabot alert
-
-## 2.0.0
-
-- namespace exports
-- support Dream and Psychic 2.0
-
-## 1.4.0
-
-- throw an error if attempting to background an entire Dream model
-
-## 1.3.0
-
-- update for Psychic 1.11.1 and modern Dream
-
-## 1.2.0
-
-- update for Dream 1.4.0