Merge pull request #4 from superturboryan/develop

1.0.1

Sources/SoundCloud/DAO/DAO.swift

@@ -8,7 +8,7 @@
 /// Describes a data access object used for persisting an item of generic `Codable` type `DataType`
  /// - Parameters:
 ///   - codingKey: key used to encode + decode persisted object
-public protocol DAO: AnyObject {
+public protocol DAO<DataType>: AnyObject {
     associatedtype DataType: Codable
 
     var codingKey: String { get }
@@ -17,3 +17,9 @@ public protocol DAO: AnyObject {
     func save(_ value: DataType) throws
     func delete() throws
 }
+
+public enum DAOError: Error {
+    case noData
+    case decoding
+    case encoding
+}

Sources/SoundCloud/DAO/KeychainDAO.swift

@@ -9,14 +9,13 @@ import Foundation
 import KeychainSwift
 
 public final class KeychainDAO<T: Codable>: DAO {
-    public typealias DataType = T
 
     private let encoder = JSONEncoder()
     private let decoder = JSONDecoder()
     private let persistence = KeychainSwift()
 
     public var codingKey: String
-    init(_ codingKey: String) {
+    public init(_ codingKey: String) {
         self.codingKey = codingKey
     }
 

Sources/SoundCloud/DAO/UserDefaultsDAO.swift

@@ -8,11 +8,9 @@
 import Foundation
 /// Data access object used for persisting a `Codable` object to device's `UserDefaults`.
 ///
-/// - Note: **Unexpected behaviour across app launches:**
-/// `UserDefaults` may not be properly synchronized after terminating app with Xcode.
-/// **Terminate app via device** for expected synchronization behaviour.
+/// - Warning: **Unexpected behaviour across app launches:** `UserDefaults` may not be properly synchronized
+/// after terminating app with Xcode. **Terminate app via device** for expected read-write behaviour.
 public final class UserDefaultsDAO<T: Codable>: DAO {
-    public typealias DataType = T
 
     private let encoder = JSONEncoder()
     private let decoder = JSONDecoder()

Sources/SoundCloud/Extension/ASWebAuthenticationSession.swift

@@ -17,7 +17,7 @@ public extension ASWebAuthenticationSession {
     ///   - context: Delegate object that specifies how to present web page. Defaults to UIApplication.shared.keyWindow
     ///   - ephemeralSession: 🍪❓
     /// - Returns: Authorization code from callback URL
-    @MainActor static func getAuthCode(
+    static func getAuthCode(
         from url: String,
         with redirectURI: String,
         context: ASWebAuthenticationPresentationContextProviding = ApplicationWindowContextProvider(),
@@ -60,7 +60,7 @@ public extension ASWebAuthenticationSession {
     ///   - with: URI for OAuth web page to use to redirect back to your app. Should take the form "<your app scheme>://<path>"
     ///   - ephemeralSession: 🍪❓
     /// - Returns: Authorization code from callback URL
-    @MainActor static func getAuthCode(
+    static func getAuthCode(
         from url: String,
         with redirectURI: String,
         ephemeralSession: Bool = false

Sources/SoundCloud/Models/Page.swift

@@ -8,6 +8,11 @@
 public struct Page<ItemType: Decodable>: Decodable {
     public var items: [ItemType]
     public var nextPage: String?
+
+    public init(items: [ItemType], nextPage: String? = nil) {
+        self.items = items
+        self.nextPage = nextPage
+    }
 }
 
 extension Page {

Sources/SoundCloud/Models/Playlist.swift

@@ -5,8 +5,6 @@
 //  Created by Ryan Forsyth on 2023-10-03.
 //
 
-import Foundation
-
 public struct Playlist: Decodable, Identifiable, Equatable {
     public let id: Int
     public let genre: String

Sources/SoundCloud/Models/StatusCode.swift

@@ -5,8 +5,6 @@
 //  Created by Ryan Forsyth on 2023-09-07.
 //
 
-import Foundation
-
 public extension SoundCloud {
     enum StatusCode: Int {
         case success = 200

Sources/SoundCloud/Models/Test Models.swift

@@ -5,9 +5,6 @@
 //  Created by Ryan Forsyth on 2023-10-03.
 //
 
-import Foundation
-import SwiftUI
-
 public func testUser(_ id: Int = Int.random(in: 0..<1000)) -> User {
     User(
         avatarUrl: "https://i1.sndcdn.com/avatars-0DxRBnyCNCI3zL1X-oeoRyw-large.jpg",
@@ -98,11 +95,6 @@ public func testTrack() -> Track {
     )
 }
 
-public func testTrackBinding() -> Binding<Track> {
-    var track = testTrack()
-    return Binding(get: { track }, set: { newTrack in track = newTrack })
-}
-
 public var testDefaultLoadedPlaylists: [Int : Playlist] {
     var loadedPlaylists = [Int : Playlist]()
     let user = testUser()
@@ -118,3 +110,5 @@ public let testNextProSubscription = User.Subscription(product: User.Subscriptio
 
 @MainActor
 public var testSC = SoundCloud(SoundCloud.Config(apiURL: "", clientId: "", clientSecret: "", redirectURI: ""))
+
+public let testStreamInfo = StreamInfo(httpMp3128Url: "", hlsMp3128Url: "")

Sources/SoundCloud/Models/TokenResponse.swift

@@ -7,14 +7,14 @@
 
 import Foundation
 
-internal struct TokenResponse: Codable {
-    let accessToken: String
-    let expiresIn: Int
-    let refreshToken: String
-    let scope: String
-    let tokenType: String
-    
-    var expiryDate: Date? = nil // Set when persisting object
+public struct TokenResponse: Codable {
+    internal let accessToken: String
+    internal let expiresIn: Int
+    internal let refreshToken: String
+    internal let scope: String
+    internal let tokenType: String
+
+    internal var expiryDate: Date? = nil // Set when persisting object
 }
 
 internal extension TokenResponse {

Sources/SoundCloud/Request.swift

@@ -4,9 +4,6 @@
 //
 //  Created by Ryan Forsyth on 2023-08-12.
 //
-// https://developers.soundcloud.com/docs/api/explorer/open-api#/
-
-import Foundation
 
 extension SoundCloud {