rxjs-rabbitmq 2.1.1 → 2.1.3

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.
@@ -19,7 +19,6 @@ export declare class RabbitMQClient {
19
19
  private exchanges;
20
20
  private bindings;
21
21
  private DEFAULT_LISTENER_TYPE;
22
- private EXCLUSIVE_QUEUE;
23
22
  private queueListeners;
24
23
  private queueToEventHandleMapping;
25
24
  private queueToEventCallbackMapping;
@@ -29,18 +28,20 @@ export declare class RabbitMQClient {
29
28
  get onMessage(): Observable<RmqEventMessage>;
30
29
  constructor(clientInitConfig: RabbitMqInitConfig);
31
30
  init(clientInitConfig: RabbitMqInitConfig): Promise<void>;
32
- getConnection(): Observable<Connection>;
33
- getChannel(): Observable<Channel>;
31
+ getConnection(): Connection;
32
+ getChannel(): Channel;
34
33
  private getQueueListener;
35
34
  private listenToQueue;
36
35
  onQueue(queue: string, options?: Options.Consume): {
37
36
  handle: (messageType: string) => Observable<RmqEventMessage>;
37
+ handleAll: (handler: RmqEventHandler) => Subscription;
38
38
  handleDefault: () => Observable<RmqEventMessage>;
39
39
  onEvent: (messageType: string, handler: RmqEventHandler) => Subscription;
40
40
  };
41
41
  forQueue(queue: string, options?: Options.Consume): Observable<RmqEventMessage>;
42
42
  ack(message: ConsumeMessage): void;
43
- sendMessage(options: RmqSendMessageParams): Promise<unknown>;
43
+ sendMessage(options: RmqSendMessageParams): void;
44
+ private getRpcMethods;
44
45
  sendRequest<T = any>(options: {
45
46
  queue: string;
46
47
  data: any;
@@ -7,9 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
7
7
  step((generator = generator.apply(thisArg, _arguments || [])).next());
8
8
  });
9
9
  };
10
- import { v1 as uuidv1 } from 'uuid';
10
+ import { v1 as uuidv1, v4 as uuidv4, } from 'uuid';
11
11
  import { connect } from "amqplib";
12
- import { BehaviorSubject, filter, firstValueFrom, map, mergeMap, ReplaySubject, Subject, take, tap, } from "rxjs";
12
+ import { BehaviorSubject, filter, firstValueFrom, mergeMap, ReplaySubject, Subject, take, tap, } from "rxjs";
13
13
  import { mapify, SERIALIZERS, uniqueValue, wait } from "./utils";
14
14
  import { ContentTypes } from "./enums";
15
15
  /**
@@ -42,7 +42,6 @@ export class RabbitMQClient {
42
42
  this.exchanges = {};
43
43
  this.bindings = [];
44
44
  this.DEFAULT_LISTENER_TYPE = '__default';
45
- this.EXCLUSIVE_QUEUE = uuidv1();
46
45
  this.queueListeners = {};
47
46
  this.queueToEventHandleMapping = {};
48
47
  this.queueToEventCallbackMapping = {};
@@ -69,14 +68,6 @@ export class RabbitMQClient {
69
68
  this.channel.prefetch(prefetch || 1);
70
69
  }
71
70
  console.log(`Channel created on message server`);
72
- })
73
- // creating exclusive queue
74
- .then(() => {
75
- // create an exclusive queue for this channel connection
76
- console.log(`Creating exclusive queue ${this.EXCLUSIVE_QUEUE}`);
77
- return this.channel.assertQueue(this.EXCLUSIVE_QUEUE, { exclusive: true, durable: false }).then((response) => {
78
- console.log(`Created exclusive queue ${this.EXCLUSIVE_QUEUE}`);
79
- });
80
71
  })
81
72
  // assert to queues
82
73
  .then(() => {
@@ -90,8 +81,7 @@ export class RabbitMQClient {
90
81
  queueListenersMap[this.DEFAULT_LISTENER_TYPE] = new ReplaySubject();
91
82
  const useHandleMessageTypes = queueConfig.handleMessageTypes || [];
92
83
  for (const messageType of useHandleMessageTypes) {
93
- const isStringList = typeof messageType === 'string';
94
- if (isStringList) {
84
+ if (typeof messageType === 'string') {
95
85
  queueListenersMap[messageType] = new ReplaySubject();
96
86
  }
97
87
  else {
@@ -131,7 +121,7 @@ export class RabbitMQClient {
131
121
  this.connectionErrorStream.next(err);
132
122
  });
133
123
  this.connection.on("close", (err) => {
134
- this.connectionErrorStream.next(err);
124
+ this.connectionCloseStream.next(err);
135
125
  });
136
126
  this.isReady = true;
137
127
  this.isReadyStream.next(true);
@@ -162,10 +152,10 @@ export class RabbitMQClient {
162
152
  });
163
153
  }
164
154
  getConnection() {
165
- return this.onReady.pipe(map(() => this.connection));
155
+ return this.connection;
166
156
  }
167
157
  getChannel() {
168
- return this.onReady.pipe(map(() => this.channel));
158
+ return this.channel;
169
159
  }
170
160
  getQueueListener(queue, options) {
171
161
  return () => {
@@ -255,18 +245,12 @@ export class RabbitMQClient {
255
245
  // listen for messages on the queue
256
246
  this.listenToQueue(queue, options);
257
247
  const handle = (messageType) => {
258
- // return this.onReady.pipe(
259
- // mergeMap((ready: boolean, index: number) => {
260
- // if (!this.queueToEventHandleMapping[queue][messageType]) {
261
- // throw new Error(`The provided routing key was not provided during initialization. Please add routing key "${messageType}" in the list of routing keys for the queue config in the constructor.`);
262
- // }
263
- // return this.queueToEventHandleMapping[queue][messageType].asObservable();
264
- // })
265
- // );
266
- return this.messagesStreamsByQueue[queue]
267
- .asObservable()
268
- .pipe(filter(() => this.isReady))
269
- .pipe(filter((event) => event.message.properties.type === messageType));
248
+ return this.onReady.pipe(mergeMap((ready, index) => {
249
+ if (!this.queueToEventHandleMapping[queue][messageType]) {
250
+ throw new Error(`The provided routing key was not provided during initialization. Please add routing key "${messageType}" in the list of routing keys for the queue config in the constructor.`);
251
+ }
252
+ return this.queueToEventHandleMapping[queue][messageType].asObservable();
253
+ }));
270
254
  };
271
255
  const handleDefault = () => {
272
256
  return this.onReady.pipe(mergeMap((ready, index) => this.queueToEventHandleMapping[queue][this.DEFAULT_LISTENER_TYPE].asObservable()));
@@ -275,14 +259,19 @@ export class RabbitMQClient {
275
259
  Providing callback function approach
276
260
  */
277
261
  const onEvent = (messageType, handler) => {
278
- return this.messagesStreamsByQueue[queue]
279
- .asObservable()
280
- .pipe(filter(() => this.isReady))
262
+ return this.onReady
263
+ .pipe(mergeMap(() => this.messagesStreamsByQueue[queue]))
281
264
  .pipe(filter((event) => event.message.properties.type === messageType))
282
265
  .subscribe({ next: handler });
283
266
  };
267
+ const handleAll = (handler) => {
268
+ return this.onReady
269
+ .pipe(mergeMap(() => this.messagesStreamsByQueue[queue]))
270
+ .subscribe({ next: handler });
271
+ };
284
272
  return {
285
273
  handle,
274
+ handleAll,
286
275
  handleDefault,
287
276
  onEvent,
288
277
  };
@@ -296,46 +285,37 @@ export class RabbitMQClient {
296
285
  console.log(`Acknoledged rmq message.`);
297
286
  }
298
287
  sendMessage(options) {
299
- return new Promise((resolve, reject) => {
300
- const send = () => {
301
- const { data, publishOptions, queue } = options;
302
- const useContentType = publishOptions.contentType || ContentTypes.TEXT;
303
- const useData = SERIALIZERS[useContentType] ? SERIALIZERS[useContentType].serialize(data) : data;
304
- this.channel.sendToQueue(queue, useData, Object.assign(Object.assign({}, publishOptions), { appId: publishOptions.appId }));
305
- resolve(undefined);
306
- };
307
- if (!this.isReady) {
308
- console.log(`wait until ready to send message...`);
309
- firstValueFrom(this.onReady).then((readyState) => {
310
- console.log(`now ready to send message`, { readyState });
311
- send();
312
- });
313
- }
314
- else {
315
- console.log(`is ready to send message`);
288
+ const send = () => {
289
+ const { data, publishOptions, queue } = options;
290
+ const useContentType = publishOptions.contentType || ContentTypes.TEXT;
291
+ const useData = SERIALIZERS[useContentType] ? SERIALIZERS[useContentType].serialize(data) : data;
292
+ this.channel.sendToQueue(queue, useData, Object.assign(Object.assign({}, publishOptions), { appId: publishOptions.appId }));
293
+ };
294
+ if (!this.isReady) {
295
+ console.log(`wait until ready to send message...`);
296
+ firstValueFrom(this.onReady).then((readyState) => {
297
+ console.log(`now ready to send message`, { readyState });
316
298
  send();
317
- }
318
- });
319
- }
320
- sendRequest(options) {
321
- console.log(`sendRequest:`, options);
322
- return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
323
- const start_time = Date.now();
324
- const consumerTag = uniqueValue();
325
- const correlationId = options.publishOptions.correlationId || uniqueValue();
326
- const temporaryRpcQueue = uuidv1();
327
- const newQueue = yield this.channel.assertQueue(temporaryRpcQueue, { exclusive: true, durable: false, autoDelete: true }).then((response) => {
328
- console.log(`Created temp queue ${temporaryRpcQueue} for client.`);
329
- return response;
330
299
  });
331
- const send = () => {
332
- const { data, publishOptions, queue } = options;
333
- const useContentType = publishOptions.contentType || ContentTypes.TEXT;
334
- const useData = SERIALIZERS[useContentType] ? SERIALIZERS[useContentType].serialize(data) : data;
335
- this.channel.sendToQueue(queue, useData, Object.assign(Object.assign({}, publishOptions), { correlationId, replyTo: temporaryRpcQueue, appId: publishOptions.appId }));
336
- };
337
- const watch = () => {
338
- console.log(`request/rpc sent; awaiting response...`, { correlationId, consumerTag });
300
+ }
301
+ else {
302
+ console.log(`is ready to send message`);
303
+ send();
304
+ }
305
+ }
306
+ getRpcMethods(temporaryRpcQueue, options) {
307
+ const start_time = Date.now();
308
+ const consumerTag = uniqueValue();
309
+ const correlationId = options.publishOptions.correlationId || uuidv4();
310
+ const send = () => {
311
+ const { data, publishOptions, queue } = options;
312
+ const useContentType = publishOptions.contentType || ContentTypes.TEXT;
313
+ const useData = SERIALIZERS[useContentType] ? SERIALIZERS[useContentType].serialize(data) : data;
314
+ this.channel.sendToQueue(queue, useData, Object.assign(Object.assign({}, publishOptions), { correlationId, replyTo: temporaryRpcQueue, appId: publishOptions.appId }));
315
+ };
316
+ const watch = () => {
317
+ return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
318
+ console.log(`request/rpc sent; awaiting response...`, { correlationId, consumerTag, temporaryRpcQueue });
339
319
  const replyHandler = (message) => {
340
320
  console.log(`\nReceived reply.\n`, { message });
341
321
  const correlationIdMatch = message.properties.correlationId == correlationId;
@@ -361,24 +341,47 @@ export class RabbitMQClient {
361
341
  console.log(`received response from request/rpc:`, { start_time, end_time, total_time, time_in_seconds, messageObj, options });
362
342
  resolve(messageObj);
363
343
  this.channel.cancel(consumerTag).then(() => {
364
- console.log(`removed consumer via consumerTag`);
344
+ console.log(`removed consumer via consumerTag; deleting temporary queue ${temporaryRpcQueue}...`);
345
+ this.channel.deleteQueue(temporaryRpcQueue, { ifEmpty: true, ifUnused: true })
346
+ .then(() => {
347
+ console.log(`temp queue deleted: ${temporaryRpcQueue}`);
348
+ })
349
+ .catch((error) => {
350
+ console.log(`could not delete temp queue ${temporaryRpcQueue}`);
351
+ });
365
352
  });
366
353
  }
367
354
  };
368
355
  this.channel.consume(temporaryRpcQueue, replyHandler, { consumerTag });
369
- };
356
+ }));
357
+ };
358
+ return { watch, send };
359
+ }
360
+ sendRequest(options) {
361
+ console.log(`sendRequest:`, options);
362
+ return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
363
+ const temporaryRpcQueue = uuidv1();
364
+ const newQueue = yield this.channel.assertQueue(temporaryRpcQueue, { exclusive: true, durable: false, autoDelete: true }).then((response) => {
365
+ console.log(`Created temp queue ${temporaryRpcQueue} for client.`);
366
+ return response;
367
+ });
368
+ const rpc = this.getRpcMethods(temporaryRpcQueue, options);
370
369
  if (!this.isReady) {
371
370
  console.log(`waiting until ready to send request`);
372
371
  firstValueFrom(this.onReady).then((readyState) => {
373
372
  console.log(`now ready to publish event`, { readyState });
374
- watch(); // first listen on the reply queue
375
- send(); // then send the rpc/rmq message
373
+ rpc.watch().then((message) => {
374
+ resolve(message);
375
+ }); // first listen on the reply queue
376
+ rpc.send(); // then send the rpc/rmq message
376
377
  });
377
378
  }
378
379
  else {
379
380
  console.log(`is ready to send request`);
380
- watch();
381
- send();
381
+ rpc.watch().then((message) => {
382
+ resolve(message);
383
+ }); // first listen on the reply queue
384
+ rpc.send(); // then send the rpc/rmq message
382
385
  }
383
386
  }));
