redis-smq 7.0.0-rc.1 → 7.0.0-rc.2

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # CHANGELOG
 
+## 7.0.0-rc.2 (2022-05-18)
+
+* Fix typo (8002616)
+* Update docs (d40b1c2)
+* Update misc scripts (bde5171)
+* Clean up WebsocketRateStreamWorker, use incremental timestamp (918fac0)
+
 ## 7.0.0-rc.1 (2022-05-15)
 
 * Update docs (41ee4bf)

package/dist/misc/health-check/combined-run.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/misc/health-check/combined-run.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const __1 = require("../..");
+(0, __1.setConfiguration)({
+    logger: {
+        enabled: false,
+    },
+    monitor: {
+        enabled: true,
+        basePath: '/',
+    },
+    messages: {
+        store: true,
+    },
+});
+(0, __1.setLogger)(console);
+const producer = new __1.Producer();
+const consumer = new __1.Consumer();
+consumer.run();
+const monitorServer = new __1.MonitorServer();
+monitorServer.listen().catch((err) => console.log(err));
+const produce = (err) => {
+    if (err)
+        console.log(err);
+    else {
+        setTimeout(() => {
+            const m = new __1.Message().setBody(Date.now()).setQueue(queue);
+            producer.produce(m, produce);
+        }, 1000);
+    }
+};
+const queue = `queue_${Date.now()}`;
+__1.QueueManager.getSingletonInstance((err, queueManager) => {
+    if (err)
+        console.log(err);
+    else {
+        queueManager === null || queueManager === void 0 ? void 0 : queueManager.queue.create(queue, false, (err) => {
+            if (err)
+                console.log(err);
+            else
+                consumer.consume(queue, (msg, cb) => cb(), produce);
+        });
+    }
+});
+//# sourceMappingURL=combined-run.js.map

package/dist/misc/health-check/on-off.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/misc/health-check/on-off.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const __1 = require("../..");
+const events_1 = require("../../src/system/common/events");
+const async_1 = require("../../src/system/lib/async");
+const queue = `queue_${Date.now()}`;
+const producer = new __1.Producer();
+const produceForever = (err) => {
+    if (err)
+        console.log(err);
+    else {
+        if (producer.isGoingUp() || producer.isRunning()) {
+            const message = new __1.Message().setBody('some data').setQueue(queue);
+            producer.produce(message, produceForever);
+        }
+    }
+};
+const consumer = new __1.Consumer();
+consumer.consume(queue, (message, cb) => cb(), (err) => err && console.log(err));
+consumer.on(events_1.events.UP, () => {
+    console.log('UP');
+});
+consumer.on(events_1.events.DOWN, () => {
+    console.log('DOWN');
+});
+const serialOnOff = (cb) => (0, async_1.waterfall)([
+    (cb) => consumer.run((err) => cb(err)),
+    (cb) => consumer.shutdown((err) => cb(err)),
+    (cb) => consumer.run((err) => cb(err)),
+    (cb) => consumer.shutdown((err) => cb(err)),
+    (cb) => consumer.run((err) => cb(err)),
+    (cb) => consumer.shutdown((err) => cb(err)),
+    (cb) => consumer.run((err) => cb(err)),
+    (cb) => consumer.shutdown((err) => cb(err)),
+    (cb) => consumer.run((err) => cb(err)),
+    (cb) => consumer.shutdown((err) => cb(err)),
+], cb);
+(0, async_1.waterfall)([
+    (cb) => __1.QueueManager.getSingletonInstance((err, queueManager) => {
+        if (err)
+            cb(err);
+        else
+            queueManager === null || queueManager === void 0 ? void 0 : queueManager.queue.create(queue, false, cb);
+    }),
+    (cb) => {
+        produceForever();
+        serialOnOff(cb);
+    },
+], (err) => {
+    if (err)
+        console.log(err);
+    else {
+        producer.shutdown();
+        consumer.shutdown();
+        __1.QueueManager.getSingletonInstance((err, queueManager) => queueManager === null || queueManager === void 0 ? void 0 : queueManager.quit(() => void 0));
+    }
+});
+//# sourceMappingURL=on-off.js.map

package/dist/src/monitor-server/workers/websocket-rate-stream.worker.d.ts

