@duvdu-v1/duvdu 1.1.276 → 1.1.278

package/build/middlewares/pull.connection.d.ts

@@ -1,2 +1 @@
-declare const bullRedis: import("ioredis/built/Redis").default;
-export { bullRedis };
+export declare const getBullRedis: () => Promise<import("ioredis/built/Redis").default>;

package/build/middlewares/pull.connection.js

@@ -1,8 +1,17 @@
 "use strict";
 // // bullmq-redis.ts
 // import IORedis from 'ioredis';
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bullRedis = void 0;
+exports.getBullRedis = void 0;
 // const bullRedis = new IORedis({
 //   host: process.env.REDIS_HOST?.split('://')[1]?.split(':')[0] || 'localhost',
 //   port: parseInt(process.env.REDIS_HOST?.split(':').pop() || '6379'),
@@ -17,6 +26,8 @@ exports.bullRedis = void 0;
 // export { bullRedis };
 // bullmq-redis.ts
 const redis_connection_1 = require("./redis-connection");
-// Use the existing Redis client from redis-connection.ts
-const bullRedis = (0, redis_connection_1.getRedisClient)();
-exports.bullRedis = bullRedis;
+// Create a function that returns the Redis client for BullMQ
+const getBullRedis = () => __awaiter(void 0, void 0, void 0, function* () {
+    return yield (0, redis_connection_1.getRedisClient)();
+});
+exports.getBullRedis = getBullRedis;

package/build/middlewares/redis-connection.d.ts

@@ -1,6 +1,6 @@
 import RedisStore from 'connect-redis';
 import Redis from 'ioredis';
-export declare const getRedisClient: () => Redis;
+export declare const getRedisClient: () => Promise<Redis>;
 export declare const redisConnection: () => Promise<Redis>;
 export declare const sessionStore: () => Promise<RedisStore>;
 export declare const cleanupRedis: () => Promise<void>;

package/build/middlewares/redis-connection.js

@@ -17,10 +17,11 @@ const connect_redis_1 = __importDefault(require("connect-redis"));
 const ioredis_1 = __importDefault(require("ioredis"));
 const data_base_connections_1 = require("../errors/data-base-connections");
 // Create a Redis cluster or connection pool
-const MAX_CLIENTS = 2; // Limited to 2 connections to stay well below the connection limit
+const MAX_CLIENTS = 1; // Single connection per service to minimize total connections
 let connectionPool = [];
 let currentConnectionIndex = 0;
 let activeConnections = 0;
+let isInitializing = false;
 // Cache the RedisStore instance
 let redisStoreInstance = null;
 // Parse Redis connection details
@@ -35,6 +36,7 @@ const getRedisConfig = () => {
         password,
         maxRetriesPerRequest: null,
         enableReadyCheck: false,
+        lazyConnect: true, // Don't connect immediately
         retryStrategy: (times) => {
             if (times > 3)
                 return null;
@@ -57,7 +59,7 @@ const getClientInfo = (client) => __awaiter(void 0, void 0, void 0, function* ()
 const startMonitoring = () => {
     const monitorInterval = 60000; // 1 minute
     setInterval(() => __awaiter(void 0, void 0, void 0, function* () {
-        if (connectionPool.length > 0) {
+        if (connectionPool.length > 0 && activeConnections > 0) {
             try {
                 const clientCount = yield getClientInfo(connectionPool[0]);
                 console.log(`[REDIS] Stats: Connected clients: ${clientCount}, Pool size: ${connectionPool.length}, Active: ${activeConnections}`);
@@ -69,8 +71,9 @@ const startMonitoring = () => {
     }), monitorInterval);
 };
 // Initialize the connection pool
-const initializePool = () => {
-    if (connectionPool.length === 0) {
+const initializePool = () => __awaiter(void 0, void 0, void 0, function* () {
+    if (connectionPool.length === 0 && !isInitializing) {
+        isInitializing = true;
         const config = getRedisConfig();
         for (let i = 0; i < MAX_CLIENTS; i++) {
             const client = new ioredis_1.default(config);
@@ -90,22 +93,27 @@ const initializePool = () => {
         }
         // Start monitoring
         startMonitoring();
+        isInitializing = false;
     }
-};
+});
 // Get a client from the pool using round-robin
-const getRedisClient = () => {
+const getRedisClient = () => __awaiter(void 0, void 0, void 0, function* () {
     if (connectionPool.length === 0) {
-        initializePool();
+        yield initializePool();
     }
-    // Round-robin selection
+    // Round-robin selection (though with MAX_CLIENTS=1, this just returns the single client)
     const client = connectionPool[currentConnectionIndex];
     currentConnectionIndex = (currentConnectionIndex + 1) % connectionPool.length;
+    // Ensure the client is connected
+    if (client.status !== 'ready' && client.status !== 'connecting') {
+        yield client.connect();
+    }
     return client;
-};
+});
 exports.getRedisClient = getRedisClient;
 const redisConnection = () => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const client = (0, exports.getRedisClient)();
+        const client = yield (0, exports.getRedisClient)();
         return client;
     }
     catch (error) {
@@ -119,7 +127,7 @@ const sessionStore = () => __awaiter(void 0, void 0, void 0, function* () {
     if (redisStoreInstance) {
         return redisStoreInstance;
     }
-    const client = (0, exports.getRedisClient)();
+    const client = yield (0, exports.getRedisClient)();
     redisStoreInstance = new connect_redis_1.default({ client });
     return redisStoreInstance;
 });

package/build/models/transactions.model.d.ts

@@ -36,6 +36,7 @@ export interface ITransaction {
     status: string;
     timeStamp: Date;
     model: string;
+    isSubscription: boolean;
 }
 export declare const Transaction: import("mongoose").Model<ITransaction, {}, {}, {}, import("mongoose").Document<unknown, {}, ITransaction> & ITransaction & {
     _id: Types.ObjectId;

package/build/models/transactions.model.js

@@ -17,4 +17,5 @@ exports.Transaction = (0, mongoose_1.model)(model_names_1.MODELS.transaction, ne
     status: { type: String, default: TransactionStatus.PENDING },
     timeStamp: { type: Date, default: Date.now },
     model: { type: String, default: null },
+    isSubscription: { type: Boolean, default: false },
 }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duvdu-v1/duvdu",
-  "version": "1.1.276",
+  "version": "1.1.278",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [