Merge pull request #1417 from greenart7c3/main

Change BasicOkHttpWebSocket to be like the docs
This commit is contained in:
Vitor Pamplona
2025-08-18 13:27:52 -04:00
committed by GitHub

View File

@@ -30,7 +30,7 @@ import okhttp3.Response
class BasicOkHttpWebSocket( class BasicOkHttpWebSocket(
val url: NormalizedRelayUrl, val url: NormalizedRelayUrl,
val httpClient: OkHttpClient, val httpClient: (NormalizedRelayUrl) -> OkHttpClient,
val out: WebSocketListener, val out: WebSocketListener,
) : WebSocket { ) : WebSocket {
private var socket: okhttp3.WebSocket? = null private var socket: okhttp3.WebSocket? = null
@@ -74,7 +74,7 @@ class BasicOkHttpWebSocket(
) = out.onFailure(t, r?.code, r?.message) ) = out.onFailure(t, r?.code, r?.message)
} }
socket = httpClient.newWebSocket(request, listener) socket = httpClient(url).newWebSocket(request, listener)
} }
override fun disconnect() { override fun disconnect() {
@@ -85,7 +85,7 @@ class BasicOkHttpWebSocket(
override fun send(msg: String): Boolean = socket?.send(msg) ?: false override fun send(msg: String): Boolean = socket?.send(msg) ?: false
class Builder( class Builder(
val httpClient: OkHttpClient, val httpClient: (NormalizedRelayUrl) -> OkHttpClient,
) : WebsocketBuilder { ) : WebsocketBuilder {
// Called when connecting. // Called when connecting.
override fun build( override fun build(