mirror of
https://github.com/RevenueCat/purchases-ios
synced 2026-11-10 22:45:55 +05:45
For #695. The biggest change is that this code at the beginning of `HTTPClient.handle` is now gone: ```swift var statusCode: HTTPStatusCode = .networkConnectTimeoutError var jsonObject: [String: Any]? var httpResponse: HTTPResponse? = HTTPResponse(statusCode: statusCode, jsonObject: jsonObject) var receivedJSONError: Error? ``` It was hard to trace which paths modified these default values. The new implementation has a mostly linear path (part of it abstracted in smaller methods now) and doesn’t have mutable values. This is the new `handle` implementation: ```swift func handle(urlResponse: URLResponse?, request: Request, urlRequest: URLRequest, data: Data?, error networkError: Error?) { let (response, shouldRetry) = self.parse( urlResponse: urlResponse, request: request, urlRequest: urlRequest, data: data, error: networkError ) if shouldRetry { Logger.debug(Strings.network.retrying_request(httpMethod: request.method.httpMethod, path: request.path)) self.state.modify { $0.queuedRequests.insert(request.retriedRequest(), at: 0) } } else { request.completionHandler?(response) } self.beginNextRequest() } ``` ## All Changes: - `HTTPClient.perform` no longer has a bunch of mutable variables with forking paths that make it hard to follow. Most of the response handling is now in a new `parse` method. This will simplify the task of continuing to refactor response deserialization. - `HTTPClient`’s completion abstracts response into `HTTPResponse` - `UserInfoAttributeParser` is now an `enum` - `ETagManager` no longer takes an `Error`. The only thing it did with it is to return the default response. - `HTTPResponse.jsonObject` is no longer `Optional` - Moved `defaultJsonEncoder` / `defaultJsonDecoder` to `JSONDecoder+Extensions`. They used by `HTTPClient` and others soon.
154 lines
5.2 KiB
Swift
154 lines
5.2 KiB
Swift
//
|
|
// Copyright RevenueCat Inc. All Rights Reserved.
|
|
//
|
|
// Licensed under the MIT License (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// https://opensource.org/licenses/MIT
|
|
//
|
|
// JSONDecoder+Extensions.swift
|
|
//
|
|
// Created by Juanpe Catalán on 25/8/21.
|
|
|
|
import Foundation
|
|
|
|
enum CodableError: Error, CustomStringConvertible {
|
|
|
|
case unexpectedValue(Any.Type)
|
|
case valueNotFound(value: Any.Type, context: DecodingError.Context)
|
|
case invalidJSONObject(value: [String: Any])
|
|
|
|
var description: String {
|
|
switch self {
|
|
case let .unexpectedValue(type):
|
|
return Strings.codable.unexpectedValueError(type: type).description
|
|
case let .valueNotFound(value, context):
|
|
return Strings.codable.valueNotFoundError(value: value, context: context).description
|
|
case let .invalidJSONObject(value):
|
|
return Strings.codable.invalid_json_error(jsonData: value).description
|
|
}
|
|
}
|
|
}
|
|
|
|
extension JSONDecoder {
|
|
|
|
/// Decodes a top-level value of the given type from the given Dictionary.
|
|
///
|
|
/// - Parameters:
|
|
/// - type: The type of the value to decode. The default is `T.self`.
|
|
/// - dictionary: The dictionary to decode from.
|
|
/// - keyDecodingStrategy: The strategy to use for automatically changing the
|
|
/// value of keys before decoding. The default is `useDefaultKeys`.
|
|
/// - dateDecodingStrategy: The strategy to use for decoding `Date` values. The default is `deferredToDate`.
|
|
/// - dataDecodingStrategy: The strategy to use for decoding `Data` values. The default is `deferredToData`.
|
|
/// - Returns: A value of the requested type.
|
|
/// - throws: `CodableError` or `DecodableError` if the data is invalid or can't be deserialized.
|
|
func decode<T: Decodable>(
|
|
_ type: T.Type = T.self,
|
|
dictionary: [String: Any],
|
|
keyDecodingStrategy: KeyDecodingStrategy = .useDefaultKeys,
|
|
dateDecodingStrategy: DateDecodingStrategy = .deferredToDate,
|
|
dataDecodingStrategy: DataDecodingStrategy = .deferredToData
|
|
) throws -> T {
|
|
self.keyDecodingStrategy = keyDecodingStrategy
|
|
self.dateDecodingStrategy = dateDecodingStrategy
|
|
self.dataDecodingStrategy = dataDecodingStrategy
|
|
|
|
do {
|
|
if JSONSerialization.isValidJSONObject(dictionary) {
|
|
let jsonData = try JSONSerialization.data(withJSONObject: dictionary)
|
|
return try decode(type, from: jsonData)
|
|
} else {
|
|
throw CodableError.invalidJSONObject(value: dictionary)
|
|
}
|
|
} catch {
|
|
ErrorUtils.logDecodingError(error)
|
|
throw error
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
extension KeyedDecodingContainer {
|
|
|
|
/// Decodes a value of the given type for the given key.
|
|
/// - Parameters:
|
|
/// - type: The type of value to decode.
|
|
/// - key: The key that the decoded value is associated with.
|
|
/// - defaultValue: The default value returned if decoding fails.
|
|
/// - Returns: A value of the requested type, or the given default value
|
|
/// if decoding fails.
|
|
func decode<T: Decodable>(_ type: T.Type, forKey key: Self.Key, defaultValue: T) -> T {
|
|
do {
|
|
return try decode(type, forKey: key)
|
|
} catch {
|
|
return defaultValue
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
// MARK: Decoding Error handling
|
|
private extension ErrorUtils {
|
|
|
|
static func logDecodingError(_ error: Error) {
|
|
guard let decodingError = error as? DecodingError else {
|
|
Logger.error(Strings.codable.decoding_error(error))
|
|
return
|
|
}
|
|
|
|
switch decodingError {
|
|
case .dataCorrupted(let context):
|
|
Logger.error(Strings.codable.corrupted_data_error(context: context))
|
|
case .keyNotFound(let key, let context):
|
|
// This is expected to happen occasionally, the backend doesn't always populate all key/values.
|
|
Logger.debug(Strings.codable.keyNotFoundError(key: key, context: context))
|
|
case .valueNotFound(let value, let context):
|
|
Logger.debug(Strings.codable.valueNotFoundError(value: value, context: context))
|
|
case .typeMismatch(let type, let context):
|
|
Logger.error(Strings.codable.typeMismatch(type: type, context: context))
|
|
@unknown default:
|
|
Logger.error("Unhandled DecodingError: \(decodingError)\n\(Strings.codable.decoding_error(decodingError))")
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
extension Encodable {
|
|
|
|
func asDictionary() throws -> [String: Any] {
|
|
let data = try JSONEncoder().encode(self)
|
|
let result = try JSONSerialization.jsonObject(with: data, options: [])
|
|
|
|
guard let result = result as? [String: Any] else {
|
|
throw CodableError.unexpectedValue(type(of: result))
|
|
}
|
|
|
|
return result
|
|
}
|
|
|
|
}
|
|
|
|
extension JSONEncoder {
|
|
|
|
static let `default`: JSONEncoder = {
|
|
let encoder = JSONEncoder()
|
|
encoder.keyEncodingStrategy = .convertToSnakeCase
|
|
|
|
return encoder
|
|
}()
|
|
|
|
}
|
|
|
|
extension JSONDecoder {
|
|
|
|
static let `default`: JSONDecoder = {
|
|
let decoder = JSONDecoder()
|
|
decoder.keyDecodingStrategy = .convertFromSnakeCase
|
|
|
|
return decoder
|
|
}()
|
|
|
|
}
|