@hastehaul/common 2.0.48 → 2.0.50

package/build/connections-wrappers/redis-wrapper.d.ts

@@ -1,10 +1,10 @@
+import IORedis from 'ioredis';
 export declare class RedisClient {
-    private master;
-    private replicas;
-    private static instance;
-    private constructor();
-    get client(): RedisClient;
-    static connect(masterHost: string, replicaHosts: string[]): Promise<RedisClient>;
+    private master?;
+    private replicas?;
+    get masterClient(): IORedis;
+    get relicaClients(): IORedis[];
+    connect(masterHost: string, replicaHosts: string[]): Promise<void>;
     private executeMasterOperation;
     private executeReplicaOperation;
     private executeOperation;
@@ -14,3 +14,4 @@ export declare class RedisClient {
     setex(key: string, value: string, seconds: number): Promise<any>;
     quit(): void;
 }
+export declare const rWrapper: RedisClient;

package/build/connections-wrappers/redis-wrapper.js

@@ -32,52 +32,48 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisClient = void 0;
+exports.rWrapper = exports.RedisClient = void 0;
 const ioredis_1 = __importStar(require("ioredis"));
 class RedisClient {
-    constructor(masterHost, replicaHosts) {
-        this.master = new ioredis_1.default({ host: masterHost, port: 6379 });
-        this.replicas = replicaHosts.map(replicaHost => new ioredis_1.default({ host: replicaHost, port: 6379 }));
-        const masterConnected = new Promise((resolve) => {
-            this.master.on('connect', () => {
-                console.log('Master connected');
-                resolve();
-            });
-            this.master.on('error', (error) => {
-                console.log('Master connection error:', error.message);
-                resolve();
-            });
-        });
-        const replicaPromises = this.replicas.map((replica) => {
-            return new Promise((resolve) => {
-                replica.on('connect', () => {
-                    console.log('Replica connected');
+    get masterClient() {
+        if (!this.master)
+            throw new Error("Cannot access Master Redis Client before connecting");
+        return this.master;
+    }
+    get relicaClients() {
+        if (!this.replicas)
+            throw new Error("Cannot access Replica Redis Client before connecting");
+        return this.replicas;
+    }
+    connect(masterHost, replicaHosts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.master = new ioredis_1.default({ host: masterHost, port: 6379, maxRetriesPerRequest: null, });
+            this.replicas = replicaHosts.map(replicaHost => new ioredis_1.default({ host: replicaHost, port: 6379, maxRetriesPerRequest: null, }));
+            const masterConnected = new Promise((resolve) => {
+                this.master.on('connect', () => {
+                    console.log('Master connected');
                     resolve();
                 });
-                replica.on('error', (error) => {
-                    console.log('Replica connection error:', error.message);
+                this.master.on('error', (error) => {
+                    console.log('Master connection error:', error.message);
                     resolve();
                 });
             });
-        });
-        // Wait for all connections to be established
-        Promise.all([masterConnected, ...replicaPromises]).then(() => {
-            console.log('All connections established');
-        });
-    }
-    get client() {
-        if (!RedisClient.instance)
-            throw new Error("Cannot access Redis Client before connecting");
-        return RedisClient.instance;
-    }
-    static connect(masterHost, replicaHosts) {
-        return new Promise((resolve) => {
-            if (!RedisClient.instance) {
-                const redisClient = new RedisClient(masterHost, replicaHosts);
-                RedisClient.instance = redisClient;
-                resolve(redisClient);
-            }
-            resolve(RedisClient.instance);
+            const replicaPromises = this.replicas.map((replica) => {
+                return new Promise((resolve) => {
+                    replica.on('connect', () => {
+                        console.log('Replica connected');
+                        resolve();
+                    });
+                    replica.on('error', (error) => {
+                        console.log('Replica connection error:', error.message);
+                        resolve();
+                    });
+                });
+            });
+            // Wait for all connections to be established
+            yield Promise.all([masterConnected, ...replicaPromises]);
+            return console.log('All connections established');
         });
     }
     executeMasterOperation(command, ...args) {
@@ -116,4 +112,4 @@ class RedisClient {
     }
 }
 exports.RedisClient = RedisClient;
-RedisClient.instance = null;
+exports.rWrapper = new RedisClient();

package/build/utils/base_classes/jobs/base-producers.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractJobQueue = void 0;
 const bullmq_1 = require("bullmq");
-const redis_connection_wrapper_1 = require("../../../connections-wrappers/redis-connection-wrapper");
+// import { redisWrapper } from '../../../connections-wrappers/redis-connection-wrapper';
+const redis_wrapper_1 = require("../../../connections-wrappers/redis-wrapper");
 /**
  * Abstract class representing a Job Queue.
  */
@@ -14,7 +15,7 @@ class AbstractJobQueue {
      */
     constructor(queueName) {
         // Initialize the job queue with the provided name and a Redis connection from the redisWrapper.
-        this.que = new bullmq_1.Queue(queueName, { connection: redis_connection_wrapper_1.redisWrapper.client, prefix: '{BULLMQ}' });
+        this.que = new bullmq_1.Queue(queueName, { connection: redis_wrapper_1.rWrapper.masterClient, prefix: '{BULLMQ}' });
     }
 }
 exports.AbstractJobQueue = AbstractJobQueue;

package/build/utils/base_classes/jobs/base-worker.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractWorker = void 0;
 const bullmq_1 = require("bullmq");
-const redis_connection_wrapper_1 = require("../../../connections-wrappers/redis-connection-wrapper");
+// import { redisWrapper } from '../../../connections-wrappers/redis-connection-wrapper';
+const redis_wrapper_1 = require("../../../connections-wrappers/redis-wrapper");
 /**
  * Abstract class representing a worker for processing jobs from a Job Queue.
  */
@@ -15,7 +16,7 @@ class AbstractWorker {
     constructor(queueName) {
         // Create a worker instance with the provided queueName and bind the 'process' method to this worker.
         this.worker = new bullmq_1.Worker(queueName, this.process.bind(this), {
-            connection: redis_connection_wrapper_1.redisWrapper.client,
+            connection: redis_wrapper_1.rWrapper.masterClient,
             autorun: false,
             prefix: '{BULLMQ}',
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hastehaul/common",
-  "version": "2.0.48",
+  "version": "2.0.50",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",