From 077a2d2c799d8800ca58bb46f7bc07b113e75dd6 Mon Sep 17 00:00:00 2001
From: getlarge <ed@getlarge.eu>
Date: Fri, 7 Jun 2024 11:07:00 +0200
Subject: [PATCH] fix(nestjs-tools-amqp-transport): evaluate default options
 correctly

---
 .github/workflows/node.yml                    |  2 +-
 .../amqp-transport/src/lib/amqp-server.ts     | 26 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml
index 6faffd0..57d3972 100644
--- a/.github/workflows/node.yml
+++ b/.github/workflows/node.yml
@@ -40,7 +40,7 @@ jobs:
 
     services:
       rabbitmq:
-        image: rabbitmq:3.9-management-alpine
+        image: rabbitmq:3.12-management-alpine
         options: >-
           --health-cmd "rabbitmq-diagnostics status"
           --health-interval 10s
diff --git a/packages/amqp-transport/src/lib/amqp-server.ts b/packages/amqp-transport/src/lib/amqp-server.ts
index 0d46689..335ae34 100644
--- a/packages/amqp-transport/src/lib/amqp-server.ts
+++ b/packages/amqp-transport/src/lib/amqp-server.ts
@@ -68,20 +68,20 @@ export class AmqpServer extends Server implements CustomTransportStrategy {
     this.transportId = transportId;
     this.server = null;
     this.channel = null;
-    this.noAck = this.getOptionsProp(this.options, 'noAck') || RQM_DEFAULT_NOACK;
-    this.urls = this.getOptionsProp(this.options, 'urls') || [RQM_DEFAULT_URL];
-    this.queue = this.getOptionsProp(this.options, 'queue') || '';
-    this.queueOptions = this.getOptionsProp(this.options, 'queueOptions') || RQM_DEFAULT_QUEUE_OPTIONS;
-    this.exchange = this.getOptionsProp(this.options, 'exchange') || undefined;
-    this.exchangeType = this.getOptionsProp(this.options, 'exchangeType') || AMQP_DEFAULT_EXCHANGE_TYPE;
-    this.exchangeOptions = this.getOptionsProp(this.options, 'exchangeOptions') || AMQP_DEFAULT_EXCHANGE_OPTIONS;
-    this.prefetchCount = this.getOptionsProp(this.options, 'prefetchCount') || RQM_DEFAULT_PREFETCH_COUNT;
+    this.noAck = this.getOptionsProp(this.options, 'noAck') ?? RQM_DEFAULT_NOACK;
+    this.urls = this.getOptionsProp(this.options, 'urls') ?? [RQM_DEFAULT_URL];
+    this.queue = this.getOptionsProp(this.options, 'queue') ?? '';
+    this.queueOptions = this.getOptionsProp(this.options, 'queueOptions') ?? RQM_DEFAULT_QUEUE_OPTIONS;
+    this.exchange = this.getOptionsProp(this.options, 'exchange') ?? undefined;
+    this.exchangeType = this.getOptionsProp(this.options, 'exchangeType') ?? AMQP_DEFAULT_EXCHANGE_TYPE;
+    this.exchangeOptions = this.getOptionsProp(this.options, 'exchangeOptions') ?? AMQP_DEFAULT_EXCHANGE_OPTIONS;
+    this.prefetchCount = this.getOptionsProp(this.options, 'prefetchCount') ?? RQM_DEFAULT_PREFETCH_COUNT;
     this.isGlobalPrefetchCount =
-      this.getOptionsProp(this.options, 'isGlobalPrefetchCount') || RQM_DEFAULT_IS_GLOBAL_PREFETCH_COUNT;
-    this.noAssert = this.getOptionsProp(this.options, 'noAssert') || RQM_DEFAULT_NO_ASSERT;
-    this.noQueueAssert = this.getOptionsProp(this.options, 'noQueueAssert') || RQM_DEFAULT_NO_ASSERT;
-    this.noExchangeAssert = this.getOptionsProp(this.options, 'noExchangeAssert') || RQM_DEFAULT_NO_ASSERT;
-    this.deleteChannelOnFailure = this.getOptionsProp(this.options, 'deleteChannelOnFailure') || true;
+      this.getOptionsProp(this.options, 'isGlobalPrefetchCount') ?? RQM_DEFAULT_IS_GLOBAL_PREFETCH_COUNT;
+    this.noAssert = this.getOptionsProp(this.options, 'noAssert') ?? RQM_DEFAULT_NO_ASSERT;
+    this.noQueueAssert = this.getOptionsProp(this.options, 'noQueueAssert') ?? RQM_DEFAULT_NO_ASSERT;
+    this.noExchangeAssert = this.getOptionsProp(this.options, 'noExchangeAssert') ?? RQM_DEFAULT_NO_ASSERT;
+    this.deleteChannelOnFailure = this.getOptionsProp(this.options, 'deleteChannelOnFailure') ?? true;
 
     this.initializeSerializer(options);
     this.initializeDeserializer(options);