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

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

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

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

@@ -5,7 +5,7 @@ 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
     }
 

PhotoGether/DataLayer/PhotoGetherData/PhotoGetherData/ServiceImpl/RoomServiceImpl.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/SignalingServiceImpl.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/DomainLayer/PhotoGetherDomain/PhotoGetherDomain/UseCaseImpl/GetLocalVideoUseCaseImpl.swift

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

PhotoGether/DomainLayer/PhotoGetherDomain/PhotoGetherDomain/UseCaseImpl/GetRemoteVideoUseCaseImpl.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
+    }
+}

PhotoGether/DomainLayer/PhotoGetherDomain/PhotoGetherDomain/UseCaseImpl/SendOfferUseCaseImpl.swift

@@ -0,0 +1,16 @@
+import Foundation
+import PhotoGetherDomainInterface
+
+public final class SendOfferUseCaseImpl: SendOfferUseCase {
+    public func execute() {
+        // TODO: 특정 Peer에게만 Offer를 보내도록 수정해야 함
+        guard let client = repository.clients.first else { return }
+        client.sendOffer()
+    }
+
+    private let repository: ConnectionRepository
+
+    init(repository: ConnectionRepository) {
+        self.repository = repository
+    }
+}

PhotoGether/DomainLayer/PhotoGetherDomain/PhotoGetherDomainInterface/UseCase/GetLocalVideoUseCase.swift

@@ -0,0 +1,6 @@
+import Foundation
+import UIKit
+
+public protocol GetLocalVideoUseCase {
+    func execute() -> UIView
+}

PhotoGether/DomainLayer/PhotoGetherDomain/PhotoGetherDomainInterface/UseCase/GetRemoteVideoUseCase.swift

@@ -0,0 +1,6 @@
+import Foundation
+import UIKit
+
+public protocol GetRemoteVideoUseCase {
+    func execute() -> [UIView]
+}

PhotoGether/DomainLayer/PhotoGetherDomain/PhotoGetherDomainInterface/UseCase/SendOfferUseCase.swift

@@ -0,0 +1,5 @@
+import Foundation
+
+public protocol SendOfferUseCase {
+    func execute()
+}

PhotoGether/PresentationLayer/WaitingRoomFeature/WaitingRoomFeature.xcodeproj/project.pbxproj

@@ -18,8 +18,6 @@
 		6075676A2CEDA2E6001110DB /* PhotoGetherData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 607567692CEDA2E6001110DB /* PhotoGetherData.framework */; };
 		6075676B2CEDA2E6001110DB /* PhotoGetherData.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 607567692CEDA2E6001110DB /* PhotoGetherData.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		7B17455F2CE49EB100E01D1A /* WebRTC in Frameworks */ = {isa = PBXBuildFile; productRef = 7B17455E2CE49EB100E01D1A /* WebRTC */; };
-		7B5951062CDB597600B89C85 /* FeatureTesting.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B5951052CDB597600B89C85 /* FeatureTesting.framework */; };
-		7B5951072CDB597600B89C85 /* FeatureTesting.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7B5951052CDB597600B89C85 /* FeatureTesting.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		7B5951462CDB5FF200B89C85 /* BaseFeature.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B5951452CDB5FF200B89C85 /* BaseFeature.framework */; };
 		7B5951472CDB5FF200B89C85 /* BaseFeature.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 7B5951452CDB5FF200B89C85 /* BaseFeature.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		7B5951C92CDB656D00B89C85 /* PhotoGetherDomainInterface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B5951C82CDB656D00B89C85 /* PhotoGetherDomainInterface.framework */; };
@@ -45,7 +43,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				7B5951072CDB597600B89C85 /* FeatureTesting.framework in Embed Frameworks */,
 				6013799E2CDB4B4500CA430A /* WaitingRoomFeature.framework in Embed Frameworks */,
 				60348F302CE48F02002D1CEE /* PhotoGetherDomain.framework in Embed Frameworks */,
 				6075676B2CEDA2E6001110DB /* PhotoGetherData.framework in Embed Frameworks */,
