Фикс оптимизации

app/build.gradle.kts

@@ -23,8 +23,8 @@ val gitShortSha = safeGitOutput("rev-parse", "--short", "HEAD") ?: "unknown"
 // ═══════════════════════════════════════════════════════════
 // Rosetta versioning — bump here on each release
 // ═══════════════════════════════════════════════════════════
-val rosettaVersionName = "1.3.0"
+val rosettaVersionName = "1.3.1"
-val rosettaVersionCode = 32  // Increment on each release
+val rosettaVersionCode = 33  // Increment on each release
 val customWebRtcAar = file("libs/libwebrtc-custom.aar")
 
 android {

app/src/main/java/com/rosetta/messenger/MainActivity.kt

@@ -1379,6 +1379,11 @@ fun MainScreen(
                     },
                     onNavigateToCrashLogs = {
                         navStack = navStack.filterNot { it is Screen.Search } + Screen.CrashLogs
+                    },
+                    onNavigateToConnectionLogs = {
+                        navStack =
+                                navStack.filterNot { it is Screen.Search } +
+                                        Screen.ConnectionLogs
                     }
             )
         }

app/src/main/java/com/rosetta/messenger/data/MessageRepository.kt

@@ -885,11 +885,10 @@ class MessageRepository private constructor(private val context: Context) {
                     unreadCount = dialog?.unreadCount ?: 0
             )
 
