Removes Session in favour of Domain

Author: shaps80

Sources/Endpoints/Domain.swift

@@ -2,10 +2,33 @@ import Foundation
 
 /// Represents a domain that can process the associated endpoint's
 public protocol Domain {
+
+    var urlSession: URLSession { get }
+
+    func baseUrl<E: Endpoint>(for endpoint: E) async throws -> URL
+
     /// A URL that represents the baseURL for this domain
     ///
     /// A fully defined `URLRequest` that represents this a request for the
     /// specified `Endpoint`. A default implementation exists so in most
     /// cases you do not need to implement this.
     func urlRequest<E: Endpoint>(for endpoint: E) async throws -> URLRequest
+
+    /// Returns the data and associated response returned from an API
+    /// - Parameter request: The URL request that should request this data
+    func data(for request: URLRequest) async throws -> (Data, URLResponse)
+}
+
+public extension Domain {
+    func urlRequest<E: Endpoint>(for endpoint: E) async throws -> URLRequest {
+        try await endpoint.urlRequest(baseUrl: baseUrl(for: endpoint))
+    }
+
+    func data(for request: URLRequest) async throws -> (Data, URLResponse) {
+        if #available(iOS 15, *) {
+            return try await urlSession.data(for: request)
+        } else {
+            return try await urlSession.backport.data(for: request)
+        }
+    }
 }

Sources/Endpoints/EndpointService.swift

@@ -1,27 +1,15 @@
 import Foundation
 
-/// Represents a session for an EndpointService
-///
-/// Typically this wraps the `shared` URLSession instance. However you
-/// can provide a custom session (useful in testing) as well.
-public protocol EndpointSession {
-    var urlSession: URLSession { get }
-    /// Returns the data and associated response returned from an API
-    /// - Parameter request: The URL request that should request this data
-    func data(for request: URLRequest) async throws -> (Data, URLResponse)
-}
-
 /// Represents a service that can perform requests against `domains` and their associated `endpoints`
 public final class EndpointService {
-    let session: EndpointSession
+//    let session: EndpointSession
     public let domain: Domain
     private var observers: [ObjectIdentifier: WeakBox] = [:]
 
     /// Creates a new service with the specified session
     /// - Parameter session: The session that will process endpoint requests
-    public init(domain: Domain, session: EndpointSession? = nil, observers: [EndpointServiceObserver] = [EndpointPrintLogger()]) {
+    public init(domain: Domain, observers: [EndpointServiceObserver] = [EndpointPrintLogger()]) {
         self.domain = domain
-        self.session = session ?? Session()
         observers.forEach { register($0) }
     }
 
@@ -208,7 +196,7 @@ private extension EndpointService {
             $0.object?.service(self, willBegin: endpoint)
         }
 
-        let (data, response) = try await session.data(for: request)
+        let (data, response) = try await domain.data(for: request)
         guard let httpResponse = response as? HTTPURLResponse else {
             try throwError(error: EndpointError.unexpectedResponse(response), status: -1, endpoint: endpoint)
         }
@@ -265,22 +253,3 @@ public enum EndpointError: LocalizedError {
         }
     }
 }
-
-private final class Session: EndpointSession {
-    var urlSession: URLSession = {
-        let config = URLSessionConfiguration.default
-        config.allowsCellularAccess = true
-        config.allowsExpensiveNetworkAccess = true
-        config.allowsConstrainedNetworkAccess = true
-        config.waitsForConnectivity = false
-        return URLSession(configuration: config)
-    }()
-
-    func data(for request: URLRequest) async throws -> (Data, URLResponse) {
-        if #available(iOS 15, *) {
-            return try await urlSession.data(for: request)
-        } else {
-            return try await urlSession.backport.data(for: request)
-        }
-    }
-}

Tests/EndpointsTests/EndpointsTests.swift

@@ -4,8 +4,7 @@ import XCTest
 final class EndpointsTests: XCTestCase {
     func testDataSuccess() async throws {
         let service = EndpointService(
-            domain: .mockDomain,
-            session: MockSession(statusCode: 200)
+            domain: .mockDomain
         )
 
         let (data, response) = try await service.perform(.mockData)
@@ -15,8 +14,7 @@ final class EndpointsTests: XCTestCase {
 
     func testJSONSuccess() async throws {
         let service = EndpointService(
-            domain: .mockDomain,
-            session: MockSession(statusCode: 200)
+            domain: .mockDomain
         )
 
         let (_, response) = try await service.perform(.mockJSON(filename: "gist"))
@@ -25,8 +23,7 @@ final class EndpointsTests: XCTestCase {
 
     func testBadStatusCode() async {
         let service = EndpointService(
-            domain: .mockDomain,
-            session: MockSession(statusCode: 404)
+            domain: .mockDomain(code: 404)
         )
 
         do {
@@ -41,8 +38,7 @@ final class EndpointsTests: XCTestCase {
 
     func testCorruptJSON() async throws {
         let service = EndpointService(
-            domain: .mockDomain,
-            session: MockSession(statusCode: 200)
+            domain: .mockDomain
         )
 
         do {
@@ -57,8 +53,7 @@ final class EndpointsTests: XCTestCase {
 
     func testMisTypeJSON() async throws {
         let service = EndpointService(
-            domain: .mockDomain,
-            session: MockSession(statusCode: 200)
+            domain: .mockDomain
         )
 
         do {
@@ -73,8 +68,7 @@ final class EndpointsTests: XCTestCase {
 
     func testPostJSON() async throws {
         let service = EndpointService(
-            domain: .mockDomain,
-            session: MockSession(statusCode: 200)
+            domain: .mockDomain
         )
 
         let (_, response) = try await service.perform(.mockEncodable)
@@ -83,8 +77,7 @@ final class EndpointsTests: XCTestCase {
 
     func testPostJSONGetJSON() async throws {
         let service = EndpointService(
-            domain: .mockDomain,
-            session: MockSession(statusCode: 200)
+            domain: .mockDomain
         )
 
         let (result, response) = try await service.perform(.mockCodable)
@@ -159,22 +152,19 @@ extension Endpoint where Self == MockJSONEndpoint {
 }
 
 private struct MockDomain: Domain {
-    func urlRequest<E>(for endpoint: E) async throws -> URLRequest where E: Endpoint {
+    var statusCode: Int
+    let urlSession = URLSession(configuration: .ephemeral)
+
+    func baseUrl<E>(for endpoint: E) async throws -> URL where E : Endpoint {
         guard let url = Bundle.module.url(forResource: endpoint.request.path, withExtension: "json") else {
             throw EndpointError.badEndpoint("Mock file missing from bundle: \(endpoint.request)")
         }
-
-        return URLRequest(url: url)
+        return url
     }
-}
-
-extension Domain where Self == MockDomain {
-    static var mockDomain: Self { .init() }
-}
 
-private struct MockSession: EndpointSession {
-    var urlSession: URLSession = .init(configuration: .ephemeral)
-    var statusCode: Int = 200
+    func urlRequest<E>(for endpoint: E) async throws -> URLRequest where E: Endpoint {
+        try await URLRequest(url: baseUrl(for: endpoint))
+    }
 
     func data(for request: URLRequest) async throws -> (Data, URLResponse) {
         let data = try Data(contentsOf: request.url!)
@@ -187,3 +177,10 @@ private struct MockSession: EndpointSession {
         return (data, response)
     }
 }
+
+extension Domain where Self == MockDomain {
+    static var mockDomain: Self { .init(statusCode: 200) }
+    static func mockDomain(code: Int) -> Self {
+        .init(statusCode: code)
+    }
+}