Add availability conditional for URL init

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