refactor: 최종 리팩토링

alsongDalsong/ASAudioKit/ASAudioAnalyzer.swift

@@ -0,0 +1,54 @@
+import AVFoundation
+import Foundation
+
+public enum ASAudioAnalyzer {
+    public static func analyze(data: Data, samplesCount: Int) async throws -> [CGFloat] {
+        let tempURL = FileManager.default.temporaryDirectory.appendingPathComponent(UUID().uuidString + ".m4a")
+        try data.write(to: tempURL)
+        let file = try AVAudioFile(forReading: tempURL)
+
+        guard
+            let format = AVAudioFormat(
+                commonFormat: .pcmFormatFloat32,
+                sampleRate: file.fileFormat.sampleRate,
+                channels: file.fileFormat.channelCount,
+                interleaved: false
+            ),
+            let buffer = AVAudioPCMBuffer(pcmFormat: format, frameCapacity: AVAudioFrameCount(file.length))
+        else {
+            return []
+        }
+
+        try file.read(into: buffer)
+        guard let floatChannelData = buffer.floatChannelData else {
+            return []
+        }
+
+        let frameLength = Int(buffer.frameLength)
+        let samples = Array(UnsafeBufferPointer(start: floatChannelData[0], count: frameLength))
+        var result = [CGFloat]()
+        let chunkedSamples = samples.chunked(into: samples.count / samplesCount)
+
+        for chunk in chunkedSamples {
+            let squaredSum = chunk.reduce(0) { $0 + $1 * $1 }
+            let averagePower = squaredSum / Float(chunk.count)
+            let decibels = 10 * log10(max(averagePower, Float.ulpOfOne))
+
+            let newAmplitude = 1.8 * pow(10.0, decibels / 20.0)
+            let clampedAmplitude = min(max(CGFloat(newAmplitude), 0), 1)
+            result.append(clampedAmplitude)
+        }
+
+        try? FileManager.default.removeItem(at: tempURL)
+
+        return result
+    }
+}
+
+extension Array {
+    func chunked(into size: Int) -> [[Element]] {
+        stride(from: 0, to: count, by: size).map {
+            Array(self[$0 ..< Swift.min($0 + size, count)])
+        }
+    }
+}

alsongDalsong/ASAudioKit/ASAudioKit.xcodeproj/project.pbxproj

@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		1B7EB01B2CFDA83B00B2BE2A /* ASAudioAnalyzer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B7EB01A2CFDA83B00B2BE2A /* ASAudioAnalyzer.swift */; };
+		1B7EB01C2CFDA83B00B2BE2A /* ASAudioAnalyzer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1B7EB01A2CFDA83B00B2BE2A /* ASAudioAnalyzer.swift */; };
 		4E8907C22CE2489A00D5B547 /* ASAudioKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E89071E2CE23D1B00D5B547 /* ASAudioKit.framework */; platformFilter = ios; };
 		4EB1ED372CE88E500012FFBA /* ASAudioKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4E89071E2CE23D1B00D5B547 /* ASAudioKit.framework */; };
 		4EB1ED382CE88E500012FFBA /* ASAudioKit.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4E89071E2CE23D1B00D5B547 /* ASAudioKit.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -44,6 +46,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		1B7EB01A2CFDA83B00B2BE2A /* ASAudioAnalyzer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ASAudioAnalyzer.swift; sourceTree = "<group>"; };
 		4E89071E2CE23D1B00D5B547 /* ASAudioKit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ASAudioKit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		4E8907BE2CE2489A00D5B547 /* ASAudioKitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ASAudioKitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		4EB1EC802CE7AA160012FFBA /* ASAudioDemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ASAudioDemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -121,6 +124,7 @@
 		4E8907142CE23D1A00D5B547 = {
 			isa = PBXGroup;
 			children = (
+				1B7EB01A2CFDA83B00B2BE2A /* ASAudioAnalyzer.swift */,
 				4E8907AD2CE240D400D5B547 /* ASAudioKit */,
 				4E8907BF2CE2489A00D5B547 /* ASAudioKitTests */,
 				4EB1EC812CE7AA160012FFBA /* ASAudioDemo */,
