Merge pull request #13285 from sorooshme/fix-microservice-rmq-noasser…

…t-flag fix(microservices): fix rabbitmq no-assert not being applied correctly
nestjs · Mar 17, 2024 · 07fb4d5 · 07fb4d5
2 parents 57bae20 + ed6d91b
commit 07fb4d5
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 6 deletions.
diff --git a/packages/microservices/client/client-rmq.ts b/packages/microservices/client/client-rmq.ts
@@ -78,7 +78,9 @@ export class ClientRMQ extends ClientProxy {
     this.persistent =
       this.getOptionsProp(this.options, 'persistent') || RQM_DEFAULT_PERSISTENT;
     this.noAssert =
-      this.getOptionsProp(this.options, 'noAssert') || RQM_DEFAULT_NO_ASSERT;
+      this.getOptionsProp(this.options, 'noAssert') ??
+      this.queueOptions.noAssert ??
+      RQM_DEFAULT_NO_ASSERT;
 
     loadPackage('amqplib', ClientRMQ.name, () => require('amqplib'));
     rmqPackage = loadPackage('amqp-connection-manager', ClientRMQ.name, () =>
@@ -187,7 +189,7 @@ export class ClientRMQ extends ClientProxy {
       this.getOptionsProp(this.options, 'isGlobalPrefetchCount') ||
       RQM_DEFAULT_IS_GLOBAL_PREFETCH_COUNT;
 
-    if (!this.queueOptions.noAssert) {
+    if (!this.noAssert) {
       await channel.assertQueue(this.queue, this.queueOptions);
     }
     await channel.prefetch(prefetchCount, isGlobalPrefetchCount);

diff --git a/packages/microservices/server/server-rmq.ts b/packages/microservices/server/server-rmq.ts
@@ -65,7 +65,9 @@ export class ServerRMQ extends Server implements CustomTransportStrategy {
       this.getOptionsProp(this.options, 'queueOptions') ||
       RQM_DEFAULT_QUEUE_OPTIONS;
     this.noAssert =
-      this.getOptionsProp(this.options, 'noAssert') || RQM_DEFAULT_NO_ASSERT;
+      this.getOptionsProp(this.options, 'noAssert') ??
+      this.queueOptions.noAssert ??
+      RQM_DEFAULT_NO_ASSERT;
 
     this.loadPackage('amqplib', ServerRMQ.name, () => require('amqplib'));
     rmqPackage = this.loadPackage(
@@ -145,7 +147,7 @@ export class ServerRMQ extends Server implements CustomTransportStrategy {
   }
 
   public async setupChannel(channel: any, callback: Function) {
-    if (!this.queueOptions.noAssert) {
+    if (!this.noAssert) {
       await channel.assertQueue(this.queue, this.queueOptions);
     }
     await channel.prefetch(this.prefetchCount, this.isGlobalPrefetchCount);

diff --git a/packages/microservices/test/client/client-rmq.spec.ts b/packages/microservices/test/client/client-rmq.spec.ts
@@ -11,6 +11,19 @@ describe('ClientRMQ', function () {
 
   let client: ClientRMQ;
 
+  describe('constructor', () => {
+    it(`should fallback to queueOptions.noAssert when 'noAssert' is undefined`, () => {
+      const queueOptions = {
+        noAssert: true,
+      };
+      const instance = new ClientRMQ({
+        queueOptions,
+      });
+
+      expect(instance).property('noAssert').to.eq(queueOptions.noAssert);
+    });
+  });
+
   describe('connect', () => {
     let createClientStub: sinon.SinonStub;
     let handleErrorsSpy: sinon.SinonSpy;
@@ -135,10 +148,18 @@ describe('ClientRMQ', function () {
     afterEach(() => {
       consumeStub.restore();
     });
-    it('should call "assertQueue" with queue and queue options', async () => {
+    it('should call "assertQueue" with queue and queue options when noAssert is false', async () => {
+      client['noAssert'] = false;
+
       await client.setupChannel(channel, () => null);
       expect(channel.assertQueue.calledWith(queue, queueOptions)).to.be.true;
     });
+    it('should not call "assertQueue" when noAssert is true', async () => {
+      client['noAssert'] = true;
+
+      await client.setupChannel(channel, () => null);
+      expect(channel.assertQueue.called).not.to.be.true;
+    });
     it('should call "prefetch" with prefetchCount and "isGlobalPrefetchCount"', async () => {
       await client.setupChannel(channel, () => null);
       expect(channel.prefetch.calledWith(prefetchCount, isGlobalPrefetchCount))

diff --git a/packages/microservices/test/server/server-rmq.spec.ts b/packages/microservices/test/server/server-rmq.spec.ts
@@ -14,6 +14,20 @@ describe('ServerRMQ', () => {
   beforeEach(() => {
     server = new ServerRMQ({});
   });
+
+  describe('constructor', () => {
+    it(`should fallback to queueOptions.noAssert when 'noAssert' is undefined`, () => {
+      const queueOptions = {
+        noAssert: true,
+      };
+      const instance = new ServerRMQ({
+        queueOptions,
+      });
+
+      expect(instance).property('noAssert').to.eq(queueOptions.noAssert);
+    });
+  });
+
   describe('listen', () => {
     let createClient: sinon.SinonStub;
     let onStub: sinon.SinonStub;
@@ -196,10 +210,18 @@ describe('ServerRMQ', () => {
         consume: sinon.spy(),
       };
     });
-    it('should call "assertQueue" with queue and queue options', async () => {
+    it('should call "assertQueue" with queue and queue options when noAssert is false', async () => {
+      server['noAssert' as any] = false;
+
       await server.setupChannel(channel, () => null);
       expect(channel.assertQueue.calledWith(queue, queueOptions)).to.be.true;
     });
+    it('should not call "assertQueue" when noAssert is true', async () => {
+      server['noAssert' as any] = true;
+
+      await server.setupChannel(channel, () => null);
+      expect(channel.assertQueue.called).not.to.be.true;
+    });
     it('should call "prefetch" with prefetchCount and "isGlobalPrefetchCount"', async () => {
       await server.setupChannel(channel, () => null);
       expect(channel.prefetch.calledWith(prefetchCount, isGlobalPrefetchCount))