fix(node): reconcile stale identity replays after renumbering (#6259)

Author: jeremiah-k

core/data/src/commonMain/kotlin/org/meshtastic/core/data/datasource/NodeInfoReadDataSource.kt

@@ -37,4 +37,11 @@ interface NodeInfoReadDataSource {
     suspend fun getNodesOlderThan(lastHeard: Int): List<NodeEntity>
 
     suspend fun getUnknownNodes(): List<NodeEntity>
+
+    /**
+     * One-shot snapshot of every node row in the currently selected database. Bypasses the process-wide
+     * [nodeDBbyNumFlow] cache so callers see the live DB state at invocation time rather than a `stateIn` value that
+     * may belong to a previous transport.
+     */
+    suspend fun getNodeDbSnapshot(): Map<Int, NodeWithRelations>
 }

core/data/src/commonMain/kotlin/org/meshtastic/core/data/datasource/SwitchingNodeInfoReadDataSource.kt

@@ -55,4 +55,7 @@ class SwitchingNodeInfoReadDataSource(private val dbManager: DatabaseProvider) :
 
     override suspend fun getUnknownNodes(): List<NodeEntity> =
         dbManager.withReadDb { it.nodeInfoDao().getUnknownNodes() }
+
+    override suspend fun getNodeDbSnapshot(): Map<Int, NodeWithRelations> =
+        dbManager.withReadDb { it.nodeInfoDao().nodeDBbyNumSnapshot() }
 }

core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/MeshConfigFlowManagerImpl.kt

@@ -296,7 +296,7 @@ class MeshConfigFlowManagerImpl(
         if (!isActiveSession(session)) return
         if (removedNums.isNotEmpty()) {
             Logger.i { "Config install migrated ${removedNums.size} stale node identit(y/ies)" }
-            removedNums.forEach(nodeManager::removeByNodenum)
+            nodeManager.applyTrustedIdentityMigrations(removedNums)
         }
 
         val published =

core/data/src/commonMain/kotlin/org/meshtastic/core/data/manager/NodeManagerImpl.kt

@@ -227,6 +227,9 @@ class NodeRepositoryImpl(
     override suspend fun getUnknownNodes(): List<Node> =
         withContext(dispatchers.io) { nodeInfoReadDataSource.getUnknownNodes().map { it.toModel() } }
 
+    override suspend fun getNodeDbSnapshot(): Map<Int, Node> =
+        withContext(dispatchers.io) { nodeInfoReadDataSource.getNodeDbSnapshot().mapValues { (_, it) -> it.toModel() } }
+
     /** Persists hardware metadata for a node. */
     override suspend fun insertMetadata(nodeNum: Int, metadata: DeviceMetadata) =
         withContext(dispatchers.io) { nodeInfoWriteDataSource.upsert(MetadataEntity(nodeNum, metadata)) }

core/data/src/commonMain/kotlin/org/meshtastic/core/data/repository/NodeRepositoryImpl.kt

@@ -626,6 +626,37 @@ class MeshConfigFlowManagerImplTest {
         verifySuspend { connectionManager.onNodeDbReady() }
     }
 
+    @Test
+    fun `Stage 2 applies trusted migrations before readiness and replay`() = testScope.runTest {
+        val retiredNum = 456
+        val callOrder = mutableListOf<String>()
+        everySuspend { nodeRepository.installConfig(any(), any()) } calls
+            {
+                callOrder.add("installConfig")
+                listOf(retiredNum)
+            }
+        every { nodeManager.applyTrustedIdentityMigrations(any()) } calls { callOrder.add("applyMigrations") }
+        every { nodeManager.setNodeDbReady(true) } calls { callOrder.add("nodeDbReady") }
+        every { nodeManager.setAllowNodeDbWrites(true) } calls { callOrder.add("writesReady") }
+        everySuspend { connectionManager.onNodeDbReady() } calls { callOrder.add("replayReady") }
+
+        handleMyInfo(protoMyNodeInfo)
+        advanceUntilIdle()
+        manager.handleLocalMetadata(metadata)
+        advanceUntilIdle()
+        manager.handleConfigComplete(HandshakeConstants.CONFIG_NONCE)
+        advanceTimeBy(STAGE_TRANSITION_ADVANCE_MS)
+        runCurrent()
+        manager.handleConfigComplete(HandshakeConstants.NODE_INFO_NONCE)
+        advanceUntilIdle()
+
+        assertEquals(
+            listOf("installConfig", "applyMigrations", "nodeDbReady", "writesReady", "replayReady"),
+            callOrder,
+        )
+        verify { nodeManager.applyTrustedIdentityMigrations(listOf(retiredNum)) }
+    }
+
     @Test
     fun `Stage 2 complete id ignored when not in ReceivingNodeInfo state`() = testScope.runTest {
         manager.handleConfigComplete(HandshakeConstants.NODE_INFO_NONCE)

core/data/src/commonTest/kotlin/org/meshtastic/core/data/manager/MeshConfigFlowManagerImplTest.kt

@@ -19,6 +19,7 @@ package org.meshtastic.core.data.manager
 import dev.mokkery.MockMode
 import dev.mokkery.answering.returns
 import dev.mokkery.every
+import dev.mokkery.everySuspend
 import dev.mokkery.mock
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
@@ -55,6 +56,7 @@ class NodeManagerConnectionIdentityTest {
 
     @BeforeTest
     fun setUp() {
+        everySuspend { nodeRepository.getNodeDbSnapshot() } returns emptyMap()
         nodeManager = NodeManagerImpl(nodeRepository, notificationManager, radioInterfaceService, testScope)
     }