@@ -300,6 +304,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1B7EB01C2CFDA83B00B2BE2A /* ASAudioAnalyzer.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -314,6 +319,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				1B7EB01B2CFDA83B00B2BE2A /* ASAudioAnalyzer.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

alsongDalsong/ASAudioKit/ASAudioKit/ASAudioPlayer/ASAudioPlayer.swift

@@ -13,7 +13,7 @@ public actor ASAudioPlayer: NSObject {
     public var onPlaybackFinished: (@Sendable () async -> Void)?
 
     /// 녹음파일을 재생하고 옵션에 따라 재생시간을 설정합니다.
-    public func startPlaying(data: Data, option: PlayType) {
+    public func startPlaying(data: Data, option: PlayType = .full) {
         configureAudioSession()
         do {
             audioPlayer = try AVAudioPlayer(data: data)

alsongDalsong/ASEntity/ASEntity/Answer.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public struct Answer: Codable, Equatable {
+public struct Answer: Codable, Equatable, Sendable, Hashable {
     public var player: Player?
     public var music: Music?
     public var playlist: Playlist?

alsongDalsong/ASEntity/ASEntity/Music.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public struct Music: Codable, Equatable, Identifiable, Sendable {
+public struct Music: Codable, Equatable, Identifiable, Sendable, Hashable {
     public var id: String?
     public var title: String?
     public var artist: String?

alsongDalsong/ASEntity/ASEntity/Player.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public struct Player: Codable, Equatable, Identifiable {
+public struct Player: Codable, Equatable, Identifiable, Sendable, Hashable {
     public var id: String
     public var avatarUrl: URL?
     public var nickname: String?

alsongDalsong/ASEntity/ASEntity/Playlist.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public struct Playlist: Codable, Equatable {
+public struct Playlist: Codable, Equatable, Sendable, Hashable {
     public var artworkUrl: URL?
     public var title: String?
 

alsongDalsong/ASEntity/ASEntity/Record.swift

@@ -1,6 +1,6 @@
 import Foundation
 
-public struct Record: Codable, Equatable {
+public struct Record: Codable, Equatable, Sendable, Hashable {
     public var player: Player?
     public var recordOrder: UInt8?
     public var fileUrl: URL?

alsongDalsong/ASRepository/ASRepository/Protocols/RepositoryProtocols.swift

@@ -48,7 +48,6 @@ public protocol SubmitsRepositoryProtocol {
 
 public protocol AvatarRepositoryProtocol {
     func getAvatarUrls() async throws -> [URL]
-    func getAvatarData(url: URL) async -> Data?
 }
 
 public protocol RoomActionRepositoryProtocol: Sendable {
@@ -61,15 +60,14 @@ public protocol RoomActionRepositoryProtocol: Sendable {
     func resetGame() async throws -> Bool
 }
 
-public protocol MusicRepositoryProtocol {
-    func getMusicData(url: URL) async -> Data?
-}
-
 public protocol GameStateRepositoryProtocol {
     func getGameState() -> AnyPublisher<GameState?, Never>
 }
 
 public protocol HummingResultRepositoryProtocol {
     func getResult() -> AnyPublisher<[(answer: Answer, records: [ASEntity.Record], submit: Answer, recordOrder: UInt8)], Never>
-    func getRecordData(url: URL) -> Future<Data?, Error>
+}
+
+public protocol DataDownloadRepositoryProtocol {
+    func downloadData(url: URL) async -> Data?
 }

alsongDalsong/ASRepository/ASRepository/Repositories/AvatarRepository.swift

@@ -6,14 +6,11 @@ import ASRepositoryProtocol
 public final class AvatarRepository: AvatarRepositoryProtocol {
     // TODO: - Container로 주입
     private let storageManager: ASFirebaseStorageProtocol
-    private let networkManager: ASNetworkManagerProtocol
 
     public init (
-        storageManager: ASFirebaseStorageProtocol,
-        networkManager: ASNetworkManagerProtocol
+        storageManager: ASFirebaseStorageProtocol
     ) {
         self.storageManager = storageManager
-        self.networkManager = networkManager
     }
 
     public func getAvatarUrls() async throws -> [URL] {
@@ -24,14 +21,4 @@ public final class AvatarRepository: AvatarRepositoryProtocol {
             throw error
         }
     }
-
-    public func getAvatarData(url: URL) async -> Data? {
-        do {
-            guard let endpoint = ResourceEndpoint(url: url) else { return nil }
-            let data = try await self.networkManager.sendRequest(to: endpoint, type: .none, body: nil, option: .both)
-            return data
-        } catch {
-            return nil
-        }
-    }
 }

alsongDalsong/ASRepository/ASRepository/Repositories/DataDownloadRepository.swift

@@ -0,0 +1,20 @@
+import ASNetworkKit
+import ASRepositoryProtocol
+
+public final class DataDownloadRepository: DataDownloadRepositoryProtocol {
+    private var networkManager: ASNetworkManagerProtocol
+
+    public init(networkManager: ASNetworkManagerProtocol) {
+        self.networkManager = networkManager
+    }
+
+    public func downloadData(url: URL) async -> Data? {
+        guard let endpoint = ResourceEndpoint(url: url) else { return nil }
+        do {
+            let data = try await networkManager.sendRequest(to: endpoint, type: .none, body: nil, option: .both)
+            return data
+        } catch {
+            return nil
+        }
+    }
+}