redis-smq 9.0.6-next.0 → 9.0.6-next.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +22 -0
- package/dist/cjs/src/common/redis/redis-client/scripts/lua/clear-queue-rate-limit.lua +36 -0
- package/dist/cjs/src/common/redis/redis-client/scripts/scripts.d.ts +2 -1
- package/dist/cjs/src/common/redis/redis-client/scripts/scripts.d.ts.map +1 -1
- package/dist/cjs/src/common/redis/redis-client/scripts/scripts.js +2 -0
- package/dist/cjs/src/common/redis/redis-client/scripts/scripts.js.map +1 -1
- package/dist/cjs/src/config/configuration.d.ts +18 -9
- package/dist/cjs/src/config/configuration.d.ts.map +1 -1
- package/dist/cjs/src/config/configuration.js +190 -88
- package/dist/cjs/src/config/configuration.js.map +1 -1
- package/dist/cjs/src/consumer/consumer-heartbeat/consumer-heartbeat.d.ts.map +1 -1
- package/dist/cjs/src/consumer/consumer-heartbeat/consumer-heartbeat.js +3 -10
- package/dist/cjs/src/consumer/consumer-heartbeat/consumer-heartbeat.js.map +1 -1
- package/dist/cjs/src/consumer/consumer-heartbeat/event-publisher.d.ts +3 -0
- package/dist/cjs/src/consumer/consumer-heartbeat/event-publisher.d.ts.map +1 -0
- package/dist/cjs/src/consumer/consumer-heartbeat/event-publisher.js +8 -0
- package/dist/cjs/src/consumer/consumer-heartbeat/event-publisher.js.map +1 -0
- package/dist/cjs/src/consumer/consumer.d.ts.map +1 -1
- package/dist/cjs/src/consumer/consumer.js +3 -9
- package/dist/cjs/src/consumer/consumer.js.map +1 -1
- package/dist/cjs/src/consumer/event-publisher.d.ts +3 -0
- package/dist/cjs/src/consumer/event-publisher.d.ts.map +1 -0
- package/dist/cjs/src/consumer/event-publisher.js +12 -0
- package/dist/cjs/src/consumer/event-publisher.js.map +1 -0
- package/dist/cjs/src/consumer/message-handler/consume-message/consume-message.d.ts.map +1 -1
- package/dist/cjs/src/consumer/message-handler/consume-message/consume-message.js +3 -8
- package/dist/cjs/src/consumer/message-handler/consume-message/consume-message.js.map +1 -1
- package/dist/cjs/src/consumer/message-handler/consume-message/event-publisher.d.ts +3 -0
- package/dist/cjs/src/consumer/message-handler/consume-message/event-publisher.d.ts.map +1 -0
- package/dist/cjs/src/consumer/message-handler/consume-message/event-publisher.js +14 -0
- package/dist/cjs/src/consumer/message-handler/consume-message/event-publisher.js.map +1 -0
- package/dist/cjs/src/consumer/message-handler/dequeue-message/dequeue-message.d.ts.map +1 -1
- package/dist/cjs/src/consumer/message-handler/dequeue-message/dequeue-message.js +2 -4
- package/dist/cjs/src/consumer/message-handler/dequeue-message/dequeue-message.js.map +1 -1
- package/dist/cjs/src/consumer/message-handler/dequeue-message/event-publisher.d.ts +3 -0
- package/dist/cjs/src/consumer/message-handler/dequeue-message/event-publisher.d.ts.map +1 -0
- package/dist/cjs/src/consumer/message-handler/dequeue-message/event-publisher.js +11 -0
- package/dist/cjs/src/consumer/message-handler/dequeue-message/event-publisher.js.map +1 -0
- package/dist/cjs/src/consumer/message-handler/message-handler.d.ts.map +1 -1
- package/dist/cjs/src/consumer/message-handler/message-handler.js +1 -3
- package/dist/cjs/src/consumer/message-handler/message-handler.js.map +1 -1
- package/dist/cjs/src/consumer/message-handler-runner/event-publisher.d.ts +3 -0
- package/dist/cjs/src/consumer/message-handler-runner/event-publisher.d.ts.map +1 -0
- package/dist/cjs/src/consumer/message-handler-runner/event-publisher.js +8 -0
- package/dist/cjs/src/consumer/message-handler-runner/event-publisher.js.map +1 -0
- package/dist/cjs/src/consumer/message-handler-runner/message-handler-runner.d.ts.map +1 -1
- package/dist/cjs/src/consumer/message-handler-runner/message-handler-runner.js +2 -4
- package/dist/cjs/src/consumer/message-handler-runner/message-handler-runner.js.map +1 -1
- package/dist/cjs/src/consumer-groups/_/_delete-consumer-group.d.ts +2 -3
- package/dist/cjs/src/consumer-groups/_/_delete-consumer-group.d.ts.map +1 -1
- package/dist/cjs/src/consumer-groups/_/_delete-consumer-group.js +3 -2
- package/dist/cjs/src/consumer-groups/_/_delete-consumer-group.js.map +1 -1
- package/dist/cjs/src/consumer-groups/_/_save-consumer-group.d.ts +2 -3
- package/dist/cjs/src/consumer-groups/_/_save-consumer-group.d.ts.map +1 -1
- package/dist/cjs/src/consumer-groups/_/_save-consumer-group.js +3 -2
- package/dist/cjs/src/consumer-groups/_/_save-consumer-group.js.map +1 -1
- package/dist/cjs/src/consumer-groups/consumer-groups.d.ts +1 -5
- package/dist/cjs/src/consumer-groups/consumer-groups.d.ts.map +1 -1
- package/dist/cjs/src/consumer-groups/consumer-groups.js +13 -47
- package/dist/cjs/src/consumer-groups/consumer-groups.js.map +1 -1
- package/dist/cjs/src/event-bus/event-bus.d.ts.map +1 -1
- package/dist/cjs/src/event-bus/event-bus.js +5 -2
- package/dist/cjs/src/event-bus/event-bus.js.map +1 -1
- package/dist/cjs/src/event-bus/event-multiplexer.d.ts +15 -0
- package/dist/cjs/src/event-bus/event-multiplexer.d.ts.map +1 -0
- package/dist/cjs/src/event-bus/event-multiplexer.js +46 -0
- package/dist/cjs/src/event-bus/event-multiplexer.js.map +1 -0
- package/dist/cjs/src/event-bus/event-routing-policies.d.ts +3 -0
- package/dist/cjs/src/event-bus/event-routing-policies.d.ts.map +1 -0
- package/dist/cjs/src/event-bus/event-routing-policies.js +11 -0
- package/dist/cjs/src/event-bus/event-routing-policies.js.map +1 -0
- package/dist/cjs/src/event-bus/internal-event-bus.d.ts +9 -0
- package/dist/cjs/src/event-bus/internal-event-bus.d.ts.map +1 -0
- package/dist/cjs/src/event-bus/internal-event-bus.js +26 -0
- package/dist/cjs/src/event-bus/internal-event-bus.js.map +1 -0
- package/dist/cjs/src/event-bus/types/index.d.ts +8 -0
- package/dist/cjs/src/event-bus/types/index.d.ts.map +1 -0
- package/dist/cjs/src/event-bus/types/index.js +10 -0
- package/dist/cjs/src/event-bus/types/index.js.map +1 -0
- package/dist/cjs/src/producer/event-publisher.d.ts +3 -0
- package/dist/cjs/src/producer/event-publisher.d.ts.map +1 -0
- package/dist/cjs/src/producer/event-publisher.js +13 -0
- package/dist/cjs/src/producer/event-publisher.js.map +1 -0
- package/dist/cjs/src/producer/producer.d.ts.map +1 -1
- package/dist/cjs/src/producer/producer.js +3 -8
- package/dist/cjs/src/producer/producer.js.map +1 -1
- package/dist/cjs/src/producer/pub-sub-target-resolver.d.ts +2 -2
- package/dist/cjs/src/producer/pub-sub-target-resolver.d.ts.map +1 -1
- package/dist/cjs/src/producer/pub-sub-target-resolver.js +12 -24
- package/dist/cjs/src/producer/pub-sub-target-resolver.js.map +1 -1
- package/dist/cjs/src/queue-manager/queue-manager.d.ts +1 -5
- package/dist/cjs/src/queue-manager/queue-manager.d.ts.map +1 -1
- package/dist/cjs/src/queue-manager/queue-manager.js +8 -51
- package/dist/cjs/src/queue-manager/queue-manager.js.map +1 -1
- package/dist/cjs/src/queue-rate-limit/queue-rate-limit.d.ts.map +1 -1
- package/dist/cjs/src/queue-rate-limit/queue-rate-limit.js +9 -4
- package/dist/cjs/src/queue-rate-limit/queue-rate-limit.js.map +1 -1
- package/dist/cjs/src/redis-smq.d.ts +10 -6
- package/dist/cjs/src/redis-smq.d.ts.map +1 -1
- package/dist/cjs/src/redis-smq.js +162 -80
- package/dist/cjs/src/redis-smq.js.map +1 -1
- package/dist/esm/src/common/redis/redis-client/scripts/lua/clear-queue-rate-limit.lua +36 -0
- package/dist/esm/src/common/redis/redis-client/scripts/scripts.d.ts +2 -1
- package/dist/esm/src/common/redis/redis-client/scripts/scripts.d.ts.map +1 -1
- package/dist/esm/src/common/redis/redis-client/scripts/scripts.js +2 -0
- package/dist/esm/src/common/redis/redis-client/scripts/scripts.js.map +1 -1
- package/dist/esm/src/config/configuration.d.ts +18 -9
- package/dist/esm/src/config/configuration.d.ts.map +1 -1
- package/dist/esm/src/config/configuration.js +193 -87
- package/dist/esm/src/config/configuration.js.map +1 -1
- package/dist/esm/src/consumer/consumer-heartbeat/consumer-heartbeat.d.ts.map +1 -1
- package/dist/esm/src/consumer/consumer-heartbeat/consumer-heartbeat.js +3 -10
- package/dist/esm/src/consumer/consumer-heartbeat/consumer-heartbeat.js.map +1 -1
- package/dist/esm/src/consumer/consumer-heartbeat/event-publisher.d.ts +3 -0
- package/dist/esm/src/consumer/consumer-heartbeat/event-publisher.d.ts.map +1 -0
- package/dist/esm/src/consumer/consumer-heartbeat/event-publisher.js +5 -0
- package/dist/esm/src/consumer/consumer-heartbeat/event-publisher.js.map +1 -0
- package/dist/esm/src/consumer/consumer.d.ts.map +1 -1
- package/dist/esm/src/consumer/consumer.js +3 -9
- package/dist/esm/src/consumer/consumer.js.map +1 -1
- package/dist/esm/src/consumer/event-publisher.d.ts +3 -0
- package/dist/esm/src/consumer/event-publisher.d.ts.map +1 -0
- package/dist/esm/src/consumer/event-publisher.js +9 -0
- package/dist/esm/src/consumer/event-publisher.js.map +1 -0
- package/dist/esm/src/consumer/message-handler/consume-message/consume-message.d.ts.map +1 -1
- package/dist/esm/src/consumer/message-handler/consume-message/consume-message.js +3 -8
- package/dist/esm/src/consumer/message-handler/consume-message/consume-message.js.map +1 -1
- package/dist/esm/src/consumer/message-handler/consume-message/event-publisher.d.ts +3 -0
- package/dist/esm/src/consumer/message-handler/consume-message/event-publisher.d.ts.map +1 -0
- package/dist/esm/src/consumer/message-handler/consume-message/event-publisher.js +11 -0
- package/dist/esm/src/consumer/message-handler/consume-message/event-publisher.js.map +1 -0
- package/dist/esm/src/consumer/message-handler/dequeue-message/dequeue-message.d.ts.map +1 -1
- package/dist/esm/src/consumer/message-handler/dequeue-message/dequeue-message.js +2 -4
- package/dist/esm/src/consumer/message-handler/dequeue-message/dequeue-message.js.map +1 -1
- package/dist/esm/src/consumer/message-handler/dequeue-message/event-publisher.d.ts +3 -0
- package/dist/esm/src/consumer/message-handler/dequeue-message/event-publisher.d.ts.map +1 -0
- package/dist/esm/src/consumer/message-handler/dequeue-message/event-publisher.js +8 -0
- package/dist/esm/src/consumer/message-handler/dequeue-message/event-publisher.js.map +1 -0
- package/dist/esm/src/consumer/message-handler/message-handler.d.ts.map +1 -1
- package/dist/esm/src/consumer/message-handler/message-handler.js +1 -3
- package/dist/esm/src/consumer/message-handler/message-handler.js.map +1 -1
- package/dist/esm/src/consumer/message-handler-runner/event-publisher.d.ts +3 -0
- package/dist/esm/src/consumer/message-handler-runner/event-publisher.d.ts.map +1 -0
- package/dist/esm/src/consumer/message-handler-runner/event-publisher.js +5 -0
- package/dist/esm/src/consumer/message-handler-runner/event-publisher.js.map +1 -0
- package/dist/esm/src/consumer/message-handler-runner/message-handler-runner.d.ts.map +1 -1
- package/dist/esm/src/consumer/message-handler-runner/message-handler-runner.js +2 -4
- package/dist/esm/src/consumer/message-handler-runner/message-handler-runner.js.map +1 -1
- package/dist/esm/src/consumer-groups/_/_delete-consumer-group.d.ts +2 -3
- package/dist/esm/src/consumer-groups/_/_delete-consumer-group.d.ts.map +1 -1
- package/dist/esm/src/consumer-groups/_/_delete-consumer-group.js +3 -2
- package/dist/esm/src/consumer-groups/_/_delete-consumer-group.js.map +1 -1
- package/dist/esm/src/consumer-groups/_/_save-consumer-group.d.ts +2 -3
- package/dist/esm/src/consumer-groups/_/_save-consumer-group.d.ts.map +1 -1
- package/dist/esm/src/consumer-groups/_/_save-consumer-group.js +3 -2
- package/dist/esm/src/consumer-groups/_/_save-consumer-group.js.map +1 -1
- package/dist/esm/src/consumer-groups/consumer-groups.d.ts +1 -5
- package/dist/esm/src/consumer-groups/consumer-groups.d.ts.map +1 -1
- package/dist/esm/src/consumer-groups/consumer-groups.js +14 -49
- package/dist/esm/src/consumer-groups/consumer-groups.js.map +1 -1
- package/dist/esm/src/event-bus/event-bus.d.ts.map +1 -1
- package/dist/esm/src/event-bus/event-bus.js +5 -2
- package/dist/esm/src/event-bus/event-bus.js.map +1 -1
- package/dist/esm/src/event-bus/event-multiplexer.d.ts +15 -0
- package/dist/esm/src/event-bus/event-multiplexer.d.ts.map +1 -0
- package/dist/esm/src/event-bus/event-multiplexer.js +43 -0
- package/dist/esm/src/event-bus/event-multiplexer.js.map +1 -0
- package/dist/esm/src/event-bus/event-routing-policies.d.ts +3 -0
- package/dist/esm/src/event-bus/event-routing-policies.d.ts.map +1 -0
- package/dist/esm/src/event-bus/event-routing-policies.js +8 -0
- package/dist/esm/src/event-bus/event-routing-policies.js.map +1 -0
- package/dist/esm/src/event-bus/internal-event-bus.d.ts +9 -0
- package/dist/esm/src/event-bus/internal-event-bus.d.ts.map +1 -0
- package/dist/esm/src/event-bus/internal-event-bus.js +22 -0
- package/dist/esm/src/event-bus/internal-event-bus.js.map +1 -0
- package/dist/esm/src/event-bus/types/index.d.ts +8 -0
- package/dist/esm/src/event-bus/types/index.d.ts.map +1 -0
- package/dist/esm/src/event-bus/types/index.js +7 -0
- package/dist/esm/src/event-bus/types/index.js.map +1 -0
- package/dist/esm/src/producer/event-publisher.d.ts +3 -0
- package/dist/esm/src/producer/event-publisher.d.ts.map +1 -0
- package/dist/esm/src/producer/event-publisher.js +10 -0
- package/dist/esm/src/producer/event-publisher.js.map +1 -0
- package/dist/esm/src/producer/producer.d.ts.map +1 -1
- package/dist/esm/src/producer/producer.js +3 -8
- package/dist/esm/src/producer/producer.js.map +1 -1
- package/dist/esm/src/producer/pub-sub-target-resolver.d.ts +2 -2
- package/dist/esm/src/producer/pub-sub-target-resolver.d.ts.map +1 -1
- package/dist/esm/src/producer/pub-sub-target-resolver.js +14 -26
- package/dist/esm/src/producer/pub-sub-target-resolver.js.map +1 -1
- package/dist/esm/src/queue-manager/queue-manager.d.ts +1 -5
- package/dist/esm/src/queue-manager/queue-manager.d.ts.map +1 -1
- package/dist/esm/src/queue-manager/queue-manager.js +10 -54
- package/dist/esm/src/queue-manager/queue-manager.js.map +1 -1
- package/dist/esm/src/queue-rate-limit/queue-rate-limit.d.ts.map +1 -1
- package/dist/esm/src/queue-rate-limit/queue-rate-limit.js +10 -5
- package/dist/esm/src/queue-rate-limit/queue-rate-limit.js.map +1 -1
- package/dist/esm/src/redis-smq.d.ts +10 -6
- package/dist/esm/src/redis-smq.d.ts.map +1 -1
- package/dist/esm/src/redis-smq.js +163 -81
- package/dist/esm/src/redis-smq.js.map +1 -1
- package/package.json +2 -2
- package/dist/cjs/src/consumer/consumer-heartbeat/event-bus-publisher.d.ts +0 -3
- package/dist/cjs/src/consumer/consumer-heartbeat/event-bus-publisher.d.ts.map +0 -1
- package/dist/cjs/src/consumer/consumer-heartbeat/event-bus-publisher.js +0 -12
- package/dist/cjs/src/consumer/consumer-heartbeat/event-bus-publisher.js.map +0 -1
- package/dist/cjs/src/consumer/event-bus-publisher/event-bus-publisher.d.ts +0 -3
- package/dist/cjs/src/consumer/event-bus-publisher/event-bus-publisher.d.ts.map +0 -1
- package/dist/cjs/src/consumer/event-bus-publisher/event-bus-publisher.js +0 -32
- package/dist/cjs/src/consumer/event-bus-publisher/event-bus-publisher.js.map +0 -1
- package/dist/cjs/src/consumer/message-handler/consume-message/event-bus-publisher.d.ts +0 -3
- package/dist/cjs/src/consumer/message-handler/consume-message/event-bus-publisher.d.ts.map +0 -1
- package/dist/cjs/src/consumer/message-handler/consume-message/event-bus-publisher.js +0 -38
- package/dist/cjs/src/consumer/message-handler/consume-message/event-bus-publisher.js.map +0 -1
- package/dist/cjs/src/consumer/message-handler/dequeue-message/event-bus-publisher.d.ts +0 -3
- package/dist/cjs/src/consumer/message-handler/dequeue-message/event-bus-publisher.d.ts.map +0 -1
- package/dist/cjs/src/consumer/message-handler/dequeue-message/event-bus-publisher.js +0 -23
- package/dist/cjs/src/consumer/message-handler/dequeue-message/event-bus-publisher.js.map +0 -1
- package/dist/cjs/src/consumer/message-handler-runner/event-bus-publisher.d.ts +0 -3
- package/dist/cjs/src/consumer/message-handler-runner/event-bus-publisher.d.ts.map +0 -1
- package/dist/cjs/src/consumer/message-handler-runner/event-bus-publisher.js +0 -12
- package/dist/cjs/src/consumer/message-handler-runner/event-bus-publisher.js.map +0 -1
- package/dist/cjs/src/producer/event-bus-publisher.d.ts +0 -3
- package/dist/cjs/src/producer/event-bus-publisher.d.ts.map +0 -1
- package/dist/cjs/src/producer/event-bus-publisher.js +0 -37
- package/dist/cjs/src/producer/event-bus-publisher.js.map +0 -1
- package/dist/esm/src/consumer/consumer-heartbeat/event-bus-publisher.d.ts +0 -3
- package/dist/esm/src/consumer/consumer-heartbeat/event-bus-publisher.d.ts.map +0 -1
- package/dist/esm/src/consumer/consumer-heartbeat/event-bus-publisher.js +0 -9
- package/dist/esm/src/consumer/consumer-heartbeat/event-bus-publisher.js.map +0 -1
- package/dist/esm/src/consumer/event-bus-publisher/event-bus-publisher.d.ts +0 -3
- package/dist/esm/src/consumer/event-bus-publisher/event-bus-publisher.d.ts.map +0 -1
- package/dist/esm/src/consumer/event-bus-publisher/event-bus-publisher.js +0 -29
- package/dist/esm/src/consumer/event-bus-publisher/event-bus-publisher.js.map +0 -1
- package/dist/esm/src/consumer/message-handler/consume-message/event-bus-publisher.d.ts +0 -3
- package/dist/esm/src/consumer/message-handler/consume-message/event-bus-publisher.d.ts.map +0 -1
- package/dist/esm/src/consumer/message-handler/consume-message/event-bus-publisher.js +0 -35
- package/dist/esm/src/consumer/message-handler/consume-message/event-bus-publisher.js.map +0 -1
- package/dist/esm/src/consumer/message-handler/dequeue-message/event-bus-publisher.d.ts +0 -3
- package/dist/esm/src/consumer/message-handler/dequeue-message/event-bus-publisher.d.ts.map +0 -1
- package/dist/esm/src/consumer/message-handler/dequeue-message/event-bus-publisher.js +0 -20
- package/dist/esm/src/consumer/message-handler/dequeue-message/event-bus-publisher.js.map +0 -1
- package/dist/esm/src/consumer/message-handler-runner/event-bus-publisher.d.ts +0 -3
- package/dist/esm/src/consumer/message-handler-runner/event-bus-publisher.d.ts.map +0 -1
- package/dist/esm/src/consumer/message-handler-runner/event-bus-publisher.js +0 -9
- package/dist/esm/src/consumer/message-handler-runner/event-bus-publisher.js.map +0 -1
- package/dist/esm/src/producer/event-bus-publisher.d.ts +0 -3
- package/dist/esm/src/producer/event-bus-publisher.d.ts.map +0 -1
- package/dist/esm/src/producer/event-bus-publisher.js +0 -34
- package/dist/esm/src/producer/event-bus-publisher.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,28 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [9.0.6-next.2](https://github.com/weyoss/redis-smq/compare/v9.0.6-next.1...v9.0.6-next.2) (2025-12-26)
|
|
7
|
+
|
|
8
|
+
### 📝 Documentation
|
|
9
|
+
|
|
10
|
+
- **redis-smq:** update class refs ([369621c](https://github.com/weyoss/redis-smq/commit/369621cbc5a5e78b6af4f8d3ed58f8623dc7dbac))
|
|
11
|
+
|
|
12
|
+
### ♻️ Code Refactoring
|
|
13
|
+
|
|
14
|
+
- **redis-smq:** introduce InternalEventBus for system communication ([ff0a0e9](https://github.com/weyoss/redis-smq/commit/ff0a0e96bbcb4c29677d07edb83cc5168a4c81de))
|
|
15
|
+
|
|
16
|
+
## [9.0.6-next.1](https://github.com/weyoss/redis-smq/compare/v9.0.6-next.0...v9.0.6-next.1) (2025-12-25)
|
|
17
|
+
|
|
18
|
+
### 🐛 Bug Fixes
|
|
19
|
+
|
|
20
|
+
- **redis-smq:** resolve config persistence issue in test environment ([0ce29e8](https://github.com/weyoss/redis-smq/commit/0ce29e8e888d599a3268b8a599720528448e333e))
|
|
21
|
+
|
|
22
|
+
### ♻️ Code Refactoring
|
|
23
|
+
|
|
24
|
+
- **redis-smq:** convert Configuration class to an enum-driven state machine ([50b53d4](https://github.com/weyoss/redis-smq/commit/50b53d4d97bec42fe4ed736bee32cfb4660720fd))
|
|
25
|
+
- **redis-smq:** convert RedisSMQ class to an enum-driven state machine ([4ac8268](https://github.com/weyoss/redis-smq/commit/4ac82681d9f6bbfad0444de656c27683e75c0349))
|
|
26
|
+
- **redis-smq:** migrate queue rate limit setup to Lua ([eef5903](https://github.com/weyoss/redis-smq/commit/eef590347a13c8f33bcbdac77551758d05009c67))
|
|
27
|
+
|
|
6
28
|
## [9.0.6-next.0](https://github.com/weyoss/redis-smq/compare/v9.0.5...v9.0.6-next.0) (2025-12-19)
|
|
7
29
|
|
|
8
30
|
### 🐛 Bug Fixes
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
--
|
|
2
|
+
-- Copyright (c)
|
|
3
|
+
-- Weyoss <weyoss@outlook.com>
|
|
4
|
+
-- https://github.com/weyoss
|
|
5
|
+
--
|
|
6
|
+
-- This source code is licensed under the MIT license found in the LICENSE file
|
|
7
|
+
-- in the root directory of this source tree.
|
|
8
|
+
--
|
|
9
|
+
-- Description:
|
|
10
|
+
-- Atomically clears the rate limit for a queue by removing its
|
|
11
|
+
-- configuration from the queue properties and deleting its counter.
|
|
12
|
+
--
|
|
13
|
+
-- Arguments:
|
|
14
|
+
-- KEYS[1]: The key for the queue properties hash.
|
|
15
|
+
-- KEYS[2]: The key for the queue rate limit counter.
|
|
16
|
+
--
|
|
17
|
+
-- ARGV[1]: The field name of the rate limit property to be deleted from the hash (e.g., 'rateLimit').
|
|
18
|
+
--
|
|
19
|
+
-- Returns:
|
|
20
|
+
-- OK: Success.
|
|
21
|
+
-- QUEUE_NOT_FOUND: Queue not found.
|
|
22
|
+
--
|
|
23
|
+
|
|
24
|
+
local keyQueueProperties = KEYS[1]
|
|
25
|
+
local keyQueueRateLimitCounter = KEYS[2]
|
|
26
|
+
|
|
27
|
+
local keyQueuePropertiesRateLimit = ARGV[1]
|
|
28
|
+
|
|
29
|
+
if redis.call("EXISTS", keyQueueProperties) == 0 then
|
|
30
|
+
return 'QUEUE_NOT_FOUND'
|
|
31
|
+
end
|
|
32
|
+
|
|
33
|
+
redis.call('HDEL', keyQueueProperties, keyQueuePropertiesRateLimit)
|
|
34
|
+
redis.call('DEL', keyQueueRateLimitCounter)
|
|
35
|
+
|
|
36
|
+
return 'OK'
|
|
@@ -13,7 +13,8 @@ export declare enum ELuaScriptName {
|
|
|
13
13
|
CHECKOUT_MESSAGE = "CHECKOUT_MESSAGE",
|
|
14
14
|
DELETE_CONSUMER_GROUP = "DELETE_CONSUMER_GROUP",
|
|
15
15
|
SET_QUEUE_RATE_LIMIT = "SET_QUEUE_RATE_LIMIT",
|
|
16
|
-
DELETE_QUEUE = "DELETE_QUEUE"
|
|
16
|
+
DELETE_QUEUE = "DELETE_QUEUE",
|
|
17
|
+
CLEAR_QUEUE_RATE_LIMIT = "CLEAR_QUEUE_RATE_LIMIT"
|
|
17
18
|
}
|
|
18
19
|
export declare const scriptFileMap: Record<ELuaScriptName, string | string[]>;
|
|
19
20
|
//# sourceMappingURL=scripts.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scripts.d.ts","sourceRoot":"","sources":["../../../../../../../src/common/redis/redis-client/scripts/scripts.ts"],"names":[],"mappings":"AAYA,oBAAY,cAAc;IACxB,iBAAiB,sBAAsB;IACvC,eAAe,oBAAoB;IACnC,eAAe,oBAAoB;IACnC,iBAAiB,sBAAsB;IACvC,eAAe,oBAAoB;IACnC,sBAAsB,2BAA2B;IACjD,YAAY,iBAAiB;IAC7B,kBAAkB,uBAAuB;IACzC,qBAAqB,0BAA0B;IAC/C,mBAAmB,wBAAwB;IAC3C,cAAc,mBAAmB;IACjC,gBAAgB,qBAAqB;IACrC,qBAAqB,0BAA0B;IAC/C,oBAAoB,yBAAyB;IAC7C,YAAY,iBAAiB;
|
|
1
|
+
{"version":3,"file":"scripts.d.ts","sourceRoot":"","sources":["../../../../../../../src/common/redis/redis-client/scripts/scripts.ts"],"names":[],"mappings":"AAYA,oBAAY,cAAc;IACxB,iBAAiB,sBAAsB;IACvC,eAAe,oBAAoB;IACnC,eAAe,oBAAoB;IACnC,iBAAiB,sBAAsB;IACvC,eAAe,oBAAoB;IACnC,sBAAsB,2BAA2B;IACjD,YAAY,iBAAiB;IAC7B,kBAAkB,uBAAuB;IACzC,qBAAqB,0BAA0B;IAC/C,mBAAmB,wBAAwB;IAC3C,cAAc,mBAAmB;IACjC,gBAAgB,qBAAqB;IACrC,qBAAqB,0BAA0B;IAC/C,oBAAoB,yBAAyB;IAC7C,YAAY,iBAAiB;IAC7B,sBAAsB,2BAA2B;CAClD;AAID,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,EAAE,CAwDnE,CAAC"}
|
|
@@ -20,6 +20,7 @@ var ELuaScriptName;
|
|
|
20
20
|
ELuaScriptName["DELETE_CONSUMER_GROUP"] = "DELETE_CONSUMER_GROUP";
|
|
21
21
|
ELuaScriptName["SET_QUEUE_RATE_LIMIT"] = "SET_QUEUE_RATE_LIMIT";
|
|
22
22
|
ELuaScriptName["DELETE_QUEUE"] = "DELETE_QUEUE";
|
|
23
|
+
ELuaScriptName["CLEAR_QUEUE_RATE_LIMIT"] = "CLEAR_QUEUE_RATE_LIMIT";
|
|
23
24
|
})(ELuaScriptName || (exports.ELuaScriptName = ELuaScriptName = {}));
|
|
24
25
|
const dirname = redis_smq_common_1.env.getCurrentDir();
|
|
25
26
|
exports.scriptFileMap = {
|
|
@@ -47,5 +48,6 @@ exports.scriptFileMap = {
|
|
|
47
48
|
[ELuaScriptName.CHECK_QUEUE_RATE_LIMIT]: (0, path_1.resolve)(dirname, './lua/check-queue-rate-limit.lua'),
|
|
48
49
|
[ELuaScriptName.SET_QUEUE_RATE_LIMIT]: (0, path_1.resolve)(dirname, './lua/set-queue-rate-limit.lua'),
|
|
49
50
|
[ELuaScriptName.DELETE_QUEUE]: (0, path_1.resolve)(dirname, './lua/delete-queue.lua'),
|
|
51
|
+
[ELuaScriptName.CLEAR_QUEUE_RATE_LIMIT]: (0, path_1.resolve)(dirname, './lua/clear-queue-rate-limit.lua'),
|
|
50
52
|
};
|
|
51
53
|
//# sourceMappingURL=scripts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../../../../src/common/redis/redis-client/scripts/scripts.ts"],"names":[],"mappings":";;;AASA,+BAA+B;AAC/B,uDAAuC;AAEvC,IAAY,
|
|
1
|
+
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../../../../src/common/redis/redis-client/scripts/scripts.ts"],"names":[],"mappings":";;;AASA,+BAA+B;AAC/B,uDAAuC;AAEvC,IAAY,cAiBX;AAjBD,WAAY,cAAc;IACxB,yDAAuC,CAAA;IACvC,qDAAmC,CAAA;IACnC,qDAAmC,CAAA;IACnC,yDAAuC,CAAA;IACvC,qDAAmC,CAAA;IACnC,mEAAiD,CAAA;IACjD,+CAA6B,CAAA;IAC7B,2DAAyC,CAAA;IACzC,iEAA+C,CAAA;IAC/C,6DAA2C,CAAA;IAC3C,mDAAiC,CAAA;IACjC,uDAAqC,CAAA;IACrC,iEAA+C,CAAA;IAC/C,+DAA6C,CAAA;IAC7C,+CAA6B,CAAA;IAC7B,mEAAiD,CAAA;AACnD,CAAC,EAjBW,cAAc,8BAAd,cAAc,QAiBzB;AAED,MAAM,OAAO,GAAG,sBAAG,CAAC,aAAa,EAAE,CAAC;AAEvB,QAAA,aAAa,GAA8C;IACtE,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAE;QAClC,IAAA,cAAO,EAAC,OAAO,EAAE,6CAA6C,CAAC;QAC/D,IAAA,cAAO,EAAC,OAAO,EAAE,6BAA6B,CAAC;KAChD;IACD,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE;QAChC,IAAA,cAAO,EAAC,OAAO,EAAE,6CAA6C,CAAC;QAC/D,IAAA,cAAO,EAAC,OAAO,EAAE,2BAA2B,CAAC;KAC9C;IACD,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE;QAChC,IAAA,cAAO,EAAC,OAAO,EAAE,6CAA6C,CAAC;QAC/D,IAAA,cAAO,EAAC,OAAO,EAAE,2BAA2B,CAAC;KAC9C;IACD,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAE,IAAA,cAAO,EACzC,OAAO,EACP,6BAA6B,CAC9B;IACD,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,IAAA,cAAO,EACvC,OAAO,EACP,2BAA2B,CAC5B;IACD,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE,IAAA,cAAO,EAAC,OAAO,EAAE,wBAAwB,CAAC;IACzE,CAAC,cAAc,CAAC,kBAAkB,CAAC,EAAE,IAAA,cAAO,EAC1C,OAAO,EACP,8BAA8B,CAC/B;IACD,CAAC,cAAc,CAAC,qBAAqB,CAAC,EAAE,IAAA,cAAO,EAC7C,OAAO,EACP,iCAAiC,CAClC;IACD,CAAC,cAAc,CAAC,mBAAmB,CAAC,EAAE,IAAA,cAAO,EAC3C,OAAO,EACP,+BAA+B,CAChC;IACD,CAAC,cAAc,CAAC,cAAc,CAAC,EAAE,IAAA,cAAO,EAAC,OAAO,EAAE,0BAA0B,CAAC;IAC7E,CAAC,cAAc,CAAC,gBAAgB,CAAC,EAAE,IAAA,cAAO,EACxC,OAAO,EACP,4BAA4B,CAC7B;IACD,CAAC,cAAc,CAAC,qBAAqB,CAAC,EAAE,IAAA,cAAO,EAC7C,OAAO,EACP,iCAAiC,CAClC;IACD,CAAC,cAAc,CAAC,sBAAsB,CAAC,EAAE,IAAA,cAAO,EAC9C,OAAO,EACP,kCAAkC,CACnC;IACD,CAAC,cAAc,CAAC,oBAAoB,CAAC,EAAE,IAAA,cAAO,EAC5C,OAAO,EACP,gCAAgC,CACjC;IACD,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE,IAAA,cAAO,EAAC,OAAO,EAAE,wBAAwB,CAAC;IACzE,CAAC,cAAc,CAAC,sBAAsB,CAAC,EAAE,IAAA,cAAO,EAC9C,OAAO,EACP,kCAAkC,CACnC;CACF,CAAC"}
|
|
@@ -1,21 +1,30 @@
|
|
|
1
|
-
import { ICallback } from 'redis-smq-common';
|
|
1
|
+
import { ICallback, PowerSwitch } from 'redis-smq-common';
|
|
2
2
|
import { IRedisSMQConfig, IRedisSMQParsedConfig } from './types/index.js';
|
|
3
3
|
export declare class Configuration {
|
|
4
4
|
protected static instance: Configuration | null;
|
|
5
|
+
protected static state: PowerSwitch;
|
|
6
|
+
protected static initializationQueue: Array<ICallback>;
|
|
7
|
+
protected operationInProgress: boolean;
|
|
8
|
+
protected operationQueue: Array<() => void>;
|
|
9
|
+
protected completionWaiters: Array<ICallback>;
|
|
5
10
|
protected config: IRedisSMQParsedConfig;
|
|
6
11
|
protected constructor();
|
|
12
|
+
private static validateInitializationState;
|
|
13
|
+
private static completeInitialization;
|
|
14
|
+
private static performInitialization;
|
|
7
15
|
static getInstance(): Configuration;
|
|
8
16
|
static getConfig(): IRedisSMQParsedConfig;
|
|
9
|
-
static initialize(cb: ICallback
|
|
17
|
+
static initialize(cb: ICallback): void;
|
|
10
18
|
static initializeWithConfig(config: IRedisSMQConfig, cb: ICallback): void;
|
|
11
19
|
static shutdown(cb: ICallback): void;
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
20
|
+
protected runExclusive(fn: (done: ICallback) => void, done: ICallback): void;
|
|
21
|
+
protected flushOperationQueue(): void;
|
|
22
|
+
protected notifyCompletionWaiters(): void;
|
|
23
|
+
protected waitForOperationCompletion(cb: ICallback): void;
|
|
24
|
+
protected mergeConfig(current: IRedisSMQParsedConfig, updates: IRedisSMQConfig): IRedisSMQConfig;
|
|
16
25
|
getConfig(): IRedisSMQParsedConfig;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
26
|
+
load(cb: ICallback): void;
|
|
27
|
+
saveCurrentConfig(cb: ICallback): void;
|
|
28
|
+
updateConfig(updates: IRedisSMQConfig, cb: ICallback): void;
|
|
20
29
|
}
|
|
21
30
|
//# sourceMappingURL=configuration.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../src/config/configuration.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../../../../src/config/configuration.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAuC1E,qBAAa,aAAa;IAExB,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,aAAa,GAAG,IAAI,CAAQ;IAGvD,SAAS,CAAC,MAAM,CAAC,KAAK,cAAqB;IAG3C,SAAS,CAAC,MAAM,CAAC,mBAAmB,EAAE,KAAK,CAAC,SAAS,CAAC,CAAM;IAG5D,SAAS,CAAC,mBAAmB,UAAS;IAGtC,SAAS,CAAC,cAAc,EAAE,KAAK,CAAC,MAAM,IAAI,CAAC,CAAM;IAGjD,SAAS,CAAC,iBAAiB,EAAE,KAAK,CAAC,SAAS,CAAC,CAAM;IAMnD,SAAS,CAAC,MAAM,EAAE,qBAAqB,CAAiB;IAQxD,SAAS;IAET,OAAO,CAAC,MAAM,CAAC,2BAA2B;IAuB1C,OAAO,CAAC,MAAM,CAAC,sBAAsB;IAgBrC,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAgCpC,MAAM,CAAC,WAAW,IAAI,aAAa;IA2CnC,MAAM,CAAC,SAAS,IAAI,qBAAqB;IA4BzC,MAAM,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IA+CtC,MAAM,CAAC,oBAAoB,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,EAAE,SAAS,GAAG,IAAI;IAuCzE,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IAkCpC,SAAS,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,SAAS,KAAK,IAAI,EAAE,IAAI,EAAE,SAAS,GAAG,IAAI;IAkC5E,SAAS,CAAC,mBAAmB,IAAI,IAAI;IAerC,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAWzC,SAAS,CAAC,0BAA0B,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IAezD,SAAS,CAAC,WAAW,CACnB,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,eAAe,GACvB,eAAe;IAYlB,SAAS,IAAI,qBAAqB;IASlC,IAAI,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IAoBzB,iBAAiB,CAAC,EAAE,EAAE,SAAS,GAAG,IAAI;IAqCtC,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,EAAE,EAAE,SAAS,GAAG,IAAI;CAwB5D"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.Configuration = void 0;
|
|
4
|
+
const redis_smq_common_1 = require("redis-smq-common");
|
|
4
5
|
const configuration_not_found_error_js_1 = require("../errors/configuration-not-found.error.js");
|
|
5
6
|
const redis_keys_js_1 = require("../common/redis/redis-keys/redis-keys.js");
|
|
6
7
|
const parse_config_js_1 = require("./parse-config.js");
|
|
@@ -9,11 +10,60 @@ const default_config_js_1 = require("./default-config.js");
|
|
|
9
10
|
const with_shared_pool_connection_js_1 = require("../common/redis/redis-connection-pool/with-shared-pool-connection.js");
|
|
10
11
|
class Configuration {
|
|
11
12
|
constructor() {
|
|
13
|
+
this.operationInProgress = false;
|
|
14
|
+
this.operationQueue = [];
|
|
15
|
+
this.completionWaiters = [];
|
|
12
16
|
this.config = default_config_js_1.defaultConfig;
|
|
13
17
|
}
|
|
18
|
+
static validateInitializationState(cb) {
|
|
19
|
+
if (Configuration.state.isUp()) {
|
|
20
|
+
cb(new index_js_1.ConfigurationError('Configuration already initialized'));
|
|
21
|
+
return false;
|
|
22
|
+
}
|
|
23
|
+
if (Configuration.state.isGoingUp()) {
|
|
24
|
+
Configuration.initializationQueue.push(cb);
|
|
25
|
+
return false;
|
|
26
|
+
}
|
|
27
|
+
if (Configuration.state.isGoingDown()) {
|
|
28
|
+
cb(new index_js_1.ConfigurationError('Configuration is shutting down. Cannot initialize.'));
|
|
29
|
+
return false;
|
|
30
|
+
}
|
|
31
|
+
return true;
|
|
32
|
+
}
|
|
33
|
+
static completeInitialization(error, cb) {
|
|
34
|
+
if (error) {
|
|
35
|
+
Configuration.state.rollback();
|
|
36
|
+
Configuration.instance = null;
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
Configuration.state.commit();
|
|
40
|
+
}
|
|
41
|
+
const queuedCallbacks = Configuration.initializationQueue.splice(0);
|
|
42
|
+
cb(error);
|
|
43
|
+
queuedCallbacks.forEach((queuedCb) => queuedCb(error));
|
|
44
|
+
}
|
|
45
|
+
static performInitialization(initializationFn, cb) {
|
|
46
|
+
if (!Configuration.validateInitializationState(cb)) {
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
Configuration.state.goingUp();
|
|
50
|
+
const instance = (Configuration.instance = new Configuration());
|
|
51
|
+
initializationFn(instance, (err) => {
|
|
52
|
+
Configuration.completeInitialization(err, cb);
|
|
53
|
+
});
|
|
54
|
+
}
|
|
14
55
|
static getInstance() {
|
|
56
|
+
if (Configuration.state.isDown()) {
|
|
57
|
+
throw new index_js_1.ConfigurationError('Configuration not initialized. Call initialize() first.');
|
|
58
|
+
}
|
|
59
|
+
if (Configuration.state.isGoingUp()) {
|
|
60
|
+
throw new index_js_1.ConfigurationError('Configuration is currently initializing. Please wait for initialization to complete.');
|
|
61
|
+
}
|
|
62
|
+
if (Configuration.state.isGoingDown()) {
|
|
63
|
+
throw new index_js_1.ConfigurationError('Configuration is shutting down. Cannot access instance.');
|
|
64
|
+
}
|
|
15
65
|
if (!Configuration.instance) {
|
|
16
|
-
throw new index_js_1.ConfigurationError('Configuration
|
|
66
|
+
throw new index_js_1.ConfigurationError('Configuration instance is null despite being initialized');
|
|
17
67
|
}
|
|
18
68
|
return Configuration.instance;
|
|
19
69
|
}
|
|
@@ -21,116 +71,168 @@ class Configuration {
|
|
|
21
71
|
return Configuration.getInstance().getConfig();
|
|
22
72
|
}
|
|
23
73
|
static initialize(cb) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
if (err) {
|
|
74
|
+
Configuration.performInitialization((instance, cb) => {
|
|
75
|
+
instance.load((err) => {
|
|
76
|
+
if (err && !(err instanceof configuration_not_found_error_js_1.ConfigurationNotFoundError)) {
|
|
77
|
+
return cb(err);
|
|
78
|
+
}
|
|
30
79
|
if (err instanceof configuration_not_found_error_js_1.ConfigurationNotFoundError) {
|
|
31
|
-
|
|
32
|
-
if (err)
|
|
33
|
-
return cb(err);
|
|
34
|
-
Configuration.instance = instance;
|
|
35
|
-
cb(null, instance);
|
|
36
|
-
});
|
|
80
|
+
instance.saveCurrentConfig(cb);
|
|
37
81
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
});
|
|
82
|
+
else {
|
|
83
|
+
cb();
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
}, cb);
|
|
43
87
|
}
|
|
44
88
|
static initializeWithConfig(config, cb) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
89
|
+
Configuration.performInitialization((instance, cb) => {
|
|
90
|
+
try {
|
|
91
|
+
instance.config = (0, parse_config_js_1.parseConfig)(config);
|
|
92
|
+
instance.saveCurrentConfig(cb);
|
|
93
|
+
}
|
|
94
|
+
catch (parseErr) {
|
|
95
|
+
const error = parseErr instanceof Error
|
|
96
|
+
? parseErr
|
|
97
|
+
: new index_js_1.ConfigurationError(String(parseErr));
|
|
98
|
+
cb(error);
|
|
99
|
+
}
|
|
100
|
+
}, cb);
|
|
56
101
|
}
|
|
57
102
|
static shutdown(cb) {
|
|
58
|
-
Configuration.
|
|
59
|
-
|
|
103
|
+
if (Configuration.state.isDown()) {
|
|
104
|
+
return cb();
|
|
105
|
+
}
|
|
106
|
+
if (Configuration.state.isGoingDown()) {
|
|
107
|
+
return cb(new index_js_1.ConfigurationError('Configuration is already shutting down'));
|
|
108
|
+
}
|
|
109
|
+
if (Configuration.state.isGoingUp()) {
|
|
110
|
+
return cb(new index_js_1.ConfigurationError('Cannot shutdown while initializing'));
|
|
111
|
+
}
|
|
112
|
+
Configuration.state.goingDown();
|
|
113
|
+
if (Configuration.instance) {
|
|
114
|
+
Configuration.instance.waitForOperationCompletion(() => {
|
|
115
|
+
Configuration.instance = null;
|
|
116
|
+
Configuration.state.commit();
|
|
117
|
+
cb();
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
Configuration.state.commit();
|
|
122
|
+
cb();
|
|
123
|
+
}
|
|
60
124
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
if (err)
|
|
66
|
-
return cb(err);
|
|
67
|
-
if (!configData) {
|
|
68
|
-
return cb(new configuration_not_found_error_js_1.ConfigurationNotFoundError());
|
|
69
|
-
}
|
|
125
|
+
runExclusive(fn, done) {
|
|
126
|
+
const run = () => {
|
|
127
|
+
this.operationInProgress = true;
|
|
128
|
+
const releaseAndNext = (err) => {
|
|
70
129
|
try {
|
|
71
|
-
|
|
72
|
-
cb(null, this.config);
|
|
130
|
+
done(err);
|
|
73
131
|
}
|
|
74
|
-
|
|
75
|
-
|
|
132
|
+
finally {
|
|
133
|
+
this.operationInProgress = false;
|
|
134
|
+
this.notifyCompletionWaiters();
|
|
135
|
+
this.flushOperationQueue();
|
|
76
136
|
}
|
|
77
|
-
}
|
|
78
|
-
|
|
137
|
+
};
|
|
138
|
+
try {
|
|
139
|
+
fn(releaseAndNext);
|
|
140
|
+
}
|
|
141
|
+
catch (e) {
|
|
142
|
+
const err = e instanceof Error ? e : new index_js_1.ConfigurationError(String(e));
|
|
143
|
+
releaseAndNext(err);
|
|
144
|
+
}
|
|
145
|
+
};
|
|
146
|
+
if (this.operationInProgress) {
|
|
147
|
+
this.operationQueue.push(run);
|
|
148
|
+
}
|
|
149
|
+
else {
|
|
150
|
+
run();
|
|
151
|
+
}
|
|
79
152
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
153
|
+
flushOperationQueue() {
|
|
154
|
+
if (this.operationInProgress || this.operationQueue.length === 0)
|
|
155
|
+
return;
|
|
156
|
+
setImmediate(() => {
|
|
157
|
+
if (this.operationInProgress)
|
|
158
|
+
return;
|
|
159
|
+
const next = this.operationQueue.shift();
|
|
160
|
+
if (next)
|
|
161
|
+
next();
|
|
162
|
+
});
|
|
83
163
|
}
|
|
84
|
-
|
|
85
|
-
this.
|
|
164
|
+
notifyCompletionWaiters() {
|
|
165
|
+
if (!this.operationInProgress && this.operationQueue.length === 0) {
|
|
166
|
+
const waiters = this.completionWaiters.splice(0);
|
|
167
|
+
waiters.forEach((waiter) => waiter());
|
|
168
|
+
}
|
|
86
169
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
170
|
+
waitForOperationCompletion(cb) {
|
|
171
|
+
if (!this.operationInProgress && this.operationQueue.length === 0) {
|
|
172
|
+
return cb();
|
|
173
|
+
}
|
|
174
|
+
this.completionWaiters.push(cb);
|
|
175
|
+
}
|
|
176
|
+
mergeConfig(current, updates) {
|
|
177
|
+
return Object.assign(Object.assign({}, current), updates);
|
|
90
178
|
}
|
|
91
179
|
getConfig() {
|
|
92
180
|
return this.config;
|
|
93
181
|
}
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
cb(error);
|
|
109
|
-
}
|
|
182
|
+
load(cb) {
|
|
183
|
+
this.runExclusive((done) => {
|
|
184
|
+
(0, with_shared_pool_connection_js_1.withSharedPoolConnection)((client, cb) => {
|
|
185
|
+
const key = redis_keys_js_1.redisKeys.getMainKeys().keyConfiguration;
|
|
186
|
+
client.get(key, (err, configData) => {
|
|
187
|
+
if (err)
|
|
188
|
+
return cb(err);
|
|
189
|
+
if (!configData)
|
|
190
|
+
return cb(new configuration_not_found_error_js_1.ConfigurationNotFoundError());
|
|
191
|
+
this.config = JSON.parse(configData);
|
|
192
|
+
return cb();
|
|
193
|
+
});
|
|
194
|
+
}, done);
|
|
195
|
+
}, cb);
|
|
110
196
|
}
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
197
|
+
saveCurrentConfig(cb) {
|
|
198
|
+
this.runExclusive((done) => {
|
|
199
|
+
(0, with_shared_pool_connection_js_1.withSharedPoolConnection)((client, cb) => {
|
|
200
|
+
const key = redis_keys_js_1.redisKeys.getMainKeys().keyConfiguration;
|
|
201
|
+
const configData = JSON.stringify(this.config);
|
|
202
|
+
client.set(key, configData, {}, (err) => {
|
|
203
|
+
if (err)
|
|
204
|
+
return cb(err);
|
|
205
|
+
cb();
|
|
206
|
+
});
|
|
207
|
+
}, done);
|
|
119
208
|
}, cb);
|
|
120
209
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
210
|
+
updateConfig(updates, cb) {
|
|
211
|
+
this.runExclusive((done) => {
|
|
212
|
+
try {
|
|
213
|
+
const updatedConfig = this.mergeConfig(this.config, updates);
|
|
214
|
+
this.config = (0, parse_config_js_1.parseConfig)(updatedConfig);
|
|
215
|
+
}
|
|
216
|
+
catch (e) {
|
|
217
|
+
const err = e instanceof Error
|
|
218
|
+
? e
|
|
219
|
+
: new index_js_1.ConfigurationError(`Invalid configuration: ${String(e)}`);
|
|
220
|
+
return done(err);
|
|
221
|
+
}
|
|
222
|
+
(0, with_shared_pool_connection_js_1.withSharedPoolConnection)((client, cb) => {
|
|
223
|
+
const key = redis_keys_js_1.redisKeys.getMainKeys().keyConfiguration;
|
|
224
|
+
const configData = JSON.stringify(this.config);
|
|
225
|
+
client.set(key, configData, {}, (err) => {
|
|
226
|
+
if (err)
|
|
227
|
+
return cb(err);
|
|
228
|
+
cb();
|
|
229
|
+
});
|
|
230
|
+
}, done);
|
|
131
231
|
}, cb);
|
|
132
232
|
}
|
|
133
233
|
}
|
|
134
234
|
exports.Configuration = Configuration;
|
|
135
235
|
Configuration.instance = null;
|
|
236
|
+
Configuration.state = new redis_smq_common_1.PowerSwitch();
|
|
237
|
+
Configuration.initializationQueue = [];
|
|
136
238
|
//# sourceMappingURL=configuration.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../src/config/configuration.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../../../../src/config/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consumer-heartbeat.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/consumer-heartbeat/consumer-heartbeat.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,SAAS,EACT,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,KAAK,EACN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"consumer-heartbeat.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/consumer-heartbeat/consumer-heartbeat.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,SAAS,EACT,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,KAAK,EACN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAGhE,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAShE,qBAAa,iBAAkB,SAAQ,QAAQ,CAAC,uBAAuB,CAAC;IACtE,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,SAAa;IACnD,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,QAAQ;IACpD,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,SAAU;IAEhD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC;IACrD,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACvC,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAG1B,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,aAAa,CAAsB;IAG3C,OAAO,CAAC,cAAc,CAAwC;gBAElD,eAAe,EAAE,gBAAgB;IAyB7C,MAAM,CAAC,eAAe,CACpB,WAAW,EAAE,YAAY,EACzB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,SAAS,CAAC,OAAO,CAAC,GACrB,IAAI;IASP,MAAM,CAAC,mBAAmB,CACxB,WAAW,EAAE,YAAY,EACzB,WAAW,EAAE,MAAM,EAAE,EACrB,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GACrC,IAAI;cAoBY,SAAS,IAAI,OAAO;IAOvC,OAAO,CAAC,WAAW;IAyBnB,SAAS,CAAC,UAAU,IAAI,kBAAkB;IAoB1C,OAAO,CAAC,gBAAgB;IAoBxB,SAAS,CAAC,IAAI,IAAI,IAAI;cAsEH,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,CAAC,EAAE;cAmCtC,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,CAAC,EAAE;CAgC5D"}
|
|
@@ -37,8 +37,7 @@ exports.ConsumerHeartbeat = void 0;
|
|
|
37
37
|
const os = __importStar(require("os"));
|
|
38
38
|
const redis_smq_common_1 = require("redis-smq-common");
|
|
39
39
|
const redis_keys_js_1 = require("../../common/redis/redis-keys/redis-keys.js");
|
|
40
|
-
const
|
|
41
|
-
const event_bus_publisher_js_1 = require("./event-bus-publisher.js");
|
|
40
|
+
const event_publisher_js_1 = require("./event-publisher.js");
|
|
42
41
|
const with_shared_pool_connection_js_1 = require("../../common/redis/redis-connection-pool/with-shared-pool-connection.js");
|
|
43
42
|
class ConsumerHeartbeat extends redis_smq_common_1.Runnable {
|
|
44
43
|
constructor(consumerContext) {
|
|
@@ -47,16 +46,10 @@ class ConsumerHeartbeat extends redis_smq_common_1.Runnable {
|
|
|
47
46
|
this.cpuStatsUsage = process.cpuUsage();
|
|
48
47
|
this.currentDelayMs = ConsumerHeartbeat.baseBeatIntervalMs;
|
|
49
48
|
this.consumerContext = consumerContext;
|
|
50
|
-
const config = index_js_1.Configuration.getConfig();
|
|
51
49
|
this.logger = this.consumerContext.logger;
|
|
52
50
|
this.logger.debug(`Initializing ConsumerHeartbeat...`);
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
(0, event_bus_publisher_js_1.eventBusPublisher)(this);
|
|
56
|
-
}
|
|
57
|
-
else {
|
|
58
|
-
this.logger.debug('Event bus is not enabled, skipping event bus publisher setup');
|
|
59
|
-
}
|
|
51
|
+
this.logger.debug('Inittializing eventPublisher...');
|
|
52
|
+
(0, event_publisher_js_1.eventPublisher)(this);
|
|
60
53
|
const { keyConsumerHeartbeat } = redis_keys_js_1.redisKeys.getConsumerKeys(this.consumerContext.consumerId);
|
|
61
54
|
this.keyConsumerHeartbeat = keyConsumerHeartbeat;
|
|
62
55
|
this.logger.debug(`Consumer heartbeat key: ${this.keyConsumerHeartbeat}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consumer-heartbeat.js","sourceRoot":"","sources":["../../../../../src/consumer/consumer-heartbeat/consumer-heartbeat.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,uCAAyB;AACzB,uDAO0B;AAE1B,+EAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"consumer-heartbeat.js","sourceRoot":"","sources":["../../../../../src/consumer/consumer-heartbeat/consumer-heartbeat.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"event-publisher.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/consumer-heartbeat/event-publisher.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAG5D,wBAAgB,cAAc,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,IAAI,CAIzE"}
|