permissionlesstech/bitchat
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat.git synced 2026-07-25 01:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

PeerID 17/n: PeripheralState + centralToPeerID (#756)

Browse Source 
* PeerID 15/n: Bitchat Message & Packet accept in init

* PeerID 16/n: BitchatPeer / PeerInfo / TransportPeer

* PeerID 17/n: `PeripheralState` + `centralToPeerID`
This commit is contained in:
Islam
2025-10-06 17:19:43 +02:00
committed by GitHub
parent 10e3f574ab
commit 13ebaad42f
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bitchat/Services/BLEService.swift
+20 -24
View File
@@ -36,7 +36,7 @@ final class BLEService: NSObject {
private struct PeripheralState { private struct PeripheralState {
let peripheral: CBPeripheral let peripheral: CBPeripheral
var characteristic: CBCharacteristic? var characteristic: CBCharacteristic?
var peerID: String? var peerID: PeerID?
var isConnecting: Bool = false var isConnecting: Bool = false
var isConnected: Bool = false var isConnected: Bool = false
var lastConnectionAttempt: Date? = nil var lastConnectionAttempt: Date? = nil
@@ -47,7 +47,7 @@ final class BLEService: NSObject {
// 2. BLE Centrals (when acting as peripheral) // 2. BLE Centrals (when acting as peripheral)
private var subscribedCentrals: [CBCentral] = [] private var subscribedCentrals: [CBCentral] = []
private var centralToPeerID: [String: String] = [:] // Central UUID -> Peer ID mapping private var centralToPeerID: [String: PeerID] = [:] // Central UUID -> Peer ID mapping
// 3. Peer Information (single source of truth) // 3. Peer Information (single source of truth)
private struct PeerInfo { private struct PeerInfo {
@@ -271,12 +271,6 @@ final class BLEService: NSObject {
NotificationCenter.default.removeObserver(self) NotificationCenter.default.removeObserver(self)
#endif #endif
} }
func getPeerFingerprint(_ peerID: String) -> String? {
return collectionsQueue.sync {
return peers[peerID]?.noisePublicKey?.sha256Fingerprint()
}
}
func resetIdentityForPanic(currentNickname: String) { func resetIdentityForPanic(currentNickname: String) {
messageQueue.sync(flags: .barrier) { messageQueue.sync(flags: .barrier) {
@@ -536,7 +530,9 @@ final class BLEService: NSObject {
// MARK: Protocol utilities // MARK: Protocol utilities
func getFingerprint(for peerID: PeerID) -> String? { func getFingerprint(for peerID: PeerID) -> String? {
return getPeerFingerprint(peerID.id) return collectionsQueue.sync {
return peers[peerID.id]?.noisePublicKey?.sha256Fingerprint()
}
} }
func getNoiseSessionState(for peerID: PeerID) -> LazyHandshakeState { func getNoiseSessionState(for peerID: PeerID) -> LazyHandshakeState {
@@ -890,7 +886,7 @@ func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeriph
// Find the peer ID if we have it // Find the peer ID if we have it
let peerID = peripherals[peripheralID]?.peerID let peerID = peripherals[peripheralID]?.peerID
SecureLogger.debug("📱 Disconnect: \(peerID ?? peripheralID)\(error != nil ? " (\(error!.localizedDescription))" : "")", category: .session) SecureLogger.debug("📱 Disconnect: \(peerID?.id ?? peripheralID)\(error != nil ? " (\(error!.localizedDescription))" : "")", category: .session)
// If disconnect carried an error (often timeout), apply short backoff to avoid thrash // If disconnect carried an error (often timeout), apply short backoff to avoid thrash
if error != nil { if error != nil {
@@ -901,14 +897,14 @@ func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeriph
peripherals.removeValue(forKey: peripheralID) peripherals.removeValue(forKey: peripheralID)
// Clean up peer mappings // Clean up peer mappings
if let peerID = peerID { if let peerID {
peerToPeripheralUUID.removeValue(forKey: peerID) peerToPeripheralUUID.removeValue(forKey: peerID.id)
// Do not remove peer; mark as not connected but retain for reachability // Do not remove peer; mark as not connected but retain for reachability
collectionsQueue.sync(flags: .barrier) { collectionsQueue.sync(flags: .barrier) {
if var info = peers[peerID] { if var info = peers[peerID.id] {
info.isConnected = false info.isConnected = false
peers[peerID] = info peers[peerID.id] = info
} }
} }
} }
@@ -932,7 +928,7 @@ func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeriph
let currentPeerIDs = self.collectionsQueue.sync { Array(self.peers.keys) } let currentPeerIDs = self.collectionsQueue.sync { Array(self.peers.keys) }
if let peerID = peerID { if let peerID = peerID {
self.notifyPeerDisconnectedDebounced(peerID) self.notifyPeerDisconnectedDebounced(peerID.id)
} }
self.requestPeerDataPublish() self.requestPeerDataPublish()
self.delegate?.didUpdatePeerList(currentPeerIDs) self.delegate?.didUpdatePeerList(currentPeerIDs)
@@ -1200,7 +1196,7 @@ extension BLEService: CBPeripheralDelegate {
if packet.type == MessageType.announce.rawValue { if packet.type == MessageType.announce.rawValue {
if packet.ttl == messageTTL { if packet.ttl == messageTTL {
if var state = peripherals[peripheralUUID] { if var state = peripherals[peripheralUUID] {
state.peerID = senderID state.peerID = PeerID(str: senderID)
peripherals[peripheralUUID] = state peripherals[peripheralUUID] = state
} }
peerToPeripheralUUID[senderID] = peripheralUUID peerToPeripheralUUID[senderID] = peripheralUUID
@@ -1336,9 +1332,9 @@ extension BLEService: CBPeripheralManagerDelegate {
if let peerID = centralToPeerID[centralUUID] { if let peerID = centralToPeerID[centralUUID] {
// Mark peer as not connected; retain for reachability // Mark peer as not connected; retain for reachability
collectionsQueue.sync(flags: .barrier) { collectionsQueue.sync(flags: .barrier) {
if var info = peers[peerID] { if var info = peers[peerID.id] {
info.isConnected = false info.isConnected = false
peers[peerID] = info peers[peerID.id] = info
} }
} }
@@ -1352,7 +1348,7 @@ extension BLEService: CBPeripheralManagerDelegate {
// Get current peer list (after removal) // Get current peer list (after removal)
let currentPeerIDs = self.collectionsQueue.sync { Array(self.peers.keys) } let currentPeerIDs = self.collectionsQueue.sync { Array(self.peers.keys) }
self.notifyPeerDisconnectedDebounced(peerID) self.notifyPeerDisconnectedDebounced(peerID.id)
// Publish snapshots so UnifiedPeerService can refresh icons promptly // Publish snapshots so UnifiedPeerService can refresh icons promptly
self.requestPeerDataPublish() self.requestPeerDataPublish()
self.delegate?.didUpdatePeerList(currentPeerIDs) self.delegate?.didUpdatePeerList(currentPeerIDs)
@@ -1460,7 +1456,7 @@ extension BLEService: CBPeripheralManagerDelegate {
subscribedCentrals.append(sorted[0].central) subscribedCentrals.append(sorted[0].central)
} }
if packet.type == MessageType.announce.rawValue { if packet.type == MessageType.announce.rawValue {
if packet.ttl == messageTTL { centralToPeerID[centralUUID] = senderID } if packet.ttl == messageTTL { centralToPeerID[centralUUID] = PeerID(str: senderID) }
// Record ingress link for last-hop suppression then process // Record ingress link for last-hop suppression then process
let msgID = makeMessageID(for: packet) let msgID = makeMessageID(for: packet)
collectionsQueue.async(flags: .barrier) { [weak self] in collectionsQueue.async(flags: .barrier) { [weak self] in
@@ -1580,7 +1576,7 @@ extension BLEService {
return bleQueue.sync { Array(peripherals.values) } return bleQueue.sync { Array(peripherals.values) }
} }
} }
private func snapshotSubscribedCentrals() -> ([CBCentral], [String: String]) { private func snapshotSubscribedCentrals() -> ([CBCentral], [String: PeerID]) {
if DispatchQueue.getSpecific(key: bleQueueKey) != nil { if DispatchQueue.getSpecific(key: bleQueueKey) != nil {
return (self.subscribedCentrals, self.centralToPeerID) return (self.subscribedCentrals, self.centralToPeerID)
} else { } else {
@@ -2438,7 +2434,7 @@ extension BLEService {
// Check if this peer is subscribed to us as a central // Check if this peer is subscribed to us as a central
// Note: We can't identify which specific central is which peer without additional mapping // Note: We can't identify which specific central is which peer without additional mapping
let hasCentralSubscription = centralToPeerID.values.contains(peerID) let hasCentralSubscription = centralToPeerID.values.contains(PeerID(str: peerID))
// Direct announces arrive with full TTL (no prior hop) // Direct announces arrive with full TTL (no prior hop)
let isDirectAnnounce = (packet.ttl == messageTTL) let isDirectAnnounce = (packet.ttl == messageTTL)
@@ -2653,7 +2649,7 @@ extension BLEService {
let hasDirectLink: Bool = collectionsQueue.sync { let hasDirectLink: Bool = collectionsQueue.sync {
let perUUID = peerToPeripheralUUID[peerID] let perUUID = peerToPeripheralUUID[peerID]
let perConnected = perUUID != nil && peripherals[perUUID!]?.isConnected == true let perConnected = perUUID != nil && peripherals[perUUID!]?.isConnected == true
let hasCentral = centralToPeerID.values.contains(peerID) let hasCentral = centralToPeerID.values.contains(PeerID(str: peerID))
return perConnected || hasCentral return perConnected || hasCentral
} }
@@ -3014,7 +3010,7 @@ extension BLEService {
// Check if we still have an active BLE connection to this peer // Check if we still have an active BLE connection to this peer
let hasPeripheralConnection = peerToPeripheralUUID[peerID] != nil && let hasPeripheralConnection = peerToPeripheralUUID[peerID] != nil &&
peripherals[peerToPeripheralUUID[peerID]!]?.isConnected == true peripherals[peerToPeripheralUUID[peerID]!]?.isConnected == true
let hasCentralConnection = centralToPeerID.values.contains(peerID) let hasCentralConnection = centralToPeerID.values.contains(PeerID(str: peerID))
// If direct link is gone, mark as not connected (retain entry for reachability) // If direct link is gone, mark as not connected (retain entry for reachability)
if !hasPeripheralConnection && !hasCentralConnection { if !hasPeripheralConnection && !hasCentralConnection {