@@ -129,7 +126,6 @@
 			files = (
 				6075676A2CEDA2E6001110DB /* PhotoGetherData.framework in Frameworks */,
 				7B17455F2CE49EB100E01D1A /* WebRTC in Frameworks */,
-				7B5951062CDB597600B89C85 /* FeatureTesting.framework in Frameworks */,
 				6013799D2CDB4B4500CA430A /* WaitingRoomFeature.framework in Frameworks */,
 				60348F2F2CE48F02002D1CEE /* PhotoGetherDomain.framework in Frameworks */,
 				60348F342CE49013002D1CEE /* PhotoGetherNetwork.framework in Frameworks */,

PhotoGether/PresentationLayer/WaitingRoomFeature/WaitingRoomFeatureDemo/App/SceneDelegate.swift

@@ -1,8 +1,9 @@
-import PhotoGetherDomainInterface
-import PhotoGetherData
+import UIKit
 import PhotoGetherNetwork
+import PhotoGetherData
+import PhotoGetherDomainInterface
+import PhotoGetherDomain
 import WaitingRoomFeature
-import UIKit
 
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     var window: UIWindow?
@@ -18,15 +19,24 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         debugPrint("SignalingServer URL: \(url)")
 
         let webScoketClient: WebSocketClient = WebSocketClientImpl(url: url)
-        let signalingService: SignalingService = SignalingServiceImpl(webSocketClient: webScoketClient)
-
-        let webRTCService: WebRTCService = WebRTCServiceImpl(iceServers: [
-            "stun:stun.l.google.com:19302",
-            "stun:stun1.l.google.com:19302",
-            "stun:stun2.l.google.com:19302",
-            "stun:stun3.l.google.com:19302",
-            "stun:stun4.l.google.com:19302"
-        ])
+
+        let roomService: RoomService = RoomServiceImpl(
+            webSocketClient: webScoketClient
+        )
+
+        let signalingService: SignalingService = SignalingServiceImpl(
+            webSocketClient: webScoketClient
+        )
+
+        let webRTCService: WebRTCService = WebRTCServiceImpl(
+            iceServers: [
+                "stun:stun.l.google.com:19302",
+                "stun:stun1.l.google.com:19302",
+                "stun:stun2.l.google.com:19302",
+                "stun:stun3.l.google.com:19302",
+                "stun:stun4.l.google.com:19302"
+            ]
+        )
 
         let connectionClient: ConnectionClient = ConnectionClientImpl(
             signalingService: signalingService,

PhotoGetherServer/PhotoGetherServer/Sources/App/DTO/RequestDTO/RoomRequestDTO.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+struct RoomRequestDTO: WebSocketRequestable {
+    var messageType: RoomMessageType
+    var message: Data?
+
+    init(messageType: RoomMessageType, body: Data? = nil) {
+        self.messageType = messageType
+    }
+
+    enum RoomMessageType: String, Decodable {
+        case createRoom
+        case joinRoom
+    }
+}

PhotoGetherServer/PhotoGetherServer/Sources/App/DTO/RequestDTO/SignalingRequestDTO.swift

@@ -0,0 +1,14 @@
+import Foundation
+
+struct SignalingRequestDTO: WebSocketRequestable {
+    var messageType: SignalingMessageType
+    var message: Data?
+
+    init(messageType: SignalingMessageType = .signaling, body: Data? = nil) {
+        self.messageType = messageType
+    }
+
+    enum SignalingMessageType: String, Decodable {
+        case signaling
+    }
+}

PhotoGetherServer/PhotoGetherServer/Sources/App/DTO/RequestDTO/WebSocketRequestType.swift

@@ -0,0 +1,5 @@
+import Foundation
+
+struct WebSocketRequestType: Decodable {
+    let type: String
+}

PhotoGetherServer/PhotoGetherServer/Sources/App/DTO/ResponseDTO/RoomResponseDTO.swift

@@ -0,0 +1,11 @@
+import Foundation
+
+struct RoomResponseDTO: WebSocketRequestable {
+    var messageType: RoomMessageType
+    var message: Data?
+
+    enum RoomMessageType: String, Decodable {
+        case createRoom
+        case joinRoom
+    }
+}

PhotoGetherServer/PhotoGetherServer/Sources/App/Model/Room.swift

@@ -1,25 +1,23 @@
-struct Room {
+final class Room {
     private var users: [User] = []
     private var maxCount: Int = 4
     let roomID: String
 
-
     init(roomID: String) {
         self.roomID = roomID
     }
 
     @discardableResult
-    mutating func invite(user: User) -> Bool {
+    func invite(user: User) -> Bool {
         guard users.count < maxCount else { return false }
         users.append(user)
         return true
     }
 
     @discardableResult
-    mutating func kick(userID: String) -> Bool {
+    func kick(userID: String) -> Bool {
         let filtered = users.filter { $0.id != userID }
         users = filtered
         return filtered.isEmpty // 필터에 걸렸으면 찾은 것
     }
-
 }

PhotoGetherServer/PhotoGetherServer/Sources/App/Model/RoomManager.swift

@@ -1,9 +1,9 @@
 import Vapor
 
-struct RoomManager {
+final class RoomManager {
     private var rooms: [Room] = []
 
-    mutating func createRoom(_ client: WebSocket) -> (roomID: String, userID: String) {
+    func createRoom(_ client: WebSocket) -> (roomID: String, userID: String) {
         let roomID = randomRoomID()
         let userID = randomUserID()
 
@@ -16,7 +16,6 @@ struct RoomManager {
         return (roomID, userID)
     }
 
-
     private func randomRoomID() -> String {
         return "room-\(UUID().uuidString)"
     }

PhotoGetherServer/PhotoGetherServer/Sources/App/Model/WebSocketRequestable.swift

@@ -0,0 +1,7 @@
+import Foundation
+
+public protocol WebSocketRequestable: Decodable {
+    associatedtype ResponseType: Decodable
+    var messageType: ResponseType { get }
+    var message: Data? { get }
+}

PhotoGetherServer/PhotoGetherServer/Sources/App/Model/WebSocketResponsable.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+public protocol WebSocketResponsable: Encodable {
+    associatedtype RequestType: Encodable
+    var messageType: RequestType { get }
+    var message: Data? { get }
+
+    func toData(encoder: JSONEncoder) -> Data?
+}
+
+public extension WebSocketResponsable {
+    func toData(encoder: JSONEncoder) -> Data? {
+        return try? encoder.encode(self)
+    }
+}

PhotoGetherServer/PhotoGetherServer/Sources/App/configure.swift

@@ -1,10 +1,6 @@
 import Vapor
 
-// configures your application
 public func configure(_ app: Application) async throws {
-    // uncomment to serve files from /Public folder
-    // app.middleware.use(FileMiddleware(publicDirectory: app.directory.publicDirectory))
-    // register routes
     app.http.server.configuration.hostname = "0.0.0.0"
     app.http.server.configuration.port = 8080
     try routes(app)

PhotoGetherServer/PhotoGetherServer/Sources/App/entrypoint.swift

@@ -10,13 +10,6 @@ enum Entrypoint {
         try LoggingSystem.bootstrap(from: &env)
 
         let app = try await Application.make(env)
-
-        // This attempts to install NIO as the Swift Concurrency global executor.
-        // You can enable it if you'd like to reduce the amount of context switching between NIO and Swift Concurrency.
-        // Note: this has caused issues with some libraries that use `.wait()` and cleanly shutting down.
-        // If enabled, you should be careful about calling async functions before this point as it can cause assertion failures.
-        // let executorTakeoverSuccess = NIOSingletons.unsafeTryInstallSingletonPosixEventLoopGroupAsConcurrencyGlobalExecutor()
-        // app.logger.debug("Tried to install SwiftNIO's EventLoopGroup as Swift's global concurrency executor", metadata: ["success": .stringConvertible(executorTakeoverSuccess)])
 
         do {
             try await configure(app)

PhotoGetherServer/PhotoGetherServer/Sources/App/routes.swift

@@ -1,6 +1,9 @@
+import Foundation
 import Vapor
 
 var roomManager = RoomManager()
+let decoder = JSONDecoder()
+let encoder = JSONEncoder()
 
 func routes(_ app: Application) throws {
     var connectedClients = [WebSocket]()
@@ -14,14 +17,36 @@ func routes(_ app: Application) throws {
 
         // 클라이언트로부터 데이터를 수신할 때 호출
         client.onBinary { client, data in
-
+            print("Received binary data of size: \(data.readableBytes)")
             // TODO: 1. data -> JSON으로 디코딩
+            guard let requestType = try? decoder.decode(WebSocketRequestType.self, from: data) else {
+                print("Decode Failed to WebSocketRequestType: \(data)")
+                return
+            }
+
+            switch requestType.type {
+            case "signaling":
+                guard let request = try? decoder.decode(SignalingRequestDTO.self, from: data) else {
+                    print("Decode Failed to SignalingRequestDTO: \(data)")
+                    return
+                }
+
+                guard let data = request.message else {
+                    print("Message is Nil")
+                    return
+                }
+
+                connectedClients
+                    .filter { $0 !== client }
+                    .forEach { $0.send(data) }
+            default:
+                print("Unknown request message type: \(requestType.type)")
+            }
             // TODO: 2. type을 보고 수행할 명령을 선택
 
-            print("Received binary data of size: \(data.readableBytes)")
-            connectedClients
-                .filter { $0 !== client }
-                .forEach { $0.send(data) }
+//            connectedClients
+//                .filter { $0 !== client }
+//                .forEach { $0.send(data) }
         }
 
         // 클라이언트가 연결을 종료할 때 호출