@rvoh/psychic-workers 0.3.1 → 0.3.2

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

@@ -322,6 +322,7 @@ class Background {
         /////////////////////////
         const namedQueueOptionsMap = nativeBullMQ.namedQueueOptions || {};
         Object.keys(namedQueueOptionsMap).forEach(queueName => {
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
             const namedQueueOptions = namedQueueOptionsMap[queueName];
             if (namedQueueOptions.queueConnection)
                 this.redisConnections.push(namedQueueOptions.queueConnection);
@@ -344,7 +345,7 @@ class Background {
             const extraWorkerOptions = extraWorkerOptionsMap[queueName];
             const extraWorkerCount = extraWorkerOptions ? (extraWorkerOptions.workerCount ?? 1) : 0;
             this.groupNames[queueName] ||= [];
-            if (extraWorkerOptions.group?.id)
+            if (extraWorkerOptions?.group?.id)
                 this.groupNames[queueName].push(extraWorkerOptions.group.id);
             if (activateWorkers) {
                 if (!namedWorkerConnection)
@@ -425,7 +426,10 @@ class Background {
         //
         // See: https://docs.bullmq.io/guide/jobs/repeatable
         const jobId = `${ObjectClass.name}:${method}`;
-        await this.queueInstance(jobConfig).add('BackgroundJobQueueStaticJob', {
+        const queueInstance = this.queueInstance(jobConfig);
+        if (!queueInstance)
+            throw new Error(`Missing queue for: ${jobConfig.queue?.toString()}`);
+        await queueInstance.add('BackgroundJobQueueStaticJob', {
             globalName,
             method,
             args,
@@ -492,9 +496,12 @@ class Background {
             const queue = new Background.Queue('TestQueue', { connection: {} });
             const job = new bullmq_1.Job(queue, jobType, jobData, {});
             await this.doWork(job);
+            return;
             //
         }
-        else if (groupId && priority) {
+        if (!queueInstance)
+            throw new Error(`missing queue: ${jobConfig?.queue?.toString() || 'N/A'}`);
+        if (groupId && priority) {
             await queueInstance.add(jobType, jobData, {
                 delay,
                 group: {

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

@@ -318,6 +318,7 @@ export class Background {
         /////////////////////////
         const namedQueueOptionsMap = nativeBullMQ.namedQueueOptions || {};
         Object.keys(namedQueueOptionsMap).forEach(queueName => {
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
             const namedQueueOptions = namedQueueOptionsMap[queueName];
             if (namedQueueOptions.queueConnection)
                 this.redisConnections.push(namedQueueOptions.queueConnection);
@@ -340,7 +341,7 @@ export class Background {
             const extraWorkerOptions = extraWorkerOptionsMap[queueName];
             const extraWorkerCount = extraWorkerOptions ? (extraWorkerOptions.workerCount ?? 1) : 0;
             this.groupNames[queueName] ||= [];
-            if (extraWorkerOptions.group?.id)
+            if (extraWorkerOptions?.group?.id)
                 this.groupNames[queueName].push(extraWorkerOptions.group.id);
             if (activateWorkers) {
                 if (!namedWorkerConnection)
@@ -421,7 +422,10 @@ export class Background {
         //
         // See: https://docs.bullmq.io/guide/jobs/repeatable
         const jobId = `${ObjectClass.name}:${method}`;
-        await this.queueInstance(jobConfig).add('BackgroundJobQueueStaticJob', {
+        const queueInstance = this.queueInstance(jobConfig);
+        if (!queueInstance)
+            throw new Error(`Missing queue for: ${jobConfig.queue?.toString()}`);
+        await queueInstance.add('BackgroundJobQueueStaticJob', {
             globalName,
             method,
             args,
@@ -488,9 +492,12 @@ export class Background {
             const queue = new Background.Queue('TestQueue', { connection: {} });
             const job = new Job(queue, jobType, jobData, {});
             await this.doWork(job);
+            return;
             //
         }
-        else if (groupId && priority) {
+        if (!queueInstance)
+            throw new Error(`missing queue: ${jobConfig?.queue?.toString() || 'N/A'}`);
+        if (groupId && priority) {
             await queueInstance.add(jobType, jobData, {
                 delay,
                 group: {

package/dist/types/src/background/index.d.ts

@@ -169,10 +169,10 @@ export declare class Background {
         jobConfig?: BackgroundJobConfig<any>;
     }): Promise<void>;
     _addToQueue(jobType: JobTypes, jobData: BackgroundJobData, { delaySeconds, jobConfig, priority, groupId, }: {
-        delaySeconds?: number;
+        delaySeconds?: number | undefined;
         jobConfig: BackgroundJobConfig<any>;
         priority: BackgroundQueuePriority;
-        groupId?: string;
+        groupId?: string | undefined;
     }): Promise<void>;
     private jobConfigToPriority;
     private jobConfigToGroupId;

package/dist/types/src/psychic-app-workers/index.d.ts

@@ -103,7 +103,7 @@ export type QueueOptionsWithConnectionInstance = Omit<QueueOptions, 'connection'
      * queue and worker connections.
      */
     queueConnection?: RedisOrRedisClusterConnection;
-    workerConnection?: RedisOrRedisClusterConnection;
+    workerConnection?: RedisOrRedisClusterConnection | undefined;
 };
 export interface PsychicBackgroundSimpleOptions extends PsychicBackgroundSharedOptions {
     /**
@@ -114,7 +114,7 @@ export interface PsychicBackgroundSimpleOptions extends PsychicBackgroundSharedO
     /**
      * defaultWorkerConnection is only optional when workers will not be activated (e.g. on the webserver)
      */
-    defaultWorkerConnection?: RedisOrRedisClusterConnection;
+    defaultWorkerConnection: RedisOrRedisClusterConnection | undefined;
     /**
      * Every Psychic application that leverages simple background jobs will have a default
      * workstream. Set workerCount to set the number of workers that will work through the

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic-workers",
   "description": "Background job system for Psychic applications",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "author": "RVO Health",
   "repository": {
     "type": "git",