refactor storage for using new http layer

Author: grdsdev

Sources/Helpers/HTTP/HTTPBodyExtensions.swift

@@ -0,0 +1,30 @@
+import Foundation
+import HTTPTypes
+
+extension HTTPBody {
+    /// Decodes the body into a decodable object.
+    ///
+    /// - Parameters:
+    ///   - type: The type to decode the body into.
+    ///   - decoder: The decoder to use to decode the body.
+    /// - Returns: The decoded object.
+    /// - Throws: An error if the body cannot be decoded.
+    package func decoded<T: Decodable>(
+        as _: T.Type = T.self,
+        decoder: JSONDecoder = JSONDecoder()
+    ) async throws -> T {
+        try await decoder.decode(T.self, from: data)
+    }
+
+    /// The data of the body.
+    ///
+    /// This is a lazy property that will collect the data from the body.
+    ///
+    /// - Returns: The data of the body.
+    /// - Throws: An error if the data cannot be collected.
+    package var data: Data {
+        get async throws {
+            try await Data(collecting: self, upTo: .max)
+        }
+    }
+}

Sources/Helpers/HTTP/LoggingMiddleware.swift

@@ -1,6 +1,6 @@
+import HTTPTypesFoundation
 import Logging
 import OpenAPIRuntime
-import HTTPTypesFoundation
 
 #if canImport(Darwin)
   import struct Foundation.URL
