improve logs

Author: dankinsoid

Sources/SwiftAPIClient/APIClientCaller.swift

@@ -7,6 +7,7 @@ import FoundationNetworking
 /// A generic structure for handling network requests and their responses.
 public struct APIClientCaller<Response, Value, Result> {
 
+	var logRequestByItSelf = false
 	private let _call: (
 		UUID,
 		HTTPRequestComponents,
@@ -216,18 +217,19 @@ public extension APIClient {
 				let fileIDLine = configs.fileIDLine ?? FileIDLine(fileID: fileID, line: line)
 				let configs = configs.with(\.fileIDLine, fileIDLine)
 
-				if configs.loggingComponents.contains(.onRequest), configs.loggingComponents != .onRequest {
-					let message = configs.loggingComponents.requestMessage(for: request, uuid: uuid, fileIDLine: fileIDLine)
-					configs.logger.log(level: configs.logLevel, "\(message)")
-				}
 				if let mock = try configs.getMockIfNeeded(for: Value.self, serializer: serializer) {
+					#if canImport(Metrics)
+					configs.reportMetrics(false).logRequest(request, uuid: uuid)
+					#else
+					configs.logRequest(request, uuid: uuid)
+					#endif
 					return try caller.mockResult(for: mock)
 				}
-				#if canImport(Metrics)
-				if configs.reportMetrics {
-					updateTotalRequestsMetrics(for: request)
+
+				try configs.requestValidator.validate(request, configs.with(\.requestValidator, .alwaysSuccess))
+				if !caller.logRequestByItSelf {
+					configs.logRequest(request, uuid: uuid)
 				}
-				#endif
 
 				return try caller.call(uuid: uuid, request: request, configs: configs) { response, validate in
 					do {

Sources/SwiftAPIClient/Clients/HTTPClient.swift

@@ -112,13 +112,16 @@ extension APIClientCaller where Result == AsyncThrowingValue<(Value, HTTPRespons
 		validate: @escaping (T, HTTPResponse, APIClient.Configs) throws -> Void,
 		data: @escaping (T) -> Data?
 	) -> APIClientCaller where Response == (T, HTTPResponse) {
-		APIClientCaller { uuid, request, configs, serialize in
+		var result = APIClientCaller { uuid, request, configs, serialize in
 			{
 				let value: T
 				let response: HTTPResponse
 				let start = Date()
 				do {
-					(value, response) = try await configs.httpClientMiddleware.execute(request: request, configs: configs, next: task)
+					(value, response) = try await configs.httpClientMiddleware.execute(request: request, configs: configs) { request, configs in
+						configs.logRequest(request, uuid: uuid)
+						return try await task(request, configs)
+					}
 				} catch {
 					let duration = Date().timeIntervalSince(start)
 					if !configs._errorLoggingComponents.isEmpty {
@@ -191,6 +194,21 @@ extension APIClientCaller where Result == AsyncThrowingValue<(Value, HTTPRespons
 		} mockResult: { value in
 			asyncWithResponse(value)
 		}
+		result.logRequestByItSelf = true
+		return result
+	}
+}
+
+private final actor SendableValue<Value> {
+	
+	var value: Value
+	
+	init(_ value: Value) {
+		self.value = value
+	}
+	
+	func set(_ value: Value) {
+		self.value = value
 	}
 }
 

Sources/SwiftAPIClient/Modifiers/LoggingModifier.swift

@@ -84,6 +84,18 @@ extension APIClient.Configs {
 	var _errorLoggingComponents: LoggingComponents {
 		errorLogginComponents ?? loggingComponents
 	}
+
+	func logRequest(_ request: HTTPRequestComponents, uuid: UUID) {
+		if loggingComponents.contains(.onRequest), loggingComponents != .onRequest {
+			let message = loggingComponents.requestMessage(for: request, uuid: uuid, fileIDLine: fileIDLine)
+			logger.log(level: logLevel, "\(message)")
+		}
+		#if canImport(Metrics)
+		if configs.reportMetrics {
+			updateTotalRequestsMetrics(for: request)
+		}
+		#endif
+	}
 }
 
 private let defaultLogger = Logger(label: "swift-api-client")

Sources/SwiftAPIClient/Modifiers/RateLimitModifier.swift

@@ -47,7 +47,7 @@ private struct RateLimitMiddleware<ID: Hashable>: HTTPClientMiddleware {
 	func execute<T>(
 		request: HTTPRequestComponents,
 		configs: APIClient.Configs,
-		next: @escaping (HTTPRequestComponents, APIClient.Configs) async throws -> (T, HTTPResponse)
+		next: @escaping @Sendable (HTTPRequestComponents, APIClient.Configs) async throws -> (T, HTTPResponse)
 	) async throws -> (T, HTTPResponse) {
 		let id = id(request)
 		await waitForSynchronizedAccess(id: id, of: Void.self)

Sources/SwiftAPIClient/Modifiers/RequestValidator.swift

@@ -25,26 +25,27 @@ public extension RequestValidator {
 	}
 }
 
+public extension APIClient.Configs {
+
+	/// The request validator used for validating URL request instances.
+	var requestValidator: RequestValidator {
+		get { self[\.requestValidator] ?? .alwaysSuccess }
+		set { self[\.requestValidator] = newValue }
+	}
+}
+
 public extension APIClient {
 
 	/// Sets a custom request validator for the network client.
 	/// - Parameter validator: The `RequestValidator` to be used for validating URL request instances.
 	/// - Returns: An instance of `APIClient` configured with the specified request validator.
 	func requestValidator(_ validator: RequestValidator) -> APIClient {
-		httpClientMiddleware(RequestValidatorMiddleware(validator: validator))
-	}
-}
-
-private struct RequestValidatorMiddleware: HTTPClientMiddleware {
-
-	let validator: RequestValidator
-
-	func execute<T>(
-		request: HTTPRequestComponents,
-		configs: APIClient.Configs,
-		next: @escaping @Sendable (HTTPRequestComponents, APIClient.Configs) async throws -> (T, HTTPResponse)
-	) async throws -> (T, HTTPResponse) {
-		try validator.validate(request, configs)
-		return try await next(request, configs)
+		configs { configs in
+			let validate = configs.requestValidator.validate
+			configs.requestValidator.validate = { request, configs in
+				try validate(request, configs)
+				try validator.validate(request, configs)
+			}
+		}
 	}
 }

Sources/SwiftAPIClient/Utils/AnyAsyncSequence.swift

@@ -32,7 +32,7 @@ public struct AnyAsyncSequence<Element>: AsyncSequence {
 
 		private var _next: () async throws -> Element?
 
-		public init(next: @escaping () async throws -> Element?) {
+		public init(next: @escaping @Sendable () async throws -> Element?) {
 			_next = next
 		}
 

Tests/SwiftAPIClientTests/TestUtils/QueryParameterMiddleware.swift

@@ -35,4 +35,4 @@ struct QueryParameterMiddleware: HTTPClientMiddleware {
 
         return try await next(modifiedRequest, configs)
     }
-}
+}