Merge pull request #74 from makinosp/develop

Develop

Author: makinosp

Sources/VRCKit/APIClient.swift

@@ -47,7 +47,7 @@ public final class APIClient {
     func encodeAuthorization(_ username: String, _ password: String) throws -> String {
         let authString = "\(username):\(password)"
         guard let payload = authString.data(using: .utf8) else {
-            throw VRCKitError.unexpectedError
+            throw VRCKitError.unexpected
         }
         return "Basic \(payload.base64EncodedString())"
     }
@@ -97,7 +97,7 @@ public final class APIClient {
 
         let (data, response) = try await URLSession.shared.data(for: request)
         guard let response = response as? HTTPURLResponse else {
-            throw VRCKitError.invalidResponseError
+            throw VRCKitError.invalidResponse
         }
         return (data, response)
     }

Sources/VRCKit/Errors.swift

@@ -9,7 +9,7 @@ import Foundation
 
 /// An enumeration that represents various errors that can occur in the VRCKit framework.
 /// Conforms to the `Error` and `LocalizedError` protocols for better error handling and localization.
-public enum VRCKitError: Error, LocalizedError {
+public enum VRCKitError: Error, LocalizedError, Equatable {
     private typealias RawValue = String
 
     /// Represents an error from the API with details.
@@ -19,32 +19,30 @@ public enum VRCKitError: Error, LocalizedError {
     case clientDeallocated
 
     /// Represents an error indicating an invalid response was received.
-    case invalidResponseError
+    case invalidResponse
 
     /// Represents an error indicating an invalid request with additional details.
     case invalidRequest(_ details: String)
 
+    /// Represents an error indicating an authentication failure.
+    case unauthorized
+
     /// Represents an unexpected error.
-    case unexpectedError
+    case unexpected
 
     /// Represents an url error.
     case urlError
 
     /// Provides a localized description of the error.
     public var errorDescription: String? {
         switch self {
-        case .apiError:
-            "API Error"
-        case .clientDeallocated:
-            "Client Deallocated"
-        case .invalidResponseError:
-            "Invalid Response Error"
-        case .invalidRequest:
-            "Invalid Request"
-        case .unexpectedError:
-            "Unexpected Error"
-        case .urlError:
-            "URL Error"
+        case .apiError: "API Error"
+        case .clientDeallocated: "Client Deallocated"
+        case .invalidResponse: "Invalid Response"
+        case .invalidRequest: "Invalid Request"
+        case .unauthorized: "Unauthorized"
+        case .unexpected: "Unexpected"
+        case .urlError: "URL Error"
         }
     }
 

Sources/VRCKit/Models/FavoriteWorldModel.swift

@@ -0,0 +1,29 @@
+//
+//  FavoriteWorldModel.swift
+//  VRCKit
+//
+//  Created by makinosp on 2024/09/08.
+//
+
+import Foundation
+
+struct AnyCodable: Codable {}
+
+public struct FavoriteWorldWrapper {
+    public let worlds: [World]
+}
+
+extension FavoriteWorldWrapper: Decodable {
+    public init(from decoder: any Decoder) throws {
+        var container = try decoder.unkeyedContainer()
+        var worlds: [World] = []
+        while !container.isAtEnd {
+            if let world = try? container.decode(World.self) {
+                worlds.append(world)
+            } else {
+                try container.decode(AnyCodable.self)
+            }
+        }
+        self.worlds = worlds
+    }
+}

Sources/VRCKit/PreviewServices/PreviewDataProvider.swift

@@ -113,7 +113,7 @@ public final class PreviewDataProvider {
         )
     }
 
-    private static func generateFriend(
+    public static func generateFriend(
         id: UUID,
         location: Location,
         status: UserStatus
@@ -139,7 +139,7 @@ public final class PreviewDataProvider {
         )
     }
 
-    private static func generateUserDetail(
+    public static func generateUserDetail(
         id: UUID,
         location: Location,
         state: User.State,
@@ -171,7 +171,7 @@ public final class PreviewDataProvider {
         )
     }
 
-    private static func generateInstance(worldId: UUID, instanceId: Int) -> Instance {
+    public static func generateInstance(worldId: UUID, instanceId: Int) -> Instance {
         Instance(
             active: true,
             capacity: 32,
@@ -197,7 +197,11 @@ public final class PreviewDataProvider {
         )
     }
 
-    private static func generateWorld(worldId: UUID) -> World {
+    public static func generateInstance() -> Instance {
+        generateInstance(worldId: UUID(), instanceId: 0)
+    }
+
+    public static func generateWorld(worldId: UUID) -> World {
         World(
             id: "wrld_\(worldId.uuidString)",
             name: "DummyWorld",

Sources/VRCKit/Services/AuthenticationService.swift

@@ -29,7 +29,7 @@ public class AuthenticationService: APIService, AuthenticationServiceProtocol {
         } catch _ as DecodingError {
             let result: RequiresTwoFactorAuthResponse = try Serializer.shared.decode(response.data)
             guard let requires = result.requires else {
-                throw VRCKitError.unexpectedError
+                throw VRCKitError.unexpected
             }
             return requires
         }

Sources/VRCKit/Services/WorldService.swift

@@ -16,6 +16,7 @@ public class WorldService: APIService, WorldServiceProtocol {
     public func fetchFavoritedWorlds() async throws -> [World] {
         let path = "worlds/favorites"
         let response = try await client.request(path: path, method: .get)
-        return try Serializer.shared.decode(response.data)
+        let favoriteWorldWrapper: FavoriteWorldWrapper = try Serializer.shared.decode(response.data)
+        return favoriteWorldWrapper.worlds
     }
 }

Sources/VRCKit/Utils/Serializer.swift

@@ -30,7 +30,11 @@ final class Serializer {
         } catch let error as DecodingError {
             do {
                 let errorResponse = try decoder.decode(ErrorResponse.self, from: data)
-                throw VRCKitError.apiError(errorResponse.error.message)
+                if errorResponse.error.statusCode == 401 {
+                    throw VRCKitError.unauthorized
+                } else {
+                    throw VRCKitError.apiError(errorResponse.error.message)
+                }
             } catch _ as DecodingError {
                 // for debug
                 print(type(of: T.self))