@jetit/publisher 1.1.1 → 1.1.3

package/package.json

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

package/src/lib/redis/scheduler.js

@@ -51,7 +51,7 @@ class ScheduledProcessor {
                  * Instead of using the publish method directly, the entire logic is
                  * copy pasted to reduce the case of failure.
                  */
-                const transaction = this.redisPublisher.multi();
+                const transaction = this.redisPublisher.multi({ pipeline: true });
                 eventData.eventId = (0, id_1.generateID)('HEX', 'FF');
                 transaction.zrem('se', eventString);
                 const consumerGroups = yield (0, groups_1.getAllConsumerGroups)(eventData.eventName, this.redisPublisher);

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

@@ -149,5 +149,6 @@ export declare class Streams {
     close(): Promise<void>;
     private clearSubscribedEvents;
     private registerConsumerGroup;
+    releaseAllClaims(eventName: string): Promise<void>;
     private cleanupAcknowledgedMessages;
 }

package/src/lib/redis/streams.js

@@ -110,7 +110,7 @@ class Streams {
             data.eventId = (0, id_1.generateID)('HEX', 'FF');
             if (!data.createdAt)
                 data.createdAt = Date.now();
-            const transaction = this.redisPublisher.multi();
+            const transaction = this.redisPublisher.multi({ pipeline: true });
             const consumerGroups = yield (0, groups_1.getAllConsumerGroups)(data.eventName, this.redisPublisher);
             if (consumerGroups.length > 0) {
                 console.log(`Publishing event ${data.eventName} to consumer groups: ${consumerGroups.join(', ')}`);
@@ -236,7 +236,7 @@ class Streams {
                                 bs.next(eventData);
                                 const pmKey = `pm:${this.consumerGroupName}:${streamName}`;
                                 const currentTime = Date.now();
-                                const transaction = this.redisGroups.multi();
+                                const transaction = this.redisGroups.multi({ pipeline: true });
                                 transaction.zadd(pmKey, currentTime, messageId);
                                 transaction.xack(streamName, this.consumerGroupName, id);
                                 transaction.zadd(`ack:${streamName}`, Date.now(), id);
@@ -275,17 +275,19 @@ class Streams {
             const result = yield this.redisGroups.xreadgroup('GROUP', this.consumerGroupName, this.instanceId, 'STREAMS', streamName, '>');
             if (result) {
                 const [, streamMessages] = result[0];
+                if (!streamMessages)
+                    return;
                 console.log(`Unprocessed events: ${streamMessages.length}`);
-                const transaction = this.redisGroups.multi();
                 for (const [id, data] of streamMessages) {
                     const eventData = JSON.parse(data[1]);
+                    const transaction = this.redisGroups.multi();
                     // Republishing the events
                     transaction.xadd(streamName, '*', 'data', JSON.stringify(eventData));
                     transaction.publish(eventName, '');
                     transaction.xack(streamName, this.consumerGroupName, id);
+                    yield transaction.exec().catch(publisherErrorHandler);
                     console.log(`Event ${eventName} with ID: ${id} published`);
                 }
-                yield transaction.exec();
             }
         });
     }
@@ -312,7 +314,6 @@ class Streams {
             const [, minId, maxId, consumers] = pendingMessages;
             if (!consumers || consumers.length === 0)
                 return;
-            const transaction = this.redisGroups.multi();
             for (const [consumer, pendingCount] of consumers) {
                 if (parseInt(pendingCount) > 0) {
                     const pending = (yield this.redisGroups.xpending(streamName, this.consumerGroupName, minId, maxId, Number(pendingCount), consumer));
@@ -321,14 +322,15 @@ class Streams {
                         if (claimedMessage) {
                             const [, data] = claimedMessage[0];
                             const eventData = JSON.parse(data[1]);
+                            const transaction = this.redisGroups.multi();
                             transaction.xadd(streamName, '*', 'data', JSON.stringify(eventData));
                             transaction.publish(eventName, '');
                             transaction.xack(streamName, this.consumerGroupName, messageId);
+                            yield transaction.exec().catch(publisherErrorHandler);
                         }
                     }
                 }
             }
-            yield transaction.exec();
         });
     }
     /**
@@ -373,6 +375,9 @@ class Streams {
             console.log(`${this.eventsListened.length} events to be cleared`);
             for (const eventName of this.eventsListened) {
                 yield this.redisGroups.srem(`${eventName}`, this.consumerGroupName);
+                // Releasing all claims based on info from: https://redis.io/commands/xgroup-delconsumer/
+                yield this.releaseAllClaims(eventName);
+                yield this.redisGroups.xgroup('DELCONSUMER', eventName, this.consumerGroupName, this.instanceId);
             }
         });
     }
@@ -381,13 +386,28 @@ class Streams {
             yield this.redisGroups.sadd(`${eventName}`, this.consumerGroupName);
         });
     }
+    releaseAllClaims(eventName) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            // Retrieve the pending messages for the consumer
+            const pendingMessages = (yield this.redisGroups.xpending(eventName, this.consumerGroupName, '-', '+', 1000, this.instanceId));
+            if (pendingMessages && pendingMessages.length > 0) {
+                const transaction = this.redisGroups.multi({ pipeline: true });
+                for (const [messageId] of pendingMessages) {
+                    // Setting the idle time to 10000 ms to make sure this consumer shuts down completely
+                    const idleTime = 10000;
+                    transaction.xclaim(eventName, this.consumerGroupName, this.instanceId, idleTime);
+                }
+                yield transaction.exec();
+            }
+        });
+    }
     cleanupAcknowledgedMessages(eventName, interval = 60 * 60 * 1000) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const streamName = `${eventName}:${this.consumerGroupName}`;
             const cleanupThreshold = Date.now() - interval;
             const acknowledgedMessages = yield this.redisGroups.zrangebyscore(`ack:${streamName}`, '-inf', cleanupThreshold);
             if (acknowledgedMessages && acknowledgedMessages.length > 0) {
-                const transaction = this.redisGroups.multi();
+                const transaction = this.redisGroups.pipeline();
                 // Remove acknowledged messages from the stream
                 for (const messageId of acknowledgedMessages) {
                     transaction.xdel(streamName, messageId);