Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ABW-2204] RadixConnect 🚀 Mainnet ready PROD servers 🚀 #720

Merged
merged 2 commits into from
Sep 6, 2023
Merged

[ABW-2204] RadixConnect 🚀 Mainnet ready PROD servers 🚀 #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae16dfc
Update RadixConnect server urls for PROD
CyonAlexRDX Sep 6, 2023
61b5cba
remove misleading and potentially dangerous default value hardcoding …
CyonAlexRDX Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 23 additions & 6 deletions Sources/RadixConnect/RadixConnect/RTC/Infrastructure/WebRTC/WebRTCFactory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,32 @@ struct WebRTCFactory: PeerConnectionFactory {
}()

static let turnServers: [RTCIceServer] = {
func at(_ urlString: String) -> RTCIceServer {
RTCIceServer(
urlStrings: [
urlString,
],
username: "username",
credential: "password",
tlsCertPolicy: .insecureNoCheck // FIXME: change this?
)
}

#if DEBUG
[
RTCIceServer(urlStrings: ["turn:turn-dev-udp.rdx-works-main.extratools.works:80?transport=udp"], username: "username", credential: "password", tlsCertPolicy: .insecureNoCheck),
RTCIceServer(urlStrings: ["turn:turn-dev-tcp.rdx-works-main.extratools.works:80?transport=tcp"], username: "username", credential: "password", tlsCertPolicy: .insecureNoCheck),

return [
// UDP
at("turn:turn-dev-udp.rdx-works-main.extratools.works:80?transport=udp"),
// TCP
at("turn:turn-dev-tcp.rdx-works-main.extratools.works:80?transport=tcp"),
]
#else
[
RTCIceServer(urlStrings: ["turn:turn-rcnet-udp.radixdlt.com:80?transport=udp"], username: "username", credential: "password", tlsCertPolicy: .insecureNoCheck),
RTCIceServer(urlStrings: ["turn:turn-rcnet-tcp.radixdlt.com:80?transport=tcp"], username: "username", credential: "password", tlsCertPolicy: .insecureNoCheck),

return [
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

// UDP
at("turn:turn-udp.radixdlt.com:80?transport=udp"),
// TCP
at("turn:turn-tcp.radixdlt.com:80?transport=tcp"),
]
#endif
}()
Expand Down
8 changes: 4 additions & 4 deletions Sources/RadixConnect/RadixConnect/RTC/RTCClients.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ public actor RTCClients {
private var clients: [RTCClient.ID: RTCClient] = [:]

// MARK: - Initializers

init(peerConnectionFactory: PeerConnectionFactory,
signalingServerBaseURL: URL = SignalingClient.default)
{
init(
peerConnectionFactory: PeerConnectionFactory,
signalingServerBaseURL: URL = SignalingClient.default
) {
self.peerConnectionFactory = peerConnectionFactory
self.signalingServerBaseURL = signalingServerBaseURL
}
Expand Down
9 changes: 5 additions & 4 deletions Sources/RadixConnect/RadixConnect/RTC/SignalingClient/SignalingClientFactory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ import Prelude
import RadixConnectModels

extension SignalingClient {
init(password: ConnectionPassword, source: ClientSource = .wallet, baseURL: URL = SignalingClient.prodSignalingServer) throws {
init(
password: ConnectionPassword,
source: ClientSource = .wallet,
baseURL: URL
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

potentially dangerous, we defaulted to prodSignalingServer - however unused, but best be on the safe side.

) throws {
let connectionURL = try Self.signalingServerURL(connectionPassword: password, source: source, baseURL: baseURL)
let webSocket = AsyncWebSocket(url: connectionURL)
let encryptionKey = try EncryptionKey(.init(data: password.data.data))
Expand All @@ -14,9 +18,6 @@ extension SignalingClient {

/// Connection URL
extension SignalingClient {
static let prodSignalingServer = RadixConnectConstants.prodSignalingServer
static let devSignalingServer = RadixConnectConstants.devSignalingServer

static let `default` = RadixConnectConstants.defaultSignalingServer
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/RadixConnect/RadixConnectModels/RadixConnectConstants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ public enum RadixConnectConstants {}

extension RadixConnectConstants {
/// Connection URL
public static let prodSignalingServer = URL(string: "wss://signaling-server-rcnet.radixdlt.com")!
public static let prodSignalingServer = URL(string: "wss://signaling-server.radixdlt.com")!
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀


public static let devSignalingServer = URL(string: "wss://signaling-server-dev.rdx-works-main.extratools.works")!

Expand Down
Loading