diff --git a/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/seankim.xcuserdatad/UserInterfaceState.xcuserstate b/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/seankim.xcuserdatad/UserInterfaceState.xcuserstate index fb308b4..bf5fa51 100644 Binary files a/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/seankim.xcuserdatad/UserInterfaceState.xcuserstate and b/AcaMate.xcodeproj/project.xcworkspace/xcuserdata/seankim.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/AcaMate/0. Setup/SwiftUI_Prefix.swift b/AcaMate/0. Setup/SwiftUI_Prefix.swift index 06b4fe0..dcebf6c 100644 --- a/AcaMate/0. Setup/SwiftUI_Prefix.swift +++ b/AcaMate/0. Setup/SwiftUI_Prefix.swift @@ -14,7 +14,10 @@ public let WS_URL: String = "ws://localhost:5144" //#else #elseif DEV public let API_URL: String = "https://devacamate.ipstein.myds.me" -public let WS_URL: String = "wss://devacamate.ipstein.myds.me" +//public let WS_URL: String = "ws://devacamate.ipstein.myds.me" +public let WS_URL: String = "ws://192.168.0.71:5144" +//ipconfig getifaddr en0 이거는 와이파이 주소 알아내는거임 + #else public let API_URL: String = "https://acamate.ipstein.myds.me" public let WS_URL: String = "wss://acamate.ipstein.myds.me" diff --git a/AcaMate/5. Manager/APIManager.swift b/AcaMate/5. Manager/APIManager.swift index a561c0f..675279d 100644 --- a/AcaMate/5. Manager/APIManager.swift +++ b/AcaMate/5. Manager/APIManager.swift @@ -4,7 +4,7 @@ // // Created by Sean Kim on 11/26/24. // -// 이건 컨트롤러일까 매니저일까? + import Foundation import Combine @@ -14,7 +14,7 @@ import Alamofire public func loadAPIData(url: String, path: String, method: HTTPMethod = .get, parameters: [String: String], - headers: HTTPHeaders = [:], + headers: HTTPHeaders = [:],//["Accept": "application/json"], decodingType: T.Type) -> Future { return Future { promise in AF.request("\(url)\(path)", diff --git a/AcaMate/5. Manager/WebSocketManager.swift b/AcaMate/5. Manager/WebSocketManager.swift index 0b750bf..5afc0d5 100644 --- a/AcaMate/5. Manager/WebSocketManager.swift +++ b/AcaMate/5. Manager/WebSocketManager.swift @@ -17,6 +17,7 @@ class WebSocketManager: ObservableObject ,WebSocketDelegate { @Published var receivedMessage: [String] = [] init() { +// guard let url = URL(string: "wss://devacamate.ipstein.myds.me/chatHub?transport=webSockets") else { return } guard let url = URL(string: "\(WS_URL)/chatHub?transport=webSockets") else { return } // guard let url = URL(string: "\(API_URL)/chatHub?transport=websockets3") else { return } var request = URLRequest(url: url) @@ -41,7 +42,10 @@ class WebSocketManager: ObservableObject ,WebSocketDelegate { } func disconnect() { socket?.disconnect() - printLog("ClOSE SOCKET") + socket?.delegate = nil // 추가: delegate 해제 + socket = nil // 필요시, 소켓 객체 해제 + printLog("CLOSE SOCKET") + } func sendMessage(_ message: String) {