[Refactor] NearbyNetwork 참여 요청, 수락 기능 리팩터링

DataSource/DataSource/Sources/Interface/NearbyNetworkInterface.swift

@@ -33,13 +33,23 @@ public protocol NearbyNetworkInterface {
     /// 주변에 내 기기 알리는 것을 중지합니다.
     func stopPublishing()
 
-    /// 연결된 모든 피어와 연결을 끊습니다. 
+    /// 연결된 모든 피어와 연결을 끊습니다.
     func disconnectAll()
 
     /// 주변 기기와 연결을 시도합니다.
     /// - Parameter connection: 연결할 기기
+    @available(*, deprecated, message: "이 메서드는 network framework로 리팩터링 하면서 사용되지 않을 예정입니다.")
     func joinConnection(connection: NetworkConnection, context: RequestedContext) throws
 
+    /// 주변 기기와 연결을 시도합니다.
+    /// - Parameters:
+    ///   - connection: 연결할 기기
+    ///   - myConnectionInfo: 내 정보
+    /// - Returns: 연결 요청 성공 여부
+    func joinConnection(
+        connection: RefactoredNetworkConnection,
+        myConnectionInfo: RequestedContext) -> Result<Bool, Never>
+
     /// 연결된 기기들에게 데이터를 송신합니다.
     /// - Parameter data: 송신할 데이터
     func send(data: Data)
@@ -59,7 +69,7 @@ public protocol NearbyNetworkInterface {
     @available(*, deprecated, message: "이 메서드는 network framework로 리팩터링 하면서 사용되지 않을 예정입니다.")
     func send(
         fileURL: URL,
-        info: DataSource.DataInformationDTO,
+        info: DataInformationDTO,
         to connection: NetworkConnection) async
 }
 
@@ -86,27 +96,40 @@ public protocol NearbyNetworkConnectionDelegate: AnyObject {
     /// - Parameters:
     ///   - connection: 연결된 기기
     ///   - info: 기존 Session 정보
+    @available(*, deprecated, message: "이 메서드는 network framework로 리팩터링 하면서 사용되지 않을 예정입니다.")
     func nearbyNetwork(
         _ sender: NearbyNetworkInterface,
         didConnect connection: NetworkConnection,
         with info: [String: String])
 
-    /// 주변 기기와 연결에 성공했을 때 실행됩니다. 
+    /// 주변 기기와 연결에 성공하였을 때 실행됩니다.
     /// - Parameters:
+    ///   - connection: 연결된 기기
     ///   - context: 참여자가 보낸 정보
     ///   - isHost: 호스트 여부
+    @available(*, deprecated, message: "이 메서드는 network framework로 리팩터링 하면서 사용되지 않을 예정입니다.")
     func nearbyNetwork(
         _ sender: NearbyNetworkInterface,
         didConnect connection: NetworkConnection,
         with context: Data?,
         isHost: Bool)
 
+    /// 주변 기기와 연결에 성공했을 때 실행됩니다.
+    /// - Parameters:
+    ///   - didConnect: 연결된 peer
+    func nearbyNetwork(_ sender: NearbyNetworkInterface, didConnect connection: RefactoredNetworkConnection)
+
     /// 연결됐던 기기와 연결이 끊어졌을 때 실행됩니다.
     /// - Parameters:
     ///   - connection: 연결이 끊긴 기기
-    ///   - isHost: 호스트 여부
+    @available(*, deprecated, message: "이 메서드는 network framework로 리팩터링 하면서 사용되지 않을 예정입니다.")
     func nearbyNetwork(
         _ sender: NearbyNetworkInterface,
         didDisconnect connection: NetworkConnection,
         isHost: Bool)
+
+    /// 연결됐던 기기와 연결이 끊어졌을 때 실행됩니다.
+    /// - Parameters:
+    ///   - connection: 연결이 끊긴 기기
+    func nearbyNetwork(_ sender: NearbyNetworkInterface, didDisconnect connection: RefactoredNetworkConnection)
 }

DataSource/DataSource/Sources/Model/NetworkConnection.swift

@@ -45,8 +45,14 @@ public struct RefactoredNetworkConnection: Codable {
     }
 }
 
