From be08f4c8a7eae91ff62e4d4301948c39979165f6 Mon Sep 17 00:00:00 2001
From: jack <no@no.no>
Date: Fri, 4 Jul 2025 15:53:35 +0200
Subject: [PATCH] Fix peer discovery issue by enabling announce relay

- Increase announce TTL from 1 to 3 to allow relaying
- Add relay logic for announce packets (was missing\!)
- This fixes the issue where peers can chat but don't see each other
- Announces now propagate through the mesh properly
---
 bitchat/Services/BluetoothMeshService.swift | 22 ++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/bitchat/Services/BluetoothMeshService.swift b/bitchat/Services/BluetoothMeshService.swift
index 141ce5d2..9c60406a 100644
--- a/bitchat/Services/BluetoothMeshService.swift
+++ b/bitchat/Services/BluetoothMeshService.swift
@@ -371,7 +371,7 @@ class BluetoothMeshService: NSObject {
         
         let announcePacket = BitchatPacket(
             type: MessageType.announce.rawValue,
-            ttl: 1,
+            ttl: 3,  // Increase TTL so announce reaches all peers
             senderID: myPeerID,
             payload: Data(vm.nickname.utf8)
         )
@@ -654,7 +654,7 @@ class BluetoothMeshService: NSObject {
         
         let packet = BitchatPacket(
             type: MessageType.announce.rawValue,
-            ttl: 1,
+            ttl: 3,  // Allow relay for better reach
             senderID: myPeerID,
             payload: Data(vm.nickname.utf8)
         )
@@ -1410,6 +1410,18 @@ class BluetoothMeshService: NSObject {
                     }
                 } else {
                 }
+                
+                // Relay announce if TTL > 0
+                if packet.ttl > 1 {
+                    var relayPacket = packet
+                    relayPacket.ttl -= 1
+                    
+                    // Add small delay to prevent collision
+                    let delay = Double.random(in: 0.1...0.3)
+                    DispatchQueue.main.asyncAfter(deadline: .now() + delay) { [weak self] in
+                        self?.broadcastPacket(relayPacket)
+                    }
+                }
             } else {
                 // Failed to decode announce packet
             }
@@ -1851,7 +1863,7 @@ extension BluetoothMeshService: CBPeripheralDelegate {
                             guard let self = self else { return }
                             let announcePacket = BitchatPacket(
                                 type: MessageType.announce.rawValue,
-                                ttl: 1,
+                                ttl: 3,
                                 senderID: self.myPeerID,
                                 payload: Data(vm.nickname.utf8)
                             )
@@ -1868,7 +1880,7 @@ extension BluetoothMeshService: CBPeripheralDelegate {
                         
                         let announcePacket = BitchatPacket(
                             type: MessageType.announce.rawValue,
-                            ttl: 1,
+                            ttl: 3,
                             senderID: self.myPeerID,
                             payload: Data(vm.nickname.utf8)
                         )
@@ -2013,7 +2025,7 @@ extension BluetoothMeshService: CBPeripheralManagerDelegate {
                                     guard let self = self else { return }
                                     let announcePacket = BitchatPacket(
                                         type: MessageType.announce.rawValue,
-                                        ttl: 1,
+                                        ttl: 3,
                                         senderID: self.myPeerID,
                                         payload: Data(vm.nickname.utf8)
                                     )