synchronize mem access, avoid duplicate events (#69)

centrifugal · Sep 6, 2022 · 0fb098c · 0fb098c
1 parent 34c84ad
commit 0fb098c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+0.5.1
+=====
+
+* Fix crashes caused by non-synchronized memory access upon getting `no ping` disconnect
+* Fix issuing duplicate state change events
+
 0.5.0
 =====
 

diff --git a/Sources/SwiftCentrifuge/Client.swift b/Sources/SwiftCentrifuge/Client.swift
@@ -926,8 +926,11 @@ fileprivate extension CentrifugeClient {
         self.pingTimer = DispatchSource.makeTimerSource()
         self.pingTimer?.setEventHandler { [weak self] in
             guard let strongSelf = self else { return }
-            guard strongSelf.state == .connected else { return }
-            strongSelf.processDisconnect(code: connectingCodeNoPing, reason: "no ping", reconnect: true)
+            strongSelf.syncQueue.async { [weak self] in
+                guard let strongSelf = self else { return }
+                guard strongSelf.state == .connected else { return }
+                strongSelf.processDisconnect(code: connectingCodeNoPing, reason: "no ping", reconnect: true)
+            }
         }
         self.pingTimer?.schedule(deadline: .now() + Double(self.pingInterval) + self.config.maxServerPingDelay)
         self.pingTimer?.resume()
@@ -980,13 +983,14 @@ fileprivate extension CentrifugeClient {
             return
         }
 
-        let previousStatus = self.state
+        let previousState = self.state
 
         if reconnect {
             self.state = .connecting
         } else {
             self.state = .disconnected
         }
+        let needEvent = previousState != self.state
 
         self.client = nil
 
@@ -1010,23 +1014,25 @@ fileprivate extension CentrifugeClient {
         }
         subscriptionsLock.unlock()
 
-        if previousStatus == .connected  {
+        if previousState == .connected  {
             for (channel, _) in self.serverSubs {
                 let event = CentrifugeServerSubscribingEvent(channel: channel)
                 self.delegate?.onSubscribing(self, event)
             }
         }
 
-        if (self.state == .disconnected) {
-            self.delegate?.onDisconnected(
-                self,
-                CentrifugeDisconnectedEvent(code: code, reason: reason)
-            )
-        } else {
-            self.delegate?.onConnecting(
-                self,
-                CentrifugeConnectingEvent(code: code, reason: reason)
-            )
+        if (needEvent) {
+            if (self.state == .disconnected) {
+                self.delegate?.onDisconnected(
+                    self,
+                    CentrifugeDisconnectedEvent(code: code, reason: reason)
+                )
+            } else {
+                self.delegate?.onConnecting(
+                    self,
+                    CentrifugeConnectingEvent(code: code, reason: reason)
+                )
+            }
         }
 
         self.conn?.disconnect()

diff --git a/SwiftCentrifuge.podspec b/SwiftCentrifuge.podspec
@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
     s.name                  = 'SwiftCentrifuge'
     s.module_name           = 'SwiftCentrifuge'
     s.swift_version         = '5.0'
-    s.version               = '0.5.0'
+    s.version               = '0.5.1'
 
     s.homepage              = 'https://github.com/centrifugal/centrifuge-swift'
     s.summary               = 'Centrifugo and Centrifuge client in Swift'