@rvoh/psychic-workers 0.4.0 → 0.4.2

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

@@ -138,7 +138,8 @@ class Background {
      * Shuts down workers, closes all redis connections
      */
     async shutdown() {
-        index_js_1.default.getOrFail().psychicApp.logger.info(`[psychic-workers] shutdown`);
+        if (!EnvInternal_js_1.default.isTest)
+            psychic_1.PsychicApp.log(`[psychic-workers] shutdown`);
         const psychicWorkersApp = index_js_1.default.getOrFail();
         for (const hook of psychicWorkersApp.hooks.workerShutdown) {
             await hook();
@@ -150,12 +151,19 @@ class Background {
      * closes all redis connections for workers and queues
      */
     async closeAllRedisConnections() {
-        index_js_1.default.getOrFail().psychicApp.logger.info(`[psychic-workers] closeAllRedisConnections`);
+        if (!EnvInternal_js_1.default.isTest)
+            psychic_1.PsychicApp.log(`[psychic-workers] closeAllRedisConnections`);
         for (const worker of this.workers) {
             await worker.close();
         }
         for (const connection of this.redisConnections) {
-            await connection.quit();
+            try {
+                await connection.quit();
+            }
+            catch (error) {
+                if (!EnvInternal_js_1.default.isTest)
+                    psychic_1.PsychicApp.logWithLevel('error', `[psychic-workers] error quitting Redis:`, error);
+            }
         }
     }
     /**
@@ -317,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);
@@ -364,19 +371,27 @@ 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', () => {
-            index_js_1.default.getOrFail().psychicApp.logger.info('[psychic-workers] handle SIGTERM');
+            if (!EnvInternal_js_1.default.isTest)
+                psychic_1.PsychicApp.log('[psychic-workers] handle SIGTERM');
             void this.shutdownAndExit()
                 .then(() => { })
                 .catch(() => { });
         });
         process.on('SIGINT', () => {
-            index_js_1.default.getOrFail().psychicApp.logger.info('[psychic-workers] handle SIGINT');
+            if (!EnvInternal_js_1.default.isTest)
+                psychic_1.PsychicApp.log('[psychic-workers] handle SIGINT');
             void this.shutdownAndExit()
                 .then(() => { })
                 .catch(() => { });
         });
+        this.connect({ activateWorkers: true });
     }
     /**
      * adds the static method of a provided class to BullMQ

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

@@ -134,7 +134,8 @@ export class Background {
      * Shuts down workers, closes all redis connections
      */
     async shutdown() {
-        PsychicAppWorkers.getOrFail().psychicApp.logger.info(`[psychic-workers] shutdown`);
+        if (!EnvInternal.isTest)
+            PsychicApp.log(`[psychic-workers] shutdown`);
         const psychicWorkersApp = PsychicAppWorkers.getOrFail();
         for (const hook of psychicWorkersApp.hooks.workerShutdown) {
             await hook();
@@ -146,12 +147,19 @@ export class Background {
      * closes all redis connections for workers and queues
      */
     async closeAllRedisConnections() {
-        PsychicAppWorkers.getOrFail().psychicApp.logger.info(`[psychic-workers] closeAllRedisConnections`);
+        if (!EnvInternal.isTest)
+            PsychicApp.log(`[psychic-workers] closeAllRedisConnections`);
         for (const worker of this.workers) {
             await worker.close();
         }
         for (const connection of this.redisConnections) {
-            await connection.quit();
+            try {
+                await connection.quit();
+            }
+            catch (error) {
+                if (!EnvInternal.isTest)
+                    PsychicApp.logWithLevel('error', `[psychic-workers] error quitting Redis:`, error);
+            }
         }
     }
     /**
@@ -313,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);
@@ -360,19 +367,27 @@ 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', () => {
-            PsychicAppWorkers.getOrFail().psychicApp.logger.info('[psychic-workers] handle SIGTERM');
+            if (!EnvInternal.isTest)
+                PsychicApp.log('[psychic-workers] handle SIGTERM');
             void this.shutdownAndExit()
                 .then(() => { })
                 .catch(() => { });
         });
         process.on('SIGINT', () => {
-            PsychicAppWorkers.getOrFail().psychicApp.logger.info('[psychic-workers] handle SIGINT');
+            if (!EnvInternal.isTest)
+                PsychicApp.log('[psychic-workers] handle SIGINT');
             void this.shutdownAndExit()
                 .then(() => { })
                 .catch(() => { });
         });
+        this.connect({ activateWorkers: true });
     }
     /**
      * adds the static method of a provided class to BullMQ

package/dist/types/src/helpers/EnvInternal.d.ts

@@ -1,6 +1,6 @@
 import { Env } from '@rvoh/dream';
 declare const EnvInternal: Env<{
     string: "NODE_ENV" | "PSYCHIC_CORE_DEVELOPMENT";
-    boolean: "DEBUG" | "PSYCHIC_CORE_DEVELOPMENT" | "REALLY_TEST_BACKGROUND_QUEUE";
-}, "NODE_ENV" | "PSYCHIC_CORE_DEVELOPMENT", never, "PSYCHIC_CORE_DEVELOPMENT" | "DEBUG" | "REALLY_TEST_BACKGROUND_QUEUE">;
+    boolean: "REALLY_TEST_BACKGROUND_QUEUE";
+}, "NODE_ENV" | "PSYCHIC_CORE_DEVELOPMENT", never, "REALLY_TEST_BACKGROUND_QUEUE">;
 export default EnvInternal;

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "name": "@rvoh/psychic-workers",
   "description": "Background job system for Psychic applications",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "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"
-}
+}