Revert "Use URL type internally instead of string"

This reverts commit e8d6e9b.
livekit · Aug 21, 2024 · 0c6b968 · 0c6b968
1 parent 2f9ad28
commit 0c6b968
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 61 deletions.
diff --git a/Sources/LiveKit/Core/Room+Engine.swift b/Sources/LiveKit/Core/Room+Engine.swift
@@ -233,7 +233,7 @@ public enum StartReconnectReason {
 // Room+ConnectSequences
 extension Room {
     // full connect sequence, doesn't update connection state
-    func fullConnectSequence(_ url: URL, _ token: String) async throws {
+    func fullConnectSequence(_ url: String, _ token: String) async throws {
         let connectResponse = try await signalClient.connect(url,
                                                              token,
                                                              connectOptions: _state.connectOptions,

diff --git a/Sources/LiveKit/Core/Room.swift b/Sources/LiveKit/Core/Room.swift
@@ -77,7 +77,7 @@ public class Room: NSObject, ObservableObject, Loggable {
 
     // expose engine's vars
     @objc
-    public var url: String? { _state.url?.absoluteString }
+    public var url: String? { _state.url }
 
     @objc
     public var token: String? { _state.token }
@@ -134,7 +134,7 @@ public class Room: NSObject, ObservableObject, Loggable {
         var serverInfo: Livekit_ServerInfo?
 
         // Engine
-        var url: URL?
+        var url: String?
         var token: String?
         // preferred reconnect mode which will be used only for next attempt
         var nextReconnectMode: ReconnectMode?
@@ -283,12 +283,7 @@ public class Room: NSObject, ObservableObject, Loggable {
                         connectOptions: ConnectOptions? = nil,
                         roomOptions: RoomOptions? = nil) async throws
     {
-        guard let url = URL(string: url), url.isValidForSocket else {
-            log("URL parse failed", .error)
-            throw LiveKitError(.failedToParseUrl)
-        }
-
-        log("Connecting to room...", .info)
+        log("connecting to room...", .info)
 
         var state = _state.copy()
 

diff --git a/Sources/LiveKit/Core/SignalClient.swift b/Sources/LiveKit/Core/SignalClient.swift
@@ -110,7 +110,7 @@ actor SignalClient: Loggable {
     }
 
     @discardableResult
-    func connect(_ url: URL,
+    func connect(_ urlString: String,
                  _ token: String,
                  connectOptions: ConnectOptions? = nil,
                  reconnectMode: ReconnectMode? = nil,
@@ -122,11 +122,14 @@ actor SignalClient: Loggable {
             log("[Connect] mode: \(String(describing: reconnectMode))")
         }
 
-        let url = try Utils.buildUrl(url,
-                                     token,
-                                     connectOptions: connectOptions,
-                                     reconnectMode: reconnectMode,
-                                     adaptiveStream: adaptiveStream)
+        guard let url = Utils.buildUrl(urlString,
+                                       token,
+                                       connectOptions: connectOptions,
+                                       reconnectMode: reconnectMode,
+                                       adaptiveStream: adaptiveStream)
+        else {
+            throw LiveKitError(.failedToParseUrl)
+        }
 
         if reconnectMode != nil {
             log("[Connect] with url: \(url)")
@@ -176,11 +179,14 @@ actor SignalClient: Loggable {
             await cleanUp(withError: error)
 
             // Validate...
-            let validateUrl = try Utils.buildUrl(url,
-                                                 token,
-                                                 connectOptions: connectOptions,
-                                                 adaptiveStream: adaptiveStream,
-                                                 validate: true)
+            guard let validateUrl = Utils.buildUrl(urlString,
+                                                   token,
+                                                   connectOptions: connectOptions,
+                                                   adaptiveStream: adaptiveStream,
+                                                   validate: true)
+            else {
+                throw LiveKitError(.failedToParseUrl, message: "Failed to parse validation url")
+            }
 
             log("Validating with url: \(validateUrl)...")
             let validationResponse = try await HTTP.requestString(from: validateUrl)

diff --git a/Sources/LiveKit/Extensions/Primitives.swift b/Sources/LiveKit/Extensions/Primitives.swift
@@ -42,6 +42,12 @@ extension Bool {
     }
 }
 
+extension URL {
+    var isSecure: Bool {
+        scheme == "https" || scheme == "wss"
+    }
+}
+
 public extension Double {
     func rounded(to places: Int) -> Double {
         let divisor = pow(10.0, Double(places))

diff --git a/Sources/LiveKit/Extensions/URL.swift b/Sources/LiveKit/Extensions/URL.swift
diff --git a/Sources/LiveKit/Support/Utils.swift b/Sources/LiveKit/Support/Utils.swift
@@ -128,34 +128,34 @@ class Utils {
     }
 
     static func buildUrl(
-        _ url: URL,
+        _ url: String,
         _ token: String,
         connectOptions: ConnectOptions? = nil,
         reconnectMode: ReconnectMode? = nil,
         adaptiveStream: Bool,
         validate: Bool = false,
         forceSecure: Bool = false
-    ) throws -> URL {
+    ) -> URL? {
         // use default options if nil
         let connectOptions = connectOptions ?? ConnectOptions()
 
-        let components = URLComponents(url: url, resolvingAgainstBaseURL: false)
+        guard let parsedUrl = URL(string: url) else { return nil }
 
-        guard var builder = components else {
-            throw LiveKitError(.failedToParseUrl)
-        }
+        let components = URLComponents(url: parsedUrl, resolvingAgainstBaseURL: false)
+
+        guard var builder = components else { return nil }
 
-        let useSecure = url.isSecure || forceSecure
+        let useSecure = parsedUrl.isSecure || forceSecure
         let httpScheme = useSecure ? "https" : "http"
         let wsScheme = useSecure ? "wss" : "ws"
 
-        var pathSegments = url.pathComponents
+        var pathSegments = parsedUrl.pathComponents
         // strip empty & slashes
         pathSegments.removeAll(where: { $0.isEmpty || $0 == "/" })
 
         // if already ending with `rtc` or `validate`
         // and is not a dir, remove it
-        if !url.hasDirectoryPath,
+        if !parsedUrl.hasDirectoryPath,
            !pathSegments.isEmpty,
            ["rtc", "validate"].contains(pathSegments.last!)
         {
@@ -196,11 +196,7 @@ class Utils {
 
         builder.queryItems = queryItems
 
-        guard let result = builder.url else {
-            throw LiveKitError(.failedToParseUrl)
-        }
-
-        return result
+        return builder.url
     }
 
     static func computeVideoEncodings(