rabbit-queue 5.8.0 → 5.9.1
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/README.md +12 -0
- package/js/queue.js +11 -6
- package/js/queue.js.map +1 -1
- package/js/rabbit.d.ts +2 -0
- package/js/rabbit.js +14 -0
- package/js/rabbit.js.map +1 -1
- package/package.json +3 -2
package/README.md
CHANGED
|
@@ -250,6 +250,18 @@ new DemoHandler('demoQueue', rabbit, {
|
|
|
250
250
|
rabbit.publish('demoQueue', { test: 'data' }, { correlationId: '4' });
|
|
251
251
|
```
|
|
252
252
|
|
|
253
|
+
### Queue Type Behavior
|
|
254
|
+
|
|
255
|
+
You can control the type of queues created with the `defaultQueueType` option in your Rabbit configuration.
|
|
256
|
+
```javascript
|
|
257
|
+
const rabbit = new Rabbit(process.env.RABBIT_URL, { defaultQueueType: 'quorum' });
|
|
258
|
+
```
|
|
259
|
+
|
|
260
|
+
When declaring queues, the following rules apply:
|
|
261
|
+
- **Non-durable, exclusive, or auto-delete queues** always use **classic** queue type, since **quorum** queues and **streams** are always durable and not designed for temporary or connection-bound queues.
|
|
262
|
+
|
|
263
|
+
The type of a queue is **immutable** once it has been declared. Attempting to change it after creation will result in a **PRECONDITION_FAILED** error.
|
|
264
|
+
|
|
253
265
|
### Changelog
|
|
254
266
|
|
|
255
267
|
### New in v5.4.x
|
package/js/queue.js
CHANGED
|
@@ -35,7 +35,7 @@ class Queue {
|
|
|
35
35
|
this.created = this.create();
|
|
36
36
|
}
|
|
37
37
|
create() {
|
|
38
|
-
var _a, _b;
|
|
38
|
+
var _a, _b, _c;
|
|
39
39
|
return __awaiter(this, void 0, void 0, function* () {
|
|
40
40
|
const { exclusive, priority, durable, autoDelete, messageTtl, expires, deadLetterExchange, deadLetterRoutingKey, maxLength, } = this.options;
|
|
41
41
|
let queueOptions = {
|
|
@@ -52,8 +52,12 @@ class Queue {
|
|
|
52
52
|
if (priority !== undefined) {
|
|
53
53
|
queueOptions.arguments = Object.assign(Object.assign({}, queueOptions.arguments), { 'x-max-priority': priority });
|
|
54
54
|
}
|
|
55
|
-
if (
|
|
56
|
-
(
|
|
55
|
+
if (!durable || exclusive || autoDelete) {
|
|
56
|
+
(_a = queueOptions.arguments) !== null && _a !== void 0 ? _a : (queueOptions.arguments = {});
|
|
57
|
+
queueOptions.arguments['x-queue-type'] = 'classic';
|
|
58
|
+
}
|
|
59
|
+
if (((_b = queueOptions.arguments) === null || _b === void 0 ? void 0 : _b['x-max-priority']) &&
|
|
60
|
+
((_c = queueOptions.arguments) === null || _c === void 0 ? void 0 : _c['x-queue-type']) === 'quorum') {
|
|
57
61
|
logger.warn(`Invalid x-max-priority argument for quorum queue '${this.name}'`);
|
|
58
62
|
delete queueOptions.arguments['x-max-priority'];
|
|
59
63
|
}
|
|
@@ -64,13 +68,14 @@ class Queue {
|
|
|
64
68
|
return __awaiter(this, void 0, void 0, function* () {
|
|
65
69
|
yield this.created;
|
|
66
70
|
this.handler = handler;
|
|
67
|
-
|
|
68
|
-
this.tag = tag;
|
|
71
|
+
this.tag = yield this.channel.consume(this.name, this.onMessage.bind(this), { noAck: this.options.noAck });
|
|
69
72
|
});
|
|
70
73
|
}
|
|
71
74
|
unsubscribe() {
|
|
72
75
|
return __awaiter(this, void 0, void 0, function* () {
|
|
73
|
-
|
|
76
|
+
if (this.tag) {
|
|
77
|
+
yield this.channel.cancel(this.tag.consumerTag);
|
|
78
|
+
}
|
|
74
79
|
this.handler = null;
|
|
75
80
|
this.tag = null;
|
|
76
81
|
});
|
package/js/queue.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../ts/queue.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,6BAA6B;AAG7B,+CAAyC;AACzC,2CAAuC;AACvC,mCAAkC;AAClC,mDAAyC;AACzC,qCAAiC;AAEjC,MAAM,MAAM,GAAG,gBAAS,CAAC,cAAc,CAAC,CAAC;AACzC,MAAqB,KAAK;IAexB,YAAmB,OAAgB,EAAS,IAAY,EAAE,OAAwD;QAA/F,YAAO,GAAP,OAAO,CAAS;QAAS,SAAI,GAAJ,IAAI,CAAQ;QATxD,mBAAc,GAAG;YACf,OAAO,EAAE,IAAI;YACb,KAAK,EAAE,KAAK;SACb,CAAC;QAOA,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAC/D,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IAC/B,CAAC;IAEK,MAAM;;;YACV,MAAM,EACJ,SAAS,EACT,QAAQ,EACR,OAAO,EACP,UAAU,EACV,UAAU,EACV,OAAO,EACP,kBAAkB,EAClB,oBAAoB,EACpB,SAAS,GACV,GAAG,IAAI,CAAC,OAAO,CAAC;YACjB,IAAI,YAAY,GAA6B;gBAC3C,SAAS;gBACT,OAAO;gBACP,UAAU;gBACV,UAAU;gBACV,OAAO;gBACP,kBAAkB;gBAClB,oBAAoB;gBACpB,SAAS;gBACT,SAAS,oBAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAE;aACzC,CAAC;YACF,IAAI,QAAQ,KAAK,SAAS,EAAE;gBAC1B,YAAY,CAAC,SAAS,mCAAQ,YAAY,CAAC,SAAS,KAAE,gBAAgB,EAAE,QAAQ,GAAE,CAAC;aACpF;YACD,IAAI,CAAA,MAAA,YAAY,CAAC,SAAS,0CAAG,gBAAgB,CAAC;gBAC5C,CAAA,MAAA,YAAY,CAAC,SAAS,0CAAG,cAAc,CAAC,MAAK,QAAQ,EAAE;gBACvD,MAAM,CAAC,IAAI,CAAC,qDAAqD,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;gBAC/E,OAAO,YAAY,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;aACjD;YACD,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;;KACzD;IAEK,SAAS,CAAC,OAAwD;;YACtE,MAAM,IAAI,CAAC,OAAO,CAAC;YACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"queue.js","sourceRoot":"","sources":["../ts/queue.ts"],"names":[],"mappings":"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"}
|
package/js/rabbit.d.ts
CHANGED
|
@@ -28,6 +28,7 @@ export default class Rabbit extends EventEmitter {
|
|
|
28
28
|
socketOptions: any;
|
|
29
29
|
private defaultQueueType;
|
|
30
30
|
logger: ReturnType<typeof getLogger>;
|
|
31
|
+
private readonly sigtermHandler;
|
|
31
32
|
constructor(url: string, { prefetch, replyPattern, prefix, scheduledPublish, socketOptions, defaultQueueType, }?: {
|
|
32
33
|
prefetch?: number;
|
|
33
34
|
replyPattern?: boolean;
|
|
@@ -60,4 +61,5 @@ export default class Rabbit extends EventEmitter {
|
|
|
60
61
|
bindToTopic(queueName: string, topicName: string, prefix?: string): Promise<void>;
|
|
61
62
|
unbindFromTopic(queueName: string, topicName: string, prefix?: string): Promise<void>;
|
|
62
63
|
close(): Promise<void>;
|
|
64
|
+
private handleSigterm;
|
|
63
65
|
}
|
package/js/rabbit.js
CHANGED
|
@@ -34,7 +34,9 @@ class Rabbit extends events_1.EventEmitter {
|
|
|
34
34
|
this.scheduledPublish = scheduledPublish;
|
|
35
35
|
this.socketOptions = socketOptions;
|
|
36
36
|
this.defaultQueueType = defaultQueueType;
|
|
37
|
+
this.sigtermHandler = this.handleSigterm.bind(this);
|
|
37
38
|
this.reconnect();
|
|
39
|
+
process.once('SIGTERM', this.sigtermHandler);
|
|
38
40
|
}
|
|
39
41
|
connect() {
|
|
40
42
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -218,10 +220,22 @@ class Rabbit extends events_1.EventEmitter {
|
|
|
218
220
|
}
|
|
219
221
|
close() {
|
|
220
222
|
return __awaiter(this, void 0, void 0, function* () {
|
|
223
|
+
process.off('SIGTERM', this.sigtermHandler);
|
|
221
224
|
yield this.consumeConnection.close();
|
|
222
225
|
yield this.publishConnection.close();
|
|
223
226
|
});
|
|
224
227
|
}
|
|
228
|
+
handleSigterm() {
|
|
229
|
+
this.logger.info('Received SIGTERM. Cancelling consumers..');
|
|
230
|
+
for (const queue of Object.values(this.queues)) {
|
|
231
|
+
queue.unsubscribe()
|
|
232
|
+
.then(() => {
|
|
233
|
+
this.logger.debug(`Consumer for queue ${queue.name} cancelled.`);
|
|
234
|
+
}).catch(e => {
|
|
235
|
+
this.logger.error(`Consumer for queue ${queue.name} failed to cancel`, e);
|
|
236
|
+
});
|
|
237
|
+
}
|
|
238
|
+
}
|
|
225
239
|
}
|
|
226
240
|
exports.default = Rabbit;
|
|
227
241
|
Rabbit.STOP_PROPAGATION = queue_1.default.STOP_PROPAGATION;
|
package/js/rabbit.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rabbit.js","sourceRoot":"","sources":["../ts/rabbit.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,gCAAgC;AAChC,mCAAsC;AACtC,+CAAiD;AACjD,+CAAwE;AAExE,mCAA4B;AAC5B,yCAAkC;AAClC,iCAAiC;AACjC,qCAAiC;AAEjC,MAAqB,MAAO,SAAQ,qBAAY;
|
|
1
|
+
{"version":3,"file":"rabbit.js","sourceRoot":"","sources":["../ts/rabbit.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "rabbit-queue",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.9.1",
|
|
4
4
|
"description": "AMQP/RabbitMQ queue management library.",
|
|
5
5
|
"main": "js/index.js",
|
|
6
6
|
"keywords": [
|
|
@@ -52,6 +52,7 @@
|
|
|
52
52
|
},
|
|
53
53
|
"dependencies": {
|
|
54
54
|
"amqplib": ">=0.10.0",
|
|
55
|
+
"lodash": "^4.17.23",
|
|
55
56
|
"race-until": "~2.3.1",
|
|
56
57
|
"uuid": "~8.3.2"
|
|
57
58
|
},
|
|
@@ -66,7 +67,7 @@
|
|
|
66
67
|
"@types/uuid": "~8.3.1",
|
|
67
68
|
"husky": "~7.0.1",
|
|
68
69
|
"lint-staged": "~11.1.0",
|
|
69
|
-
"mocha": "
|
|
70
|
+
"mocha": "^11.7.5",
|
|
70
71
|
"nyc": "~15.1.0",
|
|
71
72
|
"prettier": "^3.5.3",
|
|
72
73
|
"should": "^13.2.3",
|