-extension RefactoredNetworkConnection: Equatable {
+extension RefactoredNetworkConnection: Hashable {
     public static func == (lhs: RefactoredNetworkConnection, rhs: RefactoredNetworkConnection) -> Bool {
         return lhs.id == rhs.id
     }
 }
+
+extension RefactoredNetworkConnection: CustomStringConvertible {
+    public var description: String {
+        return "ID: \(id), Name: \(name)"
+    }
+}

DataSource/DataSource/Sources/Model/RequestedContext.swift

@@ -8,10 +8,16 @@
 import Foundation
 
 public struct RequestedContext: Codable {
-    let nickname: String
-    let participant: String
+    public let peerID: UUID
+    public let nickname: String
+    public let participant: String
 
-    public init(nickname: String, participant: String) {
+    public init(
+        peerID: UUID,
+        nickname: String,
+        participant: String
+    ) {
+        self.peerID = peerID
         self.nickname = nickname
         self.participant = participant
     }

DataSource/DataSource/Sources/Repository/WhiteboardRepository.swift

@@ -54,7 +54,10 @@ public final class WhiteboardRepository: WhiteboardRepositoryInterface {
             name: whiteboard.name,
             info: participantsInfo)
 
-        let context = RequestedContext(nickname: myProfile.nickname, participant: myProfile.profileIcon.emoji)
+        let context = RequestedContext(
+            peerID: myProfile.id,
+            nickname: myProfile.nickname,
+            participant: myProfile.profileIcon.emoji)
 
         try nearbyNetwork.joinConnection(connection: connection, context: context)
     }
@@ -170,6 +173,13 @@ extension WhiteboardRepository: NearbyNetworkConnectionDelegate {
         }
     }
 
+    public func nearbyNetwork(
+        _ sender: any NearbyNetworkInterface,
+        didConnect connection: RefactoredNetworkConnection
+    ) {
+        // TODO: - 연결 되었을 때 화이트보드에 프로필 정보 넘기기
+    }
+
     public func nearbyNetwork(
         _ sender: any NearbyNetworkInterface,
         didDisconnect connection: NetworkConnection,
@@ -181,4 +191,11 @@ extension WhiteboardRepository: NearbyNetworkConnectionDelegate {
         updatePublishingInfo(myProfile: myProfile)
         nearbyNetwork.startPublishing(with: self.participantsInfo)
     }
+
+    public func nearbyNetwork(
+        _ sender: any NearbyNetworkInterface,
+        didDisconnect connection: RefactoredNetworkConnection
+    ) {
+        // TODO: - 연결 끊겼을 때 화이트보드에 프로필 정보 넘기기
+    }
 }

Domain/DomainTests/ManageWhiteboardObjectsUseCaseTests.swift

@@ -453,7 +453,6 @@ final class MockWhiteObjectRepository: WhiteboardObjectRepositoryInterface {
 }
 
 final class MockWhiteboardRepository: WhiteboardRepositoryInterface {
-
     var delegate: (any WhiteboardRepositoryDelegate)?
     var recentPeerPublisher: AnyPublisher<Domain.Profile, Never>
     var connectionResultPublisher: AnyPublisher<Bool, Never>

NearbyNetwork/NearbyNetwork.xcodeproj/project.pbxproj

@@ -13,6 +13,7 @@
 		00549AD62CEDDDB700DF8F6C /* MCSessionState+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00549AD52CEDDDB100DF8F6C /* MCSessionState+.swift */; };
 		00549AD82CEDDDCF00DF8F6C /* MCSession+.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00549AD72CEDDDCF00DF8F6C /* MCSession+.swift */; };
 		0080E86A2CE19EC40095B958 /* NearbyNetworkService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0080E8672CE19EC40095B958 /* NearbyNetworkService.swift */; };
+		00CA7A102D2E08DA00116F9E /* NearbyNetworkProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00CA7A0F2D2E08DA00116F9E /* NearbyNetworkProtocol.swift */; };
 		5B7C6EBF2CDB6C6E0024704A /* DataSource.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B7C6EBE2CDB6C6E0024704A /* DataSource.framework */; };
 		5B7C6EC02CDB6C6E0024704A /* DataSource.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 5B7C6EBE2CDB6C6E0024704A /* DataSource.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		A83D2AB02D23BAFC007EC41F /* NearbyNetworkListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = A83D2AAF2D23BAFC007EC41F /* NearbyNetworkListener.swift */; };
@@ -51,6 +52,7 @@
 		00549AD52CEDDDB100DF8F6C /* MCSessionState+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MCSessionState+.swift"; sourceTree = "<group>"; };
 		00549AD72CEDDDCF00DF8F6C /* MCSession+.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MCSession+.swift"; sourceTree = "<group>"; };
 		0080E8672CE19EC40095B958 /* NearbyNetworkService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearbyNetworkService.swift; sourceTree = "<group>"; };
+		00CA7A0F2D2E08DA00116F9E /* NearbyNetworkProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearbyNetworkProtocol.swift; sourceTree = "<group>"; };
 		5B7C6E652CDB6A560024704A /* NearbyNetwork.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NearbyNetwork.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		5B7C6EBE2CDB6C6E0024704A /* DataSource.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = DataSource.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		A83D2AAF2D23BAFC007EC41F /* NearbyNetworkListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearbyNetworkListener.swift; sourceTree = "<group>"; };
@@ -107,6 +109,7 @@
 			isa = PBXGroup;
 			children = (
 				00549AD32CEDDDA300DF8F6C /* Common */,
