Only emit connection disconnect event for non internal disconnect (#27)

gojek · Aug 9, 2023 · 00ccab8 · 00ccab8
1 parent 50c98ba
commit 00ccab8
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 11 deletions.
diff --git a/CourierMQTT/MQTT/Client/IMQTTClient.swift b/CourierMQTT/MQTT/Client/IMQTTClient.swift
@@ -12,7 +12,7 @@ protocol IMQTTClient {
 
     func connect(connectOptions: ConnectOptions)
     func reconnect()
-    func disconnect()
+    func disconnect(isInternal: Bool)
 
     func subscribe(_ topics: [(topic: String, qos: QoS)])
     func unsubscribe(_ topics: [String])

diff --git a/CourierMQTT/MQTT/Client/MQTTClient.swift b/CourierMQTT/MQTT/Client/MQTTClient.swift
@@ -75,12 +75,14 @@ class MQTTClient: IMQTTClient {
             return
         }
         eventHandler.onEvent(.init(connectionInfo: options, event: .reconnect))
-        disconnect()
+        disconnect(isInternal: true)
         connect(connectOptions: options)
     }
 
-    func disconnect() {
-        eventHandler.onEvent(.init(connectionInfo: connectOptions, event: .connectionDisconnect))
+    func disconnect(isInternal: Bool) {
+        if !isInternal {
+            eventHandler.onEvent(.init(connectionInfo: connectOptions, event: .connectionDisconnect))
+        }
         isInitialized = false
         disconnectMqtt()
     }
@@ -185,7 +187,7 @@ class MQTTClient: IMQTTClient {
     }
 
     func destroy() {
-        disconnect()
+        disconnect(isInternal: false)
         connectOptions = nil
         removeObserveAppLifecycle()
         removeObserveNetwork()
@@ -218,7 +220,7 @@ extension MQTTClient {
 
 extension MQTTClient: KeepAliveFailureHandler {
     func handleKeepAliveFailure() {
-        disconnect()
+        disconnect(isInternal: true)
         reconnect()
     }
 }
diff --git a/CourierMQTT/MQTT/MQTTCourierClient.swift b/CourierMQTT/MQTT/MQTTCourierClient.swift
@@ -299,7 +299,7 @@ class MQTTCourierClient: CourierClient {
 
 extension MQTTCourierClient: IAuthFailureHandler {
     func handleAuthFailure() {
-        client.disconnect()
+        client.disconnect(isInternal: true)
         connectionServiceProvider.clearCachedAuthResponse()
         connect()
     }

diff --git a/CourierTests/Core/MQTT/Client/MQTTClientTests.swift b/CourierTests/Core/MQTT/Client/MQTTClientTests.swift
@@ -68,6 +68,7 @@ class MQTTClientTests: XCTestCase {
         } else {
             XCTAssert(false)
         }
+        XCTAssertEqual(self.mockEventHandler.invokedOnEventParametersList.count, 1)
         XCTAssertTrue(mockConnection.invokedConnect)
     }
 
@@ -114,10 +115,19 @@ class MQTTClientTests: XCTestCase {
         XCTAssertTrue(mockConnection.invokedUnsubscribe)
         XCTAssertEqual(mockConnection.invokedUnsubscribeParameters?.topics.first, "fbon")
     }
+
+    func testDisconnectIsInternalTrue() {
+        mockConnection.stubbedIsConnected = true
+        sut.disconnect(isInternal: true)
+
+        XCTAssertTrue(self.mockEventHandler.invokedOnEventParametersList.isEmpty)
+        XCTAssertFalse(sut.isInitialized)
+        XCTAssertTrue(mockConnection.invokedDisconnect)
+    }
 
-    func testDisconnect() {
+    func testDisconnectIsNotInternalFalse() {
         mockConnection.stubbedIsConnected = true
-        sut.disconnect()
+        sut.disconnect(isInternal: false)
 
         if case .connectionDisconnect = self.mockEventHandler.invokedOnEventParametersList.first!!.event.type {
             XCTAssert(true)
@@ -145,6 +155,12 @@ class MQTTClientTests: XCTestCase {
 
         XCTAssertFalse(sut.isInitialized)
         XCTAssertTrue(mockConnection.invokedDisconnect)
+
+        if case .connectionDisconnect = self.mockEventHandler.invokedOnEventParametersList.first!!.event.type {
+            XCTAssert(true)
+        } else {
+            XCTAssert(false)
+        }
 
         XCTAssertNil(sut.connectOptions)
         XCTAssertEqual(mockNotificationCenter.invokedRemoveObserverWithNameParametersList[0].name, UIApplication.willResignActiveNotification)
@@ -168,6 +184,12 @@ class MQTTClientTests: XCTestCase {
 
         XCTAssertFalse(sut.isInitialized)
         XCTAssertTrue(mockConnection.invokedDisconnect)
+
+        if case .connectionDisconnect = self.mockEventHandler.invokedOnEventParametersList.first!!.event.type {
+            XCTAssert(true)
+        } else {
+            XCTAssert(false)
+        }
 
         XCTAssertNil(sut.connectOptions)
         XCTAssertEqual(mockNotificationCenter.invokedRemoveObserverWithNameParametersList[0].name, UIApplication.didEnterBackgroundNotification)
@@ -186,6 +208,7 @@ class MQTTClientTests: XCTestCase {
         sut.handleKeepAliveFailure()
         XCTAssertTrue(mockConnection.invokedDisconnect)
         XCTAssertTrue(mockConnection.invokedConnect)
+        XCTAssertEqual(self.mockEventHandler.invokedOnEventParametersList.count, 1)
     }
 
     func testResetWithActiveNotifications() {

diff --git a/CourierTests/Core/MQTT/MQTTCourierClientTests.swift b/CourierTests/Core/MQTT/MQTTCourierClientTests.swift
@@ -221,7 +221,7 @@ class MQTTCourierClientTests: XCTestCase {
 
     func testHandleAuthFailure() {
         sut.handleAuthFailure()
-//        XCTAssertTrue(mockEventHandler.invokedReset)
+        XCTAssertTrue(mockClient.invokedDisconnectParameters!.isInternal)
         if case .connectionServiceAuthStart = self.mockEventHandler.invokedOnEventParameters?.event.type {
             XCTAssert(true)
         } else {

diff --git a/CourierTests/Core/Mocks/MockMQTTClient.swift b/CourierTests/Core/Mocks/MockMQTTClient.swift
@@ -86,10 +86,14 @@ class MockMQTTClient: IMQTTClient {
 
     var invokedDisconnect = false
     var invokedDisconnectCount = 0
+    var invokedDisconnectParameters: (isInternal: Bool, Void)?
+    var invokedDisconnectParametersList = [(isInternal: Bool, Void)]()
 
-    func disconnect() {
+    func disconnect(isInternal: Bool) {
         invokedDisconnect = true
         invokedDisconnectCount += 1
+        invokedDisconnectParameters = (isInternal, ())
+        invokedDisconnectParametersList.append((isInternal, ()))
     }
 
     var invokedSubscribe = false