highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-09-26 19:36:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes more random relay hint errors

Browse Source
This commit is contained in:
Vitor Pamplona
2025-07-30 17:31:24 -04:00
parent cf1d66bc01
commit bd7dba1a31
1 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
quartz/src/main/java/com/vitorpamplona/quartz/nip01Core/relay/normalizer/RelayUrlNormalizer.kt
View File

@@ -24,6 +24,7 @@ import android.util.Log
import androidx.collection.LruCache
import kotlinx.coroutines.CancellationException
import org.czeal.rfc3986.URIReference
import java.lang.RuntimeException
import kotlin.contracts.ExperimentalContracts
val normalizedUrls = LruCache<String, NormalizedRelayUrl>(5000)
@@ -53,7 +54,14 @@ class RelayUrlNormalizer {
fun isHttpSuffix(url: String) = url[4] == ':' && url[5] == '/' && url[6] == '/'
fun isRelayUrl(url: String): Boolean {
val trimmed = url.trim().ifEmpty { return false }
if (url.length < 3) return false
val trimmed =
if (url[0].isWhitespace() || url[url.length - 1].isWhitespace()) {
url.trim()
} else {
url
}
// fast
if (isRelaySchemePrefix(trimmed)) {
@@ -78,9 +86,14 @@ class RelayUrlNormalizer {
@OptIn(ExperimentalContracts::class)
fun fix(url: String): String? {
val trimmed = url.trim()
if (url.length < 3) return null
if (trimmed.isEmpty()) return null
val trimmed =
if (url[0].isWhitespace() || url[url.length - 1].isWhitespace()) {
url.trim()
} else {
url
}
// fast for good wss:// urls
if (isRelaySchemePrefix(trimmed)) {
@@ -100,12 +113,30 @@ class RelayUrlNormalizer {
}
}
// fast for good ww:// urls
if (trimmed.startsWith("ww://")) {
return "wss://${trimmed.drop(5)}"
}
// fast for good ww:// urls
if (trimmed.startsWith("was://")) {
return "wss://${trimmed.drop(6)}"
}
// fast for good ww:// urls
if (trimmed.startsWith("Wws://")) {
return "wss://${trimmed.drop(6)}"
}
if (trimmed.contains("://")) {
// some other scheme we cannot connect to.
Log.w("RelayUrlNormalizer", "Rejected relay URL: $url")
return null
}
Log.w("RelayUrlNormalizer", "Rejected relay URL: $url")
throw RuntimeException("RelayError $trimmed")
return if (isOnion(trimmed) || isLocalHost(trimmed)) {
"ws://$trimmed"
} else {
@@ -114,7 +145,7 @@ class RelayUrlNormalizer {
}
fun normalize(url: String): NormalizedRelayUrl {
normalizedUrls.get(url)?.let { return it }
normalizedUrls[url]?.let { return it }
return try {
val fixed = fix(url) ?: return NormalizedRelayUrl(url)
@@ -142,6 +173,7 @@ class RelayUrlNormalizer {
}
} catch (e: Exception) {
if (e is CancellationException) throw e
e.printStackTrace()
Log.w("NormalizedRelayUrl", "Rejected Error $url")
null
}