highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-20 14:01:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixing crash due to wrong relay url (spaces, wrong schema, etc)

Browse Source
This commit is contained in:
Vitor Pamplona
2023-01-29 23:27:48 -03:00
parent bba5afcdbf
commit 29b1a94ec4
1 changed files with 70 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
app/src/main/java/com/vitorpamplona/amethyst/service/relays/Relay.kt
View File

@@ -41,81 +41,87 @@ class Relay(
} }
fun requestAndWatch() { fun requestAndWatch() {
val request = Request.Builder().url(url.trim()).build() try {
val listener = object : WebSocketListener() { val request = Request.Builder().url(url.trim()).build()
val listener = object : WebSocketListener() {
override fun onOpen(webSocket: WebSocket, response: Response) { override fun onOpen(webSocket: WebSocket, response: Response) {
// Sends everything. // Sends everything.
Client.allSubscriptions().forEach { Client.allSubscriptions().forEach {
sendFilter(requestId = it) sendFilter(requestId = it)
}
listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT) }
} }
listeners.forEach { it.onRelayStateChange(this@Relay, Type.CONNECT) }
}
override fun onMessage(webSocket: WebSocket, text: String) { override fun onMessage(webSocket: WebSocket, text: String) {
try { try {
val msg = Event.gson.fromJson(text, JsonElement::class.java).asJsonArray val msg = Event.gson.fromJson(text, JsonElement::class.java).asJsonArray
val type = msg[0].asString val type = msg[0].asString
val channel = msg[1].asString val channel = msg[1].asString
when (type) { when (type) {
"EVENT" -> { "EVENT" -> {
eventDownloadCounter++ eventDownloadCounter++
val event = Event.fromJson(msg[2], Client.lenient) val event = Event.fromJson(msg[2], Client.lenient)
listeners.forEach { it.onEvent(this@Relay, channel, event) } listeners.forEach { it.onEvent(this@Relay, channel, event) }
}
"EOSE" -> listeners.forEach {
it.onRelayStateChange(this@Relay, Type.EOSE)
}
"NOTICE" -> listeners.forEach {
// "channel" being the second string in the string array ...
it.onError(this@Relay, channel, Error("Relay sent notice: $channel"))
}
"OK" -> listeners.forEach {
it.onSendResponse(this@Relay, msg[1].asString, msg[2].asBoolean, msg[3].asString)
}
else -> listeners.forEach {
it.onError(
this@Relay,
channel,
Error("Unknown type $type on channel $channel. Msg was $text")
)
}
} }
"EOSE" -> listeners.forEach { } catch (t: Throwable) {
it.onRelayStateChange(this@Relay, Type.EOSE) t.printStackTrace()
} text.chunked(2000) { chunked ->
"NOTICE" -> listeners.forEach { listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) }
// "channel" being the second string in the string array ...
it.onError(this@Relay, channel, Error("Relay sent notice: $channel"))
}
"OK" -> listeners.forEach {
it.onSendResponse(this@Relay, msg[1].asString, msg[2].asBoolean, msg[3].asString)
}
else -> listeners.forEach {
it.onError(
this@Relay,
channel,
Error("Unknown type $type on channel $channel. Msg was $text")
)
} }
} }
} catch (t: Throwable) { }
t.printStackTrace()
text.chunked(2000) { chunked -> override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
listeners.forEach { it.onError(this@Relay, "", Error("Problem with $chunked")) } listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECTING) }
}
override fun onClosed(webSocket: WebSocket, code: Int, reason: String) {
socket = null
closingTime = Date().time / 1000
listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT) }
}
override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
errorCounter++
socket?.close(1000, "Normal close")
// Failures disconnect the relay.
socket = null
closingTime = Date().time / 1000
Log.w("Relay", "Relay onFailure ${url}, ${response?.message}")
//t.printStackTrace()
listeners.forEach {
it.onError(this@Relay, "", Error("WebSocket Failure. Response: ${response}. Exception: ${t.message}", t))
} }
} }
} }
override fun onClosing(webSocket: WebSocket, code: Int, reason: String) { socket = httpClient.newWebSocket(request, listener)
listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECTING) } } catch (e: Exception) {
} closingTime = Date().time / 1000
Log.e("Relay", "Relay Invalid ${url}")
override fun onClosed(webSocket: WebSocket, code: Int, reason: String) { e.printStackTrace()
socket = null
closingTime = Date().time / 1000
listeners.forEach { it.onRelayStateChange(this@Relay, Type.DISCONNECT) }
}
override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
errorCounter++
socket?.close(1000, "Normal close")
// Failures disconnect the relay.
socket = null
closingTime = Date().time / 1000
Log.w("Relay", "Relay onFailure ${url}, ${response?.message}")
//t.printStackTrace()
listeners.forEach {
it.onError(this@Relay, "", Error("WebSocket Failure. Response: ${response}. Exception: ${t.message}", t))
}
}
} }
socket = httpClient.newWebSocket(request, listener)
} }
fun disconnect() { fun disconnect() {