@@ -1,29 +1,12 @@
 import { ICallback, TQueueParams } from '../../../types';
 import { Worker } from '../../system/common/worker/worker';
 export declare class WebsocketRateStreamWorker extends Worker {
-    protected queueData: {
-        [ns: string]: {
-            [queueName: string]: {
-                consumers: string[];
-            };
-        };
-    };
-    protected tasks: ((cb: ICallback<void>) => void)[];
-    protected reset: () => void;
-    protected addConsumerTasks: (ts: number, queue: TQueueParams, consumerId: string) => void;
-    protected addQueueTasks: (ts: number, queue: TQueueParams) => void;
-    protected addGlobalTasks: (ts: number) => void;
-    protected addQueue: (queue: TQueueParams) => {
-        consumers: string[];
-    };
-    protected handleQueueConsumers: (ts: number, queue: TQueueParams, consumers: string[], cb: ICallback<void>) => void;
-    protected handleQueue: (ts: number, queue: TQueueParams, queueProperties: {
-        consumers: string[];
-    }, cb: ICallback<void>) => void;
-    protected prepare: (cb: ICallback<void>) => void;
-    protected publish: (cb: ICallback<void>) => void;
-    protected consumersCount: (cb: ICallback<void>) => void;
-    protected getQueues: (cb: ICallback<void>) => void;
+    protected timestamp: number;
+    protected publishConsumerTimeSeries: (queue: TQueueParams, consumerId: string, cb: ICallback<void>) => void;
+    protected publishQueueTimeSeries: (queue: TQueueParams, cb: ICallback<void>) => void;
+    protected handleGlobalTimeSeries: (cb: ICallback<void>) => void;
+    protected handleConsumersTimeSeries: (cb: ICallback<void>) => void;
+    protected handleQueuesTimeSeries: (cb: ICallback<void>) => void;
     work: (cb: ICallback<void>) => void;
 }
 export default WebsocketRateStreamWorker;

package/dist/src/monitor-server/workers/websocket-rate-stream.worker.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebsocketRateStreamWorker = void 0;
 const redis_keys_1 = require("../../system/common/redis-keys/redis-keys");
 const consumer_heartbeat_1 = require("../../system/app/consumer/consumer-heartbeat");
-const time_series_1 = require("../../system/common/time-series/time-series");
 const queue_published_time_series_1 = require("../../system/app/producer/producer-time-series/queue-published-time-series");
 const queue_dead_lettered_time_series_1 = require("../../system/app/consumer/consumer-time-series/queue-dead-lettered-time-series");
 const queue_acknowledged_time_series_1 = require("../../system/app/consumer/consumer-time-series/queue-acknowledged-time-series");
