Merge pull request #51 from YAPP-Github/BOOK-72-refactor/#44

refactor: 네트워크 아키텍처 리팩토링

Author: clxxrlove

src/Projects/BKData/Sources/Interface/Network/NetworkProvider.swift

@@ -1,10 +1,11 @@
 // Copyright © 2025 Booket. All rights reserved
 
+import Combine
+
 public protocol NetworkProvider {
     @discardableResult
     func request<T: Decodable>(
         target: RequestTarget,
-        type: T.Type,
-        isRetry: Bool
-    ) async throws -> T
+        type: T.Type
+    ) -> AnyPublisher<T, Error>
 }

src/Projects/BKData/Sources/Interface/Storage/TokenProvider.swift

@@ -2,5 +2,5 @@
 
 public protocol TokenProvider {
     var accessToken: String? { get }
-    func refreshIfNeeded() async throws
+    func refreshIfNeeded()
 }

src/Projects/BKNetwork/Sources/Adapter/URLSessionRequestor.swift

@@ -0,0 +1,19 @@
+// Copyright © 2025 Booket. All rights reserved
+
+import Combine
+import Foundation
+
+final class URLSessionRequestor: NetworkRequestable {
+    private let session: URLSession
+
+    init(session: URLSession = .shared) {
+        self.session = session
+    }
+
+    func data(for request: URLRequest) -> AnyPublisher<(Data, URLResponse), Error> {
+        session.dataTaskPublisher(for: request)
+            .map { ($0.data, $0.response) }
+            .mapError { $0 as Error }
+            .eraseToAnyPublisher()
+    }
+}

src/Projects/BKNetwork/Sources/Error/RetryTrigger.swift

@@ -0,0 +1,5 @@
+// Copyright © 2025 Booket. All rights reserved
+
+import Foundation
+
+struct RetryTrigger: Error {}

src/Projects/BKNetwork/Sources/Extension/Data+.swift

@@ -4,24 +4,8 @@ import Foundation
 
 extension Data {
     func decode<T: Decodable>(
-        to type: T.Type,
-        with response: URLResponse
+        to type: T.Type
     ) throws -> T {
-        guard let httpResponse = response as? HTTPURLResponse else {
-            throw NetworkError.invalidResponse
-        }
-        
-        switch httpResponse.statusCode {
-        case 200...299:
-            break
-        case 401:
-            throw NetworkError.unauthorized
-        case 500...599:
-            throw NetworkError.internalServerError
-        default:
-            throw NetworkError.invalidResponse
-        }
-
         return try JSONDecoder().decode(T.self, from: self)
     }
 }

src/Projects/BKNetwork/Sources/Extension/HTTPURLResponse+.swift

@@ -0,0 +1,18 @@
+// Copyright © 2025 Booket. All rights reserved
+
+import Foundation
+
+extension HTTPURLResponse {
+    func validate() throws {
+        switch statusCode {
+        case 200...299:
+            return
+        case 401:
+            throw NetworkError.unauthorized
+        case 500...599:
+            throw NetworkError.internalServerError
+        default:
+            throw NetworkError.invalidResponse
+        }
+    }
+}

src/Projects/BKNetwork/Sources/Extension/Optional+.swift

@@ -0,0 +1,12 @@
+// Copyright © 2025 Booket. All rights reserved
+
+import Foundation
+
+extension Optional {
+    func orThrow(
+        _ error: @autoclosure () -> Error
+    ) throws -> Wrapped {
+        guard let value = self else { throw error() }
+        return value
+    }
+}

src/Projects/BKNetwork/Sources/Extension/Publisher+.swift

@@ -0,0 +1,20 @@
+// Copyright © 2025 Booket. All rights reserved
+
+import Combine
+
+extension Publisher {
+    func retryIf(
+        _ shouldRetry: @escaping (Failure) -> Bool,
+        maxRetries: Int
+    ) -> AnyPublisher<Output, Failure> {
+        self.catch { error -> AnyPublisher<Output, Failure> in
+            guard maxRetries > 0, shouldRetry(error) else {
+                return Fail(error: error).eraseToAnyPublisher()
+            }
+            return self
+                .retryIf(shouldRetry, maxRetries: maxRetries - 1)
+                .eraseToAnyPublisher()
+        }
+        .eraseToAnyPublisher()
+    }
+}

src/Projects/BKNetwork/Sources/Extension/URLResponse+.swift

@@ -0,0 +1,9 @@
+// Copyright © 2025 Booket. All rights reserved
+
+import Foundation
+
+extension URLResponse {
+    var asHTTP: HTTPURLResponse? {
+        self as? HTTPURLResponse
+    }
+}

src/Projects/BKNetwork/Sources/Helper/AuthInterceptor.swift

@@ -10,20 +10,23 @@ public struct AuthInterceptor {
         self.tokenProvider = tokenProvider
     }
 
-    func adapt(_ request: URLRequest) throws -> URLRequest {
+    func adapt(_ request: URLRequest) -> URLRequest {
         guard let token = tokenProvider.accessToken else { return request }
 
         var adapted = request
         adapted.addAuthorization(token)
         return adapted
     }
 
-    func retryIfNeeded(_ response: URLResponse?, _ data: Data) async throws -> Bool {
-        guard let httpResponse = response as? HTTPURLResponse else { return false }
+    func retryIfNeeded(
+        _ response: URLResponse,
+        _ data: Data
+    ) throws {
+        let httpResponse = try response.asHTTP
+            .orThrow(NetworkError.invalidResponse)
         if httpResponse.statusCode == 401 {
-            try await tokenProvider.refreshIfNeeded()
-            return true
+            tokenProvider.refreshIfNeeded()
+            throw RetryTrigger()
         }
-        return false
     }
 }