mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 05:45:18 +00:00
* chat: de-dup private chats across ephemeral/stable IDs; prefer most advanced delivery status\n\n- Fixes LazyVStack duplicate ID warnings and blank row in PM\n- Merges messages by id from ephemeral and Noise-key stores\n- Chooses read > delivered > partiallyDelivered > sent > sending > failed (newer wins on tie)\n- Ensures status icon updates immediately without waiting for another send\n- Adds exhaustive handling for DeliveryStatus in ranking * logging: reduce noisy info logs to debug; keep errors/warnings\n\n- Downgrade routing/ACK/subscription/connect logs to debug\n- Retain security/fingerprint/keychain info logs\n- Keep errors and warnings intact\n\ndocs: add docs/privacy-assessment.md covering BLE privacy, routing TTL/jitter, Nostr E2E gift wraps, ACK throttling, and logging posture --------- Co-authored-by: jack <jackjackbits@users.noreply.github.com>
124 lines
5.9 KiB
Swift
124 lines
5.9 KiB
Swift
import Foundation
|
|
|
|
/// Routes messages between BLE and Nostr transports
|
|
@MainActor
|
|
final class MessageRouter {
|
|
private let mesh: Transport
|
|
private let nostr: NostrTransport
|
|
private var outbox: [String: [(content: String, nickname: String, messageID: String)]] = [:] // peerID -> queued messages
|
|
|
|
init(mesh: Transport, nostr: NostrTransport) {
|
|
self.mesh = mesh
|
|
self.nostr = nostr
|
|
self.nostr.senderPeerID = mesh.myPeerID
|
|
|
|
// Observe favorites changes to learn Nostr mapping and flush queued messages
|
|
NotificationCenter.default.addObserver(
|
|
forName: .favoriteStatusChanged,
|
|
object: nil,
|
|
queue: .main
|
|
) { [weak self] note in
|
|
guard let self = self else { return }
|
|
if let data = note.userInfo?["peerPublicKey"] as? Data {
|
|
let peerID = PeerIDUtils.derivePeerID(fromPublicKey: data)
|
|
Task { @MainActor in
|
|
self.flushOutbox(for: peerID)
|
|
}
|
|
}
|
|
// Handle key updates
|
|
if let newKey = note.userInfo?["peerPublicKey"] as? Data,
|
|
let _ = note.userInfo?["isKeyUpdate"] as? Bool {
|
|
let peerID = PeerIDUtils.derivePeerID(fromPublicKey: newKey)
|
|
Task { @MainActor in
|
|
self.flushOutbox(for: peerID)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
func sendPrivate(_ content: String, to peerID: String, recipientNickname: String, messageID: String) {
|
|
let hasMesh = mesh.isPeerConnected(peerID)
|
|
let hasEstablished = mesh.getNoiseService().hasEstablishedSession(with: peerID)
|
|
if hasMesh && hasEstablished {
|
|
SecureLogger.log("Routing PM via mesh to \(peerID.prefix(8))… id=\(messageID.prefix(8))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
mesh.sendPrivateMessage(content, to: peerID, recipientNickname: recipientNickname, messageID: messageID)
|
|
} else if canSendViaNostr(peerID: peerID) {
|
|
SecureLogger.log("Routing PM via Nostr to \(peerID.prefix(8))… id=\(messageID.prefix(8))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
nostr.sendPrivateMessage(content, to: peerID, recipientNickname: recipientNickname, messageID: messageID)
|
|
} else {
|
|
// Queue for later (when mesh connects or Nostr mapping appears)
|
|
if outbox[peerID] == nil { outbox[peerID] = [] }
|
|
outbox[peerID]?.append((content, recipientNickname, messageID))
|
|
SecureLogger.log("Queued PM for \(peerID.prefix(8))… (no mesh, no Nostr mapping) id=\(messageID.prefix(8))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
}
|
|
}
|
|
|
|
func sendReadReceipt(_ receipt: ReadReceipt, to peerID: String) {
|
|
// Prefer mesh only if a Noise session is established; else use Nostr to avoid handshakeRequired spam
|
|
if mesh.isPeerConnected(peerID) && mesh.getNoiseService().hasEstablishedSession(with: peerID) {
|
|
SecureLogger.log("Routing READ ack via mesh to \(peerID.prefix(8))… id=\(receipt.originalMessageID.prefix(8))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
mesh.sendReadReceipt(receipt, to: peerID)
|
|
} else {
|
|
SecureLogger.log("Routing READ ack via Nostr to \(peerID.prefix(8))… id=\(receipt.originalMessageID.prefix(8))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
nostr.sendReadReceipt(receipt, to: peerID)
|
|
}
|
|
}
|
|
|
|
func sendDeliveryAck(_ messageID: String, to peerID: String) {
|
|
if mesh.isPeerConnected(peerID) && mesh.getNoiseService().hasEstablishedSession(with: peerID) {
|
|
mesh.sendDeliveryAck(for: messageID, to: peerID)
|
|
} else {
|
|
nostr.sendDeliveryAck(for: messageID, to: peerID)
|
|
}
|
|
}
|
|
|
|
func sendFavoriteNotification(to peerID: String, isFavorite: Bool) {
|
|
if mesh.isPeerConnected(peerID) {
|
|
mesh.sendFavoriteNotification(to: peerID, isFavorite: isFavorite)
|
|
} else {
|
|
nostr.sendFavoriteNotification(to: peerID, isFavorite: isFavorite)
|
|
}
|
|
}
|
|
|
|
// MARK: - Outbox Management
|
|
private func canSendViaNostr(peerID: String) -> Bool {
|
|
guard let noiseKey = Data(hexString: peerID) else { return false }
|
|
if let fav = FavoritesPersistenceService.shared.getFavoriteStatus(for: noiseKey),
|
|
fav.peerNostrPublicKey != nil {
|
|
return true
|
|
}
|
|
return false
|
|
}
|
|
|
|
func flushOutbox(for peerID: String) {
|
|
guard let queued = outbox[peerID], !queued.isEmpty else { return }
|
|
SecureLogger.log("Flushing outbox for \(peerID.prefix(8))… count=\(queued.count)",
|
|
category: SecureLogger.session, level: .debug)
|
|
// Prefer mesh if connected; else try Nostr if mapping exists
|
|
for (content, nickname, messageID) in queued {
|
|
if mesh.isPeerConnected(peerID) {
|
|
SecureLogger.log("Outbox -> mesh for \(peerID.prefix(8))… id=\(messageID.prefix(8))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
mesh.sendPrivateMessage(content, to: peerID, recipientNickname: nickname, messageID: messageID)
|
|
} else if canSendViaNostr(peerID: peerID) {
|
|
SecureLogger.log("Outbox -> Nostr for \(peerID.prefix(8))… id=\(messageID.prefix(8))…",
|
|
category: SecureLogger.session, level: .debug)
|
|
nostr.sendPrivateMessage(content, to: peerID, recipientNickname: nickname, messageID: messageID)
|
|
} else {
|
|
continue
|
|
}
|
|
}
|
|
// Remove all flushed items (remaining ones, if any, will be re-queued on next call)
|
|
outbox[peerID]?.removeAll()
|
|
}
|
|
|
|
func flushAllOutbox() {
|
|
for key in outbox.keys { flushOutbox(for: key) }
|
|
}
|
|
}
|