fix URLSession

supabase · Oct 23, 2024 · 6617fc1 · 6617fc1
1 parent c583270
commit 6617fc1
Show file tree

Hide file tree

Showing 10 changed files with 81 additions and 27 deletions.
diff --git a/Sources/Auth/AuthClientConfiguration.swift b/Sources/Auth/AuthClientConfiguration.swift
@@ -76,9 +76,9 @@ extension AuthClient {
       decoder: JSONDecoder = AuthClient.Configuration.jsonDecoder,
       fetch: @escaping FetchHandler = { request, body in
         if let body {
-          try await URLSession.shared.upload(for: request, from: body)
+          return try await URLSession.shared.upload(for: request, from: body)
         } else {
-          try await URLSession.shared.data(for: request)
+          return try await URLSession.shared.data(for: request)
         }
       },
       autoRefreshToken: Bool = AuthClient.Configuration.defaultAutoRefreshToken
@@ -125,9 +125,9 @@ extension AuthClient {
     decoder: JSONDecoder = AuthClient.Configuration.jsonDecoder,
     fetch: @escaping FetchHandler = { request, body in
       if let body {
-        try await URLSession.shared.upload(for: request, from: body)
+        return try await URLSession.shared.upload(for: request, from: body)
       } else {
-        try await URLSession.shared.data(for: request)
+        return try await URLSession.shared.data(for: request)
       }
     },
     autoRefreshToken: Bool = AuthClient.Configuration.defaultAutoRefreshToken

diff --git a/Sources/Auth/Deprecated.swift b/Sources/Auth/Deprecated.swift
@@ -78,9 +78,9 @@ extension AuthClient.Configuration {
     decoder: JSONDecoder = AuthClient.Configuration.jsonDecoder,
     fetch: @escaping AuthClient.FetchHandler = { request, body in
       if let body {
-        try await URLSession.shared.upload(for: request, from: body)
+        return try await URLSession.shared.upload(for: request, from: body)
       } else {
-        try await URLSession.shared.data(for: request)
+        return try await URLSession.shared.data(for: request)
       }
     }  ) {
     self.init(
@@ -121,9 +121,9 @@ extension AuthClient {
     decoder: JSONDecoder = AuthClient.Configuration.jsonDecoder,
     fetch: @escaping AuthClient.FetchHandler = { request, body in
       if let body {
-        try await URLSession.shared.upload(for: request, from: body)
+        return try await URLSession.shared.upload(for: request, from: body)
       } else {
-        try await URLSession.shared.data(for: request)
+        return try await URLSession.shared.data(for: request)
       }
     }
   ) {

diff --git a/Sources/Functions/FunctionsClient.swift b/Sources/Functions/FunctionsClient.swift
@@ -52,9 +52,9 @@ public final class FunctionsClient: Sendable {
     logger: (any SupabaseLogger)? = nil,
     fetch: @escaping FetchHandler = { request, body in
       if let body {
-        try await URLSession.shared.upload(for: request, from: body)
+        return try await URLSession.shared.upload(for: request, from: body)
       } else {
-        try await URLSession.shared.data(for: request)
+        return try await URLSession.shared.data(for: request)
       }
     }
   ) {
@@ -101,9 +101,9 @@ public final class FunctionsClient: Sendable {
     logger: (any SupabaseLogger)? = nil,
     fetch: @escaping FetchHandler = { request, body in
       if let body {
-        try await URLSession.shared.upload(for: request, from: body)
+        return try await URLSession.shared.upload(for: request, from: body)
       } else {
-        try await URLSession.shared.data(for: request)
+        return try await URLSession.shared.data(for: request)
       }
     }
   ) {

diff --git a/Sources/Helpers/URLSession+AsyncAwait.swift b/Sources/Helpers/URLSession+AsyncAwait.swift
@@ -1,5 +1,56 @@
+import Foundation
+
+#if (os(Linux) || os(Windows)) && compiler(<6)
+  import HTTPTypes
+  import HTTPTypesFoundation
+
+  #if canImport(FoundationNetworking)
+    import FoundationNetworking
+  #endif
+
+  private enum HTTPTypeConversionError: Error {
+    case failedToConvertHTTPRequestToURLRequest
+    case failedToConvertURLResponseToHTTPResponse
+  }
+
+  extension URLSession {
+    /// Convenience method to load data using an `HTTPRequest`; creates and resumes a `URLSessionDataTask` internally.
+    ///
+    /// - Parameter request: The `HTTPRequest` for which to load data.
+    /// - Returns: Data and response.
+    public func data(for request: HTTPRequest) async throws -> (Data, HTTPResponse) {
+      guard let urlRequest = URLRequest(httpRequest: request) else {
+        throw HTTPTypeConversionError.failedToConvertHTTPRequestToURLRequest
+      }
+      let (data, urlResponse) = try await self.data(for: urlRequest)
+      guard let response = (urlResponse as? HTTPURLResponse)?.httpResponse else {
+        throw HTTPTypeConversionError.failedToConvertURLResponseToHTTPResponse
+      }
+      return (data, response)
+    }
+
+    /// Convenience method to upload data using an `HTTPRequest`, creates and resumes a `URLSessionUploadTask` internally.
+    ///
+    /// - Parameter request: The `HTTPRequest` for which to upload data.
+    /// - Parameter bodyData: Data to upload.
+    /// - Returns: Data and response.
+    public func upload(
+      for request: HTTPRequest,
+      from bodyData: Data
+    ) async throws -> (Data, HTTPResponse) {
+      guard let urlRequest = URLRequest(httpRequest: request) else {
+        throw HTTPTypeConversionError.failedToConvertHTTPRequestToURLRequest
+      }
+      let (data, urlResponse) = try await self.upload(for: urlRequest, from: bodyData)
+      guard let response = (urlResponse as? HTTPURLResponse)?.httpResponse else {
+        throw HTTPTypeConversionError.failedToConvertURLResponseToHTTPResponse
+      }
+      return (data, response)
+    }
+  }
+#endif
+
 #if canImport(FoundationNetworking) && compiler(<6)
-  import Foundation
   import FoundationNetworking
 
   /// A set of errors that can be returned from the

diff --git a/Sources/PostgREST/Deprecated.swift b/Sources/PostgREST/Deprecated.swift
@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import Helpers
 import HTTPTypes
 import HTTPTypesFoundation
 
@@ -33,9 +34,9 @@ extension PostgrestClient.Configuration {
     headers: [String: String] = [:],
     fetch: @escaping PostgrestClient.FetchHandler = { request, body in
       if let body {
-        try await URLSession.shared.upload(for: request, from: body)
+        return try await URLSession.shared.upload(for: request, from: body)
       } else {
-        try await URLSession.shared.data(for: request)
+        return try await URLSession.shared.data(for: request)
       }
     },
     encoder: JSONEncoder = PostgrestClient.Configuration.jsonEncoder,
@@ -73,9 +74,9 @@ extension PostgrestClient {
     headers: [String: String] = [:],
     fetch: @escaping FetchHandler = { request, body in
       if let body {
-        try await URLSession.shared.upload(for: request, from: body)
+        return try await URLSession.shared.upload(for: request, from: body)
       } else {
-        try await URLSession.shared.data(for: request)
+        return try await URLSession.shared.data(for: request)
       }
     },
     encoder: JSONEncoder = PostgrestClient.Configuration.jsonEncoder,

diff --git a/Sources/PostgREST/PostgrestClient.swift b/Sources/PostgREST/PostgrestClient.swift
@@ -46,9 +46,9 @@ public final class PostgrestClient: Sendable {
       logger: (any SupabaseLogger)? = nil,
       fetch: @escaping FetchHandler = { request, body in
         if let body {
-          try await URLSession.shared.upload(for: request, from: body)
+          return try await URLSession.shared.upload(for: request, from: body)
         } else {
-          try await URLSession.shared.data(for: request)
+          return try await URLSession.shared.data(for: request)
         }
       },
       encoder: JSONEncoder = PostgrestClient.Configuration.jsonEncoder,
@@ -92,9 +92,9 @@ public final class PostgrestClient: Sendable {
     logger: (any SupabaseLogger)? = nil,
     fetch: @escaping FetchHandler = { request, body in
       if let body {
-        try await URLSession.shared.upload(for: request, from: body)
+        return try await URLSession.shared.upload(for: request, from: body)
       } else {
-        try await URLSession.shared.data(for: request)
+        return try await URLSession.shared.data(for: request)
       }
     },
     encoder: JSONEncoder = PostgrestClient.Configuration.jsonEncoder,

diff --git a/Sources/Realtime/RealtimeClient.swift b/Sources/Realtime/RealtimeClient.swift
@@ -238,9 +238,9 @@ public class RealtimeClient: PhoenixTransportDelegate {
     http = HTTPClient(
       fetch: { request, body in
         if let body {
-          try await URLSession.shared.upload(for: request, from: body)
+          return try await URLSession.shared.upload(for: request, from: body)
         } else {
-          try await URLSession.shared.data(for: request)
+          return try await URLSession.shared.data(for: request)
         }
       },
       interceptors: []

diff --git a/Sources/Storage/StorageHTTPClient.swift b/Sources/Storage/StorageHTTPClient.swift
@@ -1,5 +1,6 @@
 import Foundation
 import HTTPTypes
+import Helpers
 
 #if canImport(FoundationNetworking)
   import FoundationNetworking
@@ -21,9 +22,9 @@ public struct StorageHTTPSession: Sendable {
     self.init(
       fetch: { request, body in
         if let body {
-          try await session.upload(for: request, from: body)
+          return try await session.upload(for: request, from: body)
         } else {
-          try await session.data(for: request)
+          return try await session.data(for: request)
         }
       }
     )

diff --git a/Sources/Supabase/SupabaseClient.swift b/Sources/Supabase/SupabaseClient.swift
@@ -180,9 +180,9 @@ public final class SupabaseClient: Sendable {
       fetch: { request, body in
         // DON'T use `fetchWithAuth` method within the AuthClient as it may cause a deadlock.
         if let body {
-          try await options.global.session.upload(for: request, from: body)
+          return try await options.global.session.upload(for: request, from: body)
         } else {
-          try await options.global.session.data(for: request)
+          return try await options.global.session.data(for: request)
         }
       },
       autoRefreshToken: options.auth.autoRefreshToken

diff --git a/Tests/IntegrationTests/AuthClientIntegrationTests.swift b/Tests/IntegrationTests/AuthClientIntegrationTests.swift
@@ -8,6 +8,7 @@
 import ConcurrencyExtras
 import CustomDump
 import HTTPTypes
+import Helpers
 import TestHelpers
 import XCTest