CipherLabs
/
alpha-wallet-ios
mirror of https://github.com/AlphaWallet/alpha-wallet-ios
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Extract Session+Publisher to separate file

Browse Source
pull/4574/head
Krypto Pank 3 years ago
parent 84889bcbb1
commit efa30da462
3 changed files with 52 additions and 34 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      AlphaWallet.xcodeproj/project.pbxproj
  2. 48
      AlphaWallet/Extensions/Publishers/Session+Publishers.swift
  3. 34
      AlphaWallet/Extensions/Session+PromiseKit.swift

4
AlphaWallet.xcodeproj/project.pbxproj
Unescape View File

@ -888,6 +888,7 @@
8765D6E5282BAD7E00529F45 /* FakeSingleChainTokenBalanceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8765D6E4282BAD7E00529F45 /* FakeSingleChainTokenBalanceService.swift */; };
8765D6E7282BCC8000529F45 /* ReportUsersWalletAddresses.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8765D6E6282BCC8000529F45 /* ReportUsersWalletAddresses.swift */; };
8765D6F5282BE0B100529F45 /* Alamofire+Publishers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8765D6F4282BE0B100529F45 /* Alamofire+Publishers.swift */; };
8765D6F7282BE26200529F45 /* Session+Publishers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8765D6F6282BE26200529F45 /* Session+Publishers.swift */; };
8769888D24C6ED04002BF62B /* TransactionInProgressCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8769888C24C6ED04002BF62B /* TransactionInProgressCoordinator.swift */; };
8769BCA8256D15BF0095EA5B /* BlockieImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8769BCA7256D15BF0095EA5B /* BlockieImageView.swift */; };
876C80C92673349300B16595 /* CoinTickersFetcherCache.swift in Sources */ = {isa = PBXBuildFile; fileRef = 876C80C82673349300B16595 /* CoinTickersFetcherCache.swift */; };
@ -2045,6 +2046,7 @@
8765D6E4282BAD7E00529F45 /* FakeSingleChainTokenBalanceService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeSingleChainTokenBalanceService.swift; sourceTree = "<group>"; };
8765D6E6282BCC8000529F45 /* ReportUsersWalletAddresses.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportUsersWalletAddresses.swift; sourceTree = "<group>"; };
8765D6F4282BE0B100529F45 /* Alamofire+Publishers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Alamofire+Publishers.swift"; sourceTree = "<group>"; };
8765D6F6282BE26200529F45 /* Session+Publishers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Session+Publishers.swift"; sourceTree = "<group>"; };
8769888C24C6ED04002BF62B /* TransactionInProgressCoordinator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionInProgressCoordinator.swift; sourceTree = "<group>"; };
8769BCA7256D15BF0095EA5B /* BlockieImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BlockieImageView.swift; sourceTree = "<group>"; };
876C80C82673349300B16595 /* CoinTickersFetcherCache.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoinTickersFetcherCache.swift; sourceTree = "<group>"; };
@ -5074,6 +5076,7 @@
8714430127FB2E6B008819D1 /* NotificationCenter.swift */,
8782E9CF2828E47100E93689 /* RetryIf.swift */,
8765D6F4282BE0B100529F45 /* Alamofire+Publishers.swift */,
8765D6F6282BE26200529F45 /* Session+Publishers.swift */,
);
path = Publishers;
sourceTree = "<group>";
@ -6518,6 +6521,7 @@
5E7C75E5C64619ABFD246183 /* TransferTokensCardViaWalletAddressViewController.swift in Sources */,
5E7C7EAEBB435F3909DA36FB /* TransferTokensCardViaWalletAddressViewControllerViewModel.swift in Sources */,
5E7C7CCC8D376C6E5C245715 /* EthCurrencyHelper.swift in Sources */,
8765D6F7282BE26200529F45 /* Session+Publishers.swift in Sources */,
8757E5E225DE5ADB00812392 /* WalletConnectToSessionViewModel.swift in Sources */,
8739BB5526CCECD10045CFED /* Erc875NonFungibleRowView.swift in Sources */,
5E7C7317533D24B6A292F88D /* UIStackView+Array.swift in Sources */,

48
AlphaWallet/Extensions/Publishers/Session+Publishers.swift
Unescape View File

@ -0,0 +1,48 @@
//
// Session+Publishers.swift
// AlphaWallet
//
// Created by Vladyslav Shepitko on 10.05.2022.
//
import Foundation
import APIKit
import JSONRPCKit
import Combine
extension Session {
class func sendPublisher<Request: APIKit.Request>(_ request: Request, callbackQueue: CallbackQueue? = nil) -> AnyPublisher<Request.Response, SessionTaskError> {
sendImplPublisher(request, callbackQueue: callbackQueue)
.retry(times: 2, when: {
guard case SessionTaskError.requestError(let e) = $0 else { return false }
return e is SendTransactionRetryableError
})
.eraseToAnyPublisher()
}
private class func sendImplPublisher<Request: APIKit.Request>(_ request: Request, callbackQueue: CallbackQueue? = nil) -> AnyPublisher<Request.Response, SessionTaskError> {
var sessionTask: SessionTask?
let publisher = Deferred {
Future<Request.Response, SessionTaskError> { seal in
sessionTask = Session.send(request, callbackQueue: callbackQueue) { result in
switch result {
case .success(let result):
seal(.success(result))
case .failure(let error):
if let e = convertToUserFriendlyError(error: error, baseUrl: request.baseURL) {
seal(.failure(.requestError(e)))
} else {
seal(.failure(error))
}
}
}
}
}.handleEvents(receiveCancel: {
sessionTask?.cancel()
})
return publisher
.eraseToAnyPublisher()
}
}

34
AlphaWallet/Extensions/Session+PromiseKit.swift
Unescape View File

@ -4,42 +4,8 @@ import Foundation
import APIKit
import JSONRPCKit
import PromiseKit
import Combine
extension Session {
private class func sendImplPublisher<Request: APIKit.Request>(_ request: Request, callbackQueue: CallbackQueue? = nil) -> AnyPublisher<Request.Response, SessionTaskError> {
var sessionTask: SessionTask?
let publisher = Deferred {
Future<Request.Response, SessionTaskError> { seal in
sessionTask = Session.send(request, callbackQueue: callbackQueue) { result in
switch result {
case .success(let result):
seal(.success(result))
case .failure(let error):
if let e = convertToUserFriendlyError(error: error, baseUrl: request.baseURL) {
seal(.failure(.requestError(e)))
} else {
seal(.failure(error))
}
}
}
}
}.handleEvents(receiveCancel: {
sessionTask?.cancel()
})
return publisher
.eraseToAnyPublisher()
}
class func sendPublisher<Request: APIKit.Request>(_ request: Request, callbackQueue: CallbackQueue? = nil) -> AnyPublisher<Request.Response, SessionTaskError> {
sendImplPublisher(request, callbackQueue: callbackQueue)
.retry(times: 2, when: {
guard case SessionTaskError.requestError(let e) = $0 else { return false }
return e is SendTransactionRetryableError
})
.eraseToAnyPublisher()
}
private class func sendImpl<Request: APIKit.Request>(_ request: Request, callbackQueue: CallbackQueue? = nil) -> Promise<Request.Response> {
let (promise, seal) = Promise<Request.Response>.pending()

Write Preview
Loading…
Cancel
Save