-            // 🔥 Запрашиваем информацию о пользователе для отображения имени вместо ключа
+            // 🔥 Запрашиваем информацию о пользователе для отображения имени вместо ключа.
-            // Desktop parity: always re-fetch on incoming message so renamed contacts
+            // Важно: не форсим повторный запрос на каждый входящий пакет — это создает
-            // get their new name/username updated in the chat list.
+            // шторм PacketSearch во время sync и заметно тормозит обработку.
             if (!isGroupDialogKey(dialogOpponentKey)) {
-                requestedUserInfoKeys.remove(dialogOpponentKey)
                 requestUserInfo(dialogOpponentKey)
             } else {
                 applyGroupDisplayNameToDialog(account, dialogOpponentKey)

app/src/main/java/com/rosetta/messenger/data/ReleaseNotes.kt

@@ -17,12 +17,9 @@ object ReleaseNotes {
     val RELEASE_NOTICE = """
         Update v$VERSION_PLACEHOLDER
 
-        Синхронизация 1 в 1 с desktop/server
+        Оптимизация sync и protocol logging
-        - Выровнен сетевой контракт пакетов как в desktop: добавлена поддержка 0x10 (push), 0x1A (signal), 0x1B (webrtc), 0x1C (ice)
+        - Устранены лаги при CONNECTING/SYNCING: heartbeat-логи ограничены и больше не забивают UI
-        - Исправлена нормализация дубликатов своих сообщений из sync: локальные WAITING/ERROR теперь автоматически переходят в DELIVERED
+        - Добавлен fail-safe для handshake state: поврежденное/неизвестное значение больше не трактуется как успешный handshake
-        - Добавлен watchdog для sync-запроса: если ответ на PacketSync завис, запрос перезапускается автоматически
-        - Повышена стабильность цикла BATCH_START/BATCH_END/NOT_NEEDED при reconnect
-        - Исправлена обработка PacketRead: read-статусы теперь ставятся как в desktop/wss, включая сценарии когда read приходит раньше delivery
     """.trimIndent()
 
     fun getNotice(version: String): String =

app/src/main/java/com/rosetta/messenger/network/PacketHandshake.kt

@@ -6,7 +6,8 @@ enum class HandshakeState(val value: Int) {
 
     companion object {
         fun fromValue(value: Int): HandshakeState {
-            return entries.firstOrNull { it.value == value } ?: COMPLETED
+            // Fail-safe: unknown value must not auto-authenticate.
+            return entries.firstOrNull { it.value == value } ?: NEED_DEVICE_VERIFICATION
         }
     }
 }

app/src/main/java/com/rosetta/messenger/network/Protocol.kt

@@ -33,6 +33,9 @@ class Protocol(
         private const val RECONNECT_INTERVAL = 5000L // 5 seconds (как в Архиве)
         private const val HANDSHAKE_TIMEOUT = 10000L // 10 seconds
         private const val MIN_PACKET_ID_BITS = 18 // Stream.readInt16() = 2 * readInt8() (9 bits each)
+        private const val DEFAULT_HEARTBEAT_INTERVAL_SECONDS = 15
+        private const val MIN_HEARTBEAT_SEND_INTERVAL_MS = 2_000L
+        private const val HEARTBEAT_OK_LOG_THROTTLE_MS = 30_000L
     }
     
     private fun log(message: String) {
@@ -112,6 +115,9 @@ class Protocol(
     
     // Heartbeat
     private var heartbeatJob: Job? = null
+    @Volatile private var heartbeatPeriodMs: Long = 0L
+    @Volatile private var lastHeartbeatOkLogAtMs: Long = 0L
+    @Volatile private var heartbeatOkSuppressedCount: Int = 0
     
     // Supported packets
     private val supportedPackets = mapOf(
@@ -179,11 +185,24 @@ class Protocol(
      * Как в Архиве - отправляем text "heartbeat" СРАЗУ и потом с интервалом
      */
     private fun startHeartbeat(intervalSeconds: Int) {
-        heartbeatJob?.cancel()
+        val normalizedServerIntervalSec =
+            if (intervalSeconds > 0) intervalSeconds else DEFAULT_HEARTBEAT_INTERVAL_SECONDS
+        // Отправляем чаще - каждые 1/3 интервала, но с нижним лимитом чтобы исключить tight-loop.
+        val intervalMs =
+            ((normalizedServerIntervalSec * 1000L) / 3).coerceAtLeast(MIN_HEARTBEAT_SEND_INTERVAL_MS)
 
-        // Отправляем чаще - каждые 1/3 интервала (чтобы не терять соединение)
+        if (heartbeatJob?.isActive == true && heartbeatPeriodMs == intervalMs) {
-        val intervalMs = (intervalSeconds * 1000L) / 3
+            return
-        log("💓 HEARTBEAT START: server=${intervalSeconds}s, sending=${intervalMs/1000}s, state=${_state.value}")
+        }
+
+        heartbeatJob?.cancel()
+        heartbeatPeriodMs = intervalMs
+        lastHeartbeatOkLogAtMs = 0L
+        heartbeatOkSuppressedCount = 0
+        log(
+            "💓 HEARTBEAT START: server=${intervalSeconds}s(normalized=${normalizedServerIntervalSec}s), " +
+                "sending=${intervalMs / 1000}s, state=${_state.value}"
+        )
         
         heartbeatJob = scope.launch {
             // ⚡ СРАЗУ отправляем первый heartbeat (как в Архиве)
@@ -210,7 +229,17 @@ class Protocol(
             ) {
                 val sent = webSocket?.send("heartbeat") ?: false
                 if (sent) {
-                    log("💓 Heartbeat OK (socket=$socketAlive, state=$currentState)")
+                    val now = System.currentTimeMillis()
+                    if (now - lastHeartbeatOkLogAtMs >= HEARTBEAT_OK_LOG_THROTTLE_MS) {
+                        val suppressed = heartbeatOkSuppressedCount
+                        heartbeatOkSuppressedCount = 0
+                        lastHeartbeatOkLogAtMs = now
+                        val suffix =
+                            if (suppressed > 0) ", +$suppressed suppressed" else ""
+                        log("💓 Heartbeat OK (socket=$socketAlive, state=$currentState$suffix)")
+                    } else {
+                        heartbeatOkSuppressedCount++
+                    }
                 } else {
                     log("💔 HEARTBEAT FAILED: socket=$socketAlive, state=$currentState, manuallyClosed=$isManuallyClosed")
                     // Триггерим reconnect если heartbeat не прошёл
@@ -506,52 +535,40 @@ class Protocol(
             log("📥 Received ${data.size} bytes: $hexDump${if (data.size > 50) "..." else ""}")
 
             val stream = Stream(data)
-            var parsedPackets = 0
+            if (stream.getRemainingBits() < MIN_PACKET_ID_BITS) {
+                log("⚠️ Frame too short to contain packet ID (${stream.getRemainingBits()} bits)")
+                return
+            }
+            // Desktop/server parity: one WebSocket frame contains one packet.
+            val packetId = stream.readInt16()
+            log("📥 Packet ID: $packetId")
 
-            while (stream.getRemainingBits() >= MIN_PACKET_ID_BITS) {
+            val packetFactory = supportedPackets[packetId]
-                val packetStartBits = stream.getReadPointerBits()
+            if (packetFactory == null) {
-                val packetId = stream.readInt16()
+                log("⚠️ Unknown packet ID: $packetId")
-
+                return
-                log("📥 Packet ID: $packetId")
-
-                val packetFactory = supportedPackets[packetId]
-                if (packetFactory == null) {
-                    log("⚠️ Unknown packet ID: $packetId, stopping frame parse")
-                    break
-                }
-
-                val packet = packetFactory()
-                try {
-                    packet.receive(stream)
-                } catch (e: Exception) {
-                    log("❌ Error parsing packet $packetId: ${e.message}")
-                    e.printStackTrace()
-                    break
-                }
-
-                // Notify waiters
-                val waitersCount = packetWaiters[packetId]?.size ?: 0
-                log("📥 Notifying $waitersCount waiter(s) for packet $packetId")
-
-                packetWaiters[packetId]?.forEach { callback ->
-                    try {
-                        callback(packet)
-                    } catch (e: Exception) {
-                        log("❌ Error in packet handler: ${e.message}")
-                        e.printStackTrace()
-                    }
-                }
-
-                parsedPackets++
-                val consumedBits = stream.getReadPointerBits() - packetStartBits
-                if (consumedBits <= 0) {
-                    log("⚠️ Packet parser made no progress for packet $packetId, stopping frame parse")
-                    break
-                }
             }
 
-            if (parsedPackets > 1) {
+            val packet = packetFactory()
-                log("📦 Parsed $parsedPackets packets from single WebSocket frame")
+            try {
+                packet.receive(stream)
+            } catch (e: Exception) {
+                log("❌ Error parsing packet $packetId: ${e.message}")
+                e.printStackTrace()
+                return
+            }
+
+            // Notify waiters
+            val waitersCount = packetWaiters[packetId]?.size ?: 0
+            log("📥 Notifying $waitersCount waiter(s) for packet $packetId")
+
+            packetWaiters[packetId]?.forEach { callback ->
+                try {
+                    callback(packet)
+                } catch (e: Exception) {
+                    log("❌ Error in packet handler: ${e.message}")
+                    e.printStackTrace()
+                }
             }
         } catch (e: Exception) {
             log("❌ Error parsing packet: ${e.message}")
@@ -573,6 +590,7 @@ class Protocol(
         handshakeComplete = false
         handshakeJob?.cancel()
         heartbeatJob?.cancel()
+        heartbeatPeriodMs = 0L
         
         // Автоматический reconnect с защитой от бесконечных попыток
         if (!isManuallyClosed) {
@@ -628,6 +646,7 @@ class Protocol(
         reconnectJob = null
         handshakeJob?.cancel()
         heartbeatJob?.cancel()
+        heartbeatPeriodMs = 0L
         webSocket?.close(1000, "User disconnected")
         webSocket = null
         _state.value = ProtocolState.DISCONNECTED

app/src/main/java/com/rosetta/messenger/network/ProtocolManager.kt

@@ -6,6 +6,7 @@ import com.rosetta.messenger.data.AccountManager
 import com.rosetta.messenger.data.GroupRepository
 import com.rosetta.messenger.data.MessageRepository
 import com.rosetta.messenger.data.isPlaceholderAccountName
+import com.rosetta.messenger.utils.MessageLogger
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -30,6 +31,7 @@ object ProtocolManager {
     private const val SYNC_REQUEST_TIMEOUT_MS = 12_000L
     private const val MAX_DEBUG_LOGS = 600
     private const val DEBUG_LOG_FLUSH_DELAY_MS = 60L
+    private const val HEARTBEAT_OK_LOG_MIN_INTERVAL_MS = 5_000L
     private const val TYPING_INDICATOR_TIMEOUT_MS = 3_000L
     private const val PACKET_SIGNAL_PEER = 0x1A
     private const val PACKET_WEB_RTC = 0x1B
@@ -61,6 +63,8 @@ object ProtocolManager {
     private val debugLogsLock = Any()
     @Volatile private var debugFlushJob: Job? = null
     private val debugFlushPending = AtomicBoolean(false)
+    @Volatile private var lastHeartbeatOkLogAtMs: Long = 0L
+    @Volatile private var suppressedHeartbeatOkLogs: Int = 0
     
     // Typing status
     private val _typingUsers = MutableStateFlow<Set<String>>(emptySet())
@@ -92,8 +96,8 @@ object ProtocolManager {
     private fun normalizeSearchQuery(value: String): String =
         value.trim().removePrefix("@").lowercase(Locale.ROOT)
     
-    // UI logs are enabled by default; updates are throttled and bounded by MAX_DEBUG_LOGS.
+    // Keep heavy protocol/message UI logs disabled by default.
-    private var uiLogsEnabled = true
+    private var uiLogsEnabled = false
     private var lastProtocolState: ProtocolState? = null
     @Volatile private var syncBatchInProgress = false
     private val _syncInProgress = MutableStateFlow(false)
@@ -131,9 +135,23 @@ object ProtocolManager {
     
     fun addLog(message: String) {
         if (!uiLogsEnabled) return
+        var normalizedMessage = message
+        val isHeartbeatOk = normalizedMessage.startsWith("💓 Heartbeat OK")
+        if (isHeartbeatOk) {
+            val now = System.currentTimeMillis()
+            if (now - lastHeartbeatOkLogAtMs < HEARTBEAT_OK_LOG_MIN_INTERVAL_MS) {
+                suppressedHeartbeatOkLogs++
+                return
+            }
+            if (suppressedHeartbeatOkLogs > 0) {
+                normalizedMessage = "$normalizedMessage (+${suppressedHeartbeatOkLogs} skipped)"
+                suppressedHeartbeatOkLogs = 0
+            }
+            lastHeartbeatOkLogAtMs = now
+        }
         val timestamp =
                 java.text.SimpleDateFormat("HH:mm:ss.SSS", Locale.getDefault()).format(Date())
-        val line = "[$timestamp] $message"
+        val line = "[$timestamp] $normalizedMessage"
         synchronized(debugLogsLock) {
             if (debugLogsBuffer.size >= MAX_DEBUG_LOGS) {
                 debugLogsBuffer.removeFirst()
@@ -145,6 +163,7 @@ object ProtocolManager {
 
     fun enableUILogs(enabled: Boolean) {
         uiLogsEnabled = enabled
+        MessageLogger.setEnabled(enabled)
         if (enabled) {
             val snapshot = synchronized(debugLogsLock) { debugLogsBuffer.toList() }
             _debugLogs.value = snapshot
@@ -157,6 +176,8 @@ object ProtocolManager {
         synchronized(debugLogsLock) {
             debugLogsBuffer.clear()
         }
+        suppressedHeartbeatOkLogs = 0
+        lastHeartbeatOkLogAtMs = 0L
         _debugLogs.value = emptyList()
     }
 

app/src/main/java/com/rosetta/messenger/ui/chats/ConnectionLogsScreen.kt

@@ -40,9 +40,16 @@ fun ConnectionLogsScreen(
     val listState = rememberLazyListState()
     val scope = rememberCoroutineScope()
 
+    DisposableEffect(Unit) {
+        ProtocolManager.enableUILogs(true)
+        onDispose {
+            ProtocolManager.enableUILogs(false)
+        }
+    }
+
     LaunchedEffect(logs.size) {
         if (logs.isNotEmpty()) {
-            listState.animateScrollToItem(logs.size - 1)
+            listState.scrollToItem(logs.size - 1)
         }
     }
 
@@ -89,7 +96,7 @@ fun ConnectionLogsScreen(
 
                 IconButton(onClick = {
                     scope.launch {
-                        if (logs.isNotEmpty()) listState.animateScrollToItem(logs.size - 1)
+                        if (logs.isNotEmpty()) listState.scrollToItem(logs.size - 1)
                     }
                 }) {
                     Icon(

app/src/main/java/com/rosetta/messenger/ui/chats/SearchScreen.kt

@@ -101,7 +101,8 @@ fun SearchScreen(
         protocolState: ProtocolState,
         onBackClick: () -> Unit,
         onUserSelect: (SearchUser) -> Unit,
-        onNavigateToCrashLogs: () -> Unit = {}
+        onNavigateToCrashLogs: () -> Unit = {},
+        onNavigateToConnectionLogs: () -> Unit = {}
 ) {
     // Context и View для мгновенного закрытия клавиатуры
     val context = LocalContext.current
@@ -150,6 +151,11 @@ fun SearchScreen(
         if (searchQuery.trim().equals("rosettadev1", ignoreCase = true)) {
             searchViewModel.clearSearchQuery()
             onNavigateToCrashLogs()
+            return@LaunchedEffect
+        }
+        if (searchQuery.trim().equals("rosettadev2", ignoreCase = true)) {
+            searchViewModel.clearSearchQuery()
+            onNavigateToConnectionLogs()
         }
     }
 

app/src/main/java/com/rosetta/messenger/utils/MessageLogger.kt

@@ -14,9 +14,12 @@ import com.rosetta.messenger.network.ProtocolManager
 object MessageLogger {
     private const val TAG = "RosettaMsg"
 
-    // Всегда включён — вывод идёт только в ProtocolManager.addLog() (in-memory UI),
+    @Volatile
-    // не в logcat, безопасно для release
+    private var isEnabled: Boolean = false
-    private val isEnabled: Boolean = true
+
+    fun setEnabled(enabled: Boolean) {
+        isEnabled = enabled
+    }
     
     /**
      * Добавить лог в UI (Debug Logs в чате)