forked from Moya/Moya
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This reverts commit 7e82d4b. # Conflicts: # Moya.podspec # Moya.xcodeproj/project.pbxproj
- Loading branch information
1 parent
71180ee
commit 5644997
Showing
7 changed files
with
605 additions
and
11 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| #if canImport(Combine) | ||
|
|
||
| import Foundation | ||
| import Combine | ||
|
|
||
| #if canImport(UIKit) | ||
| import UIKit.UIImage | ||
| #elseif canImport(AppKit) | ||
| import AppKit.NSImage | ||
| #endif | ||
|
|
||
| /// Extension for processing raw NSData generated by network access. | ||
| @available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) | ||
| public extension AnyPublisher where Output == Response, Failure == MoyaError { | ||
|
|
||
| /// Filters out responses that don't fall within the given range, generating errors when others are encountered. | ||
| func filter<R: RangeExpression>(statusCodes: R) -> AnyPublisher<Response, MoyaError> where R.Bound == Int { | ||
| return unwrapThrowable { response in | ||
| try response.filter(statusCodes: statusCodes) | ||
| } | ||
| } | ||
|
|
||
| /// Filters out responses that has the specified `statusCode`. | ||
| func filter(statusCode: Int) -> AnyPublisher<Response, MoyaError> { | ||
| return unwrapThrowable { response in | ||
| try response.filter(statusCode: statusCode) | ||
| } | ||
| } | ||
|
|
||
| /// Filters out responses where `statusCode` falls within the range 200 - 299. | ||
| func filterSuccessfulStatusCodes() -> AnyPublisher<Response, MoyaError> { | ||
| return unwrapThrowable { response in | ||
| try response.filterSuccessfulStatusCodes() | ||
| } | ||
| } | ||
|
|
||
| /// Filters out responses where `statusCode` falls within the range 200 - 399 | ||
| func filterSuccessfulStatusAndRedirectCodes() -> AnyPublisher<Response, MoyaError> { | ||
| return unwrapThrowable { response in | ||
| try response.filterSuccessfulStatusAndRedirectCodes() | ||
| } | ||
| } | ||
|
|
||
| /// Maps data received from the signal into an Image. If the conversion fails, the signal errors. | ||
| func mapImage() -> AnyPublisher<Image, MoyaError> { | ||
| return unwrapThrowable { response in | ||
| try response.mapImage() | ||
| } | ||
| } | ||
|
|
||
| /// Maps data received from the signal into a JSON object. If the conversion fails, the signal errors. | ||
| func mapJSON(failsOnEmptyData: Bool = true) -> AnyPublisher<Any, MoyaError> { | ||
| return unwrapThrowable { response in | ||
| try response.mapJSON(failsOnEmptyData: failsOnEmptyData) | ||
| } | ||
| } | ||
|
|
||
| /// Maps received data at key path into a String. If the conversion fails, the signal errors. | ||
| func mapString(atKeyPath keyPath: String? = nil) -> AnyPublisher<String, MoyaError> { | ||
| return unwrapThrowable { response in | ||
| try response.mapString(atKeyPath: keyPath) | ||
| } | ||
| } | ||
|
|
||
| /// Maps received data at key path into a Decodable object. If the conversion fails, the signal errors. | ||
| func map<D: Decodable>(_ type: D.Type, atKeyPath keyPath: String? = nil, using decoder: JSONDecoder = JSONDecoder(), failsOnEmptyData: Bool = true) -> AnyPublisher<D, MoyaError> { | ||
| return unwrapThrowable { response in | ||
| try response.map(type, atKeyPath: keyPath, using: decoder, failsOnEmptyData: failsOnEmptyData) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) | ||
| public extension AnyPublisher where Output == ProgressResponse, Failure == MoyaError { | ||
|
|
||
| /** | ||
| Filter completed progress response and maps to actual response | ||
|
|
||
| - returns: response associated with ProgressResponse object | ||
| */ | ||
| func filterCompleted() -> AnyPublisher<Response, MoyaError> { | ||
| return self | ||
| .compactMap { $0.response } | ||
| .eraseToAnyPublisher() | ||
| } | ||
|
|
||
| /** | ||
| Filter progress events of current ProgressResponse | ||
|
|
||
| - returns: observable of progress events | ||
| */ | ||
| func filterProgress() -> AnyPublisher<Double, MoyaError> { | ||
| return self | ||
| .filter { !$0.completed } | ||
| .map { $0.progress } | ||
| .eraseToAnyPublisher() | ||
| } | ||
| } | ||
|
|
||
| @available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) | ||
| extension AnyPublisher where Failure == MoyaError { | ||
|
|
||
| // Workaround for a lot of things, actually. We don't have Publishers.Once, flatMap | ||
| // that can throw and a lot more. So this monster was created because of that. Sorry. | ||
| private func unwrapThrowable<T>(throwable: @escaping (Output) throws -> T) -> AnyPublisher<T, MoyaError> { | ||
| self.tryMap { element in | ||
| try throwable(element) | ||
| } | ||
| .mapError { error -> MoyaError in | ||
| if let moyaError = error as? MoyaError { | ||
| return moyaError | ||
| } else { | ||
| return .underlying(error, nil) | ||
| } | ||
| } | ||
| .eraseToAnyPublisher() | ||
| } | ||
| } | ||
|
|
||
| #endif |
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,62 @@ | ||
| #if canImport(Combine) | ||
|
|
||
| import Foundation | ||
| import Combine | ||
|
|
||
| @available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) | ||
| public extension MoyaProvider { | ||
|
|
||
| /// Designated request-making method. | ||
| /// | ||
| /// - Parameters: | ||
| /// - target: Entity, which provides specifications necessary for a `MoyaProvider`. | ||
| /// - callbackQueue: Callback queue. If nil - queue from provider initializer will be used. | ||
| /// - Returns: `AnyPublisher<Response, MoyaError` | ||
| func requestPublisher(_ target: Target, callbackQueue: DispatchQueue? = nil) -> AnyPublisher<Response, MoyaError> { | ||
| return MoyaPublisher { [weak self] subscriber in | ||
| return self?.request(target, callbackQueue: callbackQueue, progress: nil) { result in | ||
| switch result { | ||
| case let .success(response): | ||
| _ = subscriber.receive(response) | ||
| subscriber.receive(completion: .finished) | ||
| case let .failure(error): | ||
| subscriber.receive(completion: .failure(error)) | ||
| } | ||
| } | ||
| } | ||
| .eraseToAnyPublisher() | ||
| } | ||
|
|
||
| /// Designated request-making method with progress. | ||
| func requestWithProgressPublisher(_ target: Target, callbackQueue: DispatchQueue? = nil) -> AnyPublisher<ProgressResponse, MoyaError> { | ||
| let progressBlock: (AnySubscriber<ProgressResponse, MoyaError>) -> (ProgressResponse) -> Void = { subscriber in | ||
| return { progress in | ||
| _ = subscriber.receive(progress) | ||
| } | ||
| } | ||
|
|
||
| let response = MoyaPublisher<ProgressResponse> { [weak self] subscriber in | ||
| let cancellableToken = self?.request(target, callbackQueue: callbackQueue, progress: progressBlock(subscriber)) { result in | ||
| switch result { | ||
| case .success: | ||
| subscriber.receive(completion: .finished) | ||
| case let .failure(error): | ||
| subscriber.receive(completion: .failure(error)) | ||
| } | ||
| } | ||
|
|
||
| return cancellableToken | ||
| } | ||
|
|
||
| // Accumulate all progress and combine them when the result comes | ||
| return response | ||
| .scan(ProgressResponse()) { last, progress in | ||
| let progressObject = progress.progressObject ?? last.progressObject | ||
| let response = progress.response ?? last.response | ||
| return ProgressResponse(progress: progressObject, response: response) | ||
| } | ||
| .eraseToAnyPublisher() | ||
| } | ||
| } | ||
|
|
||
| #endif |
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,42 @@ | ||
| #if canImport(Combine) | ||
|
|
||
| import Combine | ||
|
|
||
| // This should be already provided in Combine, but it's not. | ||
| // Ideally we would like to remove it, in favor of a framework-provided solution, ASAP. | ||
|
|
||
| @available(OSX 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *) | ||
| internal class MoyaPublisher<Output>: Publisher { | ||
|
|
||
| internal typealias Failure = MoyaError | ||
|
|
||
| private class Subscription: Combine.Subscription { | ||
|
|
||
| private let cancellable: Cancellable? | ||
|
|
||
| init(subscriber: AnySubscriber<Output, MoyaError>, callback: @escaping (AnySubscriber<Output, MoyaError>) -> Cancellable?) { | ||
| self.cancellable = callback(subscriber) | ||
| } | ||
|
|
||
| func request(_ demand: Subscribers.Demand) { | ||
| // We don't care for the demand right now | ||
| } | ||
|
|
||
| func cancel() { | ||
| cancellable?.cancel() | ||
| } | ||
| } | ||
|
|
||
| private let callback: (AnySubscriber<Output, MoyaError>) -> Cancellable? | ||
|
|
||
| init(callback: @escaping (AnySubscriber<Output, MoyaError>) -> Cancellable?) { | ||
| self.callback = callback | ||
| } | ||
|
|
||
| internal func receive<S>(subscriber: S) where S: Subscriber, Failure == S.Failure, Output == S.Input { | ||
| let subscription = Subscription(subscriber: AnySubscriber(subscriber), callback: callback) | ||
| subscriber.receive(subscription: subscription) | ||
| } | ||
| } | ||
|
|
||
| #endif |
Oops, something went wrong.