Fix the issue with recursive locking when disposing of a SubscriptionSet (#219)

Author: jguz-pubnub

.pubnub.yml

@@ -1,9 +1,14 @@
 ---
 name: swift
 scm: github.com/pubnub/swift
-version: "9.3.0"
+version: "9.3.1"
 schema: 1
 changelog:
+  - date: 2025-07-31
+    version: 9.3.1
+    changes:
+      - type: bug
+        text: "Fix the issue with recursive locking introduced in 9.3.0 when disposing a SubscriptionSet."
   - date: 2025-07-29
     version: 9.3.0
     changes:
@@ -708,7 +713,7 @@ sdks:
           - distribution-type: source
             distribution-repository: GitHub release
             package-name: PubNub
-            location: https://github.com/pubnub/swift/archive/refs/tags/9.3.0.zip
+            location: https://github.com/pubnub/swift/archive/refs/tags/9.3.1.zip
             supported-platforms:
               supported-operating-systems:
                 macOS:

PubNub.xcodeproj/project.pbxproj

@@ -4031,7 +4031,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 9.3.0;
+				MARKETING_VERSION = 9.3.1;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -4082,7 +4082,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 9.3.0;
+				MARKETING_VERSION = 9.3.1;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
@@ -4190,7 +4190,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 9.3.0;
+				MARKETING_VERSION = 9.3.1;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -4243,7 +4243,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 9.3.0;
+				MARKETING_VERSION = 9.3.1;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
@@ -4364,7 +4364,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 9.3.0;
+				MARKETING_VERSION = 9.3.1;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
@@ -4416,7 +4416,7 @@
 					"@loader_path/Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 9.3.0;
+				MARKETING_VERSION = 9.3.1;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++17";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
@@ -4896,7 +4896,7 @@
 					"$(TOOLCHAIN_DIR)/usr/lib/swift/macosx",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 9.3.0;
+				MARKETING_VERSION = 9.3.1;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++14";
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = "$(inherited)";
@@ -4939,7 +4939,7 @@
 					"$(TOOLCHAIN_DIR)/usr/lib/swift/macosx",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 9.3.0;
+				MARKETING_VERSION = 9.3.1;
 				MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu17 gnu++14";
 				OTHER_CFLAGS = "$(inherited)";
 				OTHER_LDFLAGS = "$(inherited)";

PubNubSwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = 'PubNubSwift'
-  s.version  = '9.3.0'
+  s.version  = '9.3.1'
   s.homepage = 'https://github.com/pubnub/swift'
   s.documentation_url = 'https://www.pubnub.com/docs/swift-native/pubnub-swift-sdk'
   s.authors = { 'PubNub, Inc.' => '[email protected]' }

Sources/PubNub/Events/New/SubscriptionSet.swift

@@ -142,7 +142,7 @@ public final class SubscriptionSet: EventListenerInterface, SubscriptionDisposab
   /// Once disposed, the subscription interface cannot be restarted.
   public func dispose() {
     clearCallbacks()
-    currentSubscriptions.lockedRead { $0.forEach { $0.dispose() } }
+    currentSubscriptions.lockedRead { $0 }.forEach { $0.dispose() }
     removeAllListeners()
     isDisposedContainer.lockedWrite { $0 = true }
   }

Sources/PubNub/Helpers/Constants.swift

@@ -57,7 +57,7 @@ public enum Constant {
 
   static let pubnubSwiftSDKName: String = "PubNubSwift"
 
-  static let pubnubSwiftSDKVersion: String = "9.3.0"
+  static let pubnubSwiftSDKVersion: String = "9.3.1"
 
   static let appBundleId: String = {
     if let info = Bundle.main.infoDictionary,

Tests/PubNubTests/Integration/SubscriptionIntegrationTests.swift

@@ -463,6 +463,29 @@ class SubscriptionIntegrationTests: XCTestCase {
     // Ensuring backward compatibility and that the presence channel is unsubscribed along with the main channel
     XCTAssertEqual(pubnub.subscribedChannels.sorted(by: <), ["B", "B-pnpres"])
   }
+  
+  func testSubscriptionSetDispose() {
+    let expectation = expectation(description: "Test")
+    let pubnub = PubNub(configuration: .init(from: testsBundle))
+    let channel = pubnub.channel("test-channel")
+    let channel2 = pubnub.channel("test-channel2")
+    let subscriptionSet = pubnub.subscription(entities: [channel, channel2])
+    
+    subscriptionSet.subscribe()
+    
+    pubnub.onConnectionStateChange = { [unowned subscriptionSet] newStatus in
+      switch newStatus {
+      case .connected:
+        subscriptionSet.dispose()
+        XCTAssertTrue(subscriptionSet.isDisposed)
+        expectation.fulfill()
+      default:
+        break
+      }
+    }
+    
+    wait(for: [expectation], timeout: 3)
+  }
 }
 
 private extension SubscriptionIntegrationTests {