fix listener

Author: dankinsoid

Sources/SwiftAPIClient/APIClientCaller.swift

@@ -238,7 +238,7 @@ public extension APIClient {
 					configs = configs.with(\.reportMetrics, false)
 					configs.logRequestStarted(request, uuid: uuid)
 					let result = try caller.mockResult(for: mock)
-					configs.logRequestCompleted(request, response: nil, data: nil, uuid: uuid, start: start, result: result)
+					configs.logRequestCompleted(request, response: nil, data: nil, uuid: uuid, start: start)
 					return result
 				}
 
@@ -257,9 +257,11 @@ public extension APIClient {
 							response: (response as? (Data, HTTPResponse))?.1,
 							data: data,
 							uuid: uuid,
-							start: start,
-							result: result
+							start: start
 						)
+						if !caller.logRequestByItSelf {
+							configs.listener.onRequestCompleted(id: uuid, configs: configs)
+						}
 						return result
 					} catch {
 						var error = error

Sources/SwiftAPIClient/Clients/HTTPClient.swift

@@ -142,6 +142,7 @@ extension APIClientCaller where Result == AsyncThrowingValue<(Value, HTTPRespons
 				let result = try serialize((value, response)) {
 					try validate(value, response, configs)
 				}
+				configs.listener.onRequestCompleted(id: uuid, configs: configs)
 				return (result, response)
 			}
 		} mockResult: { value in

Sources/SwiftAPIClient/Modifiers/ListenerModifiers.swift

@@ -5,15 +5,17 @@ public protocol APIClientListener {
 	func onRequestStarted(id: UUID, request: HTTPRequestComponents, configs: APIClient.Configs)
 	func onResponseReceived<R>(id: UUID, response: R, configs: APIClient.Configs)
 	func onResponseSerialized<T>(id: UUID, response: T, configs: APIClient.Configs)
-	func onError(id: UUID, error: Error, configs: APIClient.Configs)
+	func onRequestFailed(id: UUID, error: Error, configs: APIClient.Configs)
+	func onRequestCompleted(id: UUID, configs: APIClient.Configs)
 }
 
-extension APIClientListener {
+public extension APIClientListener {
 
 	func onRequestStarted(id: UUID, request: HTTPRequestComponents, configs: APIClient.Configs) {}
 	func onResponseReceived<R>(id: UUID, response: R, configs: APIClient.Configs) {}
 	func onResponseSerialized<T>(id: UUID, response: T, configs: APIClient.Configs) {}
-	func onError(id: UUID, error: Error, configs: APIClient.Configs) {}
+	func onRequestFailed(id: UUID, error: Error, configs: APIClient.Configs) {}
+	func onRequestCompleted(id: UUID, configs: APIClient.Configs) {}
 }
 
 public struct MultiplexAPIClientListener: APIClientListener {
@@ -36,8 +38,12 @@ public struct MultiplexAPIClientListener: APIClientListener {
 		listeners.forEach { $0.onResponseSerialized(id: id, response: response, configs: configs) }
 	}
 
-	public func onError(id: UUID, error: Error, configs: APIClient.Configs) {
-		listeners.forEach { $0.onError(id: id, error: error, configs: configs) }
+	public func onRequestFailed(id: UUID, error: Error, configs: APIClient.Configs) {
+		listeners.forEach { $0.onRequestFailed(id: id, error: error, configs: configs) }
+	}
+
+	public func onRequestCompleted(id: UUID, configs: APIClient.Configs) {
+		listeners.forEach { $0.onRequestCompleted(id: id, configs: configs) }
 	}
 }
 

Sources/SwiftAPIClient/Modifiers/LoggingModifier.swift

@@ -151,17 +151,16 @@ public extension APIClient.Configs {
 		} catch {
 			finalError = error
 		}
-		listener.onError(id: uuid, error: finalError, configs: self)
+		listener.onRequestFailed(id: uuid, error: finalError, configs: self)
 		return finalError
 	}
 
-	func logRequestCompleted<T>(
+	func logRequestCompleted(
 		_ request: HTTPRequestComponents,
 		response: HTTPResponse?,
 		data: Data?,
 		uuid: UUID,
-		start: Date,
-		result: T
+		start: Date
 	) {
 		let duration = Date().timeIntervalSince(start)
 		if !loggingComponents.isEmpty {
@@ -179,7 +178,7 @@ public extension APIClient.Configs {
 		if reportMetrics {
 			updateHTTPMetrics(for: request, status: response?.status, duration: duration, successful: true)
 		}
-		listener.onResponseSerialized(id: uuid, response: result, configs: self)
+		listener.onRequestCompleted(id: uuid, configs: self)
 	}
 }