@jetit/publisher 3.2.0 → 3.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetit/publisher",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "type": "commonjs",
   "dependencies": {
     "@jetit/id": "0.0.11",
@@ -10,6 +10,5 @@
   "peerDependencies": {
     "tslib": "2.5.3"
   },
-  "main": "./src/index.js",
-  "types": "./src/index.d.ts"
+  "main": "./src/index.js"
 }

package/src/lib/publisher.d.ts

@@ -1,4 +1,4 @@
-export { Streams as Publisher } from './redis/streams';
 export { setRedisConnectionSettings as setRedisConfig } from './redis/registry';
+export { Streams as Publisher } from './redis/streams';
 export { ScheduledProcessor as __SCHEDULER_INTERNALS__ } from './redis/scheduler';
 export { UTILS as StreamUtilityFunctions } from './redis/utils';

package/src/lib/publisher.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StreamUtilityFunctions = exports.__SCHEDULER_INTERNALS__ = exports.setRedisConfig = exports.Publisher = void 0;
-var streams_1 = require("./redis/streams");
-Object.defineProperty(exports, "Publisher", { enumerable: true, get: function () { return streams_1.Streams; } });
+exports.StreamUtilityFunctions = exports.__SCHEDULER_INTERNALS__ = exports.Publisher = exports.setRedisConfig = void 0;
 var registry_1 = require("./redis/registry");
 Object.defineProperty(exports, "setRedisConfig", { enumerable: true, get: function () { return registry_1.setRedisConnectionSettings; } });
+var streams_1 = require("./redis/streams");
+Object.defineProperty(exports, "Publisher", { enumerable: true, get: function () { return streams_1.Streams; } });
 var scheduler_1 = require("./redis/scheduler");
 Object.defineProperty(exports, "__SCHEDULER_INTERNALS__", { enumerable: true, get: function () { return scheduler_1.ScheduledProcessor; } });
 var utils_1 = require("./redis/utils");

package/src/lib/redis/scheduler.js

@@ -40,7 +40,7 @@ class ScheduledProcessor {
         const events = await this.redisPublisher.zrangebyscore('se', 0, currentTime);
         console.log('Events to process:', events.length);
         for (const eventString of events) {
-            const eventData = JSON.parse(eventString);
+            const eventData = (0, utils_1.decodeScheduledMessage)(eventString);
             /**
              * Remove the event from the Redis Sorted Set first. Please note that
              * there is a chance of failure here if the process crashes before

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

@@ -1,5 +1,5 @@
-import { EventData, PublishData } from './types';
 import { Observable } from 'rxjs';
+import { EventData, PublishData } from './types';
 export declare class Streams {
     private _redisPublisher?;
     private _redisGroups?;

package/src/lib/redis/streams.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Streams = void 0;
-const registry_1 = require("./registry");
-const rxjs_1 = require("rxjs");
 const id_1 = require("@jetit/id");
+const rxjs_1 = require("rxjs");
+const registry_1 = require("./registry");
 const utils_1 = require("./utils");
 function publisherErrorHandler(error) {
     console.error('PUBLISHER UNHANDLED ERROR: ', JSON.stringify(error));
@@ -98,20 +98,10 @@ class Streams {
         }
         else {
             if (uniquePerInstance === true) {
-                const existingJob = await this.redisPublisher.zscore('se', JSON.stringify(eventData));
+                const existingJob = await this.redisPublisher.zscore('se', (0, utils_1.encodeScheduledMessage)(eventData));
                 if (existingJob) {
-                    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;
-                    }
+                    console.log(`PUBLISHER: Job with data '${eventData}' already exists. Skipping.`);
+                    return;
                 }
             }
             await this.redisPublisher.zadd('se', scheduledTime.getTime(), JSON.stringify(eventData));
@@ -184,10 +174,17 @@ class Streams {
         const processMessage = async (redisClient, messageId, processPending = false) => {
             console.log(`PUBLISHER: Processing message ${messageId} for ${streamName}`);
             try {
-                const pendingDetails = await redisClient.xpending(streamName, this.consumerGroupName, messageId, messageId, this.instanceId);
-                if (pendingDetails[2] === 0) {
-                    console.warn(`PUBLISHER: Message ${messageId} for ${streamName} already acknowledged.`);
-                    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) {

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

@@ -1,4 +1,5 @@
 import { RedisType } from './registry';
+import { EventData } from './types';
 export declare function getAllConsumerGroups(eventName: string, redisConnection: RedisType): Promise<string[]>;
 export declare function getUnacknowledgedMessages(redisClient: RedisType, consumerGroupName: string, streamName: string, count?: number): Promise<{
     count: number;
@@ -11,6 +12,8 @@ export declare function getMessageStatesCount(redisClient: RedisType, streamName
 }>;
 export declare function notifySubscribers(redisClient: RedisType, eventName: string, messageId: string): Promise<void>;
 export declare function removedScheduledJob(redisClient: RedisType, eventString: string): Promise<void>;
+export declare function encodeScheduledMessage<TData, TName extends string>(data: EventData<TData, TName>): string;
+export declare function decodeScheduledMessage(data: string): EventData<never, never>;
 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.removedScheduledJob = exports.notifySubscribers = exports.getMessageStatesCount = exports.getUnacknowledgedMessages = exports.getAllConsumerGroups = void 0;
+exports.UTILS = exports.decodeScheduledMessage = exports.encodeScheduledMessage = 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;
@@ -58,6 +58,24 @@ async function removedScheduledJob(redisClient, eventString) {
     console.log(`Total Events in scheduled queue: ${eventsLater.length}`);
 }
 exports.removedScheduledJob = removedScheduledJob;
+function encodeScheduledMessage(data) {
+    const eventName = data.eventName;
+    const eventData = JSON.stringify(data.data);
+    const repeatInterval = data.repeatInterval;
+    const eventDataBuffer = Buffer.from(eventData, 'utf8').toString('base64');
+    return `${eventName}%%${eventDataBuffer}%%${repeatInterval}`;
+}
+exports.encodeScheduledMessage = encodeScheduledMessage;
+function decodeScheduledMessage(data) {
+    const parts = data.split('%%');
+    const eventName = parts[0];
+    return {
+        data: JSON.parse(Buffer.from(parts[1], 'base64').toString('utf-8')),
+        eventName,
+        repeatInterval: parts[2],
+    };
+}
+exports.decodeScheduledMessage = decodeScheduledMessage;
 exports.UTILS = {
     getMessageStatesCount,
     getUnacknowledgedMessages,