@jetit/publisher 1.7.0 → 1.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetit/publisher",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "type": "commonjs",
   "dependencies": {
     "@jetit/id": "0.0.11",
@@ -8,7 +8,7 @@
     "rxjs": "^7.8.0"
   },
   "peerDependencies": {
-    "tslib": "2.5.0"
+    "tslib": "^2.3.0"
   },
   "main": "./src/index.js",
   "types": "./src/index.d.ts"

package/src/lib/redis/scheduler.js

@@ -61,6 +61,11 @@ class ScheduledProcessor {
                     const streamName = `${eventData.eventName}:${consumerGroup}`;
                     transaction.xadd(streamName, '*', 'data', JSON.stringify(eventData));
                 }
+                if (eventData.repeatInterval) {
+                    const nextEventTime = currentTime + eventData.repeatInterval;
+                    const nextEventString = JSON.stringify(Object.assign({}, eventData));
+                    transaction.zadd('se', nextEventTime, nextEventString);
+                }
                 transaction.publish(eventData.eventName, '');
                 yield transaction.exec();
             }

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

@@ -52,6 +52,8 @@ export declare class Streams {
      *
      * @param scheduledTime - The Date object representing the future time when the event should be published.
      * @param eventData - The event data object, containing the event name and its associated data.
+     * @param uniquePerInstance - Have only one scheduled job per type
+     * @param repeatInterval - The duration for which to reschedule the job in ms
      *
      * @throws Error - Throws an error if the scheduled time is in the past.
      *
@@ -67,7 +69,7 @@ export declare class Streams {
      *
      * await streams.scheduledPublish(futureTime, eventData);
      */
-    scheduledPublish<T, const TName extends string = string>(scheduledTime: Date, eventData: EventData<T, TName>, uniquePerInstance?: boolean): Promise<void>;
+    scheduledPublish<TData = unknown, TName extends string = string>(scheduledTime: Date, eventData: PublishData<TData, TName>, uniquePerInstance?: boolean, repeatInterval?: number): Promise<void>;
     /**
      * Listens for events with the given name and returns an Observable that emits an EventData<T> object
      * each time a new event is received.

package/src/lib/redis/streams.js

@@ -116,32 +116,17 @@ class Streams {
                     throw new Error('Publisher Error');
                 });
             }
+            else
+                console.log(`PUBLISHER: Event publish failed for event ${data.eventName}, reason: no consumers ${consumerGroups}`);
         });
     }
-    /**
-     * Schedules an event to be published at a specified future time. Thee event gets published if the
-     * differnece between the current time and the scheduled time is less than 500ms.
-     *
-     * @param scheduledTime - The Date object representing the future time when the event should be published.
-     * @param eventData - The event data object, containing the event name and its associated data.
-     *
-     * @throws Error - Throws an error if the scheduled time is in the past.
-     *
-     * @example
-     *
-     * const streams = new Streams('app-service');
-     *
-     * const futureTime = new Date(Date.now() + 10000); // 10 seconds from now
-     * const eventData: EventData<string> = {
-     *   eventName: 'order.created',
-     *   data: 'Order data'
-     * };
-     *
-     * await streams.scheduledPublish(futureTime, eventData);
-     */
-    scheduledPublish(scheduledTime, eventData, uniquePerInstance = false) {
+    scheduledPublish(scheduledTime, eventData, uniquePerInstance = false, repeatInterval = 0) {
         return tslib_1.__awaiter(this, void 0, void 0, function* () {
             const currentTime = new Date();
+            delete eventData.repeatInterval;
+            if (repeatInterval > 0) {
+                eventData.repeatInterval = repeatInterval;
+            }
             if (scheduledTime < currentTime) {
                 throw new Error('PUBLISHER: Cannot schedule an event in the past');
             }
@@ -212,8 +197,8 @@ class Streams {
             pipeline.sadd(key, eventName);
             pipeline.sadd(`${eventName}`, this.consumerGroupName);
             pipeline.set(setKeyForK8sHandling, this.consumerGroupName);
-            const [, createConsumerStatus, , ,] = (yield pipeline.exec());
-            console.log(`PUBLISHER: Consumer Registered and created with ${this.instanceId} under ${this.consumerGroupName} with the ${createConsumerStatus[1]} consumers`);
+            const [, createConsumerStatus, addToCGSet, addToFlushSet] = (yield pipeline.exec());
+            console.log(`PUBLISHER: Consumer Registered and created with ${this.instanceId} under ${this.consumerGroupName} with ${createConsumerStatus[1]} consumers and with the following status ${JSON.stringify({ addToCGSet, addToFlushSet })}`);
             return createConsumerStatus[1] === 0 || createConsumerStatus[1] === 1;
         });
     }
@@ -279,7 +264,7 @@ class Streams {
                 })}`);
             });
             eventStreamClient.on('message', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                console.log(`PUBLISHER: Stream Notification Recieved for event ${eventName}`);
+                console.log(`PUBLISHER: Stream Notification Received for event ${eventName}`);
                 yield processMessage(this.redisGroups);
             }));
             this.scanAndClaimAUnclaimedMessage(streamName)

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

@@ -4,6 +4,7 @@ export type EventData<TData, TName extends string> = {
     eventId?: string;
     createdAt?: number;
     republishEvent?: string;
+    repeatInterval?: number;
 };
 export type PublishData<TData, TName extends string> = {
     data: TData;