mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 07:05:20 +00:00
Surface router drops as failed status; bound relay pending subscriptions; jitter backoff
MessageRouter outbox drops (attempt cap, TTL expiry in flush and cleanup, per-peer overflow eviction) now invoke onMessageDropped, wired to mark the message .failed in the ConversationStore - guarded so a late failure never downgrades an already delivered/read status. NostrRelayManager pending subscriptions gain a per-relay cap (64, oldest-by-sequence eviction; durable intent still replays from subscriptionRequestState) and a 10-minute age sweep on the existing connect path. Reconnect backoff gets injectable +/-20% jitter so recovering relays don't thundering-herd. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -110,6 +110,98 @@ struct MessageRouterTests {
|
||||
#expect(transport.sentPrivateMessages.count == 8)
|
||||
}
|
||||
|
||||
// MARK: - Drop visibility (onMessageDropped)
|
||||
|
||||
@Test @MainActor
|
||||
func flushOutbox_attemptCapDropInvokesOnMessageDropped() async {
|
||||
let peerID = PeerID(str: "0000000000000009")
|
||||
let transport = MockTransport()
|
||||
transport.reachablePeers.insert(peerID)
|
||||
|
||||
let router = MessageRouter(transports: [transport])
|
||||
var dropped: [(messageID: String, peerID: PeerID)] = []
|
||||
router.onMessageDropped = { dropped.append(($0, $1)) }
|
||||
|
||||
router.sendPrivate("Hello", to: peerID, recipientNickname: "Peer", messageID: "m9")
|
||||
for _ in 0..<10 {
|
||||
router.flushOutbox(for: peerID)
|
||||
}
|
||||
|
||||
#expect(dropped.count == 1)
|
||||
#expect(dropped.first?.messageID == "m9")
|
||||
#expect(dropped.first?.peerID == peerID)
|
||||
}
|
||||
|
||||
@Test @MainActor
|
||||
func flushOutbox_ttlExpiryInvokesOnMessageDroppedAndDoesNotResend() async {
|
||||
let peerID = PeerID(str: "000000000000000a")
|
||||
let transport = MockTransport()
|
||||
let clock = MutableTestClock()
|
||||
|
||||
let router = MessageRouter(transports: [transport], now: { clock.now })
|
||||
var dropped: [String] = []
|
||||
router.onMessageDropped = { messageID, _ in dropped.append(messageID) }
|
||||
|
||||
// No reachable transport: the message is queued, never sent.
|
||||
router.sendPrivate("Hello", to: peerID, recipientNickname: "Peer", messageID: "m10")
|
||||
#expect(transport.sentPrivateMessages.isEmpty)
|
||||
|
||||
// Past the 24h TTL the flush must drop it (visibly), not send it.
|
||||
clock.now = clock.now.addingTimeInterval(24 * 60 * 60 + 1)
|
||||
transport.reachablePeers.insert(peerID)
|
||||
router.flushOutbox(for: peerID)
|
||||
|
||||
#expect(dropped == ["m10"])
|
||||
#expect(transport.sentPrivateMessages.isEmpty)
|
||||
|
||||
// The drop is final: nothing is retained for later flushes.
|
||||
router.flushOutbox(for: peerID)
|
||||
#expect(dropped == ["m10"])
|
||||
}
|
||||
|
||||
@Test @MainActor
|
||||
func cleanupExpiredMessages_invokesOnMessageDroppedForExpiredOnly() async {
|
||||
let peerID = PeerID(str: "000000000000000b")
|
||||
let transport = MockTransport()
|
||||
let clock = MutableTestClock()
|
||||
|
||||
let router = MessageRouter(transports: [transport], now: { clock.now })
|
||||
var dropped: [String] = []
|
||||
router.onMessageDropped = { messageID, _ in dropped.append(messageID) }
|
||||
|
||||
router.sendPrivate("Old", to: peerID, recipientNickname: "Peer", messageID: "m11-old")
|
||||
clock.now = clock.now.addingTimeInterval(24 * 60 * 60 - 60)
|
||||
router.sendPrivate("Fresh", to: peerID, recipientNickname: "Peer", messageID: "m11-fresh")
|
||||
clock.now = clock.now.addingTimeInterval(120)
|
||||
|
||||
router.cleanupExpiredMessages()
|
||||
|
||||
#expect(dropped == ["m11-old"])
|
||||
|
||||
// The fresh message survived and still flushes once reachable.
|
||||
transport.reachablePeers.insert(peerID)
|
||||
router.flushOutbox(for: peerID)
|
||||
#expect(transport.sentPrivateMessages.map(\.messageID) == ["m11-fresh"])
|
||||
}
|
||||
|
||||
@Test @MainActor
|
||||
func enqueue_perPeerOverflowEvictionInvokesOnMessageDropped() async {
|
||||
let peerID = PeerID(str: "000000000000000c")
|
||||
let transport = MockTransport()
|
||||
|
||||
let router = MessageRouter(transports: [transport])
|
||||
var dropped: [String] = []
|
||||
router.onMessageDropped = { messageID, _ in dropped.append(messageID) }
|
||||
|
||||
// No reachable transport: everything queues. The cap is 100 per peer,
|
||||
// so the 101st enqueue evicts the oldest.
|
||||
for i in 0...100 {
|
||||
router.sendPrivate("Hello \(i)", to: peerID, recipientNickname: "Peer", messageID: "q\(i)")
|
||||
}
|
||||
|
||||
#expect(dropped == ["q0"])
|
||||
}
|
||||
|
||||
@Test @MainActor
|
||||
func sendReadReceipt_usesReachableTransport() async {
|
||||
let peerID = PeerID(str: "0000000000000003")
|
||||
@@ -135,3 +227,9 @@ struct MessageRouterTests {
|
||||
#expect(transport.sentFavoriteNotifications.count == 1)
|
||||
}
|
||||
}
|
||||
|
||||
/// Mutable wall clock injected into `MessageRouter` so TTL expiry is testable
|
||||
/// without real waiting.
|
||||
private final class MutableTestClock {
|
||||
var now = Date(timeIntervalSince1970: 1_700_000_000)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user