@jetit/publisher 1.3.2 → 1.5.0

package/package.json

@@ -1,15 +1,14 @@
 {
   "name": "@jetit/publisher",
-  "version": "1.3.2",
+  "version": "1.5.0",
   "type": "commonjs",
   "dependencies": {
     "@jetit/id": "0.0.11",
-    "ioredis": "5.3.1",
-    "rxjs": "7.8.0",
-    "tslib": "2.5.0"
+    "ioredis": "^5.3.0",
+    "rxjs": "^7.0.0"
   },
   "peerDependencies": {
-    "@types/ioredis-mock": "8.2.1"
+    "tslib": "2.5.0"
   },
   "main": "./src/index.js",
   "types": "./src/index.d.ts"

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

@@ -152,6 +152,7 @@ export declare class Streams {
     private registerSubscribedEvent;
     private registerConsumerGroup;
     private registerConsumerGroupName;
+    private scanAndClaimAUnclaimedMessage;
     releaseAllClaims(streamName: string): Promise<void>;
     private cleanupAcknowledgedMessages;
 }

package/src/lib/redis/streams.js

@@ -222,6 +222,9 @@ class Streams {
             const observable = bs.asObservable().pipe((0, rxjs_1.skip)(1));
             const streamName = `${eventName}:${this.consumerGroupName}`;
             this.redisSubscriber.subscribe(eventName);
+            this.scanAndClaimAUnclaimedMessage(streamName)
+                .then()
+                .catch((e) => console.log('PUBLISHER: Err in handling unclaimed Messages ' + e.message));
             const processMessage = () => {
                 try {
                     process.nextTick(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -247,6 +250,9 @@ class Streams {
                                 yield transaction.exec();
                             }
                         }
+                        this.scanAndClaimAUnclaimedMessage(streamName)
+                            .then()
+                            .catch((e) => console.log('PUBLISHER: Err in handling unclaimed Messages ' + e.message));
                     }));
                 }
                 catch (e) {
@@ -315,7 +321,7 @@ class Streams {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             console.log(`PUBLISHER: Running recoverCrashedConsumerMessages`);
             const streamName = `${eventName}:${this.consumerGroupName}`;
-            const pendingMessages = (yield this.redisGroups.xpending(streamName, this.consumerGroupName));
+            const pendingMessages = (yield this.redisGroups.xpending(streamName, this.consumerGroupName, 'IDLE', 10000, 0));
             if (!pendingMessages)
                 return;
             const [, minId, maxId, consumers] = pendingMessages;
@@ -340,6 +346,10 @@ class Streams {
                         yield transaction.exec().catch(publisherErrorHandler);
                     }
                 }
+                // Remove the consumer if it has messages pending for more than 10 secs
+                // NOTE: Ideally, this might never happen as messages will automatically be reassigned
+                console.log(`PUBLISHER: Closing consumer in ${this.consumerGroupName} with ID: ${consumer}`);
+                yield this.redisGroups.xgroup('DELCONSUMER', streamName, this.consumerGroupName, consumer);
             }
         });
     }
@@ -417,6 +427,16 @@ class Streams {
             yield this.redisGroups.set(key, this.consumerGroupName);
         });
     }
+    scanAndClaimAUnclaimedMessage(streamName) {
+        return tslib_1.__awaiter(this, void 0, void 0, function* () {
+            const rows = yield this.redisGroups.xautoclaim(streamName, this.consumerGroupName, this.instanceId, 500, 0, 'COUNT', 1);
+            if (rows) {
+                yield this.redisPublisher.publish(streamName.split(':')[0], '');
+                return this.scanAndClaimAUnclaimedMessage(streamName);
+            }
+            return;
+        });
+    }
     releaseAllClaims(streamName) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             /**
@@ -428,7 +448,7 @@ class Streams {
             if (pendingMessages && pendingMessages.length > 0) {
                 console.log(`${pendingMessages.length} messages to clean up.`);
                 const transaction = this.redisGroups.multi({ pipeline: true });
-                const tempConsumerId = `${this.instanceId}-temp`;
+                const tempConsumerId = `${this.consumerGroupName}-temp`;
                 for (const [messageId] of pendingMessages) {
                     transaction.xclaim(streamName, this.consumerGroupName, tempConsumerId, 10, messageId);
                 }