From 8b187641b8e7d13c54495e5b49456922e3eda011 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 13 Aug 2021 15:34:44 +1000 Subject: [PATCH] Clean up TestCallConfig --- Session.xcodeproj/project.pbxproj | 8 +++--- SessionMessagingKit/Calls/CallManager.swift | 2 +- .../Calls/MockCallConfig.swift | 25 ------------------- .../Calls/MockCallServer.swift | 6 ++--- .../Calls/TestCallConfig.swift | 13 ++++++++++ 5 files changed, 21 insertions(+), 33 deletions(-) delete mode 100644 SessionMessagingKit/Calls/MockCallConfig.swift create mode 100644 SessionMessagingKit/Calls/TestCallConfig.swift diff --git a/Session.xcodeproj/project.pbxproj b/Session.xcodeproj/project.pbxproj index 1ae1439fe..3d49dac53 100644 --- a/Session.xcodeproj/project.pbxproj +++ b/Session.xcodeproj/project.pbxproj @@ -249,7 +249,7 @@ B8B320B7258C30D70020074B /* HTMLMetadata.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B320B6258C30D70020074B /* HTMLMetadata.swift */; }; B8B558EF26C4B56C00693325 /* VideoCallVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B558EE26C4B56C00693325 /* VideoCallVC.swift */; }; B8B558F126C4BB0600693325 /* CameraManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B558F026C4BB0600693325 /* CameraManager.swift */; }; - B8B558F326C4CA4600693325 /* MockCallConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B558F226C4CA4600693325 /* MockCallConfig.swift */; }; + B8B558F326C4CA4600693325 /* TestCallConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B558F226C4CA4600693325 /* TestCallConfig.swift */; }; B8B558F926C4CE6800693325 /* CallVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B558F826C4CE6800693325 /* CallVC.swift */; }; B8B558FB26C4D25C00693325 /* WebSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B558FA26C4D25C00693325 /* WebSocket.swift */; }; B8B558FD26C4D35400693325 /* MockCallServer.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8B558FC26C4D35400693325 /* MockCallServer.swift */; }; @@ -1225,7 +1225,7 @@ B8B320B6258C30D70020074B /* HTMLMetadata.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HTMLMetadata.swift; sourceTree = ""; }; B8B558EE26C4B56C00693325 /* VideoCallVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoCallVC.swift; sourceTree = ""; }; B8B558F026C4BB0600693325 /* CameraManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CameraManager.swift; sourceTree = ""; }; - B8B558F226C4CA4600693325 /* MockCallConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockCallConfig.swift; sourceTree = ""; }; + B8B558F226C4CA4600693325 /* TestCallConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestCallConfig.swift; sourceTree = ""; }; B8B558F826C4CE6800693325 /* CallVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CallVC.swift; sourceTree = ""; }; B8B558FA26C4D25C00693325 /* WebSocket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebSocket.swift; sourceTree = ""; }; B8B558FC26C4D35400693325 /* MockCallServer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockCallServer.swift; sourceTree = ""; }; @@ -2371,10 +2371,10 @@ B806ECA026C4A7E4008BDA44 /* CallManager+UI.swift */, B8B558FE26C4E05E00693325 /* CallManager+Messages.swift */, B806ECA226C4A8C6008BDA44 /* MockTURNServer.swift */, - B8B558F226C4CA4600693325 /* MockCallConfig.swift */, B8B558FC26C4D35400693325 /* MockCallServer.swift */, B8B5590026C4E2A400693325 /* SignalingMessage.swift */, B8B558FA26C4D25C00693325 /* WebSocket.swift */, + B8B558F226C4CA4600693325 /* TestCallConfig.swift */, ); path = Calls; sourceTree = ""; @@ -4761,7 +4761,7 @@ C32C5AAB256DBE8F003C73A2 /* TSIncomingMessage+Conversion.swift in Sources */, B866CE112581C1A900535CC4 /* Sodium+Conversion.swift in Sources */, C32C5A88256DBCF9003C73A2 /* MessageReceiver+Handling.swift in Sources */, - B8B558F326C4CA4600693325 /* MockCallConfig.swift in Sources */, + B8B558F326C4CA4600693325 /* TestCallConfig.swift in Sources */, C32C5C1B256DC9E0003C73A2 /* General.swift in Sources */, C32C5A02256DB658003C73A2 /* MessageSender+Convenience.swift in Sources */, B8566C6C256F60F50045A0B9 /* OWSUserProfile.m in Sources */, diff --git a/SessionMessagingKit/Calls/CallManager.swift b/SessionMessagingKit/Calls/CallManager.swift index 735d7f120..5994c9a00 100644 --- a/SessionMessagingKit/Calls/CallManager.swift +++ b/SessionMessagingKit/Calls/CallManager.swift @@ -23,7 +23,7 @@ public final class CallManager : NSObject, RTCPeerConnectionDelegate { /// remote peer, maintain and monitor the connection, and close the connection once it's no longer needed. internal lazy var peerConnection: RTCPeerConnection = { let configuration = RTCConfiguration() - configuration.iceServers = [ RTCIceServer(urlStrings: MockCallConfig.default.webRTCICEServers) ] + configuration.iceServers = [ RTCIceServer(urlStrings: TestCallConfig.defaultICEServers) ] configuration.sdpSemantics = .unifiedPlan let pcert = RTCCertificate.generate(withParams: [ "expires": NSNumber(value: 100000), "name": "RSASSA-PKCS1-v1_5" ]) configuration.certificate = pcert diff --git a/SessionMessagingKit/Calls/MockCallConfig.swift b/SessionMessagingKit/Calls/MockCallConfig.swift deleted file mode 100644 index 4613f600b..000000000 --- a/SessionMessagingKit/Calls/MockCallConfig.swift +++ /dev/null @@ -1,25 +0,0 @@ - -public struct MockCallConfig { - public let signalingServerURL: String - public let serverURL: String - public let webRTCICEServers: [String] - - private static let defaultSignalingServerURL = "ws://developereric.com:8080" - private static let defaultICEServers = [ - "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" - ] - private static let defaultServerURL = "https://appr.tc" - - private init(signalingServerURL: String, serverURL: String, webRTCICEServers: [String]) { - self.signalingServerURL = signalingServerURL - self.serverURL = serverURL - self.webRTCICEServers = webRTCICEServers - } - - public static let `default` = MockCallConfig(signalingServerURL: defaultSignalingServerURL, - serverURL: defaultServerURL, webRTCICEServers: defaultICEServers) -} diff --git a/SessionMessagingKit/Calls/MockCallServer.swift b/SessionMessagingKit/Calls/MockCallServer.swift index 2925507e7..f922db76a 100644 --- a/SessionMessagingKit/Calls/MockCallServer.swift +++ b/SessionMessagingKit/Calls/MockCallServer.swift @@ -13,15 +13,15 @@ public struct RoomInfo { public enum MockCallServer { private static func getRoomURL(for roomID: String) -> String { - let base = MockCallConfig.default.serverURL + "/join/" + let base = TestCallConfig.defaultServerURL + "/join/" return base + "\(roomID)" } private static func getLeaveURL(roomID: String, userID: String) -> String { - let base = MockCallConfig.default.serverURL + "/leave/" + let base = TestCallConfig.defaultServerURL + "/leave/" return base + "\(roomID)/\(userID)" } private static func getMessageURL(roomID: String, userID: String) -> String { - let base = MockCallConfig.default.serverURL + "/message/" + let base = TestCallConfig.defaultServerURL + "/message/" return base + "\(roomID)/\(userID)" } diff --git a/SessionMessagingKit/Calls/TestCallConfig.swift b/SessionMessagingKit/Calls/TestCallConfig.swift new file mode 100644 index 000000000..d461df08c --- /dev/null +++ b/SessionMessagingKit/Calls/TestCallConfig.swift @@ -0,0 +1,13 @@ + +public enum TestCallConfig { + + public static let defaultSignalingServerURL = "ws://developereric.com:8080" + public static let defaultICEServers = [ + "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" + ] + public static let defaultServerURL = "https://appr.tc" +}