+				00CA7A0F2D2E08DA00116F9E /* NearbyNetworkProtocol.swift */,
 				0080E8672CE19EC40095B958 /* NearbyNetworkService.swift */,
 				002DEC942D22A99F00ED7EE3 /* RefactoredNearbyNetworkService.swift */,
 				A83D2AAF2D23BAFC007EC41F /* NearbyNetworkListener.swift */,
@@ -297,6 +300,7 @@
 				A83D2AB22D23BE88007EC41F /* NearbyNetworkBrowser.swift in Sources */,
 				00549AD62CEDDDB700DF8F6C /* MCSessionState+.swift in Sources */,
 				A83D2AB02D23BAFC007EC41F /* NearbyNetworkListener.swift in Sources */,
+				00CA7A102D2E08DA00116F9E /* NearbyNetworkProtocol.swift in Sources */,
 				00549AD82CEDDDCF00DF8F6C /* MCSession+.swift in Sources */,
 				002DEC952D22A99F00ED7EE3 /* RefactoredNearbyNetworkService.swift in Sources */,
 				0080E86A2CE19EC40095B958 /* NearbyNetworkService.swift in Sources */,

NearbyNetwork/NearbyNetwork/Sources/NearbyNetworkBrowser.swift

@@ -5,31 +5,45 @@
 //  Created by 최정인 on 12/31/24.
 //
 
+import DataSource
 import Foundation
 import Network
 import OSLog
 
 public protocol NearbyNetworkBrowserDelegate: AnyObject {
     func nearbyNetworkBrowserDidFindPeer(
         _ sender: NearbyNetworkBrowser,
-        hostName: String,
-        connectedPeerInfo: [String])
+        foundPeers: [RefactoredNetworkConnection])
 }
 
 public final class NearbyNetworkBrowser {
     private let nwBrowser: NWBrowser
     private let browserQueue: DispatchQueue
     private let serviceType: String
     private let logger: Logger
+    private var foundPeers: [RefactoredNetworkConnection: NWEndpoint] {
+        didSet {
+            let foundPeers = foundPeers
+                .keys
+                .sorted(by: { $0.name < $1.name })
+            delegate?.nearbyNetworkBrowserDidFindPeer(self, foundPeers: Array(foundPeers))
+        }
+    }
     weak var delegate: NearbyNetworkBrowserDelegate?
 
     init(serviceType: String) {
+        let option = NWProtocolFramer.Options(definition: NearbyNetworkProtocol.definition)
+        let parameter = NWParameters.tcp
+        parameter.defaultProtocolStack
+            .applicationProtocols
+            .insert(option, at: 0)
         nwBrowser = NWBrowser(
             for: .bonjourWithTXTRecord(type: serviceType, domain: nil),
-            using: .tcp)
+            using: parameter)
         self.browserQueue = DispatchQueue.global()
         self.serviceType = serviceType
         self.logger = Logger()
+        self.foundPeers = [:]
         configure()
     }
 
