fix: address race conditions and improve Namecoin NIP-05 resolution

Fixes discovered while porting Namecoin NIP-05 to Primal Android (PrimalHQ/primal-android-app#934): 1. Race condition: stale intermediate lookups overwrite final result - Changed map to mapLatest in SearchBarViewModel so that previous in-flight ElectrumX lookups are cancelled when the query changes - Without this, typing 'd/testls' character by character causes stale results from 'd/test', 'd/testl' etc. to arrive after the correct 'd/testls' result and overwrite it with null 2. CancellationException swallowed in catch block - mapLatest cancels previous coroutines via CancellationException - The generic catch was catching it and emitting null, wiping the valid result. Now re-throws CancellationException 3. Root lookup fails when names object has no underscore key - extractFromDomainValue tried names[localPart] then names[underscore] which is the same thing for root lookups - Now falls back to first available entry for root lookups when no underscore key exists - Non-root lookups still fail correctly (no false matches) 4. Global Mutex serializes all lookups - Single Mutex in ElectrumxClient blocked unrelated lookups to different servers. A 25s timeout on one server stalled everything - Now uses per-server mutexes via ConcurrentHashMap 5. customServers set but never read - NamecoinNameService.setCustomServers() stored the list but the resolver was constructed with the default serverListProvider - Now wires customServers through to the resolver 6. resolveLive uses orphaned CoroutineScope - Now accepts an optional external scope parameter so callers can tie resolution to their own lifecycle Adds 2 new tests: root fallback to first entry, non-root no-fallback.
2026-03-06 11:35:27 +11:00
parent 0e124f3017
commit ee418bdd0a
6 changed files with 134 additions and 15 deletions
@@ -115,6 +115,36 @@ class NamecoinNameResolverTest {
        assertEquals("aaaa000000000000000000000000000000000000000000000000000000000001", result!!.pubkey)
    }

+    @Test
+    fun `root lookup falls back to first entry when no underscore key`() {
+        val value = """{
+            "nostr": {
+                "names": {
+                    "m": "6cdebccabda1dfa058ab85352a79509b592b2bdfa0370325e28ec1cb4f18667d"
+                }
+            }
+        }"""
+
+        val result = extractNostrFromValue(value, "d/testls", "_")
+        assertNotNull(result)
+        assertEquals("6cdebccabda1dfa058ab85352a79509b592b2bdfa0370325e28ec1cb4f18667d", result!!.pubkey)
+        assertEquals("m", result.localPart)
+    }
+
+    @Test
+    fun `non-root lookup does NOT fall back to first entry`() {
+        val value = """{
+            "nostr": {
+                "names": {
+                    "m": "6cdebccabda1dfa058ab85352a79509b592b2bdfa0370325e28ec1cb4f18667d"
+                }
+            }
+        }"""
+
+        val result = extractNostrFromValue(value, "d/testls", "alice")
+        assertNull(result)
+    }
+
    // ── Value format: id/ namespace ────────────────────────────────────

    @Test
@@ -209,9 +239,40 @@ class NamecoinNameResolverTest {
        // Extended form
        if (nostrField is kotlinx.serialization.json.JsonObject) {
            val names = nostrField["names"]?.jsonObject ?: return null
-            val pubkeyElem = names[localPart] ?: names["_"] ?: return null
-            val pubkey = (pubkeyElem as? kotlinx.serialization.json.JsonPrimitive)?.content ?: return null
-            if (!pubkey.matches(Regex("^[0-9a-fA-F]{64}$"))) return null
+
+            // Resolve: exact match → "_" root → first entry (root lookups only)
+            val resolvedLocalPart: String
+            val pubkey: String
+
+            val exactMatch = names[localPart]
+            val rootMatch = names["_"]
+            val firstEntry = if (localPart == "_") names.entries.firstOrNull() else null
+
+            when {
+                exactMatch is kotlinx.serialization.json.JsonPrimitive &&
+                    exactMatch.content.matches(Regex("^[0-9a-fA-F]{64}$")) -> {
+                    resolvedLocalPart = localPart
+                    pubkey = exactMatch.content
+                }
+
+                rootMatch is kotlinx.serialization.json.JsonPrimitive &&
+                    rootMatch.content.matches(Regex("^[0-9a-fA-F]{64}$")) -> {
+                    resolvedLocalPart = "_"
+                    pubkey = rootMatch.content
+                }
+
+                firstEntry != null && firstEntry.value is kotlinx.serialization.json.JsonPrimitive &&
+                    (firstEntry.value as kotlinx.serialization.json.JsonPrimitive)
+                        .content
+                        .matches(Regex("^[0-9a-fA-F]{64}$")) -> {
+                    resolvedLocalPart = firstEntry.key
+                    pubkey = (firstEntry.value as kotlinx.serialization.json.JsonPrimitive).content
+                }
+
+                else -> {
+                    return null
+                }
+            }

            val relays =
                try {
@@ -227,7 +288,7 @@ class NamecoinNameResolverTest {
                pubkey = pubkey.lowercase(),
                relays = relays,
                namecoinName = namecoinName,
-                localPart = localPart,
+                localPart = resolvedLocalPart,
            )
        }
        return null