Merge pull request #67 from boostcampwm-2024/feat/#40-create-room-2

[FEAT/#40] 방 생성 작업 2 진행중...

Author: youn9k

PhotoGether/DataLayer/PhotoGetherData/PhotoGetherData/CapturableVideoView.swift

@@ -0,0 +1,32 @@
+import Foundation
+import WebRTC
+
+public class CapturableVideoView: RTCMTLVideoView {
+    public var capturedImage: UIImage?
+
+    public override func setSize(_ size: CGSize) {
+        super.setSize(size)
+    }
+
+    public override func renderFrame(_ frame: RTCVideoFrame?) {
+        guard let frame = frame else { return }
+        
+        super.renderFrame(frame)
+        capturedImage = convertFrameToImage(frame)
+    }
+
+    private func convertFrameToImage(_ frame: RTCVideoFrame) -> UIImage? {
+        // frame의 버퍼를 CVPixelBuffer로 가져옴
+        guard let pixelBuffer = (frame.buffer as? RTCCVPixelBuffer)?.pixelBuffer else { return nil }
+        
+        // CVPixelBuffer를 CIImage로 변환
+        let ciImage = CIImage(cvPixelBuffer: pixelBuffer).oriented(.right)
+        
+        // CIImage를 UIImage로 변환
+        let context = CIContext(options: nil)
+        if let cgImage = context.createCGImage(ciImage, from: ciImage.extent) {
+            return UIImage(cgImage: cgImage)
+        }
+        return nil
+    }
+}

PhotoGether/DataLayer/PhotoGetherData/PhotoGetherData/ConnectionClientImpl.swift

@@ -9,8 +9,8 @@ public final class ConnectionClientImpl: ConnectionClient {
 
     public var receivedDataPublisher = PassthroughSubject<Data, Never>()
 
-    public var remoteVideoView: UIView = RTCMTLVideoView()
-    public var localVideoView: UIView = RTCMTLVideoView()
+    public var remoteVideoView: UIView = CapturableVideoView()
+    public var localVideoView: UIView = CapturableVideoView()
 
     public var peerID: String = ""
     public var roomID: String = ""
@@ -40,6 +40,27 @@ public final class ConnectionClientImpl: ConnectionClient {
         self.webRTCService.sendData(data)
     }
 
+    public func captureVideos() -> [UIImage] {
+        let localCaptureImage = getCapturedVideos(isLocal: true)
+        let remoteCaptureImage = getCapturedVideos(isLocal: false)
+        
+        return [localCaptureImage, remoteCaptureImage]
+    }
+    
+    private func getCapturedVideos(isLocal: Bool) -> UIImage {
+        let targetVideo = isLocal ? self.localVideoView : self.remoteVideoView
+        
+        guard let videoView = targetVideo as? CapturableVideoView else {
+            return UIImage()
+        }
+        
+        guard let capturedImage = videoView.capturedImage else {
+            return UIImage()
+        }
+        
+        return capturedImage
+    }
+    
     private func connect() {
         self.signalingService.connect()
     }
@@ -112,7 +133,7 @@ extension ConnectionClientImpl: WebRTCServiceDelegate {
     ) {
         // TODO: 피어커넥션 연결 상태 변경에 따른 처리
     }
-
+    
     /// peerConnection의 remoteDataChannel 에 데이터가 수신되면 호출됨
     public func webRTCService(
         _ service: WebRTCService,

PhotoGether/DataLayer/PhotoGetherData/PhotoGetherData/Interface/DTO/RequestDTO/RoomRequestDTO.swift

@@ -5,8 +5,9 @@ struct RoomRequestDTO: WebSocketRequestable {
     var messageType: RoomMessageType
     var message: Data?
 
-    init(messageType: RoomMessageType, body: Data? = nil) {
+    init(messageType: RoomMessageType, message: Data? = nil) {
         self.messageType = messageType
+        self.message = message
     }
 
     enum RoomMessageType: String, Encodable {

PhotoGether/DataLayer/PhotoGetherData/PhotoGetherData/Interface/DTO/RequestDTO/SignalingRequestDTO.swift

@@ -5,8 +5,9 @@ struct SignalingRequestDTO: WebSocketRequestable {
     var messageType: SignalingMessageType
     var message: Data?
 
-    init(messageType: SignalingMessageType = .signaling, body: Data? = nil) {
+    init(messageType: SignalingMessageType = .signaling, message: Data? = nil) {
         self.messageType = messageType
+        self.message = message
     }
 
     enum SignalingMessageType: String, Encodable {

PhotoGether/DataLayer/PhotoGetherData/PhotoGetherData/Interface/DTO/ResponseDTO/CreateRoomResponseDTO.swift renamed to PhotoGether/DataLayer/PhotoGetherData/PhotoGetherData/Interface/DTO/ResponseDTO/RoomResponseDTO.swift

@@ -6,7 +6,7 @@ public final class RoomServiceImpl: RoomService {
     private let encoder = JSONEncoder()
     private var webSocketClient: WebSocketClient
 
-    init(webSocketClient: WebSocketClient) {
+    public init(webSocketClient: WebSocketClient) {
         self.webSocketClient = webSocketClient
     }
 

PhotoGether/DataLayer/PhotoGetherData/PhotoGetherData/ServiceImpl/RoomServiceImpl.swift

@@ -21,7 +21,10 @@ final public class SignalingServiceImpl: SignalingService {
         let message = SignalingMessage.sdp(SessionDescription(from: rtcSdp, peerID: peerID, roomID: roomID))
         do {
             let dataMessage = try self.encoder.encode(message)
-            self.webSocketClient.send(data: dataMessage)
+            let dto = SignalingRequestDTO(messageType: .signaling, message: dataMessage)
+            let request = try self.encoder.encode(dto)
+            
+            self.webSocketClient.send(data: request)
         } catch {
             debugPrint("Warning: Could not encode sdp: \(error)")
         }
@@ -31,7 +34,10 @@ final public class SignalingServiceImpl: SignalingService {
         let message = SignalingMessage.candidate(IceCandidate(from: rtcIceCandidate, peerID: peerID, roomID: roomID))
         do {
             let dataMessage = try self.encoder.encode(message)
-            self.webSocketClient.send(data: dataMessage)
+            let dto = SignalingRequestDTO(messageType: .signaling, message: dataMessage)
+            let request = try self.encoder.encode(dto)
+            
+            self.webSocketClient.send(data: request)
         } catch {
             debugPrint("Warning: Could not encode candidate: \(error)")
         }

PhotoGether/DataLayer/PhotoGetherData/PhotoGetherData/ServiceImpl/SignalingServiceImpl.swift

@@ -0,0 +1,17 @@
+import UIKit
+import PhotoGetherDomainInterface
+
+public final class CaptureVideosUseCaseImpl: CaptureVideosUseCase {
+    public func execute() -> [UIImage] {
+        let localImage = [connectionRepository.clients[0].captureVideos()[0]]
+        let remoteImages = connectionRepository.clients.map { $0.captureVideos()[1] }
+        
+        return localImage + remoteImages
+    }
+    
+    private let connectionRepository: ConnectionRepository
+    
+    public init(connectionRepository: ConnectionRepository) {
+        self.connectionRepository = connectionRepository
+    }
+}

PhotoGether/DomainLayer/PhotoGetherDomain/PhotoGetherDomain/UseCaseImpl/CaptureVideosUseCaseImpl.swift

@@ -0,0 +1,16 @@
+import Foundation
+import UIKit
+import PhotoGetherDomainInterface
+
+public final class GetLocalVideoUseCaseImpl: GetLocalVideoUseCase {
+    public func execute() -> UIView {
+        // TODO: 리포지토리에서 하나의 localVideoView만 들고 있도록 변경 예정
+        connectionRepository.clients[0].localVideoView
+    }
+    
+    private let connectionRepository: ConnectionRepository
+    
+    public init(connectionRepository: ConnectionRepository) {
+        self.connectionRepository = connectionRepository
+    }
+}

PhotoGether/DomainLayer/PhotoGetherDomain/PhotoGetherDomain/UseCaseImpl/GetLocalVideoUseCaseImpl.swift

@@ -0,0 +1,15 @@
+import Foundation
+import UIKit
+import PhotoGetherDomainInterface
+
+public final class GetRemoteVideoUseCaseImpl: GetRemoteVideoUseCase {
+    public func execute() -> [UIView] {
+        connectionRepository.clients.map { $0.remoteVideoView }
+    }
+    
+    private let connectionRepository: ConnectionRepository
+    
+    public init(connectionRepository: ConnectionRepository) {
+        self.connectionRepository = connectionRepository
+    }
+}