Добавлен responseTuner

Oleg-E-Bakharev · Mar 27, 2024 · 95c0677 · 95c0677
1 parent 0075f72
commit 95c0677
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Sources/AsyncHttpClient/AsyncHttpClient.swift b/Sources/AsyncHttpClient/AsyncHttpClient.swift
@@ -8,6 +8,9 @@ public enum AsyncHttpRequestTuners {
     /// Тюнер запроса - позволяет как угодно настроить запрос
     case request((inout URLRequest) -> Void)
 
+    /// Тюнер ответа - позволяет валидировать и извлекать данные из заголовка ответа
+    case response((HTTPURLResponse) throws -> Void)
+
     /// Тюнер кодера. Позволяет кастомизировать кодер
     case encoder((inout JSONEncoder) -> Void)
 
@@ -16,6 +19,7 @@ public enum AsyncHttpRequestTuners {
 
     public enum Keys {
         case request
+        case response
         case encoder
         case decoder
     }

diff --git a/Sources/AsyncHttpClient/AsyncHttpJsonClient.swift b/Sources/AsyncHttpClient/AsyncHttpJsonClient.swift
@@ -258,8 +258,16 @@ public class AsyncHttpJsonClient: AsyncHttpClient {
             throw URLError.emptyResponse
         }
 
+        guard let response = response as? HTTPURLResponse else {
+            throw URLError.invalidResponse
+        }
+
         try validate(response, data: data)
 
+        if case .response(let responseTuner) = tuners[.response] {
+            try responseTuner(response)
+        }
+
         do {
             var decoder = JSONDecoder()
             decoder.dateDecodingStrategy = .formatted(dateFormatter)
@@ -276,10 +284,7 @@ public class AsyncHttpJsonClient: AsyncHttpClient {
         }
     }
 
-    private func validate(_ response: URLResponse, data: Data?) throws {
-        guard let response = response as? HTTPURLResponse else {
-            throw URLError.invalidResponse
-        }
+    private func validate(_ response: HTTPURLResponse, data: Data?) throws {
         if let responseValidator {
             try responseValidator.validate(response: response, data: data)
         } else if data?.count ?? 0 == 0 || response.isError {