Add availability conditional for URL init

vapor · Apr 22, 2024 · cb04a37 · cb04a37
1 parent 24ea66e
commit cb04a37
Showing 1 changed file with 25 additions and 12 deletions.
diff --git a/Sources/WebSocketKit/WebSocket+Connect.swift b/Sources/WebSocketKit/WebSocket+Connect.swift
@@ -20,19 +20,32 @@ extension WebSocket {
         on eventLoopGroup: EventLoopGroup,
         onUpgrade: @Sendable @escaping (WebSocket) -> ()
     ) -> EventLoopFuture<Void> {
-        guard
-            url.hasPrefix("ws://") || url.hasPrefix("wss://"),
-            let url = URL(string: url)
-        else {
-            return eventLoopGroup.any().makeFailedFuture(WebSocketClient.Error.invalidURL)
+        if #available(iOS 17.0, macOS 14.0, tvOS 17.0, watchOS 10.0, visionOS 1.0, *) {
+            guard let url = URL(
+                string: url,
+                encodingInvalidCharacters: false
+            ) else {
+                return eventLoopGroup.any().makeFailedFuture(WebSocketClient.Error.invalidURL)
+            }
+            return self.connect(
+                to: url,
+                headers: headers,
+                configuration: configuration,
+                on: eventLoopGroup,
+                onUpgrade: onUpgrade
+            )
+        } else {
+            guard let url = URL(string: url) else {
+                return eventLoopGroup.any().makeFailedFuture(WebSocketClient.Error.invalidURL)
+            }
+            return self.connect(
+                to: url,
+                headers: headers,
+                configuration: configuration,
+                on: eventLoopGroup,
+                onUpgrade: onUpgrade
+            )
         }
-        return self.connect(
-            to: url,
-            headers: headers,
-            configuration: configuration,
-            on: eventLoopGroup,
-            onUpgrade: onUpgrade
-        )
     }
 
     /// Establish a WebSocket connection.