384
387
  }
@@ -388,17 +391,17 @@ export class RabbitMQClient {
388
391
  const useContentType = publishOptions.contentType || ContentTypes.TEXT;
389
392
  const useData = SERIALIZERS[useContentType] ? SERIALIZERS[useContentType].serialize(data) : data;
390
393
  this.channel.publish(exchange, routingKey || '', useData, Object.assign(Object.assign({}, publishOptions), { appId: publishOptions.appId }));
391
- if (publishOptions.replyTo && !this.clientInitConfig.dontSendToReplyQueueOnPublish) {
392
- console.log(`sending copy to reply to queue ${publishOptions.replyTo}...`);
393
- this.channel.sendToQueue(publishOptions.replyTo, useData, publishOptions);
394
- }
394
+ // if (publishOptions.replyTo && !this.clientInitConfig.dontSendToReplyQueueOnPublish) {
395
+ // console.log(`sending copy to reply to queue ${publishOptions.replyTo}...`);
396
+ // this.channel.sendToQueue(publishOptions.replyTo, useData, publishOptions);
397
+ // }
395
398
  };
396
399
  if (!this.isReady) {
397
400
  console.log(`wait until ready to publish event`);
398
401
  this.onReady.subscribe({
399
- next: (readyState) => {
400
- console.log(`now ready to publish event`, { readyState });
401
- readyState && publish();
402
+ next: () => {
403
+ console.log(`now ready to publish event`);
404
+ publish();
402
405
  }
403
406
  });
404
407
  }
@@ -1 +1 @@
1
- {"version":3,"file":"rabbitmq-client.helper.js","sourceRoot":"","sources":["../src/rabbitmq-client.helper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"rabbitmq-client.helper.js","sourceRoot":"","sources":["../src/rabbitmq-client.helper.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "rxjs-rabbitmq",
3
- "version": "2.1.1",
3
+ "version": "2.1.3",
4
4
  "description": "RxJS powered RabbitMQ event handling",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -1,4 +1,9 @@
1
- import { v1 as uuidv1 } from 'uuid';
1
+ import {
2
+ v1 as uuidv1,
3
+ v4 as uuidv4,
4
+ } from 'uuid';
5
+
6
+
2
7
 
3
8
  import {
4
9
  Connection,
@@ -37,6 +42,7 @@ import {
37
42
  RmqEventHandler,
38
43
  RmqEventMessage,
39
44
  RmqHandleMessageTypeConfig,
45
+ RmqHandleMessageTypeConfigs,
40
46
  RmqMessageTypeHandler,
41
47
  RmqPublishEventParams,
42
48
  RmqSendMessageParams
@@ -72,8 +78,7 @@ export class RabbitMQClient {
72
78
  private exchanges:MapType<Replies.AssertExchange> = {};
73
79
  private bindings: QueueExchangeBindingConfig[] = [];
74
80
 
75
- private DEFAULT_LISTENER_TYPE = '__default';
76
- private EXCLUSIVE_QUEUE: string = uuidv1();
81
+ private DEFAULT_LISTENER_TYPE: string = '__default';
77
82
  private queueListeners: MapType<Subscription> = {};
78
83
 
79
84
  private queueToEventHandleMapping: MapType<
@@ -119,10 +124,10 @@ export class RabbitMQClient {
119
124
  post_init_promises
120
125
  } = clientInitConfig;
121
126
 
122
- let retryAttempts = clientInitConfig.retryAttempts || 0;
123
- const retryDelay = clientInitConfig.retryDelay || 0;
127
+ let retryAttempts: number = clientInitConfig.retryAttempts || 0;
128
+ const retryDelay: number = clientInitConfig.retryDelay || 0;
124
129
 
125
- const init = () => {
130
+ const init: () => Promise<any> = () => {
126
131
  // creating connection
127
132
  console.log(`Attempting connection to Rabbit MQ...`);
128
133
  return connect(connection_url)
@@ -139,14 +144,6 @@ export class RabbitMQClient {
139
144
  }
140
145
  console.log(`Channel created on message server`);
141
146
  })
142
- // creating exclusive queue
143
- .then(() => {
144
- // create an exclusive queue for this channel connection
145
- console.log(`Creating exclusive queue ${this.EXCLUSIVE_QUEUE}`);
146
- return this.channel.assertQueue(this.EXCLUSIVE_QUEUE, { exclusive: true, durable: false }).then((response) => {
147
- console.log(`Created exclusive queue ${this.EXCLUSIVE_QUEUE}`);
148
- });
149
- })
150
147
  // assert to queues
151
148
  .then(() => {
152
149
  const promises: Promise<Replies.AssertQueue>[] = [];
@@ -161,10 +158,9 @@ export class RabbitMQClient {
161
158
  // by default, create an observable stream on the queue for unidentified/null routing keys
162
159
  queueListenersMap[this.DEFAULT_LISTENER_TYPE] = new ReplaySubject();
163
160
 
164
- const useHandleMessageTypes = queueConfig.handleMessageTypes || [];
161
+ const useHandleMessageTypes: RmqHandleMessageTypeConfigs = queueConfig.handleMessageTypes || [];
165
162
  for (const messageType of useHandleMessageTypes) {
166
- const isStringList = typeof messageType === 'string';
167
- if (isStringList) {
163
+ if (typeof messageType === 'string') {
168
164
  queueListenersMap[messageType as string] = new ReplaySubject();
169
165
  }
170
166
  else {
@@ -179,11 +175,11 @@ export class RabbitMQClient {
179
175
  return Promise.all(promises).then((values) => {
180
176
  this.queues = mapify(values, 'queue');
181
177
  console.log(`queues created on channel`);
182
- })
178
+ });
183
179
  })
184
180
  // assert exchanges
185
181
  .then(() => {
186
- const promises = exchanges.map((config) => this.channel.assertExchange(config.name, config.type, config.options));
182
+ const promises: Promise<Replies.AssertExchange>[] = exchanges.map((config) => this.channel.assertExchange(config.name, config.type, config.options));
187
183
  return Promise.all(promises).then(values => {
188
184
  this.exchanges = mapify(values, 'exchange');
189
185
  console.log(`exchanges created on channel`);
@@ -191,7 +187,7 @@ export class RabbitMQClient {
191
187
  })
192
188
  // apply bindings
193
189
  .then(() => {
194
- const promises = bindings.map((config) => this.channel.bindQueue(config.queue, config.exchange, config.routingKey));
190
+ const promises: Promise<Replies.Empty>[] = bindings.map((config) => this.channel.bindQueue(config.queue, config.exchange, config.routingKey));
195
191
  // bind the exclusive queue to all the exchanges
196
192
  // const exclusiveBindings = bindings.map((config) => this.channel.bindQueue(this.EXCLUSIVE_QUEUE, config.exchange, config.routingKey));
197
193
  return Promise.all(promises).then(values => {
@@ -208,7 +204,7 @@ export class RabbitMQClient {
208
204
  this.connectionErrorStream.next(err);
209
205
  });
210
206
  this.connection.on("close", (err) => {
211
- this.connectionErrorStream.next(err);
207
+ this.connectionCloseStream.next(err);
212
208
  });
213
209
 
214
210
  this.isReady = true;
@@ -243,11 +239,11 @@ export class RabbitMQClient {
243
239
  }
244
240
 
245
241
  getConnection() {
246
- return this.onReady.pipe(map(() => this.connection));
242
+ return this.connection;
247
243
  }
248
244
 
249
245
  getChannel() {
250
- return this.onReady.pipe(map(() => this.channel));
246
+ return this.channel;
251
247
  }
252
248
 
253
249
  private getQueueListener(queue: string, options?: Options.Consume) {
@@ -352,19 +348,14 @@ export class RabbitMQClient {
352
348
  this.listenToQueue(queue, options);
353
349
 
354
350
  const handle = (messageType: string) => {
355
- // return this.onReady.pipe(
356
- // mergeMap((ready: boolean, index: number) => {
357
- // if (!this.queueToEventHandleMapping[queue][messageType]) {
358
- // throw new Error(`The provided routing key was not provided during initialization. Please add routing key "${messageType}" in the list of routing keys for the queue config in the constructor.`);
359
- // }
360
- // return this.queueToEventHandleMapping[queue][messageType].asObservable();
361
- // })
362
- // );
363
-
364
- return this.messagesStreamsByQueue[queue]
365
- .asObservable()
366
- .pipe(filter(() => this.isReady))
367
- .pipe(filter((event: RmqEventMessage) => event.message.properties.type === messageType))
351
+ return this.onReady.pipe(
352
+ mergeMap((ready: boolean, index: number) => {
353
+ if (!this.queueToEventHandleMapping[queue][messageType]) {
354
+ throw new Error(`The provided routing key was not provided during initialization. Please add routing key "${messageType}" in the list of routing keys for the queue config in the constructor.`);
355
+ }
356
+ return this.queueToEventHandleMapping[queue][messageType].asObservable();
357
+ })
358
+ );
368
359
  };
369
360
 
370
361
  const handleDefault = () => {
@@ -377,15 +368,21 @@ export class RabbitMQClient {
377
368
  Providing callback function approach
378
369
  */
379
370
  const onEvent = (messageType: string, handler: RmqEventHandler) => {
380
- return this.messagesStreamsByQueue[queue]
381
- .asObservable()
382
- .pipe(filter(() => this.isReady))
383
- .pipe(filter((event: RmqEventMessage) => event.message.properties.type === messageType))
384
- .subscribe({ next: handler });
371
+ return this.onReady
372
+ .pipe(mergeMap(() => this.messagesStreamsByQueue[queue]))
373
+ .pipe(filter((event: RmqEventMessage) => event.message.properties.type === messageType))
374
+ .subscribe({ next: handler });
375
+ };
376
+
377
+ const handleAll = (handler: RmqEventHandler) => {
378
+ return this.onReady
379
+ .pipe(mergeMap(() => this.messagesStreamsByQueue[queue]))
380
+ .subscribe({ next: handler });
385
381
  };
386
382
 
387
383
  return {
388
384
  handle,
385
+ handleAll,
389
386
  handleDefault,
390
387
  onEvent,
391
388
  };
@@ -402,58 +399,46 @@ export class RabbitMQClient {
402
399
  }
403
400
 
404
401
  sendMessage(options: RmqSendMessageParams) {
405
- return new Promise((resolve, reject) => {
406
- const send = () => {
407
- const { data, publishOptions, queue } = options;
408
- const useContentType = publishOptions.contentType || ContentTypes.TEXT;
409
- const useData = SERIALIZERS[useContentType] ? SERIALIZERS[useContentType].serialize(data) : data;
410
- this.channel.sendToQueue(queue, useData, { ...publishOptions, appId: publishOptions.appId });
411
- resolve(undefined);
412
- };
413
-
414
- if (!this.isReady) {
415
- console.log(`wait until ready to send message...`);
416
- firstValueFrom(this.onReady).then((readyState) => {
417
- console.log(`now ready to send message`, { readyState });
418
- send();
419
- });
420
- }
421
- else {
422
- console.log(`is ready to send message`);
402
+ const send = () => {
403
+ const { data, publishOptions, queue } = options;
404
+ const useContentType = publishOptions.contentType || ContentTypes.TEXT;
405
+ const useData = SERIALIZERS[useContentType] ? SERIALIZERS[useContentType].serialize(data) : data;
406
+ this.channel.sendToQueue(queue, useData, { ...publishOptions, appId: publishOptions.appId });
407
+ };
408
+
409
+ if (!this.isReady) {
410
+ console.log(`wait until ready to send message...`);
411
+ firstValueFrom(this.onReady).then((readyState) => {
412
+ console.log(`now ready to send message`, { readyState });
423
413
  send();
424
- }
425
- });
414
+ });
415
+ }
416
+ else {
417
+ console.log(`is ready to send message`);
418
+ send();
419
+ }
426
420
  }
427
421
 
428
- sendRequest <T = any> (options: {
422
+ private getRpcMethods(temporaryRpcQueue: string, options: {
429
423
  queue: string,
430
424
  data: any,
431
425
  publishOptions: Options.Publish,
432
426
  }) {
433
- console.log(`sendRequest:`, options);
434
-
435
- return new Promise<RmqEventMessage<T>>(async (resolve, reject) => {
436
- const start_time = Date.now();
437
-
438
- const consumerTag = uniqueValue();
439
- const correlationId = options.publishOptions.correlationId || uniqueValue();
440
- const temporaryRpcQueue = uuidv1();
441
-
442
- const newQueue = await this.channel.assertQueue(temporaryRpcQueue, { exclusive: true, durable: false, autoDelete: true }).then((response) => {
443
- console.log(`Created temp queue ${temporaryRpcQueue} for client.`);
444
- return response;
445
- });
446
-
447
- const send = () => {
448
- const { data, publishOptions, queue } = options;
449
- const useContentType = publishOptions.contentType || ContentTypes.TEXT;
450
- const useData = SERIALIZERS[useContentType] ? SERIALIZERS[useContentType].serialize(data) : data;
451
- this.channel.sendToQueue(queue, useData, { ...publishOptions, correlationId, replyTo: temporaryRpcQueue, appId: publishOptions.appId });
452
- };
453
-
454
- const watch = () => {
455
- console.log(`request/rpc sent; awaiting response...`, { correlationId, consumerTag });
427
+ const start_time = Date.now();
428
+ const consumerTag = uniqueValue();
429
+ const correlationId = options.publishOptions.correlationId || uuidv4();
456
430
 
431
+ const send = () => {
432
+ const { data, publishOptions, queue } = options;
433
+ const useContentType = publishOptions.contentType || ContentTypes.TEXT;
434
+ const useData = SERIALIZERS[useContentType] ? SERIALIZERS[useContentType].serialize(data) : data;
435
+ this.channel.sendToQueue(queue, useData, { ...publishOptions, correlationId, replyTo: temporaryRpcQueue, appId: publishOptions.appId });
436
+ };
437
+
438
+ const watch = <T> () => {
439
+ return new Promise<RmqEventMessage<T>>(async (resolve, reject) => {
440
+ console.log(`request/rpc sent; awaiting response...`, { correlationId, consumerTag, temporaryRpcQueue });
441
+
457
442
  const replyHandler = (message: ConsumeMessage | null) => {
458
443
  console.log(`\nReceived reply.\n`, { message });
459
444
  const correlationIdMatch = message!.properties.correlationId == correlationId;
@@ -480,26 +465,59 @@ export class RabbitMQClient {
480
465
  console.log(`received response from request/rpc:`, { start_time, end_time, total_time, time_in_seconds, messageObj, options });
481
466
  resolve(messageObj);
482
467
  this.channel.cancel(consumerTag).then(() => {
483
- console.log(`removed consumer via consumerTag`);
468
+ console.log(`removed consumer via consumerTag; deleting temporary queue ${temporaryRpcQueue}...`);
469
+ this.channel.deleteQueue(temporaryRpcQueue, { ifEmpty: true, ifUnused: true })
470
+ .then(() => {
471
+ console.log(`temp queue deleted: ${temporaryRpcQueue}`);
472
+ })
473
+ .catch((error) => {
474
+ console.log(`could not delete temp queue ${temporaryRpcQueue}`);
475
+ });
484
476
  });
485
477
  }
486
478
  };
487
-
479
+
488
480
  this.channel.consume(temporaryRpcQueue, replyHandler, { consumerTag });
489
- };
481
+ });
482
+ };
483
+
484
+ return { watch, send };
485
+ }
486
+
487
+ sendRequest <T = any> (options: {
488
+ queue: string,
489
+ data: any,
490
+ publishOptions: Options.Publish,
491
+ }) {
492
+ console.log(`sendRequest:`, options);
493
+
494
+ return new Promise<RmqEventMessage<T>>(async (resolve, reject) => {
495
+
496
+ const temporaryRpcQueue = uuidv1();
497
+
498
+ const newQueue = await this.channel.assertQueue(temporaryRpcQueue, { exclusive: true, durable: false, autoDelete: true }).then((response) => {
499
+ console.log(`Created temp queue ${temporaryRpcQueue} for client.`);
500
+ return response;
501
+ });
502
+
503
+ const rpc = this.getRpcMethods(temporaryRpcQueue, options);
490
504
 
491
505
  if (!this.isReady) {
492
506
  console.log(`waiting until ready to send request`);
493
507
  firstValueFrom(this.onReady).then((readyState) => {
494
508
  console.log(`now ready to publish event`, { readyState });
495
- watch(); // first listen on the reply queue
496
- send(); // then send the rpc/rmq message
509
+ rpc.watch<T>().then((message: RmqEventMessage<T>) => {
510
+ resolve(message);
511
+ }); // first listen on the reply queue
512
+ rpc.send(); // then send the rpc/rmq message
497
513
  });
498
514
  }
499
515
  else {
500
516
  console.log(`is ready to send request`);
501
- watch();
502
- send();
517
+ rpc.watch<T>().then((message: RmqEventMessage<T>) => {
518
+ resolve(message);
519
+ }); // first listen on the reply queue
520
+ rpc.send(); // then send the rpc/rmq message
503
521
  }
504
522
  });
505
523
  }
@@ -511,18 +529,18 @@ export class RabbitMQClient {
511
529
  const useData = SERIALIZERS[useContentType] ? SERIALIZERS[useContentType].serialize(data) : data;
512
530
  this.channel.publish(exchange, routingKey || '', useData, { ...publishOptions, appId: publishOptions.appId });
513
531
 
514
- if (publishOptions.replyTo && !this.clientInitConfig.dontSendToReplyQueueOnPublish) {
515
- console.log(`sending copy to reply to queue ${publishOptions.replyTo}...`);
516
- this.channel.sendToQueue(publishOptions.replyTo, useData, publishOptions);
517
- }
532
+ // if (publishOptions.replyTo && !this.clientInitConfig.dontSendToReplyQueueOnPublish) {
533
+ // console.log(`sending copy to reply to queue ${publishOptions.replyTo}...`);
534
+ // this.channel.sendToQueue(publishOptions.replyTo, useData, publishOptions);
535
+ // }
518
536
  };
519
537
 
520
538
  if (!this.isReady) {
521
539
  console.log(`wait until ready to publish event`);
522
540
  this.onReady.subscribe({
523
- next: (readyState) => {
524
- console.log(`now ready to publish event`, { readyState });
525
- readyState && publish();
541
+ next: () => {
542
+ console.log(`now ready to publish event`);
543
+ publish();
526
544
  }
527
545
  });
528
546
  }
@@ -531,13 +549,4 @@ export class RabbitMQClient {
531
549
  publish();
532
550
  }
533
551
  }
534
-
535
- // listen() {
536
- // // last resort to keeping the node.js process running
537
- // const listenerCallback = () => {
538
- // console.log(`--- listening... ---`);
539
- // };
540
- // const interval = setInterval(listenerCallback, 1000 * 60 * 10);
541
- // return interval;
542
- // }
543
552
  }