@yrpri/api 9.0.195 → 9.0.197

package/models/audio.cjs

@@ -6,7 +6,7 @@ const queue = require('../services/workers/queue.cjs');
 let bullAudioQueue;
 if (process.env.USE_YOUR_PRIORITIES_ENCODER) {
     const { Queue } = require('bullmq');
-    let redisUrl = process.env.REDIS_URL ? process.env.REDIS_URL : "redis://localhost:6379";
+    let redisUrl = process.env.REDIS_WORKER_URL ?? process.env.REDIS_URL ?? "redis://localhost:6379";
     if (redisUrl.startsWith("redis://h:")) {
         redisUrl = redisUrl.replace("redis://h:", "redis://:");
     }

package/models/video.cjs

@@ -7,7 +7,7 @@ const queue = require("../services/workers/queue.cjs");
 let bullVideoQueue;
 if (process.env.USE_YOUR_PRIORITIES_ENCODER) {
     const { Queue } = require("bullmq");
-    let redisUrl = process.env.REDIS_URL ? process.env.REDIS_URL : "redis://localhost:6379";
+    let redisUrl = process.env.REDIS_WORKER_URL ?? process.env.REDIS_URL ?? "redis://localhost:6379";
     if (redisUrl.startsWith("redis://h:")) {
         redisUrl = redisUrl.replace("redis://h:", "redis://:");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrpri/api",
-  "version": "9.0.195",
+  "version": "9.0.197",
   "license": "MIT",
   "author": "Robert Bjarnason & Citizens Foundation",
   "repository": {

package/services/scripts/kue_status.js

@@ -7,7 +7,7 @@ if (process.env.AIRBRAKE_PROJECT_ID) {
 }
 // make sure we use the Heroku Redis To Go URL
 // (put REDISTOGO_URL=redis://localhost:6379 in .env for local testing)
-var redisUrl = process.env.REDIS_URL ? process.env.REDIS_URL : "redis://localhost:6379";
+var redisUrl = process.env.REDIS_WORKER_URL ?? process.env.REDIS_URL ?? "redis://localhost:6379";
 log.info("Starting app access to Kue Queue", { redis_url: redisUrl });
 var queue = kue.createQueue({
     redis: redisUrl,

package/services/scripts/kue_watch_stuck_jobs.js

@@ -9,7 +9,7 @@ if (process.env.AIRBRAKE_PROJECT_ID) {
 }
 // make sure we use the Heroku Redis To Go URL
 // (put REDISTOGO_URL=redis://localhost:6379 in .env for local testing)
-var redisUrl = process.env.REDIS_URL ? process.env.REDIS_URL : "redis://localhost:6379";
+var redisUrl = process.env.REDIS_WORKER_URL ?? process.env.REDIS_URL ?? "redis://localhost:6379";
 log.info("Starting app access to Kue Queue", { redis_url: redisUrl });
 var queue = kue.createQueue({
     redis: redisUrl,

package/services/workers/queue.cjs

@@ -6,7 +6,7 @@ if (process.env.AIRBRAKE_PROJECT_ID) {
     airbrake = require('../utils/airbrake.cjs');
 }
 const { Queue, Worker } = require('bullmq');
-let redisUrl = process.env.REDIS_URL ? process.env.REDIS_URL : "redis://localhost:6379";
+let redisUrl = process.env.REDIS_WORKER_URL ?? process.env.REDIS_URL ?? "redis://localhost:6379";
 if (redisUrl.startsWith("redis://h:")) {
     redisUrl = redisUrl.replace("redis://h:", "redis://:");
 }
@@ -27,14 +27,17 @@ if (redisUrl.startsWith("rediss://")) {
     };
 }
 log.info("Starting app access to BullMQ Queue", { redis_url: redisUrl });
-MAIN_WORKER_QUEUE_NAME = process.env.MAIN_WORKER_QUEUE_NAME || 'mainYpQueue';
+const queuePrefix = process.env.MAIN_WORKER_QUEUE_NAME ||
+    process.env.MAIN_QUEUE_NAME ||
+    process.env.BULL_PREFIX ||
+    'mainYpQueue';
 class YpQueue {
     constructor() {
         log.info("Create YpQueue");
         this.processors = new Map(); // Store processors per job name
         this.workers = new Map(); // Store workers per job name
         this.queues = new Map(); // Store queues per job name
-        this.queuePrefix = MAIN_WORKER_QUEUE_NAME;
+        this.queuePrefix = queuePrefix;
     }
     get defaultJobOptions() {
         return {

package/services/workers/queue.d.cts

@@ -4,7 +4,7 @@ declare class YpQueue {
     processors: Map<any, any>;
     workers: Map<any, any>;
     queues: Map<any, any>;
-    queuePrefix: any;
+    queuePrefix: string;
     get defaultJobOptions(): {
         attempts: number;
         removeOnComplete: boolean;