mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-26 08:25:19 +00:00
* Sign public broadcasts; verify relayed messages via persisted signing keys; keep scheduled relays in sparse graphs and speed their jitter; persist announce signing key for offline auth; add short backoff after disconnect errors to reduce reconnect thrash * Add connected vs reachable model: retain peers after link drop, expire after reachability window; expose all peers in snapshots; compute isReachable in UI; add meshReachable state and sorting; avoid removing peers on link events; notify UI on stale removals * ContentView: handle new .meshReachable connection state in header icon switch (exhaustive switch fix) * Logs: tag relayed announces as 'Reachable via mesh' and annotate public message logs with (direct|mesh) path for easier field analysis * Fix syntax error: remove stray else/log inserted into writeOrEnqueue; keep logs clean * UI: use 'point.3.connected.trianglepath.dotted' for mesh-reachable; change people count to include connected+reachable (exclude Nostr-only) * UI: switch to 'point.3.filled.connected.trianglepath.dotted' for mesh-reachable icons in list and header * Reachability: reduce retention to 21s for all peers (verified and unverified) to minimize stale presence * mesh DMs/acks: route to reachable peers; queue READ/DELIVERED until handshake; add Transport.isPeerReachable; UI: hide offline non-mutuals; DM header: better name fallback + show transport + encryption icons; fix NostrTransport conformance * Verification sheet: compute encryption status and fingerprint using short mesh ID mapping (fix 'not encrypted/handshake' for DMs with stable key) * Announce cadence: faster discovery (4s), sparse 15±4s, dense 30±8s; initial 0.6s; post-subscribe 50ms; min-force 150ms; maintenance 5s; proactive announces on handshake + recent-traffic nudge * Relay: increase broadcast TTL cap in sparse graphs to 6; tighten jitter for handshake (10–35ms) and directed (20–60ms) relays * Range/robustness: store-and-forward for directed packets (15s) with flush on new links + periodic; announces: no subset + afterglow re-announce on first-seen; adaptive scanning: force ON when <=2 neighbors or recent traffic * Fix warnings: remove unused msgID and unused mutable var in directed spool flush * Announces: TTL 7 (sparse only) via RelayController; no fanout subset for announces; neighbor-change rebroadcast of last 2–3 announces. Fragments: faster pacing (5ms global, 4ms directed). * Peer list: real-time icon updates by publishing snapshots on connectivity checks; add unread message indicator (envelope) next to peers with unread DMs * UI: unread envelope uses orange; hasUnreadMessages checks Nostr conv key for peers with known Nostr pubkeys (geohash DM consistency) * Logs/robustness: debounce disconnect notifications (1.5s), debounce 'reconnected' logs (2s), add weak-link cooldown after timeouts on very weak RSSI (<= -90) * Peer icons: faster, accurate reachability\n\n- Run connectivity checks every maintenance tick (5s)\n- Publish peer snapshots on central unsubscribe for instant UI refresh\n- Lower inactivity timeout to 8s and disconnect debounce to 0.9s\n- Gate reachability on mesh-attached (>=1 direct link); no links => no reachable peers\n- Keep 21s retention for verified/unverified, but only when attached to mesh\n\nImproves list responsiveness when walking out of range and prevents stale 'reachable' states when isolated. --------- Co-authored-by: jack <jackjackbits@users.noreply.github.com>
250 lines
14 KiB
Swift
250 lines
14 KiB
Swift
import Foundation
|
|
import Combine
|
|
|
|
// Minimal Nostr transport conforming to Transport for offline sending
|
|
final class NostrTransport: Transport {
|
|
weak var delegate: BitchatDelegate?
|
|
weak var peerEventsDelegate: TransportPeerEventsDelegate?
|
|
var peerSnapshotPublisher: AnyPublisher<[TransportPeerSnapshot], Never> {
|
|
Just([]).eraseToAnyPublisher()
|
|
}
|
|
func currentPeerSnapshots() -> [TransportPeerSnapshot] { [] }
|
|
|
|
// Provide BLE short peer ID for BitChat embedding
|
|
var senderPeerID: String = ""
|
|
|
|
// Throttle READ receipts to avoid relay rate limits
|
|
private struct QueuedRead {
|
|
let receipt: ReadReceipt
|
|
let peerID: String
|
|
}
|
|
private var readQueue: [QueuedRead] = []
|
|
private var isSendingReadAcks = false
|
|
private let readAckInterval: TimeInterval = TransportConfig.nostrReadAckInterval
|
|
|
|
var myPeerID: String { senderPeerID }
|
|
var myNickname: String { "" }
|
|
func setNickname(_ nickname: String) { /* not used for Nostr */ }
|
|
|
|
func startServices() { /* no-op */ }
|
|
func stopServices() { /* no-op */ }
|
|
func emergencyDisconnectAll() { /* no-op */ }
|
|
|
|
func isPeerConnected(_ peerID: String) -> Bool { false }
|
|
func isPeerReachable(_ peerID: String) -> Bool { false }
|
|
func peerNickname(peerID: String) -> String? { nil }
|
|
func getPeerNicknames() -> [String : String] { [:] }
|
|
|
|
func getFingerprint(for peerID: String) -> String? { nil }
|
|
func getNoiseSessionState(for peerID: String) -> LazyHandshakeState { .none }
|
|
func triggerHandshake(with peerID: String) { /* no-op */ }
|
|
// Nostr does not use Noise sessions here; return a cached placeholder to avoid reallocation
|
|
private static var cachedNoiseService: NoiseEncryptionService = {
|
|
NoiseEncryptionService()
|
|
}()
|
|
func getNoiseService() -> NoiseEncryptionService { Self.cachedNoiseService }
|
|
|
|
// Public broadcast not supported over Nostr here
|
|
func sendMessage(_ content: String, mentions: [String]) { /* no-op */ }
|
|
|
|
func sendPrivateMessage(_ content: String, to peerID: String, recipientNickname: String, messageID: String) {
|
|
Task { @MainActor in
|
|
guard let recipientNpub = resolveRecipientNpub(for: peerID) else { return }
|
|
guard let senderIdentity = try? NostrIdentityBridge.getCurrentNostrIdentity() else { return }
|
|
SecureLogger.log("NostrTransport: preparing PM to \(recipientNpub.prefix(16))… for peerID \(peerID.prefix(8))… id=\(messageID.prefix(8))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
// Convert recipient npub -> hex (x-only)
|
|
let recipientHex: String
|
|
do {
|
|
let (hrp, data) = try Bech32.decode(recipientNpub)
|
|
guard hrp == "npub" else {
|
|
SecureLogger.log("NostrTransport: recipient key not npub (hrp=\(hrp))", category: SecureLogger.session, level: .error)
|
|
return
|
|
}
|
|
recipientHex = data.hexEncodedString()
|
|
} catch {
|
|
SecureLogger.log("NostrTransport: failed to decode npub -> hex: \(error)", category: SecureLogger.session, level: .error)
|
|
return
|
|
}
|
|
guard let embedded = NostrEmbeddedBitChat.encodePMForNostr(content: content, messageID: messageID, recipientPeerID: peerID, senderPeerID: senderPeerID) else {
|
|
SecureLogger.log("NostrTransport: failed to embed PM packet", category: SecureLogger.session, level: .error)
|
|
return
|
|
}
|
|
guard let event = try? NostrProtocol.createPrivateMessage(content: embedded, recipientPubkey: recipientHex, senderIdentity: senderIdentity) else {
|
|
SecureLogger.log("NostrTransport: failed to build Nostr event for PM", category: SecureLogger.session, level: .error)
|
|
return
|
|
}
|
|
SecureLogger.log("NostrTransport: sending PM giftWrap id=\(event.id.prefix(16))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
NostrRelayManager.shared.sendEvent(event)
|
|
}
|
|
}
|
|
|
|
func sendReadReceipt(_ receipt: ReadReceipt, to peerID: String) {
|
|
// Enqueue and process with throttling to avoid relay rate limits
|
|
readQueue.append(QueuedRead(receipt: receipt, peerID: peerID))
|
|
processReadQueueIfNeeded()
|
|
}
|
|
|
|
private func processReadQueueIfNeeded() {
|
|
guard !isSendingReadAcks else { return }
|
|
guard !readQueue.isEmpty else { return }
|
|
isSendingReadAcks = true
|
|
sendNextReadAck()
|
|
}
|
|
|
|
private func sendNextReadAck() {
|
|
guard !readQueue.isEmpty else { isSendingReadAcks = false; return }
|
|
let item = readQueue.removeFirst()
|
|
Task { @MainActor in
|
|
guard let recipientNpub = resolveRecipientNpub(for: item.peerID) else { scheduleNextReadAck(); return }
|
|
guard let senderIdentity = try? NostrIdentityBridge.getCurrentNostrIdentity() else { scheduleNextReadAck(); return }
|
|
SecureLogger.log("NostrTransport: preparing READ ack for id=\(item.receipt.originalMessageID.prefix(8))… to \(recipientNpub.prefix(16))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
// Convert recipient npub -> hex
|
|
let recipientHex: String
|
|
do {
|
|
let (hrp, data) = try Bech32.decode(recipientNpub)
|
|
guard hrp == "npub" else { scheduleNextReadAck(); return }
|
|
recipientHex = data.hexEncodedString()
|
|
} catch { scheduleNextReadAck(); return }
|
|
guard let ack = NostrEmbeddedBitChat.encodeAckForNostr(type: .readReceipt, messageID: item.receipt.originalMessageID, recipientPeerID: item.peerID, senderPeerID: senderPeerID) else {
|
|
SecureLogger.log("NostrTransport: failed to embed READ ack", category: SecureLogger.session, level: .error)
|
|
scheduleNextReadAck(); return
|
|
}
|
|
guard let event = try? NostrProtocol.createPrivateMessage(content: ack, recipientPubkey: recipientHex, senderIdentity: senderIdentity) else {
|
|
SecureLogger.log("NostrTransport: failed to build Nostr event for READ ack", category: SecureLogger.session, level: .error)
|
|
scheduleNextReadAck(); return
|
|
}
|
|
SecureLogger.log("NostrTransport: sending READ ack giftWrap id=\(event.id.prefix(16))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
NostrRelayManager.shared.sendEvent(event)
|
|
scheduleNextReadAck()
|
|
}
|
|
}
|
|
|
|
private func scheduleNextReadAck() {
|
|
DispatchQueue.main.asyncAfter(deadline: .now() + readAckInterval) { [weak self] in
|
|
guard let self = self else { return }
|
|
self.isSendingReadAcks = false
|
|
self.processReadQueueIfNeeded()
|
|
}
|
|
}
|
|
|
|
func sendFavoriteNotification(to peerID: String, isFavorite: Bool) {
|
|
Task { @MainActor in
|
|
guard let recipientNpub = resolveRecipientNpub(for: peerID) else { return }
|
|
guard let senderIdentity = try? NostrIdentityBridge.getCurrentNostrIdentity() else { return }
|
|
let content = isFavorite ? "[FAVORITED]:\(senderIdentity.npub)" : "[UNFAVORITED]:\(senderIdentity.npub)"
|
|
SecureLogger.log("NostrTransport: preparing FAVORITE(\(isFavorite)) to \(recipientNpub.prefix(16))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
// Convert recipient npub -> hex
|
|
let recipientHex: String
|
|
do {
|
|
let (hrp, data) = try Bech32.decode(recipientNpub)
|
|
guard hrp == "npub" else { return }
|
|
recipientHex = data.hexEncodedString()
|
|
} catch { return }
|
|
guard let embedded = NostrEmbeddedBitChat.encodePMForNostr(content: content, messageID: UUID().uuidString, recipientPeerID: peerID, senderPeerID: senderPeerID) else {
|
|
SecureLogger.log("NostrTransport: failed to embed favorite notification", category: SecureLogger.session, level: .error)
|
|
return
|
|
}
|
|
guard let event = try? NostrProtocol.createPrivateMessage(content: embedded, recipientPubkey: recipientHex, senderIdentity: senderIdentity) else {
|
|
SecureLogger.log("NostrTransport: failed to build Nostr event for favorite notification", category: SecureLogger.session, level: .error)
|
|
return
|
|
}
|
|
SecureLogger.log("NostrTransport: sending favorite giftWrap id=\(event.id.prefix(16))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
NostrRelayManager.shared.sendEvent(event)
|
|
}
|
|
}
|
|
|
|
// MARK: - Helpers
|
|
@MainActor
|
|
private func resolveRecipientNpub(for peerID: String) -> String? {
|
|
if let noiseKey = Data(hexString: peerID),
|
|
let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey),
|
|
let npub = fav.peerNostrPublicKey {
|
|
return npub
|
|
}
|
|
if peerID.count == 16,
|
|
let fav = FavoritesPersistenceService.shared.getFavoriteStatus(forPeerID: peerID),
|
|
let npub = fav.peerNostrPublicKey {
|
|
return npub
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func sendBroadcastAnnounce() { /* no-op for Nostr */ }
|
|
func sendDeliveryAck(for messageID: String, to peerID: String) {
|
|
Task { @MainActor in
|
|
guard let recipientNpub = resolveRecipientNpub(for: peerID) else { return }
|
|
guard let senderIdentity = try? NostrIdentityBridge.getCurrentNostrIdentity() else { return }
|
|
SecureLogger.log("NostrTransport: preparing DELIVERED ack for id=\(messageID.prefix(8))… to \(recipientNpub.prefix(16))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
let recipientHex: String
|
|
do {
|
|
let (hrp, data) = try Bech32.decode(recipientNpub)
|
|
guard hrp == "npub" else { return }
|
|
recipientHex = data.hexEncodedString()
|
|
} catch { return }
|
|
guard let ack = NostrEmbeddedBitChat.encodeAckForNostr(type: .delivered, messageID: messageID, recipientPeerID: peerID, senderPeerID: senderPeerID) else {
|
|
SecureLogger.log("NostrTransport: failed to embed DELIVERED ack", category: SecureLogger.session, level: .error)
|
|
return
|
|
}
|
|
guard let event = try? NostrProtocol.createPrivateMessage(content: ack, recipientPubkey: recipientHex, senderIdentity: senderIdentity) else {
|
|
SecureLogger.log("NostrTransport: failed to build Nostr event for DELIVERED ack", category: SecureLogger.session, level: .error)
|
|
return
|
|
}
|
|
SecureLogger.log("NostrTransport: sending DELIVERED ack giftWrap id=\(event.id.prefix(16))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
NostrRelayManager.shared.sendEvent(event)
|
|
}
|
|
}
|
|
|
|
// MARK: - Geohash ACK helpers
|
|
func sendDeliveryAckGeohash(for messageID: String, toRecipientHex recipientHex: String, from identity: NostrIdentity) {
|
|
Task { @MainActor in
|
|
SecureLogger.log("GeoDM: send DELIVERED -> recip=\(recipientHex.prefix(8))… mid=\(messageID.prefix(8))… from=\(identity.publicKeyHex.prefix(8))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
guard let embedded = NostrEmbeddedBitChat.encodeAckForNostrNoRecipient(type: .delivered, messageID: messageID, senderPeerID: senderPeerID) else { return }
|
|
guard let event = try? NostrProtocol.createPrivateMessage(content: embedded, recipientPubkey: recipientHex, senderIdentity: identity) else { return }
|
|
NostrRelayManager.registerPendingGiftWrap(id: event.id)
|
|
NostrRelayManager.shared.sendEvent(event)
|
|
}
|
|
}
|
|
|
|
func sendReadReceiptGeohash(_ messageID: String, toRecipientHex recipientHex: String, from identity: NostrIdentity) {
|
|
Task { @MainActor in
|
|
SecureLogger.log("GeoDM: send READ -> recip=\(recipientHex.prefix(8))… mid=\(messageID.prefix(8))… from=\(identity.publicKeyHex.prefix(8))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
guard let embedded = NostrEmbeddedBitChat.encodeAckForNostrNoRecipient(type: .readReceipt, messageID: messageID, senderPeerID: senderPeerID) else { return }
|
|
guard let event = try? NostrProtocol.createPrivateMessage(content: embedded, recipientPubkey: recipientHex, senderIdentity: identity) else { return }
|
|
NostrRelayManager.registerPendingGiftWrap(id: event.id)
|
|
NostrRelayManager.shared.sendEvent(event)
|
|
}
|
|
}
|
|
|
|
// MARK: - Geohash DMs (per-geohash identity)
|
|
func sendPrivateMessageGeohash(content: String, toRecipientHex recipientHex: String, from identity: NostrIdentity, messageID: String) {
|
|
Task { @MainActor in
|
|
guard !recipientHex.isEmpty else { return }
|
|
SecureLogger.log("GeoDM: send PM -> recip=\(recipientHex.prefix(8))… mid=\(messageID.prefix(8))… from=\(identity.publicKeyHex.prefix(8))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
// Build embedded BitChat packet without recipient peer ID
|
|
guard let embedded = NostrEmbeddedBitChat.encodePMForNostrNoRecipient(content: content, messageID: messageID, senderPeerID: senderPeerID) else {
|
|
SecureLogger.log("NostrTransport: failed to embed geohash PM packet", category: SecureLogger.session, level: .error)
|
|
return
|
|
}
|
|
guard let event = try? NostrProtocol.createPrivateMessage(content: embedded, recipientPubkey: recipientHex, senderIdentity: identity) else {
|
|
SecureLogger.log("NostrTransport: failed to build Nostr event for geohash PM", category: SecureLogger.session, level: .error)
|
|
return
|
|
}
|
|
SecureLogger.log("NostrTransport: sending geohash PM giftWrap id=\(event.id.prefix(16))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
NostrRelayManager.registerPendingGiftWrap(id: event.id)
|
|
NostrRelayManager.shared.sendEvent(event)
|
|
}
|
|
}
|
|
}
|