Move AcoustID API to async/await for Swift 6 compatibility

This also removes the now defunct dependency DVR, bumps the iOS/tvOS
version to 15 (macOS: 12) and declares Swift language mode 6

Author: wallisch

Package.swift

@@ -1,13 +1,10 @@
-// swift-tools-version:5.8
+// swift-tools-version:6.0
 import PackageDescription
 
 let package = Package(
     name: "ChromaSwift",
-    platforms: [.macOS(.v10_15), .iOS(.v12), .tvOS(.v12)],
+    platforms: [.macOS(.v12), .iOS(.v15), .tvOS(.v15)],
     products: [.library(name: "ChromaSwift", targets: ["ChromaSwift"])],
-    dependencies: [
-        .package(url: "https://github.com/venmo/DVR", from: "2.1.0")
-    ],
     targets: [
         .target(
             name: "ChromaSwift",
@@ -69,8 +66,8 @@ let package = Package(
         ),
         .testTarget(
             name: "ChromaSwiftTests",
-            dependencies: ["ChromaSwift", "DVR"],
-            resources: [.copy("Fixtures"), .copy("Audio")]
+            dependencies: ["ChromaSwift"],
+            resources: [.copy("Audio")]
         ),
         .testTarget(
             name: "CChromaprintTests",

README.md

@@ -1,7 +1,7 @@
 # ChromaSwift
 
 ![Platform](https://img.shields.io/badge/Platform-macOS%20%7C%20iOS%20%7C%20tvOS-inactive)
-[![Swift](https://img.shields.io/badge/Swift-5-orange)](https://swift.org/)
+[![Swift](https://img.shields.io/badge/Swift-6-orange)](https://swift.org/)
 [![SPM](https://img.shields.io/badge/SPM-compatible-success)](https://swift.org/package-manager/)
 [![Unit Tests](https://github.com/wallisch/ChromaSwift/actions/workflows/unit_tests.yml/badge.svg)](https://github.com/wallisch/ChromaSwift/actions/workflows/unit_tests.yml)
 [![codecov](https://codecov.io/gh/wallisch/ChromaSwift/branch/master/graph/badge.svg?token=Y9IMV4347N)](https://codecov.io/gh/wallisch/ChromaSwift)

Sources/ChromaSwift/AcoustID.swift

@@ -6,7 +6,7 @@ import Foundation
 public class AcoustID {
     let lookupEndpoint = "https://api.acoustid.org/v2/lookup"
 
-    let session: URLSession
+    let session: URLSessionProtocol
     let apiKey: String
     let timeout: Double
 
@@ -57,17 +57,17 @@ public class AcoustID {
         public let title: String?
     }
 
-    init(apiKey: String, timeout: Double, session: URLSession) {
+    init(apiKey: String, timeout: Double, session: URLSessionProtocol) {
         self.session = session
         self.apiKey = apiKey
         self.timeout = timeout
     }
 
     public convenience init(apiKey: String, timeout: Double = 3.0) {
-        self.init(apiKey: apiKey, timeout: timeout, session: .shared)
+        self.init(apiKey: apiKey, timeout: timeout, session: URLSession.shared)
     }
 
-    public func lookup(_ fingerprint: AudioFingerprint, completion: @escaping (Result<[APIResult], Error>) -> Void) {
+    public func lookup(_ fingerprint: AudioFingerprint) async throws -> [APIResult] {
         let query = [
             URLQueryItem(name: "client", value: apiKey),
             URLQueryItem(name: "meta", value: "recordings+releasegroups+compress"),
@@ -78,41 +78,38 @@ public class AcoustID {
         lookupURLComponents.queryItems = query
 
         guard let lookupURL = lookupURLComponents.url else {
-            completion(.failure(Error.invalidURL))
-            return
+            throw Error.invalidURL
         }
         var request = URLRequest(url: lookupURL)
         request.timeoutInterval = timeout
 
-        session.dataTask(with: request) { (data, _, error) in
-            if error != nil {
-                completion(.failure(Error.networkFail))
-            } else if let data = data {
-                guard let decodedResponse = try? JSONDecoder().decode(APIResponse.self, from: data) else {
-                    completion(.failure(Error.parseFail))
-                    return
-                }
-                if let apiError = decodedResponse.error {
-                    switch apiError.code {
-                    case 3:
-                        completion(.failure(Error.invalidFingerprint))
-                    case 4:
-                        completion(.failure(Error.invalidApiKey))
-                    case 8:
-                        completion(.failure(Error.invalidDuration))
-                    case 14:
-                        completion(.failure(Error.tooManyRequests))
-                    default:
-                        completion(.failure(Error.apiFail))
-                    }
-                    return
-                }
-                guard let results = decodedResponse.results else {
-                    completion(.success([]))
-                    return
-                }
-                completion(.success(results))
+        guard let (data, _) = try? await session.data(for: request) else {
+            throw Error.networkFail
+        }
+
+        guard let decodedResponse = try? JSONDecoder().decode(APIResponse.self, from: data) else {
+            throw Error.parseFail
+        }
+
+        if let apiError = decodedResponse.error {
+            switch apiError.code {
+            case 3:
+                throw Error.invalidFingerprint
+            case 4:
+                throw Error.invalidApiKey
+            case 8:
+                throw Error.invalidDuration
+            case 14:
+                throw Error.tooManyRequests
+            default:
+                throw Error.apiFail
             }
-        }.resume()
+        }
+
+        guard let results = decodedResponse.results else {
+            return []
+        }
+
+        return results
     }
 }

Sources/ChromaSwift/URLSessionProtocol.swift

@@ -0,0 +1,10 @@
+// Copyright (c) 2024 Philipp Wallisch
+// Distributed under the MIT license, see the LICENSE file for details.
+
+import Foundation
+
+protocol URLSessionProtocol {
+    func data(for request: URLRequest) async throws -> (Data, URLResponse)
+}
+
+extension URLSession: URLSessionProtocol {}