@jetit/publisher 3.1.0 → 3.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetit/publisher",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "type": "commonjs",
   "dependencies": {
     "@jetit/id": "0.0.11",

package/src/lib/redis/streams.js

@@ -100,8 +100,18 @@ class Streams {
             if (uniquePerInstance === true) {
                 const existingJob = await this.redisPublisher.zscore('se', JSON.stringify(eventData));
                 if (existingJob) {
-                    console.log(`PUBLISHER: Job with data '${eventData}' already exists. Skipping.`);
-                    return;
+                    const parsedExistingJob = JSON.parse(existingJob);
+                    if (
+                    /** Repeating Jobs */
+                    (parsedExistingJob.eventName === eventData.eventName &&
+                        parsedExistingJob.repeatInterval &&
+                        (!parsedExistingJob.data || JSON.stringify(parsedExistingJob.data) === JSON.stringify(eventData.data))) ||
+                        /** Non-repeating schedules */
+                        (parsedExistingJob.eventName === eventData.eventName &&
+                            JSON.stringify(parsedExistingJob.data) === JSON.stringify(eventData.data))) {
+                        console.log(`PUBLISHER: Job with data '${eventData}' already exists. Skipping.`);
+                        return;
+                    }
                 }
             }
             await this.redisPublisher.zadd('se', scheduledTime.getTime(), JSON.stringify(eventData));
@@ -174,12 +184,19 @@ class Streams {
         const processMessage = async (redisClient, messageId, processPending = false) => {
             console.log(`PUBLISHER: Processing message ${messageId} for ${streamName}`);
             try {
-                const messages = await redisClient.xrange(streamName, messageId, messageId);
-                const pendingMessage = (await redisClient.xpending(streamName, this.consumerGroupName, messageId, messageId, 1, this.instanceId));
-                if (!pendingMessage || pendingMessage.length === 0 || !pendingMessage[0] || pendingMessage[0].length === 0) {
-                    console.log(`PUBLISHER: Published Message is already processed for ${streamName} with message id ${messageId} `);
-                    return;
+                try {
+                    const pendingDetails = await redisClient.xpending(streamName, this.consumerGroupName, messageId, messageId, 1, this.instanceId);
+                    if (pendingDetails[2] === 0) {
+                        console.warn(`PUBLISHER: Message ${messageId} for ${streamName} already acknowledged.`);
+                        return;
+                    }
                 }
+                catch (e) {
+                    // Ignore the xpending error and continue
+                    console.error('XPENDING ERROR: To be handled');
+                    console.warn(JSON.stringify(e));
+                }
+                const messages = await redisClient.xrange(streamName, messageId, messageId);
                 if (messages && messages.length) {
                     const eventData = JSON.parse(messages[0][1][1]);
                     bs.next(eventData);

package/src/lib/redis/utils.d.ts

@@ -10,6 +10,7 @@ export declare function getMessageStatesCount(redisClient: RedisType, streamName
     unacknowledged: number;
 }>;
 export declare function notifySubscribers(redisClient: RedisType, eventName: string, messageId: string): Promise<void>;
+export declare function removedScheduledJob(redisClient: RedisType, eventString: string): Promise<void>;
 export declare const UTILS: {
     getMessageStatesCount: typeof getMessageStatesCount;
     getUnacknowledgedMessages: typeof getUnacknowledgedMessages;

package/src/lib/redis/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UTILS = exports.notifySubscribers = exports.getMessageStatesCount = exports.getUnacknowledgedMessages = exports.getAllConsumerGroups = void 0;
+exports.UTILS = exports.removedScheduledJob = exports.notifySubscribers = exports.getMessageStatesCount = exports.getUnacknowledgedMessages = exports.getAllConsumerGroups = void 0;
 async function getAllConsumerGroups(eventName, redisConnection) {
     const consumerGroups = await redisConnection.smembers(`${eventName}`);
     return consumerGroups;
@@ -49,6 +49,15 @@ async function notifySubscribers(redisClient, eventName, messageId) {
     await redisClient.publish(eventName, messageId);
 }
 exports.notifySubscribers = notifySubscribers;
+async function removedScheduledJob(redisClient, eventString) {
+    const currentTime = new Date().getTime();
+    const events = await redisClient.zrangebyscore('se', 0, currentTime);
+    console.log(`Total Events in scheduled queue: ${events.length}`);
+    await redisClient.zrem('se', eventString);
+    const eventsLater = await redisClient.zrangebyscore('se', 0, currentTime);
+    console.log(`Total Events in scheduled queue: ${eventsLater.length}`);
+}
+exports.removedScheduledJob = removedScheduledJob;
 exports.UTILS = {
     getMessageStatesCount,
     getUnacknowledgedMessages,