@@ -54,5 +54,3 @@ extension HTTPTypes.HTTPRequest {
 extension HTTPTypes.HTTPResponse {
   fileprivate var prettyDescription: String { "\(status.code) [\(headerFields.prettyDescription)]" }
 }
-
-extension HTTPBody { fileprivate var prettyDescription: String { String(describing: self) } }

Sources/Storage/Logger.swift

@@ -0,0 +1,12 @@
+//
+//  Logger.swift
+//  Supabase
+//
+//  Created by Guilherme Souza on 14/08/25.
+//
+
+import Logging
+
+extension Logger {
+  static let storage = Logger(label: "storage")
+}

Sources/Storage/StorageApi.swift

@@ -1,5 +1,6 @@
 import Foundation
 import HTTPTypes
+import OpenAPIURLSession
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
@@ -8,7 +9,7 @@ import HTTPTypes
 public class StorageApi: @unchecked Sendable {
   public let configuration: StorageClientConfiguration
 
-  private let http: any HTTPClientType
+  private let client: Client
 
   public init(configuration: StorageClientConfiguration) {
     var configuration = configuration
@@ -40,61 +41,42 @@ public class StorageApi: @unchecked Sendable {
 
     self.configuration = configuration
 
-    var interceptors: [any HTTPClientInterceptor] = []
-    if let logger = configuration.logger {
-      interceptors.append(LoggerInterceptor(logger: logger))
-    }
-
-    http = HTTPClient(
-      fetch: configuration.session.fetch,
-      interceptors: interceptors
+    client = Client(
+      serverURL: configuration.url,
+      transport: configuration.transport
+        ?? FetchTransportAdapter(fetch: configuration.session.fetch),
+      middlewares: [LoggingMiddleware(logger: .storage)]
     )
   }
 
   @discardableResult
-  func execute(_ request: Helpers.HTTPRequest) async throws -> Helpers.HTTPResponse {
+  func execute(
+    _ request: HTTPTypes.HTTPRequest,
+    requestBody: HTTPBody? = nil
+  ) async throws -> (response: HTTPTypes.HTTPResponse, responseBody: HTTPBody) {
     var request = request
-    request.headers = HTTPFields(configuration.headers).merging(with: request.headers)
+    request.headerFields.merge(with: HTTPFields(configuration.headers))
 
-    let response = try await http.send(request)
+    let (response, responseBody) = try await client.send(request, body: requestBody)
 
-    guard (200..<300).contains(response.statusCode) else {
+    guard response.status.kind == .successful else {
+      let data = try await Data(collecting: responseBody, upTo: .max)
       if let error = try? configuration.decoder.decode(
         StorageError.self,
-        from: response.data
+        from: data
       ) {
         throw error
       }
 
-      throw HTTPError(data: response.data, response: response.underlyingResponse)
+      throw HTTPError(
+        data: data,
+        response: HTTPURLResponse(
+          httpResponse: response,
+          url: request.url!
+        )!
+      )
     }
 
-    return response
-  }
-}
-
-extension Helpers.HTTPRequest {
-  init(
-    url: URL,
-    method: HTTPTypes.HTTPRequest.Method,
-    query: [URLQueryItem],
-    formData: MultipartFormData,
-    options: FileOptions,
-    headers: HTTPFields = [:]
-  ) throws {
-    var headers = headers
-    if headers[.contentType] == nil {
-      headers[.contentType] = formData.contentType
-    }
-    if headers[.cacheControl] == nil {
-      headers[.cacheControl] = "max-age=\(options.cacheControl)"
-    }
-    try self.init(
-      url: url,
-      method: method,
-      query: query,
-      headers: headers,
-      body: formData.encode()
-    )
+    return (response, responseBody)
   }
 }

Sources/Storage/StorageBucketApi.swift

@@ -1,4 +1,7 @@
 import Foundation
+import HTTPTypes
+import HTTPTypesFoundation
+import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
@@ -9,25 +12,23 @@ public class StorageBucketApi: StorageApi, @unchecked Sendable {
   /// Retrieves the details of all Storage buckets within an existing project.
   public func listBuckets() async throws -> [Bucket] {
     try await execute(
-      HTTPRequest(
-        url: configuration.url.appendingPathComponent("bucket"),
-        method: .get
+      HTTPTypes.HTTPRequest(
+        method: .get,
+        url: configuration.url.appendingPathComponent("bucket")
       )
-    )
-    .decoded(decoder: configuration.decoder)
+    ).responseBody.decoded(decoder: configuration.decoder)
   }
 
   /// Retrieves the details of an existing Storage bucket.
   /// - Parameters:
   ///   - id: The unique identifier of the bucket you would like to retrieve.
   public func getBucket(_ id: String) async throws -> Bucket {
     try await execute(
-      HTTPRequest(
-        url: configuration.url.appendingPathComponent("bucket/\(id)"),
-        method: .get
+      HTTPTypes.HTTPRequest(
+        method: .get,
+        url: configuration.url.appendingPathComponent("bucket/\(id)")
       )
-    )
-    .decoded(decoder: configuration.decoder)
+    ).responseBody.decoded(decoder: configuration.decoder)
   }
 
   struct BucketParameters: Encodable {
@@ -44,10 +45,15 @@ public class StorageBucketApi: StorageApi, @unchecked Sendable {
   ///   - options: Options for creating the bucket.
   public func createBucket(_ id: String, options: BucketOptions = .init()) async throws {
     try await execute(
-      HTTPRequest(
-        url: configuration.url.appendingPathComponent("bucket"),
+      HTTPTypes.HTTPRequest(
         method: .post,
-        body: configuration.encoder.encode(
+        url: configuration.url.appendingPathComponent("bucket"),
+        headerFields: [
+          .contentType: "application/json"
+        ]
+      ),
+      requestBody: HTTPBody(
+        configuration.encoder.encode(
           BucketParameters(
             id: id,
             name: id,
@@ -66,10 +72,15 @@ public class StorageBucketApi: StorageApi, @unchecked Sendable {
   ///   - options: Options for updating the bucket.
   public func updateBucket(_ id: String, options: BucketOptions) async throws {
     try await execute(
-      HTTPRequest(
-        url: configuration.url.appendingPathComponent("bucket/\(id)"),
+      HTTPTypes.HTTPRequest(
         method: .put,
-        body: configuration.encoder.encode(
+        url: configuration.url.appendingPathComponent("bucket/\(id)"),
+        headerFields: [
+          .contentType: "application/json"
+        ]
+      ),
+      requestBody: HTTPBody(
+        configuration.encoder.encode(
           BucketParameters(
             id: id,
             name: id,
@@ -87,9 +98,9 @@ public class StorageBucketApi: StorageApi, @unchecked Sendable {
   ///   - id: The unique identifier of the bucket you would like to empty.
   public func emptyBucket(_ id: String) async throws {
     try await execute(
-      HTTPRequest(
-        url: configuration.url.appendingPathComponent("bucket/\(id)/empty"),
-        method: .post
+      HTTPTypes.HTTPRequest(
+        method: .post,
+        url: configuration.url.appendingPathComponent("bucket/\(id)/empty")
       )
     )
   }
@@ -100,9 +111,9 @@ public class StorageBucketApi: StorageApi, @unchecked Sendable {
   ///   - id: The unique identifier of the bucket you would like to delete.
   public func deleteBucket(_ id: String) async throws {
     try await execute(
-      HTTPRequest(
-        url: configuration.url.appendingPathComponent("bucket/\(id)"),
-        method: .delete
+      HTTPTypes.HTTPRequest(
+        method: .delete,
+        url: configuration.url.appendingPathComponent("bucket/\(id)")
       )
     )
   }