@@ -38,30 +52,51 @@ public final class NearbyNetworkBrowser {
     }
 
     private func browserHandler(results: Set<NWBrowser.Result>, changes: Set<NWBrowser.Result.Change>) {
-        for result in results {
-            switch result.metadata {
-            case .bonjour(let foundedPeerData):
-                let dictionary = foundedPeerData.dictionary
-                guard
-                    let hostName = dictionary[NearbyNetworkKey.host.rawValue],
-                    let connectedPeerInfo = dictionary[NearbyNetworkKey.connectedPeerInfo.rawValue]
-                else {
-                    logger.log(level: .error, "connection의 데이터 값이 유효하지 않습니다.")
-                    return
-                }
-
-                delegate?.nearbyNetworkBrowserDidFindPeer(
-                        self,
-                        hostName: hostName,
-                        connectedPeerInfo: connectedPeerInfo
-                            .split(separator: ",")
-                            .map { String($0) })
+        for change in changes {
+            switch change {
+            case .added(let result):
+                guard let foundPeer = convertMetadata(metadata: result.metadata) else { return }
+                foundPeers[foundPeer] = result.endpoint
+            case .removed(let result):
+                guard let foundPeer = convertMetadata(metadata: result.metadata) else { return }
+                foundPeers[foundPeer] = nil
             default:
-                logger.log(level: .error, "알 수 없는 피어가 발견되었습니다.")
+                break
+            }
+        }
+    }
+
+    private func convertMetadata(metadata: NWBrowser.Result.Metadata) -> RefactoredNetworkConnection? {
+        switch metadata {
+        case .bonjour(let foundedPeerData):
+            let dictionary = foundedPeerData.dictionary
+            guard
+                let peerIDString = dictionary[NearbyNetworkKey.peerID.rawValue],
+                let peerID = UUID(uuidString: peerIDString),
+                let hostName = dictionary[NearbyNetworkKey.host.rawValue],
+                let connectedPeerInfo = dictionary[NearbyNetworkKey.connectedPeerInfo.rawValue]
+            else {
+                logger.log(level: .error, "connection의 데이터 값이 유효하지 않습니다.")
+                return nil
             }
+
+            let foundPeer = RefactoredNetworkConnection(
+                id: peerID,
+                name: hostName,
+                connectedPeerInfo: connectedPeerInfo
+                    .split(separator: ",")
+                    .map { String($0) })
+            return foundPeer
+        default:
+            logger.log(level: .error, "알 수 없는 피어가 발견되었습니다.")
+            return nil
         }
     }
 
+    func fetchFoundConnection(networkConnection: RefactoredNetworkConnection) -> NWEndpoint? {
+        return foundPeers[networkConnection]
+    }
+
     func startSearching() {
         nwBrowser.start(queue: browserQueue)
     }

NearbyNetwork/NearbyNetwork/Sources/NearbyNetworkKey.swift

@@ -6,6 +6,7 @@
 //
 
 public enum NearbyNetworkKey: String {
+    case peerID
     case host
     case connectedPeerInfo
 }

NearbyNetwork/NearbyNetwork/Sources/NearbyNetworkListener.swift

@@ -9,16 +9,45 @@ import Foundation
 import Network
 import OSLog
 
-final class NearbyNetworkListener {
+public protocol NearbyNetworkListenerDelegate: AnyObject {
+    /// 주변 기기와 연결에 성공하였을 때 실행됩니다.
+    /// - Parameters:
+    ///   - didConnect: 연결된 기기
+    func nearbyNetworkListener(_ sender: NearbyNetworkListener, didConnect connection: NWConnection)
+
+    /// 주변 기기와 연결이 끊겼을 때 실행됩니다.
+    /// - Parameters:
+    ///   - didDisconnect: 연결이 끊긴 기기
+    func nearbyNetworkListener(_ sender: NearbyNetworkListener, didDisconnect connection: NWConnection)
+
+    /// 주변 기기와 연결에 실패했을 때 실행됩니다.
+    /// - Parameters:
+    ///   - connection: 연결에 실패한 기기
+    func nearbyNetworkListenerCannotConnect(_ sender: NearbyNetworkListener, connection: NWConnection)
+}
+
+public final class NearbyNetworkListener {
+    weak var delegate: NearbyNetworkListenerDelegate?
     private var nwListener: NWListener?
     private let listenerQueue: DispatchQueue
+    private let peerID: UUID
     private let serviceName: String
     private let serviceType: String
     private let logger: Logger
 
-    init(serviceName: String, serviceType: String) {
-        nwListener = try? NWListener(using: .tcp)
+    init(
+        peerID: UUID,
+        serviceName: String,
+        serviceType: String
+    ) {
+        let option = NWProtocolFramer.Options(definition: NearbyNetworkProtocol.definition)
+        let parameter = NWParameters.tcp
+        parameter.defaultProtocolStack
+            .applicationProtocols
+            .insert(option, at: 0)
+        nwListener = try? NWListener(using: parameter)
         listenerQueue = DispatchQueue.global()
+        self.peerID = peerID
         self.serviceName = serviceName
         self.serviceType = serviceType
         self.logger = Logger()
@@ -27,12 +56,28 @@ final class NearbyNetworkListener {
 
     private func configure() {
         nwListener?.newConnectionHandler = { connection in
+            connection.stateUpdateHandler = { state in
+                switch state {
+                case .ready:
+                    self.logger.log(level: .debug, "\(connection.debugDescription)와 연결되었습니다.")
+                    self.delegate?.nearbyNetworkListener(self, didConnect: connection)
+                case .failed:
+                    self.logger.log(level: .debug, "\(connection.debugDescription)와 연결에 실패했습니다")
+                    self.delegate?.nearbyNetworkListenerCannotConnect(self, connection: connection)
+                case .cancelled:
+                    self.logger.log(level: .debug, "\(connection.debugDescription)와 연결이 끊어졌습니다.")
+                    self.delegate?.nearbyNetworkListener(self, didDisconnect: connection)
+                default:
+                    self.logger.log(level: .debug, "\(connection.debugDescription)와 연결 설정 중입니다.")
+                }
+            }
             connection.start(queue: self.listenerQueue)
         }
     }
 
     func startPublishing(hostName: String, connectedPeerInfo: [String]) {
         let connectionData = [
+            NearbyNetworkKey.peerID.rawValue: peerID.uuidString,
             NearbyNetworkKey.host.rawValue: hostName,
             NearbyNetworkKey.connectedPeerInfo.rawValue: connectedPeerInfo.joined(separator: ",")]
         let txtRecord = NWTXTRecord(connectionData)