@rvoh/psychic-workers 0.4.1 → 0.4.3

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

@@ -325,7 +325,6 @@ 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);
@@ -372,7 +371,12 @@ class Background {
      * starts background workers
      */
     work() {
-        this.connect({ activateWorkers: true });
+        process.on('uncaughtException', (error) => {
+            psychic_1.PsychicApp.log('[psychic-workers] uncaughtException:', error);
+        });
+        process.on('unhandledRejection', (error) => {
+            psychic_1.PsychicApp.log('[psychic-workers] unhandledRejection:', error);
+        });
         process.on('SIGTERM', () => {
             if (!EnvInternal_js_1.default.isTest)
                 psychic_1.PsychicApp.log('[psychic-workers] handle SIGTERM');
@@ -387,6 +391,7 @@ class Background {
                 .then(() => { })
                 .catch(() => { });
         });
+        this.connect({ activateWorkers: true });
     }
     /**
      * adds the static method of a provided class to BullMQ
@@ -425,7 +430,7 @@ class Background {
      * @param importKey - (optional) the import key for the class
      * @param jobConfig - (optional) the background job config to use when backgrounding this method
      */
-    async scheduledMethod(ObjectClass, pattern, method, { globalName, args = [], jobConfig = {}, }) {
+    async scheduledMethod(ObjectClass, pattern, method, { globalName, args = [], jobConfig = {}, scheduleOpts = {}, }) {
         this.connect();
         // `jobId` is used to determine uniqueness along with name and repeat pattern.
         // Since the name is really a job type and never changes, the `jobId` is the only
@@ -433,22 +438,18 @@ class Background {
         // now be enforced by combining class name, method name, and cron repeat pattern.
         //
         // See: https://docs.bullmq.io/guide/jobs/repeatable
-        const jobId = `${ObjectClass.name}:${method}`;
+        const schedulerId = `${globalName}:${method}`;
         const queueInstance = this.queueInstance(jobConfig);
         if (!queueInstance)
             throw new Error(`Missing queue for: ${jobConfig.queue?.toString()}`);
-        await queueInstance.add('BackgroundJobQueueStaticJob', {
-            globalName,
-            method,
-            args,
-        }, {
-            repeat: {
-                pattern,
+        await queueInstance.upsertJobScheduler(schedulerId, { pattern }, {
+            name: schedulerId,
+            opts: scheduleOpts,
+            data: {
+                globalName,
+                method,
+                args,
             },
-            jobId,
-            group: this.jobConfigToGroup(jobConfig),
-            priority: this.mapPriorityWordToPriorityNumber(this.jobConfigToPriority(jobConfig)),
-            // explicitly typing as JobsOptions because Psychic can't be aware of BullMQ Pro options
         });
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

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

@@ -1,6 +1,6 @@
 import { closeAllDbConnections, compact, pascalize } from '@rvoh/dream';
 import { PsychicApp } from '@rvoh/psychic';
-import { Job, Queue, Worker } from 'bullmq';
+import { Job, Queue, Worker, } from 'bullmq';
 import ActivatingBackgroundWorkersWithoutDefaultWorkerConnection from '../error/background/ActivatingBackgroundWorkersWithoutDefaultWorkerConnection.js';
 import ActivatingNamedQueueBackgroundWorkersWithoutWorkerConnection from '../error/background/ActivatingNamedQueueBackgroundWorkersWithoutWorkerConnection.js';
 import DefaultBullMQNativeOptionsMissingQueueConnectionAndDefaultQueueConnection from '../error/background/DefaultBullMQNativeOptionsMissingQueueConnectionAndDefaultQueueConnection.js';
@@ -321,7 +321,6 @@ 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);
@@ -368,7 +367,12 @@ export class Background {
      * starts background workers
      */
     work() {
-        this.connect({ activateWorkers: true });
+        process.on('uncaughtException', (error) => {
+            PsychicApp.log('[psychic-workers] uncaughtException:', error);
+        });
+        process.on('unhandledRejection', (error) => {
+            PsychicApp.log('[psychic-workers] unhandledRejection:', error);
+        });
         process.on('SIGTERM', () => {
             if (!EnvInternal.isTest)
                 PsychicApp.log('[psychic-workers] handle SIGTERM');
@@ -383,6 +387,7 @@ export class Background {
                 .then(() => { })
                 .catch(() => { });
         });
+        this.connect({ activateWorkers: true });
     }
     /**
      * adds the static method of a provided class to BullMQ
@@ -421,7 +426,7 @@ export class Background {
      * @param importKey - (optional) the import key for the class
      * @param jobConfig - (optional) the background job config to use when backgrounding this method
      */
-    async scheduledMethod(ObjectClass, pattern, method, { globalName, args = [], jobConfig = {}, }) {
+    async scheduledMethod(ObjectClass, pattern, method, { globalName, args = [], jobConfig = {}, scheduleOpts = {}, }) {
         this.connect();
         // `jobId` is used to determine uniqueness along with name and repeat pattern.
         // Since the name is really a job type and never changes, the `jobId` is the only
@@ -429,22 +434,18 @@ export class Background {
         // now be enforced by combining class name, method name, and cron repeat pattern.
         //
         // See: https://docs.bullmq.io/guide/jobs/repeatable
-        const jobId = `${ObjectClass.name}:${method}`;
+        const schedulerId = `${globalName}:${method}`;
         const queueInstance = this.queueInstance(jobConfig);
         if (!queueInstance)
             throw new Error(`Missing queue for: ${jobConfig.queue?.toString()}`);
-        await queueInstance.add('BackgroundJobQueueStaticJob', {
-            globalName,
-            method,
-            args,
-        }, {
-            repeat: {
-                pattern,
+        await queueInstance.upsertJobScheduler(schedulerId, { pattern }, {
+            name: schedulerId,
+            opts: scheduleOpts,
+            data: {
+                globalName,
+                method,
+                args,
             },
-            jobId,
-            group: this.jobConfigToGroup(jobConfig),
-            priority: this.mapPriorityWordToPriorityNumber(this.jobConfigToPriority(jobConfig)),
-            // explicitly typing as JobsOptions because Psychic can't be aware of BullMQ Pro options
         });
     }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any

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

@@ -1,5 +1,5 @@
 import { Dream } from '@rvoh/dream';
-import { Job, Queue, Worker } from 'bullmq';
+import { Job, JobSchedulerTemplateOptions, Queue, Worker } from 'bullmq';
 import { BackgroundJobConfig, BackgroundJobData, BackgroundQueuePriority, JobTypes } from '../types/background.js';
 /**
  * the underlying class driving the `background` singleton,
@@ -145,12 +145,11 @@ export declare class Background {
      * @param importKey - (optional) the import key for the class
      * @param jobConfig - (optional) the background job config to use when backgrounding this method
      */
-    scheduledMethod(ObjectClass: Record<'name', string>, pattern: string, method: string, { globalName, args, jobConfig, }: {
+    scheduledMethod(ObjectClass: Record<'name', string>, pattern: string, method: string, { globalName, args, jobConfig, scheduleOpts, }: {
         globalName: string;
         args?: any[];
-        filepath?: string;
-        importKey?: string;
         jobConfig?: BackgroundJobConfig<any>;
+        scheduleOpts?: JobSchedulerTemplateOptions;
     }): Promise<void>;
     private queueInstance;
     /**

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic-workers",
   "description": "Background job system for Psychic applications",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "author": "RVO Health",
   "repository": {
     "type": "git",
@@ -53,7 +53,7 @@
     "@types/node": "^22.5.1",
     "@types/pg": "^8",
     "@types/supertest": "^6.0.2",
-    "bullmq": "^5.49.1",
+    "bullmq": "^5.52.0",
     "eslint": "^9.9.1",
     "express": "^4.21.2",
     "ioredis": "^5.4.1",
@@ -73,4 +73,4 @@
     "vitest": "^3.1.1"
   },
   "packageManager": "yarn@4.7.0"
-}
+}