refactor: update Storage module to use new execute method with proper serialization

- Replace HTTPRequest struct usage with direct execute method calls
- Use serializingDecodable() for JSON responses instead of manual decoding
- Use serializingData() for raw data responses
- Update method signatures to use new execute parameters
- Fix type conversions for headers and query parameters
- Remove unused encoder variables and fix async warnings
- Maintain backward compatibility while modernizing request handling

Author: grdsdev

Sources/Storage/StorageApi.swift

@@ -6,6 +6,8 @@ import HTTPTypes
   import FoundationNetworking
 #endif
 
+struct NoopParameter: Encodable, Sendable {}
+
 public class StorageApi: @unchecked Sendable {
   public let configuration: StorageClientConfiguration
 
@@ -43,14 +45,28 @@ public class StorageApi: @unchecked Sendable {
     self.session = configuration.session
   }
 
+  private let urlQueryEncoder: any ParameterEncoding = URLEncoding.queryString
+  private var defaultEncoder: any ParameterEncoder {
+    JSONParameterEncoder(encoder: configuration.encoder)
+  }
+
   @discardableResult
-  func execute(_ request: Helpers.HTTPRequest) async throws -> Data {
-    var request = request
-    request.headers = HTTPFields(configuration.headers).merging(with: request.headers)
+  func execute<RequestBody: Encodable & Sendable>(
+    _ url: URL,
+    method: HTTPMethod = .get,
+    headers: HTTPHeaders = [:],
+    query: Parameters? = nil,
+    body: RequestBody? = NoopParameter(),
+    encoder: (any ParameterEncoder)? = nil
+  ) throws -> DataRequest {
+    var request = try URLRequest(url: url, method: method, headers: headers)
 
-    let urlRequest = request.urlRequest
+    request = try urlQueryEncoder.encode(request, with: query)
+    if RequestBody.self != NoopParameter.self {
+      request = try (encoder ?? defaultEncoder).encode(body, into: request)
+    }
 
-    return try await session.request(urlRequest)
+    return session.request(request)
       .validate { request, response, data in
         guard 200..<300 ~= response.statusCode else {
           guard let data else {
@@ -65,8 +81,6 @@ public class StorageApi: @unchecked Sendable {
         }
         return .success(())
       }
-      .serializingData()
-      .value
   }
 }
 

Sources/Storage/StorageBucketApi.swift

@@ -8,28 +8,21 @@ import Foundation
 public class StorageBucketApi: StorageApi, @unchecked Sendable {
   /// Retrieves the details of all Storage buckets within an existing project.
   public func listBuckets() async throws -> [Bucket] {
-    let data = try await execute(
-      HTTPRequest(
-        url: configuration.url.appendingPathComponent("bucket"),
-        method: .get
-      )
-    )
-    
-    return try configuration.decoder.decode([Bucket].self, from: data)
+    try await execute(
+      configuration.url.appendingPathComponent("bucket"),
+      method: .get
+    ).serializingDecodable([Bucket].self, decoder: configuration.decoder).value
   }
 
   /// 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 {
-    let data = try await execute(
-      HTTPRequest(
-        url: configuration.url.appendingPathComponent("bucket/\(id)"),
-        method: .get
-      )
-    )
-    
-    return try configuration.decoder.decode(Bucket.self, from: data)
+    try await execute(
+      configuration.url.appendingPathComponent("bucket/\(id)"),
+      method: .get
+    ).serializingDecodable(Bucket.self, decoder: configuration.decoder).value
+
   }
 
   struct BucketParameters: Encodable {
@@ -45,67 +38,55 @@ public class StorageBucketApi: StorageApi, @unchecked Sendable {
   ///   - id: A unique identifier for the bucket you are creating.
   ///   - 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"),
-        method: .post,
-        body: configuration.encoder.encode(
-          BucketParameters(
-            id: id,
-            name: id,
-            public: options.public,
-            fileSizeLimit: options.fileSizeLimit,
-            allowedMimeTypes: options.allowedMimeTypes
-          )
-        )
+    _ = try await execute(
+      configuration.url.appendingPathComponent("bucket"),
+      method: .post,
+      body: BucketParameters(
+        id: id,
+        name: id,
+        public: options.public,
+        fileSizeLimit: options.fileSizeLimit,
+        allowedMimeTypes: options.allowedMimeTypes
       )
-    )
+    ).serializingData().value
   }
 
   /// Updates a Storage bucket.
   /// - Parameters:
   ///   - id: A unique identifier for the bucket you are updating.
   ///   - 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)"),
-        method: .put,
-        body: configuration.encoder.encode(
-          BucketParameters(
-            id: id,
-            name: id,
-            public: options.public,
-            fileSizeLimit: options.fileSizeLimit,
-            allowedMimeTypes: options.allowedMimeTypes
-          )
-        )
+    _ = try await execute(
+      configuration.url.appendingPathComponent("bucket/\(id)"),
+      method: .put,
+      body: BucketParameters(
+        id: id,
+        name: id,
+        public: options.public,
+        fileSizeLimit: options.fileSizeLimit,
+        allowedMimeTypes: options.allowedMimeTypes
       )
-    )
+    ).serializingData().value
   }
 
   /// Removes all objects inside a single bucket.
   /// - Parameters:
   ///   - 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
-      )
-    )
+    _ = try await execute(
+      configuration.url.appendingPathComponent("bucket/\(id)/empty"),
+      method: .post
+    ).serializingData().value
   }
 
   /// Deletes an existing bucket. A bucket can't be deleted with existing objects inside it.
   /// You must first `empty()` the bucket.
   /// - Parameters:
   ///   - 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
-      )
-    )
+    _ = try await execute(
+      configuration.url.appendingPathComponent("bucket/\(id)"),
+      method: .delete
+    ).serializingData().value
   }
 }