From 18ee812e3ec691358e7eba54e157768a65e7885d Mon Sep 17 00:00:00 2001
From: Idan Asulin <74712806+idanasulinmemphis@users.noreply.github.com>
Date: Mon, 18 Jul 2022 17:15:16 +0300
Subject: [PATCH] Staging (#45)

* producer example bugfix

* version update

* update readme

* update readme

* add  the client ip address of a producer

* remove the IP from the msg headers

* add max msg deliveries option

* add the connection id as a header

* remove the jenkins file

* update readme file

* add missing files

* typo

* pull consumer bugfix

* defaults consumer group to consumer name

* readme update

* async listener for dlq events

* nats connection bugfix

* nats connection bugfix

* version update

* close connection bugfix

* version update
---
 index.js     | 34 +++++++++++++++++-----------------
 package.json |  2 +-
 src/index.ts | 32 +++++++++++++++-----------------
 3 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/index.js b/index.js
index b13dcc8..e35dda4 100644
--- a/index.js
+++ b/index.js
@@ -422,6 +422,7 @@ var Memphis = /** @class */ (function () {
     };
     Memphis.prototype._close = function () {
         var _this = this;
+        var _a, _b, _c, _d;
         if (this.reconnect && this.reconnectAttempts < this.maxReconnect) {
             this.reconnectAttempts++;
             setTimeout(function () { return __awaiter(_this, void 0, void 0, function () {
@@ -455,11 +456,11 @@ var Memphis = /** @class */ (function () {
                 });
             }); }, this.reconnectIntervalMs);
         }
-        else if (this.isConnectionActive) {
-            this.client.removeAllListeners("data");
-            this.client.removeAllListeners("error");
-            this.client.removeAllListeners("close");
-            this.client.destroy();
+        else {
+            (_a = this.client) === null || _a === void 0 ? void 0 : _a.removeAllListeners("data");
+            (_b = this.client) === null || _b === void 0 ? void 0 : _b.removeAllListeners("error");
+            (_c = this.client) === null || _c === void 0 ? void 0 : _c.removeAllListeners("close");
+            (_d = this.client) === null || _d === void 0 ? void 0 : _d.destroy();
             clearTimeout(this.accessTokenTimeout);
             clearTimeout(this.pingTimeout);
             this.reconnectAttempts = 0;
@@ -473,18 +474,17 @@ var Memphis = /** @class */ (function () {
     */
     Memphis.prototype.close = function () {
         var _this = this;
-        if (this.isConnectionActive) {
-            this.client.removeAllListeners("data");
-            this.client.removeAllListeners("error");
-            this.client.removeAllListeners("close");
-            this.client.destroy();
-            clearTimeout(this.accessTokenTimeout);
-            clearTimeout(this.pingTimeout);
-            this.reconnectAttempts = 0;
-            setTimeout(function () {
-                _this.brokerManager && _this.brokerManager.close();
-            }, 500);
-        }
+        var _a, _b, _c, _d;
+        (_a = this.client) === null || _a === void 0 ? void 0 : _a.removeAllListeners("data");
+        (_b = this.client) === null || _b === void 0 ? void 0 : _b.removeAllListeners("error");
+        (_c = this.client) === null || _c === void 0 ? void 0 : _c.removeAllListeners("close");
+        (_d = this.client) === null || _d === void 0 ? void 0 : _d.destroy();
+        clearTimeout(this.accessTokenTimeout);
+        clearTimeout(this.pingTimeout);
+        this.reconnectAttempts = 0;
+        setTimeout(function () {
+            _this.brokerManager && _this.brokerManager.close();
+        }, 500);
     };
     return Memphis;
 }());
diff --git a/package.json b/package.json
index 00ff075..8a6c281 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "memphis-dev",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "A dev-first event processing platform",
   "main": "index.js",
   "scripts": {
diff --git a/src/index.ts b/src/index.ts
index 41f0540..0c61627 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -390,11 +390,11 @@ class Memphis {
                 }
             }, this.reconnectIntervalMs);
         }
-        else if (this.isConnectionActive) {
-            this.client.removeAllListeners("data");
-            this.client.removeAllListeners("error");
-            this.client.removeAllListeners("close");
-            this.client.destroy();
+        else {
+            this.client?.removeAllListeners("data");
+            this.client?.removeAllListeners("error");
+            this.client?.removeAllListeners("close");
+            this.client?.destroy();
             clearTimeout(this.accessTokenTimeout);
             clearTimeout(this.pingTimeout);
             this.reconnectAttempts = 0;
@@ -408,18 +408,16 @@ class Memphis {
         * Close Memphis connection. 
     */
     close() {
-        if (this.isConnectionActive) {
-            this.client.removeAllListeners("data");
-            this.client.removeAllListeners("error");
-            this.client.removeAllListeners("close");
-            this.client.destroy();
-            clearTimeout(this.accessTokenTimeout);
-            clearTimeout(this.pingTimeout);
-            this.reconnectAttempts = 0;
-            setTimeout(() => {
-                this.brokerManager && this.brokerManager.close();
-            }, 500);
-        }
+        this.client?.removeAllListeners("data");
+        this.client?.removeAllListeners("error");
+        this.client?.removeAllListeners("close");
+        this.client?.destroy();
+        clearTimeout(this.accessTokenTimeout);
+        clearTimeout(this.pingTimeout);
+        this.reconnectAttempts = 0;
+        setTimeout(() => {
+            this.brokerManager && this.brokerManager.close();
+        }, 500);
     }
 }