Skip to content

Commit 5146823

Browse files
committed
use Logger in HTTP client
1 parent ed4c824 commit 5146823

File tree

9 files changed

+31
-9
lines changed

9 files changed

+31
-9
lines changed

Package.swift

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,13 @@ let package = Package(
6969
],
7070
resources: [.process("Resources")]
7171
),
72-
.target(name: "Functions", dependencies: ["Helpers"]),
72+
.target(
73+
name: "Functions",
74+
dependencies: [
75+
"Helpers",
76+
.product(name: "Logging", package: "swift-log"),
77+
]
78+
),
7379
.testTarget(
7480
name: "FunctionsTests",
7581
dependencies: [
@@ -100,6 +106,7 @@ let package = Package(
100106
name: "PostgREST",
101107
dependencies: [
102108
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
109+
.product(name: "Logging", package: "swift-log"),
103110
"Helpers",
104111
]
105112
),
@@ -116,6 +123,7 @@ let package = Package(
116123
name: "Realtime",
117124
dependencies: [
118125
.product(name: "ConcurrencyExtras", package: "swift-concurrency-extras"),
126+
.product(name: "Logging", package: "swift-log"),
119127
"Helpers",
120128
]
121129
),
@@ -133,6 +141,7 @@ let package = Package(
133141
.target(
134142
name: "Storage",
135143
dependencies: [
144+
.product(name: "Logging", package: "swift-log"),
136145
"Helpers",
137146
]
138147
),

Sources/Auth/Internal/APIClient.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ extension HTTPClient {
55
init(configuration: AuthClient.Configuration) {
66
var interceptors: [any HTTPClientInterceptor] = []
77
if let logger = configuration.logger {
8-
interceptors.append(LoggerInterceptor(logger: logger))
8+
interceptors.append(LoggerInterceptor(logger: logger, log: log))
99
}
1010

1111
interceptors.append(

Sources/Functions/FunctionsClient.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
import ConcurrencyExtras
22
import Foundation
33
import Helpers
4+
import Logging
45

56
#if canImport(FoundationNetworking)
67
import FoundationNetworking
78
#endif
89

910
let version = Helpers.version
1011

12+
let log = Logger(label: "supabase.functions")
13+
1114
/// An actor representing a client for invoking functions.
1215
public final class FunctionsClient: Sendable {
1316
/// Fetch handler used to make requests.
@@ -52,7 +55,7 @@ public final class FunctionsClient: Sendable {
5255
) {
5356
var interceptors: [any HTTPClientInterceptor] = []
5457
if let logger {
55-
interceptors.append(LoggerInterceptor(logger: logger))
58+
interceptors.append(LoggerInterceptor(logger: logger, log: log))
5659
}
5760

5861
let http = HTTPClient(fetch: fetch, interceptors: interceptors)

Sources/Helpers/HTTP/HTTPClient.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import Logging
1212
import FoundationNetworking
1313
#endif
1414

15-
let log = Logger(label: "supabase.http")
16-
1715
package protocol HTTPClientType: Sendable {
1816
func send(_ request: HTTPRequest) async throws -> HTTPResponse
1917
}

Sources/Helpers/HTTP/LoggerInterceptor.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,15 @@
66
//
77

88
import Foundation
9+
import Logging
910

1011
package struct LoggerInterceptor: HTTPClientInterceptor {
1112
let logger: any SupabaseLogger
13+
let log: Logger
1214

13-
package init(logger: any SupabaseLogger) {
15+
package init(logger: any SupabaseLogger, log: Logger) {
1416
self.logger = logger
17+
self.log = log
1518
}
1619

1720
package func intercept(

Sources/PostgREST/PostgrestBuilder.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class PostgrestBuilder: @unchecked Sendable {
2929

3030
var interceptors: [any HTTPClientInterceptor] = []
3131
if let logger = configuration.logger {
32-
interceptors.append(LoggerInterceptor(logger: logger))
32+
interceptors.append(LoggerInterceptor(logger: logger, log: log))
3333
}
3434

3535
http = HTTPClient(fetch: configuration.fetch, interceptors: interceptors)

Sources/PostgREST/PostgrestClient.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import ConcurrencyExtras
22
import Foundation
33
import Helpers
4+
import Logging
45

56
public typealias PostgrestError = Helpers.PostgrestError
67
public typealias HTTPError = Helpers.HTTPError
@@ -10,6 +11,8 @@ public typealias AnyJSON = Helpers.AnyJSON
1011
import FoundationNetworking
1112
#endif
1213

14+
let log = Logger(label: "supabase.postgrest")
15+
1316
/// PostgREST client.
1417
public final class PostgrestClient: Sendable {
1518
public typealias FetchHandler = @Sendable (_ request: URLRequest) async throws -> (

Sources/Realtime/V2/RealtimeClientV2.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,14 @@
88
import ConcurrencyExtras
99
import Foundation
1010
import Helpers
11+
import Logging
1112

1213
#if canImport(FoundationNetworking)
1314
import FoundationNetworking
1415
#endif
1516

17+
let log = Logger(label: "supabase.realtime")
18+
1619
public typealias JSONObject = Helpers.JSONObject
1720

1821
public final class RealtimeClientV2: Sendable {
@@ -132,7 +135,7 @@ public final class RealtimeClientV2: Sendable {
132135
var interceptors: [any HTTPClientInterceptor] = []
133136

134137
if let logger = options.logger {
135-
interceptors.append(LoggerInterceptor(logger: logger))
138+
interceptors.append(LoggerInterceptor(logger: logger, log: log))
136139
}
137140

138141
self.init(

Sources/Storage/StorageApi.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
import Foundation
22
import Helpers
3+
import Logging
34

45
#if canImport(FoundationNetworking)
56
import FoundationNetworking
67
#endif
78

9+
let log = Logger(label: "supabase.storage")
10+
811
public class StorageApi: @unchecked Sendable {
912
public let configuration: StorageClientConfiguration
1013

@@ -19,7 +22,7 @@ public class StorageApi: @unchecked Sendable {
1922

2023
var interceptors: [any HTTPClientInterceptor] = []
2124
if let logger = configuration.logger {
22-
interceptors.append(LoggerInterceptor(logger: logger))
25+
interceptors.append(LoggerInterceptor(logger: logger, log: log))
2326
}
2427

2528
http = HTTPClient(

0 commit comments

Comments
 (0)