-
Notifications
You must be signed in to change notification settings - Fork 172
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1256 from WalletConnect/feature/update-subscripti…
…ons-on-responses [Notify] Subscriptions Updater
- Loading branch information
Showing
13 changed files
with
200 additions
and
178 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 60 additions & 0 deletions
60
Sources/WalletConnectNotify/Client/Wallet/NotifySubsctiptionsUpdater.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| import Foundation | ||
| import Combine | ||
|
|
||
| final class NotifySubsctiptionsUpdater { | ||
| private let networkingInteractor: NetworkInteracting | ||
| private let kms: KeyManagementServiceProtocol | ||
| private let logger: ConsoleLogging | ||
| private let notifyStorage: NotifyStorage | ||
| private let groupKeychainStorage: KeychainStorageProtocol | ||
|
|
||
| private let subscriptionChangedSubject = PassthroughSubject<[NotifySubscription], Never>() | ||
|
|
||
| var subscriptionChangedPublisher: AnyPublisher<[NotifySubscription], Never> { | ||
| return subscriptionChangedSubject.eraseToAnyPublisher() | ||
| } | ||
|
|
||
| init(networkingInteractor: NetworkInteracting, kms: KeyManagementServiceProtocol, logger: ConsoleLogging, notifyStorage: NotifyStorage, groupKeychainStorage: KeychainStorageProtocol) { | ||
| self.networkingInteractor = networkingInteractor | ||
| self.kms = kms | ||
| self.logger = logger | ||
| self.notifyStorage = notifyStorage | ||
| self.groupKeychainStorage = groupKeychainStorage | ||
| } | ||
|
|
||
| func update(subscriptions newSubscriptions: [NotifySubscription], for account: Account) async throws { | ||
| let oldSubscriptions = notifyStorage.getSubscriptions(account: account) | ||
|
|
||
| subscriptionChangedSubject.send(newSubscriptions) | ||
|
|
||
| try Task.checkCancellation() | ||
|
|
||
| let subscriptions = oldSubscriptions.difference(from: newSubscriptions) | ||
|
|
||
| logger.debug("Received: \(newSubscriptions.count), changed: \(subscriptions.count)") | ||
|
|
||
| if subscriptions.count > 0 { | ||
| try notifyStorage.replaceAllSubscriptions(newSubscriptions) | ||
|
|
||
| for subscription in newSubscriptions { | ||
| let symKey = try SymmetricKey(hex: subscription.symKey) | ||
| try groupKeychainStorage.add(symKey, forKey: subscription.topic) | ||
| try kms.setSymmetricKey(symKey, for: subscription.topic) | ||
| } | ||
|
|
||
| let topicsToSubscribe = newSubscriptions.map { $0.topic } | ||
|
|
||
| let oldTopics = Set(oldSubscriptions.map { $0.topic }) | ||
| let topicsToUnsubscribe = Array(oldTopics.subtracting(topicsToSubscribe)) | ||
|
|
||
| try await networkingInteractor.batchUnsubscribe(topics: topicsToUnsubscribe) | ||
| try await networkingInteractor.batchSubscribe(topics: topicsToSubscribe) | ||
|
|
||
| try Task.checkCancellation() | ||
|
|
||
| logger.debug("Updated Subscriptions by Subscriptions Changed Request", properties: [ | ||
| "topics": newSubscriptions.map { $0.topic }.joined(separator: ",") | ||
| ]) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
...ify/Client/Wallet/ProtocolEngine/wc_notifyDelete/NotifyDeleteSubscriptionSubscriber.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| import Foundation | ||
| import Combine | ||
|
|
||
| class NotifyDeleteSubscriptionSubscriber { | ||
|
|
||
| private let networkingInteractor: NetworkInteracting | ||
| private let kms: KeyManagementServiceProtocol | ||
| private let logger: ConsoleLogging | ||
| private let notifySubscriptionsBuilder: NotifySubscriptionsBuilder | ||
| private let notifySubscriptionsUpdater: NotifySubsctiptionsUpdater | ||
|
|
||
| init( | ||
| networkingInteractor: NetworkInteracting, | ||
| kms: KeyManagementServiceProtocol, | ||
| logger: ConsoleLogging, | ||
| notifySubscriptionsBuilder: NotifySubscriptionsBuilder, | ||
| notifySubscriptionsUpdater: NotifySubsctiptionsUpdater | ||
| ) { | ||
| self.networkingInteractor = networkingInteractor | ||
| self.kms = kms | ||
| self.logger = logger | ||
| self.notifySubscriptionsBuilder = notifySubscriptionsBuilder | ||
| self.notifySubscriptionsUpdater = notifySubscriptionsUpdater | ||
|
|
||
| subscribeForDeleteResponse() | ||
| } | ||
| } | ||
|
|
||
| private extension NotifyDeleteSubscriptionSubscriber { | ||
|
|
||
| func subscribeForDeleteResponse() { | ||
| networkingInteractor.subscribeOnResponse( | ||
| protocolMethod: NotifyDeleteProtocolMethod(), | ||
| requestOfType: NotifyDeletePayload.Wrapper.self, | ||
| responseOfType: NotifyDeleteResponsePayload.Wrapper.self, | ||
| errorHandler: logger | ||
| ) { [unowned self] payload in | ||
|
|
||
| let (responsePayload, _) = try NotifyDeleteResponsePayload.decodeAndVerify(from: payload.response) | ||
|
|
||
| let subscriptions = try await notifySubscriptionsBuilder.buildSubscriptions(responsePayload.subscriptions) | ||
|
|
||
| try await notifySubscriptionsUpdater.update(subscriptions: subscriptions, for: responsePayload.account) | ||
|
|
||
| logger.debug("Received Notify Delete response") | ||
|
|
||
| networkingInteractor.unsubscribe(topic: payload.topic) | ||
| kms.deleteSymmetricKey(for: payload.topic) | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.