Use URLSession

Author: grdsdev

Package.resolved

@@ -1,4 +1,4 @@
-// swift-tools-version: 5.7
+// swift-tools-version: 5.8
 
 import PackageDescription
 
@@ -14,15 +14,20 @@ let package = Package(
   products: [
     .library(name: "Functions", targets: ["Functions"])
   ],
-  dependencies: [],
+  dependencies: [
+    .package(url: "https://github.com/WeTransfer/Mocker", from: "3.0.1")
+  ],
   targets: [
     .target(
       name: "Functions",
       dependencies: []
     ),
     .testTarget(
       name: "FunctionsTests",
-      dependencies: ["Functions"]
+      dependencies: [
+        "Functions",
+        "Mocker",
+      ]
     ),
   ]
 )

Package.swift

@@ -1,22 +1,19 @@
 import Foundation
 
-public final class FunctionsClient {
-  public typealias FetchHandler = (URLRequest) async throws -> (Data, URLResponse)
-
+public actor FunctionsClient {
   let url: URL
   var headers: [String: String]
-
-  private let fetch: FetchHandler
+  let session: URLSession
 
   public init(
     url: URL,
     headers: [String: String] = [:],
-    fetch: @escaping FetchHandler = URLSession.shared.data(for:)
+    session: URLSession = .shared
   ) {
     self.url = url
     self.headers = headers
     self.headers["X-Client-Info"] = "functions-swift/\(version)"
-    self.fetch = fetch
+    self.session = session
   }
 
   /// Updates the authorization header.
@@ -80,7 +77,7 @@ public final class FunctionsClient {
     urlRequest.httpMethod = "POST"
     urlRequest.httpBody = invokeOptions.body
 
-    let (data, response) = try await fetch(urlRequest)
+    let (data, response) = try await session.data(for: urlRequest)
 
     guard let httpResponse = response as? HTTPURLResponse else {
       throw URLError(.badServerResponse)

Sources/Functions/FunctionsClient.swift

@@ -1,3 +1,4 @@
+import Mocker
 import XCTest
 
 @testable import Functions
@@ -6,12 +7,15 @@ final class FunctionsClientTests: XCTestCase {
   let url = URL(string: "http://localhost:5432/functions/v1")!
   let apiKey = "supabase.anon.key"
 
+  lazy var sut = FunctionsClient(url: url, headers: ["apikey": apiKey])
+
   func testInvoke() async throws {
+    let url = URL(string: "http://localhost:5432/functions/v1/hello_world")!
     var _request: URLRequest?
-    let sut = FunctionsClient(url: url, headers: ["apikey": apiKey]) {
-      _request = $0
-      return (Data(), HTTPURLResponse.mock(url: self.url))
-    }
+
+    var mock = Mock(url: url, dataType: .json, statusCode: 200, data: [.post: Data()])
+    mock.onRequestHandler = .init { _request = $0 }
+    mock.register()
 
     let body = ["name": "Supabase"]
 
@@ -22,18 +26,22 @@ final class FunctionsClientTests: XCTestCase {
 
     let request = try XCTUnwrap(_request)
 
-    XCTAssertEqual(request.url, URL(string: "http://localhost:5432/functions/v1/hello_world"))
+    XCTAssertEqual(request.url, url)
     XCTAssertEqual(request.httpMethod, "POST")
     XCTAssertEqual(request.value(forHTTPHeaderField: "apikey"), apiKey)
     XCTAssertEqual(request.value(forHTTPHeaderField: "X-Custom-Key"), "value")
     XCTAssertEqual(
-      request.value(forHTTPHeaderField: "X-Client-Info"), "functions-swift/\(Functions.version)")
+      request.value(forHTTPHeaderField: "X-Client-Info"),
+      "functions-swift/\(Functions.version)"
+    )
   }
 
   func testInvoke_shouldThrow_URLError_badServerResponse() async {
-    let sut = FunctionsClient(url: url) { _ in
-      (Data(), URLResponse())
-    }
+    let url = URL(string: "http://localhost:5432/functions/v1/hello_world")!
+    let mock = Mock(
+      url: url, dataType: .json, statusCode: 200, data: [.post: Data()],
+      requestError: URLError(.badServerResponse))
+    mock.register()
 
     do {
       try await sut.invoke(functionName: "hello_world")
@@ -45,12 +53,10 @@ final class FunctionsClientTests: XCTestCase {
   }
 
   func testInvoke_shouldThrow_FunctionsError_httpError() async {
-    let sut = FunctionsClient(url: url) { _ in
-      (
-        "error".data(using: .utf8)!,
-        HTTPURLResponse.mock(url: self.url, statusCode: 300)
-      )
-    }
+    let url = URL(string: "http://localhost:5432/functions/v1/hello_world")!
+    let mock = Mock(
+      url: url, dataType: .json, statusCode: 300, data: [.post: "error".data(using: .utf8)!])
+    mock.register()
 
     do {
       try await sut.invoke(functionName: "hello_world")
@@ -64,12 +70,11 @@ final class FunctionsClientTests: XCTestCase {
   }
 
   func testInvoke_shouldThrow_FunctionsError_relayError() async {
-    let sut = FunctionsClient(url: url) { _ in
-      (
-        Data(),
-        HTTPURLResponse.mock(url: self.url, headerFields: ["x-relay-error": "true"])
-      )
-    }
+    let url = URL(string: "http://localhost:5432/functions/v1/hello_world")!
+    let mock = Mock(
+      url: url, dataType: .json, statusCode: 200, data: [.post: Data()],
+      additionalHeaders: ["x-relay-error": "true"])
+    mock.register()
 
     do {
       try await sut.invoke(functionName: "hello_world")
@@ -79,14 +84,10 @@ final class FunctionsClientTests: XCTestCase {
       XCTFail("Unexpected error thrown \(error)")
     }
   }
-}
 
-extension HTTPURLResponse {
-  static func mock(
-    url: URL,
-    statusCode: Int = 200,
-    headerFields: [String: String]? = nil
-  ) -> HTTPURLResponse {
-    HTTPURLResponse(url: url, statusCode: statusCode, httpVersion: nil, headerFields: headerFields)!
+  func test_setAuth() async {
+    await sut.setAuth(token: "access.token")
+    let headers = await sut.headers
+    XCTAssertEqual(headers["Authorization"], "Bearer access.token")
   }
 }

Tests/FunctionsTests/FunctionsClientTests.swift

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+##===----------------------------------------------------------------------===##
+##
+## This source file is part of the SwiftOpenAPIGenerator open source project
+##
+## Copyright (c) 2023 Apple Inc. and the SwiftOpenAPIGenerator project authors
+## Licensed under Apache License v2.0
+##
+## See LICENSE.txt for license information
+## See CONTRIBUTORS.txt for the list of SwiftOpenAPIGenerator project authors
+##
+## SPDX-License-Identifier: Apache-2.0
+##
+##===----------------------------------------------------------------------===##
+
+set -euo pipefail
+
+log() { printf -- "** %s\n" "$*" >&2; }
+error() { printf -- "** ERROR: %s\n" "$*" >&2; }
+fatal() { error "$@"; exit 1; }
+
+CURRENT_SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+REPO_ROOT="$(git -C "${CURRENT_SCRIPT_DIR}" rev-parse --show-toplevel)"
+
+log "Checking required environment variables..."
+test -n "${BASELINE_REPO_URL:-}" || fatal "BASELINE_REPO_URL unset"
+test -n "${BASELINE_TREEISH:-}" || fatal "BASELINE_TREEISH unset"
+
+log "Fetching baseline: ${BASELINE_REPO_URL}#${BASELINE_TREEISH}..."
+git -C "${REPO_ROOT}" fetch "${BASELINE_REPO_URL}" "${BASELINE_TREEISH}"
+BASELINE_COMMIT=$(git -C "${REPO_ROOT}" rev-parse FETCH_HEAD)
+
+log "Checking for API changes since ${BASELINE_REPO_URL}#${BASELINE_TREEISH} (${BASELINE_COMMIT})..."
+swift package --package-path "${REPO_ROOT}" diagnose-api-breaking-changes \
+  "${BASELINE_COMMIT}" \
+  && RC=$? || RC=$?
+
+if [ "${RC}" -ne 0 ]; then
+  fatal "❌ Breaking API changes detected."
+  exit "${RC}"
+fi
+log "✅ No breaking API changes detected."