From 95aade3795aff84224171e54fa8344ec86349a31 Mon Sep 17 00:00:00 2001 From: Thomas Ricouard Date: Fri, 3 Feb 2023 19:48:57 +0100 Subject: [PATCH] Fix Client --- Packages/Network/Sources/Network/Client.swift | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Packages/Network/Sources/Network/Client.swift b/Packages/Network/Sources/Network/Client.swift index 2a5b7754..d8276a07 100644 --- a/Packages/Network/Sources/Network/Client.swift +++ b/Packages/Network/Sources/Network/Client.swift @@ -67,10 +67,13 @@ public class Client: ObservableObject, Equatable, Identifiable, Hashable { } } - private func makeURL(scheme: String = "https", endpoint: Endpoint, forceVersion: Version? = nil) -> URL { + private func makeURL(scheme: String = "https", + endpoint: Endpoint, + forceVersion: Version? = nil, + forceServer: String? = nil) -> URL { var components = URLComponents() components.scheme = scheme - components.host = server + components.host = forceServer ?? server if type(of: endpoint) == Oauth.self { components.path += "/\(endpoint.path())" } else { @@ -190,8 +193,8 @@ public class Client: ObservableObject, Equatable, Identifiable, Hashable { return token } - public func makeWebSocketTask(endpoint: Endpoint) -> URLSessionWebSocketTask { - let url = makeURL(scheme: "wss", endpoint: endpoint) + public func makeWebSocketTask(endpoint: Endpoint, instanceStreamingURL: URL?) -> URLSessionWebSocketTask { + let url = makeURL(scheme: "wss", endpoint: endpoint, forceServer: instanceStreamingURL?.host) let request = makeURLRequest(url: url, endpoint: endpoint, httpMethod: "GET") return urlSession.webSocketTask(with: request) }