Fixing contract tests + minor fixes in SDK

pubnub · Apr 5, 2024 · f8cc941 · f8cc941
1 parent 8155f80
commit f8cc941
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/Sources/PubNub/EventEngine/Presence/Helpers/PresenceHeartbeatRequest.swift b/Sources/PubNub/EventEngine/Presence/Helpers/PresenceHeartbeatRequest.swift
@@ -45,7 +45,7 @@ class PresenceHeartbeatRequest {
     )
     request = session.request(
       with: PresenceRouter(endpoint, configuration: configuration),
-      requestOperator: nil
+      requestOperator: configuration.automaticRetry?.retryOperator(for: .presence)
     )
     request?.validate().response(on: sessionResponseQueue, decoder: GenericServiceResponseDecoder()) { result in
       switch result {

diff --git a/Sources/PubNub/EventEngine/Subscribe/Helpers/SubscribeRequest.swift b/Sources/PubNub/EventEngine/Subscribe/Helpers/SubscribeRequest.swift
@@ -20,7 +20,6 @@ class SubscribeRequest {
   private let session: SessionReplaceable
   private let sessionResponseQueue: DispatchQueue
   private let channelStates: [String: JSONCodable]
-
   private var request: RequestReplaceable?
 
   var retryLimit: UInt { configuration.automaticRetry?.retryLimit ?? 0 }
@@ -67,7 +66,7 @@ class SubscribeRequest {
     )
     request = session.request(
       with: router,
-      requestOperator: nil
+      requestOperator: configuration.automaticRetry?.retryOperator(for: .subscribe)
     )
     request?.validate().response(
       on: sessionResponseQueue,

diff --git a/Sources/PubNub/Networking/Request/Request.swift b/Sources/PubNub/Networking/Request/Request.swift
@@ -289,6 +289,7 @@ final class Request {
     delegate.retryResult(for: self, dueTo: error, andPrevious: previousError) { retryResult in
       switch retryResult {
       case let .success(retryAfter):
+        self.atomicState.lockedWrite { $0.responesData = nil }
         delegate.retryRequest(self, withDelay: retryAfter)
       case let .failure(error):
         self.finish(error: PubNubError.retry(error, router: self.router))

diff --git a/Sources/PubNub/Subscription/SubscriptionSession.swift b/Sources/PubNub/Subscription/SubscriptionSession.swift
@@ -156,19 +156,21 @@ class SubscriptionSession: EventEmitter, StatusEmitter {
     and groups: [String] = [],
     presenceOnly: Bool = false
   ) {
+    let channelNamesToUnsubscribe = channels.flatMap {
+      presenceOnly ? [$0.presenceChannelName] : [$0, $0.presenceChannelName]
+    }
+    let groupNamesToUnsubscribe = groups.flatMap {
+      presenceOnly ? [$0.presenceChannelName] : [$0, $0.presenceChannelName]
+    }
     internalUnsubscribe(
-      from: channels.map { Subscription(queue: queue, entity: channel($0)) },
-      and: groups.map { Subscription(queue: queue, entity: channelGroup($0)) },
+      from: globalChannelSubscriptions.compactMap { channelNamesToUnsubscribe.contains($0.key) ? $0.value : nil },
+      and: globalGroupSubscriptions.compactMap { groupNamesToUnsubscribe.contains($0.key) ? $0.value : nil },
       presenceOnly: presenceOnly
     )
-    channels.flatMap {
-      presenceOnly ? [$0.presenceChannelName] : [$0, $0.presenceChannelName]
-    }.forEach {
+    channelNamesToUnsubscribe.forEach {
       globalChannelSubscriptions.removeValue(forKey: $0)
     }
-    groups.flatMap {
-      presenceOnly ? [$0.presenceChannelName] : [$0, $0.presenceChannelName]
-    }.forEach {
+    groupNamesToUnsubscribe.forEach {
       globalGroupSubscriptions.removeValue(forKey: $0)
     }
   }

diff --git a/Tests/PubNubContractTest/Steps/EventEngine/PubNubPresenceEngineContractTestSteps.swift b/Tests/PubNubContractTest/Steps/EventEngine/PubNubPresenceEngineContractTestSteps.swift
@@ -80,7 +80,6 @@ class PubNubPresenceEngineContractTestsSteps: PubNubEventEngineContractTestsStep
 
   override func createPubNubClient() -> PubNub {
     let container = DependencyContainer(configuration: self.configuration)
-    let key = PresenceEventEngineDependencyKey.self
 
     self.dispatcherDecorator = DispatcherDecorator(wrappedInstance: EffectDispatcher(
       factory: PresenceEffectFactory(

diff --git a/Tests/PubNubContractTest/Steps/EventEngine/PubNubSubscribeEngineContractTestsSteps.swift b/Tests/PubNubContractTest/Steps/EventEngine/PubNubSubscribeEngineContractTestsSteps.swift
@@ -95,7 +95,6 @@ class PubNubSubscribeEngineContractTestsSteps: PubNubEventEngineContractTestsSte
 
   override func createPubNubClient() -> PubNub {
     let container = DependencyContainer(configuration: self.configuration)
-    let key = SubscribeEventEngineDependencyKey.self
 
     self.dispatcherDecorator = DispatcherDecorator(wrappedInstance: EffectDispatcher(
       factory: SubscribeEffectFactory(
@@ -154,8 +153,8 @@ class PubNubSubscribeEngineContractTestsSteps: PubNubEventEngineContractTestsSte
       self.subscribeSynchronously(self.client, to: ["test"])
     }
 
-    When("I subscribe with timetoken 42") { _, _ in
-      self.subscribeSynchronously(self.client, to: ["test"], timetoken: 42)
+    When("I subscribe with timetoken 12345678901234567") { _, _ in
+      self.subscribeSynchronously(self.client, to: ["test"], timetoken: 12345678901234567)
     }
 
     Then("I receive an error in my subscribe response") { _, _ in