fix

Author: dankinsoid

Sources/SwiftAPIClient/APIClientCaller.swift

@@ -251,16 +251,17 @@ public extension APIClient {
 					let data = (response as? (Data, HTTPResponse))?.0 ?? (response as? Data)
 					do {
 						try validate()
+						configs.listener.onResponseReceived(id: uuid, response: response, configs: configs)
 						let result = try serializer.serialize(response, configs)
-						configs.logRequestCompleted(
-							request,
-							response: (response as? (Data, HTTPResponse))?.1,
-							data: data,
-							uuid: uuid,
-							start: start
-						)
+						configs.listener.onResponseSerialized(id: uuid, response: result, configs: configs)
 						if !caller.logRequestByItSelf {
-							configs.listener.onRequestCompleted(id: uuid, configs: configs)
+							configs.logRequestCompleted(
+								request,
+								response: (response as? (Data, HTTPResponse))?.1,
+								data: data,
+								uuid: uuid,
+								start: start
+							)
 						}
 						return result
 					} catch {

Sources/SwiftAPIClient/Clients/HTTPClient.swift

@@ -124,7 +124,6 @@ extension APIClientCaller where Result == AsyncThrowingValue<(Value, HTTPRespons
 						configs.logRequestStarted(request, uuid: uuid)
 						await requestWrapper.set(request)
 						let result = try await task(request, configs)
-						configs.listener.onResponseReceived(id: uuid, response: result, configs: configs)
 						await responseWrapper.set(result)
 						return result
 					}
@@ -142,7 +141,13 @@ 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)
+				await configs.logRequestCompleted(
+					requestWrapper.value,
+					response: responseWrapper.value?.1,
+					data: responseWrapper.value?.0 as? Data,
+					uuid: uuid,
+					start: start
+				)
 				return (result, response)
 			}
 		} mockResult: { value in