redis-smq 9.0.3 → 9.0.4-next.0
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 +16 -0
- package/README.md +7 -7
- package/dist/cjs/src/consumer/consumer-heartbeat/consumer-heartbeat.d.ts +1 -0
- package/dist/cjs/src/consumer/consumer-heartbeat/consumer-heartbeat.d.ts.map +1 -1
- package/dist/cjs/src/consumer/consumer-heartbeat/consumer-heartbeat.js +21 -0
- package/dist/cjs/src/consumer/consumer-heartbeat/consumer-heartbeat.js.map +1 -1
- package/dist/cjs/src/consumer/message-handler-runner/message-handler-runner.d.ts +2 -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 +12 -17
- package/dist/cjs/src/consumer/message-handler-runner/message-handler-runner.js.map +1 -1
- package/dist/cjs/src/consumer/message-handler-runner/multiplexed-message-handler-runner.d.ts +1 -2
- package/dist/cjs/src/consumer/message-handler-runner/multiplexed-message-handler-runner.d.ts.map +1 -1
- package/dist/cjs/src/consumer/message-handler-runner/multiplexed-message-handler-runner.js +26 -17
- package/dist/cjs/src/consumer/message-handler-runner/multiplexed-message-handler-runner.js.map +1 -1
- package/dist/cjs/src/queue-manager/_/_delete-queue.d.ts.map +1 -1
- package/dist/cjs/src/queue-manager/_/_delete-queue.js +16 -9
- package/dist/cjs/src/queue-manager/_/_delete-queue.js.map +1 -1
- package/dist/esm/src/consumer/consumer-heartbeat/consumer-heartbeat.d.ts +1 -0
- package/dist/esm/src/consumer/consumer-heartbeat/consumer-heartbeat.d.ts.map +1 -1
- package/dist/esm/src/consumer/consumer-heartbeat/consumer-heartbeat.js +22 -1
- package/dist/esm/src/consumer/consumer-heartbeat/consumer-heartbeat.js.map +1 -1
- package/dist/esm/src/consumer/message-handler-runner/message-handler-runner.d.ts +2 -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 +11 -17
- package/dist/esm/src/consumer/message-handler-runner/message-handler-runner.js.map +1 -1
- package/dist/esm/src/consumer/message-handler-runner/multiplexed-message-handler-runner.d.ts +1 -2
- package/dist/esm/src/consumer/message-handler-runner/multiplexed-message-handler-runner.d.ts.map +1 -1
- package/dist/esm/src/consumer/message-handler-runner/multiplexed-message-handler-runner.js +26 -17
- package/dist/esm/src/consumer/message-handler-runner/multiplexed-message-handler-runner.js.map +1 -1
- package/dist/esm/src/queue-manager/_/_delete-queue.d.ts.map +1 -1
- package/dist/esm/src/queue-manager/_/_delete-queue.js +16 -9
- package/dist/esm/src/queue-manager/_/_delete-queue.js.map +1 -1
- package/package.json +2 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,22 @@
|
|
|
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.4-next.0](https://github.com/weyoss/redis-smq/compare/v9.0.3...v9.0.4-next.0) (2025-11-11)
|
|
7
|
+
|
|
8
|
+
### 🚀 Chore
|
|
9
|
+
|
|
10
|
+
- update READMEs after merging 'v9.0.3' into 'next' ([5bc9ff0](https://github.com/weyoss/redis-smq/commit/5bc9ff0c9b8d8743a7613fbd499124dab05b1433))
|
|
11
|
+
|
|
12
|
+
### ♻️ Code Refactoring
|
|
13
|
+
|
|
14
|
+
- **redis-smq:** improve MultiplexedMessageHandlerRunner scheduling ([670abd9](https://github.com/weyoss/redis-smq/commit/670abd952d5e296acd49ca678ae512c8a0c3bd55))
|
|
15
|
+
- **redis-smq:** improve queue comparison logic ([2df8878](https://github.com/weyoss/redis-smq/commit/2df8878c41c4ceb1eaf87d161d9a0e119dc4bb6c))
|
|
16
|
+
- **redis-smq:** rename tickIntervalMs to multiplexingTickIntervalMs ([57bb36f](https://github.com/weyoss/redis-smq/commit/57bb36f8d8d8dfcefc1dfd5ba8fb343d386afa7e))
|
|
17
|
+
|
|
18
|
+
### ⚡ Performance Improvements
|
|
19
|
+
|
|
20
|
+
- **redis-smq:** avoid N+1 query problem by using isConsumerListAlive ([2e6573b](https://github.com/weyoss/redis-smq/commit/2e6573b7267d687ef1eade3401f79f500b6a37c0))
|
|
21
|
+
|
|
6
22
|
## [9.0.3](https://github.com/weyoss/redis-smq/compare/v9.0.3-next.1...v9.0.3) (2025-11-10)
|
|
7
23
|
|
|
8
24
|
### 🚀 Chore
|
package/README.md
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
# RedisSMQ
|
|
2
2
|
|
|
3
3
|
> [!NOTE]
|
|
4
|
-
> You are viewing the documentation for the "
|
|
5
|
-
> For
|
|
4
|
+
> You are viewing the documentation for the "next" branch. These docs describe unreleased changes published under the npm "next" dist-tag.
|
|
5
|
+
> For the latest stable documentation, see:
|
|
6
6
|
>
|
|
7
|
-
> -
|
|
7
|
+
> - Master (stable) README: https://github.com/weyoss/redis-smq/tree/master/packages/redis-smq
|
|
8
8
|
> - Latest release notes/tags: https://github.com/weyoss/redis-smq/releases/latest
|
|
9
9
|
> - Install stable packages with @latest; pre-release with @next.
|
|
10
10
|
|
|
11
|
-
[](https://github.com/weyoss/redis-smq/releases)
|
|
12
|
+
[](https://app.codecov.io/github/weyoss/redis-smq/tree/next/packages/redis-smq)
|
|
13
13
|
|
|
14
14
|
A high-performance, reliable, and scalable message queue for Node.js.
|
|
15
15
|
|
|
@@ -20,8 +20,8 @@ producers/consumers APIs, and integrates with a REST API and Web UI for monitori
|
|
|
20
20
|
- Works with ioredis or the official @redis/client
|
|
21
21
|
- Optional REST API and Web UI for management and observability
|
|
22
22
|
|
|
23
|
-
The source code and documentation for RedisSMQ are in the main [redis-smq](https://github.com/weyoss/redis-smq/tree/
|
|
23
|
+
The source code and documentation for RedisSMQ are in the main [redis-smq](https://github.com/weyoss/redis-smq/tree/next/README.md) repository.
|
|
24
24
|
|
|
25
25
|
## License
|
|
26
26
|
|
|
27
|
-
RedisSMQ is released under the [MIT License](https://github.com/weyoss/redis-smq/tree/
|
|
27
|
+
RedisSMQ is released under the [MIT License](https://github.com/weyoss/redis-smq/tree/next/LICENSE).
|
|
@@ -15,6 +15,7 @@ export declare class ConsumerHeartbeat extends Runnable<TConsumerHeartbeatEvent>
|
|
|
15
15
|
private currentDelayMs;
|
|
16
16
|
constructor(consumer: Consumer);
|
|
17
17
|
static isConsumerAlive(redisClient: IRedisClient, consumerId: string, cb: ICallback<boolean>): void;
|
|
18
|
+
static isConsumerListAlive(redisClient: IRedisClient, consumerIds: string[], cb: ICallback<Record<string, boolean>>): void;
|
|
18
19
|
protected getLogger(): ILogger;
|
|
19
20
|
private getCpuUsage;
|
|
20
21
|
protected getPayload(): IConsumerHeartbeat;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consumer-heartbeat.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/consumer-heartbeat/consumer-heartbeat.ts"],"names":[],"mappings":"AAUA,OAAO,
|
|
1
|
+
{"version":3,"file":"consumer-heartbeat.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/consumer-heartbeat/consumer-heartbeat.ts"],"names":[],"mappings":"AAUA,OAAO,EAGL,SAAS,EACT,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,KAAK,EACN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAGhE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAUtD,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,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACvC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC7B,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAG1B,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,aAAa,CAAsB;IAG3C,OAAO,CAAC,cAAc,CAAwC;gBAElD,QAAQ,EAAE,QAAQ;IAyC9B,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;IAwB1C,OAAO,CAAC,gBAAgB;IAoBxB,SAAS,CAAC,IAAI,IAAI,IAAI;cAsEH,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,CAAC,EAAE;cAoCtC,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,CAAC,EAAE;CAgC5D"}
|
|
@@ -76,6 +76,27 @@ class ConsumerHeartbeat extends redis_smq_common_1.Runnable {
|
|
|
76
76
|
cb(null, isAlive);
|
|
77
77
|
});
|
|
78
78
|
}
|
|
79
|
+
static isConsumerListAlive(redisClient, consumerIds, cb) {
|
|
80
|
+
if (!consumerIds.length) {
|
|
81
|
+
cb(null, {});
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
const heartbeatKeys = consumerIds.map((id) => {
|
|
85
|
+
const { keyConsumerHeartbeat } = redis_keys_js_1.redisKeys.getConsumerKeys(id);
|
|
86
|
+
return keyConsumerHeartbeat;
|
|
87
|
+
});
|
|
88
|
+
redisClient.mget(heartbeatKeys, (err, replies) => {
|
|
89
|
+
if (err)
|
|
90
|
+
return cb(err);
|
|
91
|
+
if (!replies)
|
|
92
|
+
return cb(new redis_smq_common_1.CallbackEmptyReplyError());
|
|
93
|
+
const result = {};
|
|
94
|
+
consumerIds.forEach((id, index) => {
|
|
95
|
+
result[id] = !!replies[index];
|
|
96
|
+
});
|
|
97
|
+
cb(null, result);
|
|
98
|
+
});
|
|
99
|
+
}
|
|
79
100
|
getLogger() {
|
|
80
101
|
return this.logger;
|
|
81
102
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consumer-heartbeat.js","sourceRoot":"","sources":["../../../../../src/consumer/consumer-heartbeat/consumer-heartbeat.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AASA,uCAAyB;AACzB,
|
|
1
|
+
{"version":3,"file":"consumer-heartbeat.js","sourceRoot":"","sources":["../../../../../src/consumer/consumer-heartbeat/consumer-heartbeat.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,8 @@ export declare class MessageHandlerRunner extends Runnable<TConsumerMessageHandl
|
|
|
12
12
|
protected messageHandlerInstances: MessageHandler[];
|
|
13
13
|
protected messageHandlers: IConsumerMessageHandlerParams[];
|
|
14
14
|
constructor(consumerContext: IConsumerContext);
|
|
15
|
+
protected getQueueIdentifier(queue: IQueueParsedParams): string;
|
|
16
|
+
protected isSameQueue(q1: IQueueParsedParams, q2: IQueueParsedParams): boolean;
|
|
15
17
|
protected scheduleReconciliation: () => void;
|
|
16
18
|
protected reconcileHandlers: () => void;
|
|
17
19
|
removeMessageHandler(queue: IQueueParsedParams, cb: ICallback<void>): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-handler-runner.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/message-handler-runner.ts"],"names":[],"mappings":"AASA,OAAO,EAAS,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,kCAAkC,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEvE,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,EACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAQhE,qBAAa,oBAAqB,SAAQ,QAAQ,CAAC,kCAAkC,CAAC;IACpF,SAAS,CAAC,QAAQ,CAAC,6BAA6B,QAAQ;IACxD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACnC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC;IAE1C,SAAS,CAAC,uBAAuB,EAAE,cAAc,EAAE,CAAM;IACzD,SAAS,CAAC,eAAe,EAAE,6BAA6B,EAAE,CAAM;gBAEpD,eAAe,EAAE,gBAAgB;IAe7C,SAAS,CAAC,sBAAsB,QAAO,IAAI,CAOzC;IAMF,SAAS,CAAC,iBAAiB,QAAO,IAAI,
|
|
1
|
+
{"version":3,"file":"message-handler-runner.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/message-handler-runner.ts"],"names":[],"mappings":"AASA,OAAO,EAAS,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,kCAAkC,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEvE,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,EACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAQhE,qBAAa,oBAAqB,SAAQ,QAAQ,CAAC,kCAAkC,CAAC;IACpF,SAAS,CAAC,QAAQ,CAAC,6BAA6B,QAAQ;IACxD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACnC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC;IAE1C,SAAS,CAAC,uBAAuB,EAAE,cAAc,EAAE,CAAM;IACzD,SAAS,CAAC,eAAe,EAAE,6BAA6B,EAAE,CAAM;gBAEpD,eAAe,EAAE,gBAAgB;IAe7C,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM;IAS/D,SAAS,CAAC,WAAW,CACnB,EAAE,EAAE,kBAAkB,EACtB,EAAE,EAAE,kBAAkB,GACrB,OAAO;IAOV,SAAS,CAAC,sBAAsB,QAAO,IAAI,CAOzC;IAMF,SAAS,CAAC,iBAAiB,QAAO,IAAI,CAmDpC;IAEF,oBAAoB,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI;IAoB1E,iBAAiB,CACf,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,uBAAuB,EACvC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAClB,IAAI;IAyBP,SAAS,IAAI,kBAAkB,EAAE;cAId,SAAS,IAAI,OAAO;IAOvC,SAAS,CAAC,yBAAyB,CACjC,KAAK,EAAE,kBAAkB,GACxB,cAAc,GAAG,SAAS;IAS7B,SAAS,CAAC,iBAAiB,CACzB,KAAK,EAAE,kBAAkB,GACxB,6BAA6B,GAAG,SAAS;IAO5C,SAAS,CAAC,4BAA4B,CACpC,aAAa,EAAE,6BAA6B,GAC3C,cAAc;IAmBjB,SAAS,CAAC,iBAAiB,CACzB,aAAa,EAAE,6BAA6B,EAC5C,EAAE,EAAE,SAAS,GACZ,IAAI;IAyBP,SAAS,CAAC,sBAAsB,CAC9B,cAAc,EAAE,cAAc,EAC9B,EAAE,EAAE,SAAS,GACZ,IAAI;IAYP,SAAS,CAAC,kBAAkB,GAAI,IAAI,SAAS,KAAG,IAAI,CAQlD;IAKF,SAAS,CAAC,uBAAuB,GAAI,IAAI,SAAS,KAAG,IAAI,CAWvD;cAEiB,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,CAAC,EAAE;cAUtC,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,CAAC,EAAE;cAUxC,WAAW,CAAC,GAAG,EAAE,KAAK;CAW1C"}
|
|
@@ -20,8 +20,8 @@ class MessageHandlerRunner extends redis_smq_common_1.Runnable {
|
|
|
20
20
|
if (!this.isRunning())
|
|
21
21
|
return;
|
|
22
22
|
this.logger.debug('Running handler reconciliation...');
|
|
23
|
-
const runningQueues = this.messageHandlerInstances.map((i) =>
|
|
24
|
-
const zombieHandlers = this.messageHandlers.filter((i) => !runningQueues.
|
|
23
|
+
const runningQueues = new Set(this.messageHandlerInstances.map((i) => this.getQueueIdentifier(i.getQueue())));
|
|
24
|
+
const zombieHandlers = this.messageHandlers.filter((i) => !runningQueues.has(this.getQueueIdentifier(i.queue)));
|
|
25
25
|
if (zombieHandlers.length > 0) {
|
|
26
26
|
this.logger.warn(`Found ${zombieHandlers.length} zombie handler(s). Attempting to restart sequentially...`);
|
|
27
27
|
const tasks = zombieHandlers.map((handlerParams) => {
|
|
@@ -71,17 +71,19 @@ class MessageHandlerRunner extends redis_smq_common_1.Runnable {
|
|
|
71
71
|
this.supervisorTimer.on('error', (err) => this.handleError(err));
|
|
72
72
|
this.logger.info(`MessageHandlerRunner with ID: ${this.id} initialized.`);
|
|
73
73
|
}
|
|
74
|
+
getQueueIdentifier(queue) {
|
|
75
|
+
var _a;
|
|
76
|
+
return `${queue.queueParams.ns}:${queue.queueParams.name}:${(_a = queue.groupId) !== null && _a !== void 0 ? _a : ''}`;
|
|
77
|
+
}
|
|
78
|
+
isSameQueue(q1, q2) {
|
|
79
|
+
return this.getQueueIdentifier(q1) === this.getQueueIdentifier(q2);
|
|
80
|
+
}
|
|
74
81
|
removeMessageHandler(queue, cb) {
|
|
75
82
|
const handler = this.getMessageHandler(queue);
|
|
76
83
|
if (!handler) {
|
|
77
84
|
return cb();
|
|
78
85
|
}
|
|
79
|
-
this.messageHandlers = this.messageHandlers.filter((h) =>
|
|
80
|
-
const q = h.queue;
|
|
81
|
-
return !(queue.queueParams.name === q.queueParams.name &&
|
|
82
|
-
queue.queueParams.ns === q.queueParams.ns &&
|
|
83
|
-
queue.groupId === q.groupId);
|
|
84
|
-
});
|
|
86
|
+
this.messageHandlers = this.messageHandlers.filter((h) => !this.isSameQueue(h.queue, queue));
|
|
85
87
|
const handlerInstance = this.getMessageHandlerInstance(queue);
|
|
86
88
|
if (handlerInstance) {
|
|
87
89
|
this.shutdownMessageHandler(handlerInstance, cb);
|
|
@@ -115,17 +117,10 @@ class MessageHandlerRunner extends redis_smq_common_1.Runnable {
|
|
|
115
117
|
return this.logger;
|
|
116
118
|
}
|
|
117
119
|
getMessageHandlerInstance(queue) {
|
|
118
|
-
return this.messageHandlerInstances.find((i) =>
|
|
119
|
-
const handlerQueue = i.getQueue();
|
|
120
|
-
return (handlerQueue.queueParams.name === queue.queueParams.name &&
|
|
121
|
-
handlerQueue.queueParams.ns === queue.queueParams.ns &&
|
|
122
|
-
handlerQueue.groupId === queue.groupId);
|
|
123
|
-
});
|
|
120
|
+
return this.messageHandlerInstances.find((i) => this.isSameQueue(i.getQueue(), queue));
|
|
124
121
|
}
|
|
125
122
|
getMessageHandler(queue) {
|
|
126
|
-
return this.messageHandlers.find((i) => i.queue
|
|
127
|
-
i.queue.queueParams.ns === queue.queueParams.ns &&
|
|
128
|
-
i.queue.groupId === queue.groupId);
|
|
123
|
+
return this.messageHandlers.find((i) => this.isSameQueue(i.queue, queue));
|
|
129
124
|
}
|
|
130
125
|
createMessageHandlerInstance(handlerParams) {
|
|
131
126
|
const instance = new message_handler_js_1.MessageHandler(this.consumerContext, handlerParams, true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-handler-runner.js","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/message-handler-runner.ts"],"names":[],"mappings":";;;AASA,uDAA8E;AAG9E,oDAAyE;AACzE,8EAAuE;AACvE,qEAA6D;AAa7D,MAAa,oBAAqB,SAAQ,2BAA4C;IASpF,YAAY,eAAiC;QAC3C,KAAK,EAAE,CAAC;QATS,kCAA6B,GAAG,IAAI,CAAC;QAK9C,4BAAuB,GAAqB,EAAE,CAAC;QAC/C,oBAAe,GAAoC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"message-handler-runner.js","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/message-handler-runner.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/src/consumer/message-handler-runner/multiplexed-message-handler-runner.d.ts
CHANGED
|
@@ -4,12 +4,11 @@ import { MessageHandlerRunner } from './message-handler-runner.js';
|
|
|
4
4
|
import { IConsumerMessageHandlerParams } from '../message-handler/types/index.js';
|
|
5
5
|
import { IConsumerContext } from '../types/consumer-context.js';
|
|
6
6
|
export declare class MultiplexedMessageHandlerRunner extends MessageHandlerRunner {
|
|
7
|
-
protected readonly
|
|
7
|
+
protected readonly multiplexingTickIntervalMs: number;
|
|
8
8
|
protected schedulerTimer: Timer;
|
|
9
9
|
protected index: number;
|
|
10
10
|
protected activeMessageHandler: MessageHandler | null;
|
|
11
11
|
constructor(consumerContext: IConsumerContext);
|
|
12
|
-
protected reconcileHandlers: () => void;
|
|
13
12
|
protected scheduleNextTick: () => void;
|
|
14
13
|
protected getNextMessageHandler(): MessageHandler | null;
|
|
15
14
|
protected execNextMessageHandler: () => void;
|
package/dist/cjs/src/consumer/message-handler-runner/multiplexed-message-handler-runner.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multiplexed-message-handler-runner.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/multiplexed-message-handler-runner.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAMhE,qBAAa,+BAAgC,SAAQ,oBAAoB;IACvE,SAAS,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"multiplexed-message-handler-runner.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/multiplexed-message-handler-runner.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAMhE,qBAAa,+BAAgC,SAAQ,oBAAoB;IACvE,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,MAAM,CAAQ;IAC7D,SAAS,CAAC,cAAc,EAAE,KAAK,CAAC;IAChC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAK;IAC5B,SAAS,CAAC,oBAAoB,EAAE,cAAc,GAAG,IAAI,CAAQ;gBAEjD,eAAe,EAAE,gBAAgB;IAU7C,SAAS,CAAC,gBAAgB,QAAO,IAAI,CAOnC;IAKF,SAAS,CAAC,qBAAqB,IAAI,cAAc,GAAG,IAAI;IAcxD,SAAS,CAAC,sBAAsB,QAAO,IAAI,CAuBzC;cAKiB,4BAA4B,CAC7C,aAAa,EAAE,6BAA6B,GAC3C,cAAc;cA0BE,sBAAsB,CACvC,cAAc,EAAE,cAAc,EAC9B,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAClB,IAAI;cAiBY,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;cAa5C,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;CAUlE"}
|
|
@@ -7,33 +7,33 @@ const message_handler_runner_js_1 = require("./message-handler-runner.js");
|
|
|
7
7
|
class MultiplexedMessageHandlerRunner extends message_handler_runner_js_1.MessageHandlerRunner {
|
|
8
8
|
constructor(consumerContext) {
|
|
9
9
|
super(consumerContext);
|
|
10
|
-
this.
|
|
10
|
+
this.multiplexingTickIntervalMs = 1000;
|
|
11
11
|
this.index = 0;
|
|
12
12
|
this.activeMessageHandler = null;
|
|
13
|
-
this.reconcileHandlers = () => {
|
|
14
|
-
};
|
|
15
13
|
this.scheduleNextTick = () => {
|
|
16
14
|
if (!this.isRunning())
|
|
17
15
|
return;
|
|
18
16
|
this.schedulerTimer.reset();
|
|
19
|
-
this.schedulerTimer.setTimeout(() => this.execNextMessageHandler(), this.
|
|
17
|
+
this.schedulerTimer.setTimeout(() => this.execNextMessageHandler(), this.multiplexingTickIntervalMs);
|
|
20
18
|
};
|
|
21
19
|
this.execNextMessageHandler = () => {
|
|
22
20
|
if (!this.isRunning())
|
|
23
21
|
return;
|
|
24
|
-
|
|
25
|
-
if (
|
|
26
|
-
|
|
27
|
-
|
|
22
|
+
const totalHandlers = this.messageHandlerInstances.length;
|
|
23
|
+
if (totalHandlers === 0) {
|
|
24
|
+
this.scheduleNextTick();
|
|
25
|
+
return;
|
|
26
|
+
}
|
|
27
|
+
for (let i = 0; i < totalHandlers; i += 1) {
|
|
28
|
+
const handler = this.getNextMessageHandler();
|
|
29
|
+
if (handler && handler.isRunning() && handler.isUp()) {
|
|
30
|
+
this.activeMessageHandler = handler;
|
|
28
31
|
this.activeMessageHandler.dequeue();
|
|
32
|
+
return;
|
|
29
33
|
}
|
|
30
|
-
else {
|
|
31
|
-
this.scheduleNextTick();
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
else {
|
|
35
|
-
this.scheduleNextTick();
|
|
36
34
|
}
|
|
35
|
+
this.activeMessageHandler = null;
|
|
36
|
+
this.scheduleNextTick();
|
|
37
37
|
};
|
|
38
38
|
this.schedulerTimer = new redis_smq_common_1.Timer();
|
|
39
39
|
this.schedulerTimer.on('error', (err) => this.handleError(err));
|
|
@@ -50,6 +50,10 @@ class MultiplexedMessageHandlerRunner extends message_handler_runner_js_1.Messag
|
|
|
50
50
|
}
|
|
51
51
|
createMessageHandlerInstance(handlerParams) {
|
|
52
52
|
const instance = new multiplexed_message_handler_js_1.MultiplexedMessageHandler(this.consumerContext, handlerParams, this.scheduleNextTick);
|
|
53
|
+
instance.on('consumer.messageHandler.error', (err) => {
|
|
54
|
+
this.logger.error(`MultiplexedMessageHandler [${instance.getId()}] has experienced a runtime error: ${err.message}. Shutting down instance. The supervisor will attempt to restart it.`);
|
|
55
|
+
this.shutdownMessageHandler(instance, () => { });
|
|
56
|
+
});
|
|
53
57
|
this.messageHandlerInstances.push(instance);
|
|
54
58
|
this.logger.info(`Created MultiplexedMessageHandler (ID: ${instance.getId()}) for queue: ${handlerParams.queue.queueParams.name}. Total: ${this.messageHandlerInstances.length}`);
|
|
55
59
|
return instance;
|
|
@@ -58,7 +62,8 @@ class MultiplexedMessageHandlerRunner extends message_handler_runner_js_1.Messag
|
|
|
58
62
|
const wasActive = messageHandler === this.activeMessageHandler;
|
|
59
63
|
super.shutdownMessageHandler(messageHandler, () => {
|
|
60
64
|
if (wasActive) {
|
|
61
|
-
this.
|
|
65
|
+
this.activeMessageHandler = null;
|
|
66
|
+
setTimeout(() => this.execNextMessageHandler(), 0);
|
|
62
67
|
}
|
|
63
68
|
cb();
|
|
64
69
|
});
|
|
@@ -72,8 +77,12 @@ class MultiplexedMessageHandlerRunner extends message_handler_runner_js_1.Messag
|
|
|
72
77
|
]);
|
|
73
78
|
}
|
|
74
79
|
goingDown() {
|
|
75
|
-
|
|
76
|
-
|
|
80
|
+
return [
|
|
81
|
+
(cb) => {
|
|
82
|
+
this.schedulerTimer.reset();
|
|
83
|
+
cb();
|
|
84
|
+
},
|
|
85
|
+
].concat(super.goingDown());
|
|
77
86
|
}
|
|
78
87
|
}
|
|
79
88
|
exports.MultiplexedMessageHandlerRunner = MultiplexedMessageHandlerRunner;
|
package/dist/cjs/src/consumer/message-handler-runner/multiplexed-message-handler-runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multiplexed-message-handler-runner.js","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/multiplexed-message-handler-runner.ts"],"names":[],"mappings":";;;AASA,uDAAoD;AAEpD,sGAA8F;AAC9F,2EAAmE;AAQnE,MAAa,+BAAgC,SAAQ,gDAAoB;IAMvE,YAAY,eAAiC;QAC3C,KAAK,CAAC,eAAe,CAAC,CAAC;QANN,
|
|
1
|
+
{"version":3,"file":"multiplexed-message-handler-runner.js","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/multiplexed-message-handler-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_delete-queue.d.ts","sourceRoot":"","sources":["../../../../../src/queue-manager/_/_delete-queue.ts"],"names":[],"mappings":"AASA,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAW1B,OAAO,EAAuB,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"_delete-queue.d.ts","sourceRoot":"","sources":["../../../../../src/queue-manager/_/_delete-queue.ts"],"names":[],"mappings":"AASA,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAW1B,OAAO,EAAuB,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAgCtE,wBAAgB,YAAY,CAC1B,WAAW,EAAE,YAAY,EACzB,WAAW,EAAE,YAAY,EACzB,KAAK,EAAE,iBAAiB,GAAG,SAAS,EACpC,EAAE,EAAE,SAAS,CAAC,iBAAiB,CAAC,GAC/B,IAAI,CAuHN"}
|
|
@@ -12,19 +12,26 @@ const _get_queue_consumer_ids_js_1 = require("./_get-queue-consumer-ids.js");
|
|
|
12
12
|
const _get_queue_properties_js_1 = require("./_get-queue-properties.js");
|
|
13
13
|
const processing_queue_js_1 = require("../../consumer/message-handler/consume-message/processing-queue.js");
|
|
14
14
|
function checkOnlineConsumers(redisClient, queue, cb) {
|
|
15
|
-
(0, _get_queue_consumer_ids_js_1._getQueueConsumerIds)(redisClient, queue, (err,
|
|
15
|
+
(0, _get_queue_consumer_ids_js_1._getQueueConsumerIds)(redisClient, queue, (err, consumerIds) => {
|
|
16
16
|
if (err)
|
|
17
17
|
cb(err);
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
else if (!consumerIds || !consumerIds.length)
|
|
19
|
+
cb();
|
|
20
|
+
else {
|
|
21
|
+
consumer_heartbeat_js_1.ConsumerHeartbeat.isConsumerListAlive(redisClient, consumerIds, (err, aliveMap) => {
|
|
20
22
|
if (err)
|
|
21
|
-
|
|
22
|
-
else
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
cb(err);
|
|
24
|
+
else {
|
|
25
|
+
const online = aliveMap
|
|
26
|
+
? Object.values(aliveMap).some((i) => i)
|
|
27
|
+
: false;
|
|
28
|
+
if (online)
|
|
29
|
+
cb(new index_js_1.QueueManagerActiveConsumersError());
|
|
30
|
+
else
|
|
31
|
+
cb();
|
|
32
|
+
}
|
|
26
33
|
});
|
|
27
|
-
}
|
|
34
|
+
}
|
|
28
35
|
});
|
|
29
36
|
}
|
|
30
37
|
function _deleteQueue(redisClient, queueParams, multi, cb) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_delete-queue.js","sourceRoot":"","sources":["../../../../../src/queue-manager/_/_delete-queue.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"_delete-queue.js","sourceRoot":"","sources":["../../../../../src/queue-manager/_/_delete-queue.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ export declare class ConsumerHeartbeat extends Runnable<TConsumerHeartbeatEvent>
|
|
|
15
15
|
private currentDelayMs;
|
|
16
16
|
constructor(consumer: Consumer);
|
|
17
17
|
static isConsumerAlive(redisClient: IRedisClient, consumerId: string, cb: ICallback<boolean>): void;
|
|
18
|
+
static isConsumerListAlive(redisClient: IRedisClient, consumerIds: string[], cb: ICallback<Record<string, boolean>>): void;
|
|
18
19
|
protected getLogger(): ILogger;
|
|
19
20
|
private getCpuUsage;
|
|
20
21
|
protected getPayload(): IConsumerHeartbeat;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consumer-heartbeat.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/consumer-heartbeat/consumer-heartbeat.ts"],"names":[],"mappings":"AAUA,OAAO,
|
|
1
|
+
{"version":3,"file":"consumer-heartbeat.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/consumer-heartbeat/consumer-heartbeat.ts"],"names":[],"mappings":"AAUA,OAAO,EAGL,SAAS,EACT,OAAO,EACP,YAAY,EACZ,QAAQ,EACR,KAAK,EACN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAGhE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAUtD,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,KAAK,EAAE,KAAK,CAAC;IACvB,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACvC,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC7B,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC;IAG1B,OAAO,CAAC,YAAY,CAAoB;IACxC,OAAO,CAAC,aAAa,CAAsB;IAG3C,OAAO,CAAC,cAAc,CAAwC;gBAElD,QAAQ,EAAE,QAAQ;IAyC9B,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;IAwB1C,OAAO,CAAC,gBAAgB;IAoBxB,SAAS,CAAC,IAAI,IAAI,IAAI;cAsEH,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,CAAC,EAAE;cAoCtC,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,CAAC,EAAE;CAgC5D"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as os from 'os';
|
|
2
|
-
import { createLogger, Runnable, Timer, } from 'redis-smq-common';
|
|
2
|
+
import { CallbackEmptyReplyError, createLogger, Runnable, Timer, } from 'redis-smq-common';
|
|
3
3
|
import { redisKeys } from '../../common/redis-keys/redis-keys.js';
|
|
4
4
|
import { Configuration } from '../../config/index.js';
|
|
5
5
|
import { eventBusPublisher } from './event-bus-publisher.js';
|
|
@@ -47,6 +47,27 @@ export class ConsumerHeartbeat extends Runnable {
|
|
|
47
47
|
cb(null, isAlive);
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
|
+
static isConsumerListAlive(redisClient, consumerIds, cb) {
|
|
51
|
+
if (!consumerIds.length) {
|
|
52
|
+
cb(null, {});
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
const heartbeatKeys = consumerIds.map((id) => {
|
|
56
|
+
const { keyConsumerHeartbeat } = redisKeys.getConsumerKeys(id);
|
|
57
|
+
return keyConsumerHeartbeat;
|
|
58
|
+
});
|
|
59
|
+
redisClient.mget(heartbeatKeys, (err, replies) => {
|
|
60
|
+
if (err)
|
|
61
|
+
return cb(err);
|
|
62
|
+
if (!replies)
|
|
63
|
+
return cb(new CallbackEmptyReplyError());
|
|
64
|
+
const result = {};
|
|
65
|
+
consumerIds.forEach((id, index) => {
|
|
66
|
+
result[id] = !!replies[index];
|
|
67
|
+
});
|
|
68
|
+
cb(null, result);
|
|
69
|
+
});
|
|
70
|
+
}
|
|
50
71
|
getLogger() {
|
|
51
72
|
return this.logger;
|
|
52
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consumer-heartbeat.js","sourceRoot":"","sources":["../../../../../src/consumer/consumer-heartbeat/consumer-heartbeat.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"consumer-heartbeat.js","sourceRoot":"","sources":["../../../../../src/consumer/consumer-heartbeat/consumer-heartbeat.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,6 +12,8 @@ export declare class MessageHandlerRunner extends Runnable<TConsumerMessageHandl
|
|
|
12
12
|
protected messageHandlerInstances: MessageHandler[];
|
|
13
13
|
protected messageHandlers: IConsumerMessageHandlerParams[];
|
|
14
14
|
constructor(consumerContext: IConsumerContext);
|
|
15
|
+
protected getQueueIdentifier(queue: IQueueParsedParams): string;
|
|
16
|
+
protected isSameQueue(q1: IQueueParsedParams, q2: IQueueParsedParams): boolean;
|
|
15
17
|
protected scheduleReconciliation: () => void;
|
|
16
18
|
protected reconcileHandlers: () => void;
|
|
17
19
|
removeMessageHandler(queue: IQueueParsedParams, cb: ICallback<void>): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-handler-runner.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/message-handler-runner.ts"],"names":[],"mappings":"AASA,OAAO,EAAS,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,kCAAkC,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEvE,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,EACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAQhE,qBAAa,oBAAqB,SAAQ,QAAQ,CAAC,kCAAkC,CAAC;IACpF,SAAS,CAAC,QAAQ,CAAC,6BAA6B,QAAQ;IACxD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACnC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC;IAE1C,SAAS,CAAC,uBAAuB,EAAE,cAAc,EAAE,CAAM;IACzD,SAAS,CAAC,eAAe,EAAE,6BAA6B,EAAE,CAAM;gBAEpD,eAAe,EAAE,gBAAgB;IAe7C,SAAS,CAAC,sBAAsB,QAAO,IAAI,CAOzC;IAMF,SAAS,CAAC,iBAAiB,QAAO,IAAI,
|
|
1
|
+
{"version":3,"file":"message-handler-runner.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/message-handler-runner.ts"],"names":[],"mappings":"AASA,OAAO,EAAS,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,kCAAkC,EAAE,MAAM,uBAAuB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEvE,OAAO,EACL,6BAA6B,EAC7B,uBAAuB,EACxB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAQhE,qBAAa,oBAAqB,SAAQ,QAAQ,CAAC,kCAAkC,CAAC;IACpF,SAAS,CAAC,QAAQ,CAAC,6BAA6B,QAAQ;IACxD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,gBAAgB,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACnC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,KAAK,CAAC;IAE1C,SAAS,CAAC,uBAAuB,EAAE,cAAc,EAAE,CAAM;IACzD,SAAS,CAAC,eAAe,EAAE,6BAA6B,EAAE,CAAM;gBAEpD,eAAe,EAAE,gBAAgB;IAe7C,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM;IAS/D,SAAS,CAAC,WAAW,CACnB,EAAE,EAAE,kBAAkB,EACtB,EAAE,EAAE,kBAAkB,GACrB,OAAO;IAOV,SAAS,CAAC,sBAAsB,QAAO,IAAI,CAOzC;IAMF,SAAS,CAAC,iBAAiB,QAAO,IAAI,CAmDpC;IAEF,oBAAoB,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI;IAoB1E,iBAAiB,CACf,KAAK,EAAE,kBAAkB,EACzB,cAAc,EAAE,uBAAuB,EACvC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAClB,IAAI;IAyBP,SAAS,IAAI,kBAAkB,EAAE;cAId,SAAS,IAAI,OAAO;IAOvC,SAAS,CAAC,yBAAyB,CACjC,KAAK,EAAE,kBAAkB,GACxB,cAAc,GAAG,SAAS;IAS7B,SAAS,CAAC,iBAAiB,CACzB,KAAK,EAAE,kBAAkB,GACxB,6BAA6B,GAAG,SAAS;IAO5C,SAAS,CAAC,4BAA4B,CACpC,aAAa,EAAE,6BAA6B,GAC3C,cAAc;IAmBjB,SAAS,CAAC,iBAAiB,CACzB,aAAa,EAAE,6BAA6B,EAC5C,EAAE,EAAE,SAAS,GACZ,IAAI;IAyBP,SAAS,CAAC,sBAAsB,CAC9B,cAAc,EAAE,cAAc,EAC9B,EAAE,EAAE,SAAS,GACZ,IAAI;IAYP,SAAS,CAAC,kBAAkB,GAAI,IAAI,SAAS,KAAG,IAAI,CAQlD;IAKF,SAAS,CAAC,uBAAuB,GAAI,IAAI,SAAS,KAAG,IAAI,CAWvD;cAEiB,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,CAAC,EAAE;cAUtC,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,KAAK,IAAI,CAAC,EAAE;cAUxC,WAAW,CAAC,GAAG,EAAE,KAAK;CAW1C"}
|
|
@@ -20,6 +20,12 @@ export class MessageHandlerRunner extends Runnable {
|
|
|
20
20
|
this.supervisorTimer.on('error', (err) => this.handleError(err));
|
|
21
21
|
this.logger.info(`MessageHandlerRunner with ID: ${this.id} initialized.`);
|
|
22
22
|
}
|
|
23
|
+
getQueueIdentifier(queue) {
|
|
24
|
+
return `${queue.queueParams.ns}:${queue.queueParams.name}:${queue.groupId ?? ''}`;
|
|
25
|
+
}
|
|
26
|
+
isSameQueue(q1, q2) {
|
|
27
|
+
return this.getQueueIdentifier(q1) === this.getQueueIdentifier(q2);
|
|
28
|
+
}
|
|
23
29
|
scheduleReconciliation = () => {
|
|
24
30
|
if (this.isRunning()) {
|
|
25
31
|
this.supervisorTimer.setTimeout(this.reconcileHandlers, this.handlerReconciliationInterval);
|
|
@@ -29,8 +35,8 @@ export class MessageHandlerRunner extends Runnable {
|
|
|
29
35
|
if (!this.isRunning())
|
|
30
36
|
return;
|
|
31
37
|
this.logger.debug('Running handler reconciliation...');
|
|
32
|
-
const runningQueues = this.messageHandlerInstances.map((i) =>
|
|
33
|
-
const zombieHandlers = this.messageHandlers.filter((i) => !runningQueues.
|
|
38
|
+
const runningQueues = new Set(this.messageHandlerInstances.map((i) => this.getQueueIdentifier(i.getQueue())));
|
|
39
|
+
const zombieHandlers = this.messageHandlers.filter((i) => !runningQueues.has(this.getQueueIdentifier(i.queue)));
|
|
34
40
|
if (zombieHandlers.length > 0) {
|
|
35
41
|
this.logger.warn(`Found ${zombieHandlers.length} zombie handler(s). Attempting to restart sequentially...`);
|
|
36
42
|
const tasks = zombieHandlers.map((handlerParams) => {
|
|
@@ -63,12 +69,7 @@ export class MessageHandlerRunner extends Runnable {
|
|
|
63
69
|
if (!handler) {
|
|
64
70
|
return cb();
|
|
65
71
|
}
|
|
66
|
-
this.messageHandlers = this.messageHandlers.filter((h) =>
|
|
67
|
-
const q = h.queue;
|
|
68
|
-
return !(queue.queueParams.name === q.queueParams.name &&
|
|
69
|
-
queue.queueParams.ns === q.queueParams.ns &&
|
|
70
|
-
queue.groupId === q.groupId);
|
|
71
|
-
});
|
|
72
|
+
this.messageHandlers = this.messageHandlers.filter((h) => !this.isSameQueue(h.queue, queue));
|
|
72
73
|
const handlerInstance = this.getMessageHandlerInstance(queue);
|
|
73
74
|
if (handlerInstance) {
|
|
74
75
|
this.shutdownMessageHandler(handlerInstance, cb);
|
|
@@ -102,17 +103,10 @@ export class MessageHandlerRunner extends Runnable {
|
|
|
102
103
|
return this.logger;
|
|
103
104
|
}
|
|
104
105
|
getMessageHandlerInstance(queue) {
|
|
105
|
-
return this.messageHandlerInstances.find((i) =>
|
|
106
|
-
const handlerQueue = i.getQueue();
|
|
107
|
-
return (handlerQueue.queueParams.name === queue.queueParams.name &&
|
|
108
|
-
handlerQueue.queueParams.ns === queue.queueParams.ns &&
|
|
109
|
-
handlerQueue.groupId === queue.groupId);
|
|
110
|
-
});
|
|
106
|
+
return this.messageHandlerInstances.find((i) => this.isSameQueue(i.getQueue(), queue));
|
|
111
107
|
}
|
|
112
108
|
getMessageHandler(queue) {
|
|
113
|
-
return this.messageHandlers.find((i) => i.queue
|
|
114
|
-
i.queue.queueParams.ns === queue.queueParams.ns &&
|
|
115
|
-
i.queue.groupId === queue.groupId);
|
|
109
|
+
return this.messageHandlers.find((i) => this.isSameQueue(i.queue, queue));
|
|
116
110
|
}
|
|
117
111
|
createMessageHandlerInstance(handlerParams) {
|
|
118
112
|
const instance = new MessageHandler(this.consumerContext, handlerParams, true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-handler-runner.js","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/message-handler-runner.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,KAAK,EAAsB,QAAQ,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAG9E,OAAO,EAAE,gCAAgC,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAa7D,MAAM,OAAO,oBAAqB,SAAQ,QAA4C;IACjE,6BAA6B,GAAG,IAAI,CAAC;IACrC,eAAe,CAAmB;IAClC,MAAM,CAAU;IAChB,eAAe,CAAQ;IAEhC,uBAAuB,GAAqB,EAAE,CAAC;IAC/C,eAAe,GAAoC,EAAE,CAAC;IAEhE,YAAY,eAAiC;QAC3C,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC;QAC1C,IAAI,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;YACjD,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QACD,IAAI,CAAC,eAAe,GAAG,IAAI,KAAK,EAAE,CAAC;QACnC,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QACjE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,IAAI,CAAC,EAAE,eAAe,CAAC,CAAC;IAC5E,CAAC;IAKS,sBAAsB,GAAG,GAAS,EAAE;QAC5C,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;YACrB,IAAI,CAAC,eAAe,CAAC,UAAU,CAC7B,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,6BAA6B,CACnC,CAAC;QACJ,CAAC;IACH,CAAC,CAAC;IAMQ,iBAAiB,GAAG,GAAS,EAAE;QACvC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YAAE,OAAO;QAE9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,MAAM,aAAa,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"message-handler-runner.js","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/message-handler-runner.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/src/consumer/message-handler-runner/multiplexed-message-handler-runner.d.ts
CHANGED
|
@@ -4,12 +4,11 @@ import { MessageHandlerRunner } from './message-handler-runner.js';
|
|
|
4
4
|
import { IConsumerMessageHandlerParams } from '../message-handler/types/index.js';
|
|
5
5
|
import { IConsumerContext } from '../types/consumer-context.js';
|
|
6
6
|
export declare class MultiplexedMessageHandlerRunner extends MessageHandlerRunner {
|
|
7
|
-
protected readonly
|
|
7
|
+
protected readonly multiplexingTickIntervalMs: number;
|
|
8
8
|
protected schedulerTimer: Timer;
|
|
9
9
|
protected index: number;
|
|
10
10
|
protected activeMessageHandler: MessageHandler | null;
|
|
11
11
|
constructor(consumerContext: IConsumerContext);
|
|
12
|
-
protected reconcileHandlers: () => void;
|
|
13
12
|
protected scheduleNextTick: () => void;
|
|
14
13
|
protected getNextMessageHandler(): MessageHandler | null;
|
|
15
14
|
protected execNextMessageHandler: () => void;
|
package/dist/esm/src/consumer/message-handler-runner/multiplexed-message-handler-runner.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multiplexed-message-handler-runner.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/multiplexed-message-handler-runner.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAMhE,qBAAa,+BAAgC,SAAQ,oBAAoB;IACvE,SAAS,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"multiplexed-message-handler-runner.d.ts","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/multiplexed-message-handler-runner.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,6BAA6B,EAAE,MAAM,mCAAmC,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAMhE,qBAAa,+BAAgC,SAAQ,oBAAoB;IACvE,SAAS,CAAC,QAAQ,CAAC,0BAA0B,EAAE,MAAM,CAAQ;IAC7D,SAAS,CAAC,cAAc,EAAE,KAAK,CAAC;IAChC,SAAS,CAAC,KAAK,EAAE,MAAM,CAAK;IAC5B,SAAS,CAAC,oBAAoB,EAAE,cAAc,GAAG,IAAI,CAAQ;gBAEjD,eAAe,EAAE,gBAAgB;IAU7C,SAAS,CAAC,gBAAgB,QAAO,IAAI,CAOnC;IAKF,SAAS,CAAC,qBAAqB,IAAI,cAAc,GAAG,IAAI;IAcxD,SAAS,CAAC,sBAAsB,QAAO,IAAI,CAuBzC;cAKiB,4BAA4B,CAC7C,aAAa,EAAE,6BAA6B,GAC3C,cAAc;cA0BE,sBAAsB,CACvC,cAAc,EAAE,cAAc,EAC9B,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,GAClB,IAAI;cAiBY,OAAO,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;cAa5C,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,EAAE;CAUlE"}
|
|
@@ -2,7 +2,7 @@ import { Timer } from 'redis-smq-common';
|
|
|
2
2
|
import { MultiplexedMessageHandler } from '../message-handler/multiplexed-message-handler.js';
|
|
3
3
|
import { MessageHandlerRunner } from './message-handler-runner.js';
|
|
4
4
|
export class MultiplexedMessageHandlerRunner extends MessageHandlerRunner {
|
|
5
|
-
|
|
5
|
+
multiplexingTickIntervalMs = 1000;
|
|
6
6
|
schedulerTimer;
|
|
7
7
|
index = 0;
|
|
8
8
|
activeMessageHandler = null;
|
|
@@ -11,13 +11,11 @@ export class MultiplexedMessageHandlerRunner extends MessageHandlerRunner {
|
|
|
11
11
|
this.schedulerTimer = new Timer();
|
|
12
12
|
this.schedulerTimer.on('error', (err) => this.handleError(err));
|
|
13
13
|
}
|
|
14
|
-
reconcileHandlers = () => {
|
|
15
|
-
};
|
|
16
14
|
scheduleNextTick = () => {
|
|
17
15
|
if (!this.isRunning())
|
|
18
16
|
return;
|
|
19
17
|
this.schedulerTimer.reset();
|
|
20
|
-
this.schedulerTimer.setTimeout(() => this.execNextMessageHandler(), this.
|
|
18
|
+
this.schedulerTimer.setTimeout(() => this.execNextMessageHandler(), this.multiplexingTickIntervalMs);
|
|
21
19
|
};
|
|
22
20
|
getNextMessageHandler() {
|
|
23
21
|
const count = this.messageHandlerInstances.length;
|
|
@@ -32,22 +30,28 @@ export class MultiplexedMessageHandlerRunner extends MessageHandlerRunner {
|
|
|
32
30
|
execNextMessageHandler = () => {
|
|
33
31
|
if (!this.isRunning())
|
|
34
32
|
return;
|
|
35
|
-
|
|
36
|
-
if (
|
|
37
|
-
|
|
38
|
-
|
|
33
|
+
const totalHandlers = this.messageHandlerInstances.length;
|
|
34
|
+
if (totalHandlers === 0) {
|
|
35
|
+
this.scheduleNextTick();
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
38
|
+
for (let i = 0; i < totalHandlers; i += 1) {
|
|
39
|
+
const handler = this.getNextMessageHandler();
|
|
40
|
+
if (handler && handler.isRunning() && handler.isUp()) {
|
|
41
|
+
this.activeMessageHandler = handler;
|
|
39
42
|
this.activeMessageHandler.dequeue();
|
|
43
|
+
return;
|
|
40
44
|
}
|
|
41
|
-
else {
|
|
42
|
-
this.scheduleNextTick();
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
46
|
-
this.scheduleNextTick();
|
|
47
45
|
}
|
|
46
|
+
this.activeMessageHandler = null;
|
|
47
|
+
this.scheduleNextTick();
|
|
48
48
|
};
|
|
49
49
|
createMessageHandlerInstance(handlerParams) {
|
|
50
50
|
const instance = new MultiplexedMessageHandler(this.consumerContext, handlerParams, this.scheduleNextTick);
|
|
51
|
+
instance.on('consumer.messageHandler.error', (err) => {
|
|
52
|
+
this.logger.error(`MultiplexedMessageHandler [${instance.getId()}] has experienced a runtime error: ${err.message}. Shutting down instance. The supervisor will attempt to restart it.`);
|
|
53
|
+
this.shutdownMessageHandler(instance, () => { });
|
|
54
|
+
});
|
|
51
55
|
this.messageHandlerInstances.push(instance);
|
|
52
56
|
this.logger.info(`Created MultiplexedMessageHandler (ID: ${instance.getId()}) for queue: ${handlerParams.queue.queueParams.name}. Total: ${this.messageHandlerInstances.length}`);
|
|
53
57
|
return instance;
|
|
@@ -56,7 +60,8 @@ export class MultiplexedMessageHandlerRunner extends MessageHandlerRunner {
|
|
|
56
60
|
const wasActive = messageHandler === this.activeMessageHandler;
|
|
57
61
|
super.shutdownMessageHandler(messageHandler, () => {
|
|
58
62
|
if (wasActive) {
|
|
59
|
-
this.
|
|
63
|
+
this.activeMessageHandler = null;
|
|
64
|
+
setTimeout(() => this.execNextMessageHandler(), 0);
|
|
60
65
|
}
|
|
61
66
|
cb();
|
|
62
67
|
});
|
|
@@ -70,8 +75,12 @@ export class MultiplexedMessageHandlerRunner extends MessageHandlerRunner {
|
|
|
70
75
|
]);
|
|
71
76
|
}
|
|
72
77
|
goingDown() {
|
|
73
|
-
|
|
74
|
-
|
|
78
|
+
return [
|
|
79
|
+
(cb) => {
|
|
80
|
+
this.schedulerTimer.reset();
|
|
81
|
+
cb();
|
|
82
|
+
},
|
|
83
|
+
].concat(super.goingDown());
|
|
75
84
|
}
|
|
76
85
|
}
|
|
77
86
|
//# sourceMappingURL=multiplexed-message-handler-runner.js.map
|
package/dist/esm/src/consumer/message-handler-runner/multiplexed-message-handler-runner.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multiplexed-message-handler-runner.js","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/multiplexed-message-handler-runner.ts"],"names":[],"mappings":"AASA,OAAO,EAAa,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAQnE,MAAM,OAAO,+BAAgC,SAAQ,oBAAoB;IACpD,
|
|
1
|
+
{"version":3,"file":"multiplexed-message-handler-runner.js","sourceRoot":"","sources":["../../../../../src/consumer/message-handler-runner/multiplexed-message-handler-runner.ts"],"names":[],"mappings":"AASA,OAAO,EAAa,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,mDAAmD,CAAC;AAC9F,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAQnE,MAAM,OAAO,+BAAgC,SAAQ,oBAAoB;IACpD,0BAA0B,GAAW,IAAI,CAAC;IACnD,cAAc,CAAQ;IACtB,KAAK,GAAW,CAAC,CAAC;IAClB,oBAAoB,GAA0B,IAAI,CAAC;IAE7D,YAAY,eAAiC;QAC3C,KAAK,CAAC,eAAe,CAAC,CAAC;QACvB,IAAI,CAAC,cAAc,GAAG,IAAI,KAAK,EAAE,CAAC;QAClC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;IAClE,CAAC;IAMS,gBAAgB,GAAG,GAAS,EAAE;QACtC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YAAE,OAAO;QAC9B,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;QAC5B,IAAI,CAAC,cAAc,CAAC,UAAU,CAC5B,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,EACnC,IAAI,CAAC,0BAA0B,CAChC,CAAC;IACJ,CAAC,CAAC;IAKQ,qBAAqB;QAC7B,MAAM,KAAK,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC;QAClD,IAAI,KAAK,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAC7B,IAAI,IAAI,CAAC,KAAK,IAAI,KAAK;YAAE,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzD,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;QACtC,OAAO,OAAO,CAAC;IACjB,CAAC;IAOS,sBAAsB,GAAG,GAAS,EAAE;QAC5C,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YAAE,OAAO;QAE9B,MAAM,aAAa,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC;QAC1D,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QAGD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC7C,IAAI,OAAO,IAAI,OAAO,CAAC,SAAS,EAAE,IAAI,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;gBACrD,IAAI,CAAC,oBAAoB,GAAG,OAAO,CAAC;gBACpC,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC;gBAEpC,OAAO;YACT,CAAC;QACH,CAAC;QAGD,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;QACjC,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC,CAAC;IAKiB,4BAA4B,CAC7C,aAA4C;QAI5C,MAAM,QAAQ,GAAG,IAAI,yBAAyB,CAC5C,IAAI,CAAC,eAAe,EACpB,aAAa,EACb,IAAI,CAAC,gBAAgB,CACtB,CAAC;QACF,QAAQ,CAAC,EAAE,CAAC,+BAA+B,EAAE,CAAC,GAAG,EAAE,EAAE;YACnD,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,8BAA8B,QAAQ,CAAC,KAAK,EAAE,sCAAsC,GAAG,CAAC,OAAO,sEAAsE,CACtK,CAAC;YACF,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,0CAA0C,QAAQ,CAAC,KAAK,EAAE,gBACxD,aAAa,CAAC,KAAK,CAAC,WAAW,CAAC,IAClC,YAAY,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,CAClD,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAKkB,sBAAsB,CACvC,cAA8B,EAC9B,EAAmB;QAEnB,MAAM,SAAS,GAAG,cAAc,KAAK,IAAI,CAAC,oBAAoB,CAAC;QAC/D,KAAK,CAAC,sBAAsB,CAAC,cAAc,EAAE,GAAG,EAAE;YAChD,IAAI,SAAS,EAAE,CAAC;gBACd,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC;gBAGjC,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC,CAAC;YACrD,CAAC;YACD,EAAE,EAAE,CAAC;QACP,CAAC,CAAC,CAAC;IACL,CAAC;IAMkB,OAAO;QACxB,OAAO,KAAK,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;YAC5B,CAAC,EAAmB,EAAE,EAAE;gBAEtB,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAC9B,EAAE,EAAE,CAAC;YACP,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAKkB,SAAS;QAC1B,OAAO;YACL,CAAC,EAAmB,EAAE,EAAE;gBACtB,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,CAAC;gBAC5B,EAAE,EAAE,CAAC;YACP,CAAC;SAGF,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC;IAC9B,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_delete-queue.d.ts","sourceRoot":"","sources":["../../../../../src/queue-manager/_/_delete-queue.ts"],"names":[],"mappings":"AASA,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAW1B,OAAO,EAAuB,YAAY,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"_delete-queue.d.ts","sourceRoot":"","sources":["../../../../../src/queue-manager/_/_delete-queue.ts"],"names":[],"mappings":"AASA,OAAO,EAEL,SAAS,EACT,YAAY,EACZ,iBAAiB,EAClB,MAAM,kBAAkB,CAAC;AAW1B,OAAO,EAAuB,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAgCtE,wBAAgB,YAAY,CAC1B,WAAW,EAAE,YAAY,EACzB,WAAW,EAAE,YAAY,EACzB,KAAK,EAAE,iBAAiB,GAAG,SAAS,EACpC,EAAE,EAAE,SAAS,CAAC,iBAAiB,CAAC,GAC/B,IAAI,CAuHN"}
|
|
@@ -9,19 +9,26 @@ import { _getQueueConsumerIds } from './_get-queue-consumer-ids.js';
|
|
|
9
9
|
import { _getQueueProperties } from './_get-queue-properties.js';
|
|
10
10
|
import { processingQueue } from '../../consumer/message-handler/consume-message/processing-queue.js';
|
|
11
11
|
function checkOnlineConsumers(redisClient, queue, cb) {
|
|
12
|
-
_getQueueConsumerIds(redisClient, queue, (err,
|
|
12
|
+
_getQueueConsumerIds(redisClient, queue, (err, consumerIds) => {
|
|
13
13
|
if (err)
|
|
14
14
|
cb(err);
|
|
15
|
-
|
|
16
|
-
|
|
15
|
+
else if (!consumerIds || !consumerIds.length)
|
|
16
|
+
cb();
|
|
17
|
+
else {
|
|
18
|
+
ConsumerHeartbeat.isConsumerListAlive(redisClient, consumerIds, (err, aliveMap) => {
|
|
17
19
|
if (err)
|
|
18
|
-
|
|
19
|
-
else
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
cb(err);
|
|
21
|
+
else {
|
|
22
|
+
const online = aliveMap
|
|
23
|
+
? Object.values(aliveMap).some((i) => i)
|
|
24
|
+
: false;
|
|
25
|
+
if (online)
|
|
26
|
+
cb(new QueueManagerActiveConsumersError());
|
|
27
|
+
else
|
|
28
|
+
cb();
|
|
29
|
+
}
|
|
23
30
|
});
|
|
24
|
-
}
|
|
31
|
+
}
|
|
25
32
|
});
|
|
26
33
|
}
|
|
27
34
|
export function _deleteQueue(redisClient, queueParams, multi, cb) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_delete-queue.js","sourceRoot":"","sources":["../../../../../src/queue-manager/_/_delete-queue.ts"],"names":[],"mappings":"AASA,OAAO,EACL,KAAK,GAIN,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,yDAAyD,CAAC;AAC5F,OAAO,EACL,2BAA2B,EAC3B,gCAAgC,EAChC,kBAAkB,EAClB,kBAAkB,GACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAgB,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,oEAAoE,CAAC;AAErG,SAAS,oBAAoB,CAC3B,WAAyB,EACzB,KAAmB,EACnB,EAAmB;IAEnB,oBAAoB,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"_delete-queue.js","sourceRoot":"","sources":["../../../../../src/queue-manager/_/_delete-queue.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "redis-smq",
|
|
3
|
-
"version": "9.0.
|
|
3
|
+
"version": "9.0.4-next.0",
|
|
4
4
|
"description": "A high-performance, reliable, and scalable message queue for Node.js.",
|
|
5
5
|
"author": "Weyoss <weyoss@protonmail.com>",
|
|
6
6
|
"license": "MIT",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"peerDependencies": {
|
|
53
53
|
"@redis/client": "^5",
|
|
54
54
|
"ioredis": "^5",
|
|
55
|
-
"redis-smq-common": "^9.0.
|
|
55
|
+
"redis-smq-common": "^9.0.4-next.0"
|
|
56
56
|
},
|
|
57
57
|
"peerDependenciesMeta": {
|
|
58
58
|
"@redis/client": {
|