mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-26 14:25:20 +00:00
jackandGitHub
d326cecb63
Converts BLEAnnounceThrottle to a lock-backed class and moves myPeerID/myPeerIDData/myNickname into a lock-backed BLELocalIdentityStateStore snapshot, so announces can never observe a split peer-ID/wire-ID during panic rotation. Serializes sendAnnounce onto the messageQueue barrier and moves the panic-reset pendingNoiseSessionQueues clear onto collectionsQueue (the queue every other mutation site uses). Rebased onto main after #1431/#1432; integrates with #1431's panic-suspend structure (guard retained in both the outer sendAnnounce and the deferred worker).
56 lines
1.6 KiB
Swift
56 lines
1.6 KiB
Swift
import BitFoundation
|
|
import Foundation
|
|
|
|
struct BLELocalIdentitySnapshot: Equatable, Sendable {
|
|
let peerID: PeerID
|
|
let peerIDData: Data
|
|
let nickname: String
|
|
}
|
|
|
|
/// Lock-backed local identity state shared by the transport's message,
|
|
/// Bluetooth, maintenance, and main-actor entry points.
|
|
///
|
|
/// `peerID` and its binary wire representation must change as one unit during
|
|
/// panic rotation. A snapshot also gives announce construction one consistent
|
|
/// view of the nickname and identity instead of reading three independently
|
|
/// mutable properties across queues.
|
|
final class BLELocalIdentityStateStore: @unchecked Sendable {
|
|
private let lock = NSLock()
|
|
private var state: BLELocalIdentitySnapshot
|
|
|
|
init(
|
|
peerID: PeerID = PeerID(str: ""),
|
|
nickname: String = "anon"
|
|
) {
|
|
state = BLELocalIdentitySnapshot(
|
|
peerID: peerID,
|
|
peerIDData: Data(hexString: peerID.id) ?? Data(),
|
|
nickname: nickname
|
|
)
|
|
}
|
|
|
|
func snapshot() -> BLELocalIdentitySnapshot {
|
|
lock.withLock { state }
|
|
}
|
|
|
|
func setNickname(_ nickname: String) {
|
|
lock.withLock {
|
|
state = BLELocalIdentitySnapshot(
|
|
peerID: state.peerID,
|
|
peerIDData: state.peerIDData,
|
|
nickname: nickname
|
|
)
|
|
}
|
|
}
|
|
|
|
func replacePeerIdentity(with peerID: PeerID) {
|
|
lock.withLock {
|
|
state = BLELocalIdentitySnapshot(
|
|
peerID: peerID,
|
|
peerIDData: Data(hexString: peerID.id) ?? Data(),
|
|
nickname: state.nickname
|
|
)
|
|
}
|
|
}
|
|
}
|