Skip to content

Commit 543e4a8

Browse files
committed
fix
1 parent 71c42ae commit 543e4a8

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

Sources/SwiftAPIClient/APIClientCaller.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ public extension APIClient {
223223
#else
224224
configs.logRequest(request, uuid: uuid)
225225
#endif
226-
configs.listener.onRequestStarted(id: uuid, request: request, configs: configs)
227226
let result = try caller.mockResult(for: mock)
228227
configs.listener.onResponseSerialized(id: uuid, response: result, configs: configs)
229228
return result
@@ -232,7 +231,6 @@ public extension APIClient {
232231
try configs.requestValidator.validate(request, configs.with(\.requestValidator, .alwaysSuccess))
233232
if !caller.logRequestByItSelf {
234233
configs.logRequest(request, uuid: uuid)
235-
configs.listener.onRequestStarted(id: uuid, request: request, configs: configs)
236234
}
237235

238236
return try caller.call(uuid: uuid, request: request, configs: configs) { response, validate in

Sources/SwiftAPIClient/Clients/HTTPClient.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ extension APIClientCaller where Result == AsyncThrowingValue<(Value, HTTPRespons
122122
do {
123123
(value, response) = try await configs.httpClientMiddleware.execute(request: request, configs: configs) { request, configs in
124124
configs.logRequest(request, uuid: uuid)
125-
configs.listener.onRequestStarted(id: uuid, request: request, configs: configs)
126125
await requestWrapper.set(request)
127126
let result = try await task(request, configs)
128127
configs.listener.onResponseReceived(id: uuid, response: result, configs: configs)

Sources/SwiftAPIClient/Modifiers/LoggingModifier.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ extension APIClient.Configs {
111111
updateTotalRequestsMetrics(for: request)
112112
}
113113
#endif
114+
listener.onRequestStarted(id: uuid, request: request, configs: self)
114115
}
115116
}
116117

Sources/SwiftAPIClient/Modifiers/MockResponses.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ private extension APIClient.Configs {
103103

104104
var mocks: [ObjectIdentifier: Any] {
105105
get {
106-
self[\.mocks] ?? [
107-
ObjectIdentifier(Void.self) : (),
108-
ObjectIdentifier(Data.self) : "Mock data".data(using: .utf8) ?? Data(),
109-
ObjectIdentifier(String.self) : "Mock string"
110-
]
106+
self[\.mocks] ?? valueFor(
107+
live: [:],
108+
test: [:],
109+
preview: [ObjectIdentifier(Void.self) : ()]
110+
)
111111
}
112112
set {
113113
self[\.mocks] = newValue

0 commit comments

Comments
 (0)