@jetit/publisher 1.0.8 → 1.1.0

package/package.json

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

package/src/lib/redis/streams.js

@@ -42,13 +42,13 @@ class Streams {
         this.instanceId = `${serviceName}:${(0, id_1.generateID)('HEX', 'FE')}`;
         this.consumerGroupName = `cg-${serviceName}`;
         const cleanUpInterval = (_a = parseInt(process.env['CLEANUP_INTERVAL'] || '1000 * 60 * 60', 10)) !== null && _a !== void 0 ? _a : 1000 * 60 * 60;
-        this.cleanUpTimer = (0, rxjs_1.interval)(cleanUpInterval).subscribe(() => {
+        this.cleanUpTimer = setInterval(() => {
             this.clearDuplicationCheckKeys();
-            this.eventsListened.forEach((eventName) => {
+            for (const eventName of this.eventsListened) {
                 this.cleanupAcknowledgedMessages(eventName, cleanUpInterval);
                 this.republishUnprocessedEvents(eventName);
-            });
-        });
+            }
+        }, cleanUpInterval);
     }
     createConsumerGroup(eventName) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -258,15 +258,16 @@ class Streams {
             const result = yield this.redisGroups.xreadgroup('GROUP', this.consumerGroupName, this.instanceId, 'STREAMS', streamName, '>');
             if (result) {
                 const [, streamMessages] = result[0];
+                console.log(`Unprocessed events: ${streamMessages.length}`);
                 for (const [id, data] of streamMessages) {
                     const eventData = JSON.parse(data[1]);
-                    console.log(`Unprocessed event: ${id}, data:`, eventData);
                     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();
+                    console.log(`Event ${eventName} with ID: ${id} published`);
                 }
             }
         });
@@ -344,7 +345,7 @@ class Streams {
                 yield this.redisGroups.quit();
             }
             if (this.cleanUpTimer) {
-                this.cleanUpTimer.unsubscribe();
+                clearInterval(this.cleanUpTimer);
             }
         });
     }