[REFACTOR] completion 대신 continuation 사용

boostcampwm-2024 · Nov 29, 2024 · 3f129ab · 3f129ab
1 parent 46c17ed
commit 3f129ab
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 22 deletions.
diff --git a/Data/Data/SharingVideoRepository.swift b/Data/Data/SharingVideoRepository.swift
@@ -102,21 +102,20 @@ private extension SharingVideoRepository {
     }
 
     func sendFiles(fileNames: [String], to peerID: String, isRequested: Bool) {
-        guard !fileNames.isEmpty else {
-            sendResponse(isRequested: isRequested, to: peerID)
-            return
-        }
-
-        for index in fileNames.indices {
-            let fileName = fileNames[index]
-            let fileURL = FileSystemManager.shared.folder.appending(component: fileName)
-            let completion: (((any Error)?) -> Void)? = (index == fileNames.count - 1) ? { _ in
-                self.sendResponse(isRequested: isRequested, to: peerID) } : nil
+        Task {
+            for index in fileNames.indices {
+                let fileName = fileNames[index]
+                let fileURL = FileSystemManager.shared.folder.appending(component: fileName)
+                
+                await socketProvider.sendResource(url: fileURL,
+                                                  resourceName: fileName,
+                                                  to: peerID)
+                sendSyncFlags[peerID] = true
+            }
 
-            socketProvider.sendResource(url: fileURL,
-                                         resourceName: fileName,
-                                         to: peerID,
-                                         completion: completion)
+            if isRequested {
+                sendReceivedResponse(to: peerID)
+            }
         }
     }
 

diff --git a/Data/P2PSocket/SocketProvidable.swift b/Data/P2PSocket/SocketProvidable.swift
@@ -54,9 +54,8 @@ public protocol SocketResourceSendable {
     func sendResource(
         url localURL: URL,
         resourceName: String,
-        to peerID: String,
-        completion: (((any Error)?) -> Void)?
-    )
+        to peerID: String
+    ) async
 	/// 연결된 모든 Peer들에게 리소스를 전송합니다.
     func sendResourceToAll(url: URL, resourceName: String) async throws
 	/// Peer들과 공유한 모든 리소스를 리턴합니다.

diff --git a/Data/P2PSocket/SocketProvider.swift b/Data/P2PSocket/SocketProvider.swift
@@ -144,17 +144,14 @@ public extension SocketProvider {
     func sendResource(
         url localURL: URL,
         resourceName: String,
-        to peerID: String,
-        completion: (((any Error)?) -> Void)? = nil
-    ) {
+        to peerID: String) async {
         let uuid = UUID()
         let nameWithUUID = [resourceName, uuid.uuidString].joined(separator: "/")
         guard let mcPeerID = MCPeerIDStorage.shared.peerIDByIdentifier[peerID]?.id else { return }
 
         session.sendResource(at: localURL,
                              withName: nameWithUUID,
-                             toPeer: mcPeerID,
-                             withCompletionHandler: completion)
+                             toPeer: mcPeerID)
     }
 
     func sendResourceToAll(url localUrl: URL, resourceName: String) async throws {