@@ -18,110 +17,76 @@ const async_1 = require("../../system/lib/async");
 class WebsocketRateStreamWorker extends worker_1.Worker {
     constructor() {
         super(...arguments);
-        this.queueData = {};
-        this.tasks = [];
-        this.reset = () => {
-            this.queueData = {};
-            this.tasks = [];
+        this.timestamp = 0;
+        this.publishConsumerTimeSeries = (queue, consumerId, cb) => {
+            (0, async_1.waterfall)([
+                (cb) => (0, consumer_acknowledged_time_series_1.ConsumerAcknowledgedTimeSeries)(this.redisClient, consumerId).getRangeFrom(this.timestamp, (err, reply) => {
+                    if (err)
+                        cb(err);
+                    else {
+                        this.redisClient.publish(`streamConsumerAcknowledged:${consumerId}`, JSON.stringify(reply), () => cb());
+                    }
+                }),
+                (cb) => (0, consumer_dead_lettered_time_series_1.ConsumerDeadLetteredTimeSeries)(this.redisClient, consumerId).getRangeFrom(this.timestamp, (err, reply) => {
+                    if (err)
+                        cb(err);
+                    else {
+                        this.redisClient.publish(`streamConsumerDeadLettered:${consumerId}`, JSON.stringify(reply), () => cb());
+                    }
+                }),
+            ], cb);
         };
-        this.addConsumerTasks = (ts, queue, consumerId) => {
-            this.tasks.push((cb) => (0, consumer_acknowledged_time_series_1.ConsumerAcknowledgedTimeSeries)(this.redisClient, consumerId).getRangeFrom(ts, (err, reply) => {
-                if (err)
-                    cb(err);
-                else {
-                    this.redisClient.publish(`streamConsumerAcknowledged:${consumerId}`, JSON.stringify(reply), () => cb());
-                }
-            }));
-            this.tasks.push((cb) => (0, consumer_dead_lettered_time_series_1.ConsumerDeadLetteredTimeSeries)(this.redisClient, consumerId).getRangeFrom(ts, (err, reply) => {
-                if (err)
-                    cb(err);
-                else {
-                    this.redisClient.publish(`streamConsumerDeadLettered:${consumerId}`, JSON.stringify(reply), () => cb());
-                }
-            }));
-        };
-        this.addQueueTasks = (ts, queue) => {
-            this.tasks.push((cb) => (0, queue_acknowledged_time_series_1.QueueAcknowledgedTimeSeries)(this.redisClient, queue).getRangeFrom(ts, (err, reply) => {
-                if (err)
-                    cb(err);
-                else {
-                    this.redisClient.publish(`streamQueueAcknowledged:${queue.ns}:${queue.name}`, JSON.stringify(reply), () => cb());
-                }
-            }));
-            this.tasks.push((cb) => (0, queue_dead_lettered_time_series_1.QueueDeadLetteredTimeSeries)(this.redisClient, queue).getRangeFrom(ts, (err, reply) => {
-                if (err)
-                    cb(err);
-                else {
-                    this.redisClient.publish(`streamQueueDeadLettered:${queue.ns}:${queue.name}`, JSON.stringify(reply), () => cb());
-                }
-            }));
-            this.tasks.push((cb) => (0, queue_published_time_series_1.QueuePublishedTimeSeries)(this.redisClient, queue).getRangeFrom(ts, (err, reply) => {
-                if (err)
-                    cb(err);
-                else {
-                    this.redisClient.publish(`streamQueuePublished:${queue.ns}:${queue.name}`, JSON.stringify(reply), () => cb());
-                }
-            }));
-        };
-        this.addGlobalTasks = (ts) => {
-            this.tasks.push((cb) => (0, global_acknowledged_time_series_1.GlobalAcknowledgedTimeSeries)(this.redisClient).getRangeFrom(ts, (err, reply) => {
-                if (err)
-                    cb(err);
-                else {
-                    this.redisClient.publish('streamGlobalAcknowledged', JSON.stringify(reply), () => cb());
-                }
-            }));
-            this.tasks.push((cb) => (0, global_dead_lettered_time_series_1.GlobalDeadLetteredTimeSeries)(this.redisClient).getRangeFrom(ts, (err, reply) => {
-                if (err)
-                    cb(err);
-                else {
-                    this.redisClient.publish('streamGlobalDeadLettered', JSON.stringify(reply), () => cb());
-                }
-            }));
-            this.tasks.push((cb) => (0, global_published_time_series_1.GlobalPublishedTimeSeries)(this.redisClient).getRangeFrom(ts, (err, reply) => {
-                if (err)
-                    cb(err);
-                else {
-                    this.redisClient.publish('streamGlobalPublished', JSON.stringify(reply), () => cb());
-                }
-            }));
-        };
-        this.addQueue = (queue) => {
-            const { ns, name } = queue;
-            if (!this.queueData[ns]) {
-                this.queueData[ns] = {};
-            }
-            if (!this.queueData[ns][name]) {
-                this.queueData[ns][name] = {
-                    consumers: [],
-                };
-            }
-            return this.queueData[ns][name];
-        };
-        this.handleQueueConsumers = (ts, queue, consumers, cb) => {
-            (0, async_1.each)(consumers, (consumerId, _, done) => {
-                this.addConsumerTasks(ts, queue, consumerId);
-                done();
-            }, cb);
-        };
-        this.handleQueue = (ts, queue, queueProperties, cb) => {
-            const { consumers } = queueProperties;
-            this.addQueueTasks(ts, queue);
-            this.handleQueueConsumers(ts, queue, consumers, cb);
-        };
-        this.prepare = (cb) => {
-            const ts = time_series_1.TimeSeries.getCurrentTimestamp();
-            this.addGlobalTasks(ts);
-            (0, async_1.each)(this.queueData, (queues, ns, done) => {
-                (0, async_1.each)(queues, (queue, queueName, done) => {
-                    this.handleQueue(ts, { ns: String(ns), name: String(queueName) }, queue, done);
-                }, done);
-            }, cb);
+        this.publishQueueTimeSeries = (queue, cb) => {
+            (0, async_1.waterfall)([
+                (cb) => (0, queue_acknowledged_time_series_1.QueueAcknowledgedTimeSeries)(this.redisClient, queue).getRangeFrom(this.timestamp, (err, reply) => {
+                    if (err)
+                        cb(err);
+                    else {
+                        this.redisClient.publish(`streamQueueAcknowledged:${queue.ns}:${queue.name}`, JSON.stringify(reply), () => cb());
+                    }
+                }),
+                (cb) => (0, queue_dead_lettered_time_series_1.QueueDeadLetteredTimeSeries)(this.redisClient, queue).getRangeFrom(this.timestamp, (err, reply) => {
+                    if (err)
+                        cb(err);
+                    else {
+                        this.redisClient.publish(`streamQueueDeadLettered:${queue.ns}:${queue.name}`, JSON.stringify(reply), () => cb());
+                    }
+                }),
+                (cb) => (0, queue_published_time_series_1.QueuePublishedTimeSeries)(this.redisClient, queue).getRangeFrom(this.timestamp, (err, reply) => {
+                    if (err)
+                        cb(err);
+                    else {
+                        this.redisClient.publish(`streamQueuePublished:${queue.ns}:${queue.name}`, JSON.stringify(reply), () => cb());
+                    }
+                }),
+            ], cb);
         };
-        this.publish = (cb) => {
-            (0, async_1.waterfall)(this.tasks, cb);
+        this.handleGlobalTimeSeries = (cb) => {
+            (0, async_1.waterfall)([
+                (cb) => (0, global_acknowledged_time_series_1.GlobalAcknowledgedTimeSeries)(this.redisClient).getRangeFrom(this.timestamp, (err, reply) => {
+                    if (err)
+                        cb(err);
+                    else {
+                        this.redisClient.publish('streamGlobalAcknowledged', JSON.stringify(reply), () => cb());
+                    }
+                }),
+                (cb) => (0, global_dead_lettered_time_series_1.GlobalDeadLetteredTimeSeries)(this.redisClient).getRangeFrom(this.timestamp, (err, reply) => {
+                    if (err)
+                        cb(err);
+                    else {
+                        this.redisClient.publish('streamGlobalDeadLettered', JSON.stringify(reply), () => cb());
+                    }
+                }),
+                (cb) => (0, global_published_time_series_1.GlobalPublishedTimeSeries)(this.redisClient).getRangeFrom(this.timestamp, (err, reply) => {
+                    if (err)
+                        cb(err);
+                    else {
+                        this.redisClient.publish('streamGlobalPublished', JSON.stringify(reply), () => cb());
+                    }
+                }),
+            ], cb);
         };
-        this.consumersCount = (cb) => {
+        this.handleConsumersTimeSeries = (cb) => {
             consumer_heartbeat_1.ConsumerHeartbeat.getValidHeartbeatIds(this.redisClient, (err, reply) => {
                 if (err)
                     cb(err);
@@ -132,9 +97,7 @@ class WebsocketRateStreamWorker extends worker_1.Worker {
                                 done(err);
                             else {
                                 (0, async_1.each)(queues !== null && queues !== void 0 ? queues : [], (queueParams, _, done) => {
-                                    const queue = this.addQueue(queueParams);
-                                    queue.consumers.push(consumerId);
-                                    done();
+                                    this.publishConsumerTimeSeries(queueParams, consumerId, done);
                                 }, done);
                             }
                         });
@@ -142,7 +105,7 @@ class WebsocketRateStreamWorker extends worker_1.Worker {
                 }
             });
         };
-        this.getQueues = (cb) => {
+        this.handleQueuesTimeSeries = (cb) => {
             const { keyQueues } = redis_keys_1.redisKeys.getMainKeys();
             this.redisClient.smembers(keyQueues, (err, reply) => {
                 if (err)
@@ -150,15 +113,21 @@ class WebsocketRateStreamWorker extends worker_1.Worker {
                 else {
                     (0, async_1.each)(reply !== null && reply !== void 0 ? reply : [], (queueStr, index, done) => {
                         const queue = JSON.parse(queueStr);
-                        this.addQueue(queue);
-                        done();
+                        this.publishQueueTimeSeries(queue, done);
                     }, cb);
                 }
             });
         };
         this.work = (cb) => {
-            this.reset();
-            (0, async_1.waterfall)([this.getQueues, this.consumersCount, this.prepare, this.publish], cb);
+            if (!this.timestamp)
+                this.timestamp = Math.ceil(Date.now() / 1000);
+            else
+                this.timestamp += 1;
+            (0, async_1.waterfall)([
+                this.handleGlobalTimeSeries,
+                this.handleQueuesTimeSeries,
+                this.handleConsumersTimeSeries,
+            ], cb);
         };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redis-smq",
-  "version": "7.0.0-rc.1",
+  "version": "7.0.0-rc.2",
   "description": "A simple high-performance Redis message queue for Node.js.",
   "author": "Weyoss <weyoss@protonmail.com>",
   "license": "MIT",