mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-24 23:25:19 +00:00
* Empty-mesh liveliness: nearby conversations, echoes, wave action, dead drops, radar The empty mesh timeline was a dead end: a grey zero and "nobody in range yet". This turns it into a live surface and gives the app pull when the mesh wakes up: - Nearest conversation: background geohash sampling now tracks actual chat messages (not just presence) per regional channel; the empty state surfaces the busiest nearby conversation with a preview, one tap to join (GeohashChatActivityTracker, fed from GeoPresenceTracker). - Echoes: the carried 6h store-and-forward window renders as dimmed "heard here earlier" rows at launch (new Transport collectArchivedPublicMessages -> GossipSyncManager snapshot, decoded with signature-derived nicknames; content-identity dedup guards against re-synced duplicates). - Wave: the "bitchatters nearby" notification gains a "wave" quick action that broadcasts a mesh 👋 straight from the notification, even backgrounded (first UNNotificationCategory in the app). - Dead drops: /drop pins a note to the current building geohash as a kind-1 location note with a 24h NIP-40 expiry; expired notes are now dropped client-side at ingest; the notices sheet shows "fades in Xh"; a "location notes" toggle plus location-permission controls live in app info (also fixes the duplicated Voice section). - Radar: an ambient sonar animation shows the radio scanning, with a privacy-safe daily tally ("N devices passed within range today" via salted per-day hashes) and a "notes left here" hint that opens the notices geo tab. All new user-facing strings ship in all 29 locales. 1403 tests green, including new suites for the activity tracker, sightings tally, and note expiry/drop publishing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Review round: app-info polish, urgent/expiry parity, centered radar, pin fill, Codex P2s - App info: LOCATION header uppercased like sibling sections; location notes and live voice descriptions shortened (29 locales); redundant "location access granted" line removed. - Notices parity: urgent + expiry controls now show on the geo tab too; the bridged Nostr note carries ["t","urgent"] and NIP-40 so relay-side readers see both; urgent parsed back from incoming notes. - Radar moved from the top of the empty state to the center of the chat area, below the help text (empty state fills the visible height). - Header pin fills whenever the scope has notices (was: only unseen), and Nostr-only nearby notes now light it too. - Codex P2 fixes: notification completion deferred until the wave action is handled (background suspension dropped the send); NIP-40 notes now prune on a timer when they expire while displayed; the location-notes kill switch retargets the nearby-notes counter immediately. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Hide macOS segmented picker's built-in label in notices composer (duplicate 'expires in') Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Geo notes: permanent (∞) expiry default, urgent stays mesh-only - Geo expiry picker gains ∞ as the default: a permanent note posts as a pure relay note (no NIP-40 tag, no mesh-board copy — a board copy must fade within days, contradicting the ∞ the user picked). 1/3/7d keep the board + bridged-note path with NIP-40. - The notes manager is now owned by the notices sheet (not the list) so the composer local-echoes ∞ notes into the list; it revives via refresh() after a tab-switch cancel, and its expiry-prune timer survives cancel (weak self, dies with the instance). - Urgent toggle returns to mesh-only per review — notes are ambient; the read-side urgent-tag parse stays so tagged notes still render. - macOS: hide the segmented picker's built-in label (duplicate "expires in"). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Clearing the mesh timeline dismisses echoes for good; tighter divider copy Triple-tap /clear emptied the timeline but the next launch re-seeded "heard here earlier" from the persisted archive. A MeshEchoSettings watermark now records the clear; only messages heard after it come back (the archive itself still carries everything for peers' sync). The echo dedup keys reset with it, and panic wipe drops the watermark. Divider copy tightened to "heard here earlier · last 6h" (29 locales). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Echoes visual polish: tinted history block, radar-captioned tally, ambient footer Device-test feedback on the echoes screen: - Archived echoes now sit on a subtle tinted background (secondary at 8%) in addition to the dim, so "heard here earlier" reads as one distinct block; the divider carries the echo ID prefix to join it. - "N devices passed within range today" moves out of the narration lines to sit centered under the radar as its caption. - When the timeline holds only echoes/system lines, a compact ambient footer (small radar + tally + live hints) renders below the history instead of the whole ambient layer vanishing. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Notes strip persists above the mesh chat; leaner empty-state narration - The 📍 "notes left here" line was empty-state-only, so starting a conversation hid it. It is now a tappable strip pinned above the mesh timeline whenever unexpired notes exist at this place (opens the notices geo tab); the nearby-notes counter runs for the whole mesh timeline, not just the empty state. - Empty state narration drops "nobody in range yet..." (the radar and the sightings caption already say it) and the nearby-conversation hint moves below the help line instead of splitting the narration. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Radar means searching: hide the sweep once mesh peers are connected or reachable Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: jack <jackjackbits@users.noreply.github.com> Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
269 lines
10 KiB
Swift
269 lines
10 KiB
Swift
//
|
|
// ChatPeerListCoordinatorContextTests.swift
|
|
// bitchatTests
|
|
//
|
|
// Exercises `ChatPeerListCoordinator` against a mock `ChatPeerListContext` —
|
|
// proving the coordinator works without a `ChatViewModel`, following the
|
|
// `ChatDeliveryCoordinatorContextTests` /
|
|
// `ChatTransportEventCoordinatorContextTests` exemplars.
|
|
//
|
|
// Scope note: the network-availability notification now posts through the
|
|
// injected `ChatPeerListContext` (`notifyNetworkAvailable(peerCount:)`), so
|
|
// its gating is covered here; the wall-clock timer-driven reset flows are
|
|
// covered by integration-level tests.
|
|
//
|
|
|
|
import Testing
|
|
import Foundation
|
|
import BitFoundation
|
|
@testable import bitchat
|
|
|
|
// MARK: - Mock Context
|
|
|
|
/// Lightweight stand-in for `ChatPeerListContext` proving that
|
|
/// `ChatPeerListCoordinator` is testable without a `ChatViewModel`.
|
|
@MainActor
|
|
private final class MockChatPeerListContext: ChatPeerListContext {
|
|
// Connection & chat state
|
|
var isConnected = false
|
|
var privateChats: [PeerID: [BitchatMessage]] = [:]
|
|
|
|
func privateMessages(for peerID: PeerID) -> [BitchatMessage] {
|
|
privateChats[peerID] ?? []
|
|
}
|
|
var unreadPrivateMessages: Set<PeerID> = []
|
|
var hasTrackedPrivateChatSelection = false
|
|
private(set) var updatePrivateChatPeerIfNeededCount = 0
|
|
private(set) var cleanupOldReadReceiptsCount = 0
|
|
|
|
func markPrivateChatRead(_ peerID: PeerID) {
|
|
unreadPrivateMessages.remove(peerID)
|
|
}
|
|
|
|
func updatePrivateChatPeerIfNeeded() {
|
|
updatePrivateChatPeerIfNeededCount += 1
|
|
}
|
|
|
|
func cleanupOldReadReceipts() {
|
|
cleanupOldReadReceiptsCount += 1
|
|
}
|
|
|
|
// Peers & sessions
|
|
var unifiedPeers: [BitchatPeer] = []
|
|
var connectedMeshPeers: Set<PeerID> = []
|
|
var reachableMeshPeers: Set<PeerID> = []
|
|
var activeMeshPeerCountValue = 0
|
|
private(set) var registeredEphemeralSessions: [PeerID] = []
|
|
private(set) var updateEncryptionStatusForPeersCount = 0
|
|
|
|
func isPeerConnected(_ peerID: PeerID) -> Bool { connectedMeshPeers.contains(peerID) }
|
|
func isPeerReachable(_ peerID: PeerID) -> Bool { reachableMeshPeers.contains(peerID) }
|
|
func activeMeshPeerCount() -> Int { activeMeshPeerCountValue }
|
|
func registerEphemeralSession(peerID: PeerID) { registeredEphemeralSessions.append(peerID) }
|
|
func updateEncryptionStatusForPeers() { updateEncryptionStatusForPeersCount += 1 }
|
|
|
|
// Notifications
|
|
private(set) var networkAvailableNotifications: [Int] = []
|
|
|
|
func notifyNetworkAvailable(peerCount: Int) {
|
|
networkAvailableNotifications.append(peerCount)
|
|
}
|
|
|
|
// Sightings
|
|
private(set) var recordedSightings: [[PeerID]] = []
|
|
|
|
func recordMeshSightings(peerIDs: [PeerID]) {
|
|
recordedSightings.append(peerIDs)
|
|
}
|
|
}
|
|
|
|
// MARK: - Helpers
|
|
|
|
/// Lets the coordinator's internal `Task { @MainActor … }` hops run.
|
|
@MainActor
|
|
private func drainMainActorTasks() async {
|
|
for _ in 0..<10 { await Task.yield() }
|
|
}
|
|
|
|
private func makeMessage(id: String, senderPeerID: PeerID? = nil) -> BitchatMessage {
|
|
BitchatMessage(
|
|
id: id,
|
|
sender: "alice",
|
|
content: "hello",
|
|
timestamp: Date(),
|
|
isRelay: false,
|
|
isPrivate: true,
|
|
recipientNickname: "me",
|
|
senderPeerID: senderPeerID
|
|
)
|
|
}
|
|
|
|
// MARK: - Coordinator Tests Against Mock Context
|
|
|
|
/// Exercises `ChatPeerListCoordinator` against `MockChatPeerListContext` with
|
|
/// no `ChatViewModel`.
|
|
struct ChatPeerListCoordinatorContextTests {
|
|
|
|
@Test @MainActor
|
|
func didUpdatePeerList_updatesConnectionSessionsAndEncryptionStatus() async {
|
|
let context = MockChatPeerListContext()
|
|
let coordinator = ChatPeerListCoordinator(context: context)
|
|
let peerA = PeerID(str: "0011223344556677")
|
|
let peerB = PeerID(str: "8899aabbccddeeff")
|
|
context.isConnected = true
|
|
|
|
// Empty list: disconnected, read-receipt hygiene still runs, no sessions.
|
|
coordinator.didUpdatePeerList([])
|
|
await drainMainActorTasks()
|
|
#expect(!context.isConnected)
|
|
#expect(context.cleanupOldReadReceiptsCount == 1)
|
|
#expect(context.registeredEphemeralSessions.isEmpty)
|
|
#expect(context.updateEncryptionStatusForPeersCount == 1)
|
|
|
|
// Non-empty list: connected, every peer gets an ephemeral session.
|
|
coordinator.didUpdatePeerList([peerA, peerB])
|
|
await drainMainActorTasks()
|
|
#expect(context.isConnected)
|
|
#expect(context.registeredEphemeralSessions == [peerA, peerB])
|
|
#expect(context.updateEncryptionStatusForPeersCount == 2)
|
|
#expect(context.cleanupOldReadReceiptsCount == 2)
|
|
}
|
|
|
|
@Test @MainActor
|
|
func didUpdatePeerList_refreshesPrivateChatPeerOnlyWhenSelectionIsTracked() async {
|
|
let context = MockChatPeerListContext()
|
|
let coordinator = ChatPeerListCoordinator(context: context)
|
|
let peerID = PeerID(str: "0011223344556677")
|
|
|
|
coordinator.didUpdatePeerList([peerID])
|
|
await drainMainActorTasks()
|
|
#expect(context.updatePrivateChatPeerIfNeededCount == 0)
|
|
|
|
context.hasTrackedPrivateChatSelection = true
|
|
coordinator.didUpdatePeerList([peerID])
|
|
await drainMainActorTasks()
|
|
#expect(context.updatePrivateChatPeerIfNeededCount == 1)
|
|
}
|
|
|
|
@Test @MainActor
|
|
func didUpdatePeerList_removesStaleUnreadPeerIDsButKeepsBackedConversations() async {
|
|
let context = MockChatPeerListContext()
|
|
let coordinator = ChatPeerListCoordinator(context: context)
|
|
|
|
let currentPeer = PeerID(str: "0011223344556677")
|
|
let staleShortPeer = PeerID(str: "8899aabbccddeeff")
|
|
let geoDMWithMessages = PeerID(str: "nostr_" + String(repeating: "ab", count: 8))
|
|
let geoDMWithoutMessages = PeerID(str: "nostr_" + String(repeating: "cd", count: 8))
|
|
let noiseKeyWithMessages = PeerID(str: String(repeating: "ef", count: 32))
|
|
|
|
context.unifiedPeers = [
|
|
BitchatPeer(
|
|
peerID: currentPeer,
|
|
noisePublicKey: Data(repeating: 0x01, count: 32),
|
|
nickname: "alice"
|
|
)
|
|
]
|
|
context.unreadPrivateMessages = [
|
|
currentPeer,
|
|
staleShortPeer,
|
|
geoDMWithMessages,
|
|
geoDMWithoutMessages,
|
|
noiseKeyWithMessages
|
|
]
|
|
context.privateChats = [
|
|
geoDMWithMessages: [makeMessage(id: "geo-1")],
|
|
noiseKeyWithMessages: [makeMessage(id: "noise-1")]
|
|
]
|
|
|
|
coordinator.didUpdatePeerList([currentPeer])
|
|
await drainMainActorTasks()
|
|
|
|
// Stale IDs without a backing conversation are dropped; geo-DM and
|
|
// Noise-key IDs with stored messages survive, as does the live peer.
|
|
#expect(context.unreadPrivateMessages == [currentPeer, geoDMWithMessages, noiseKeyWithMessages])
|
|
#expect(context.cleanupOldReadReceiptsCount == 1)
|
|
}
|
|
|
|
@Test @MainActor
|
|
func didUpdatePeerList_notifiesNetworkAvailableOncePerCooldownForNewMeshPeers() async {
|
|
let context = MockChatPeerListContext()
|
|
let coordinator = ChatPeerListCoordinator(context: context)
|
|
let peerA = PeerID(str: "0011223344556677")
|
|
let peerB = PeerID(str: "8899aabbccddeeff")
|
|
context.connectedMeshPeers = [peerA, peerB]
|
|
|
|
// First sighting of a mesh-active peer notifies with the mesh peer count.
|
|
coordinator.didUpdatePeerList([peerA])
|
|
await drainMainActorTasks()
|
|
#expect(context.networkAvailableNotifications == [1])
|
|
|
|
// The same peer again is not new — no repeat notification.
|
|
coordinator.didUpdatePeerList([peerA])
|
|
await drainMainActorTasks()
|
|
#expect(context.networkAvailableNotifications == [1])
|
|
|
|
// A genuinely new peer inside the cooldown window stays silent too.
|
|
coordinator.didUpdatePeerList([peerA, peerB])
|
|
await drainMainActorTasks()
|
|
#expect(context.networkAvailableNotifications == [1])
|
|
}
|
|
|
|
@Test @MainActor
|
|
func didUpdatePeerList_peerJoiningExistingMeshDoesNotNotify() async {
|
|
// Cooldown zero so this proves the empty-transition gate alone — a
|
|
// new peer joining while already meshed must stay silent even with
|
|
// the cooldown long expired (the sitting-idle re-notify bug).
|
|
let context = MockChatPeerListContext()
|
|
let coordinator = ChatPeerListCoordinator(context: context, notificationCooldownSeconds: 0)
|
|
let peerA = PeerID(str: "0011223344556677")
|
|
let peerB = PeerID(str: "8899aabbccddeeff")
|
|
context.connectedMeshPeers = [peerA, peerB]
|
|
|
|
coordinator.didUpdatePeerList([peerA])
|
|
await drainMainActorTasks()
|
|
#expect(context.networkAvailableNotifications == [1])
|
|
|
|
// peerB arrives while peerA is still connected: no notification.
|
|
coordinator.didUpdatePeerList([peerA, peerB])
|
|
await drainMainActorTasks()
|
|
#expect(context.networkAvailableNotifications == [1])
|
|
|
|
// Repeat events while idle keep staying silent.
|
|
coordinator.didUpdatePeerList([peerA, peerB])
|
|
await drainMainActorTasks()
|
|
#expect(context.networkAvailableNotifications == [1])
|
|
}
|
|
|
|
@Test @MainActor
|
|
func didUpdatePeerList_briefMeshFlapDoesNotRenotify() async {
|
|
let context = MockChatPeerListContext()
|
|
let coordinator = ChatPeerListCoordinator(context: context, notificationCooldownSeconds: 0)
|
|
let peerA = PeerID(str: "0011223344556677")
|
|
context.connectedMeshPeers = [peerA]
|
|
|
|
coordinator.didUpdatePeerList([peerA])
|
|
await drainMainActorTasks()
|
|
#expect(context.networkAvailableNotifications == [1])
|
|
|
|
// Link flap: empty list, then the peer returns before the 30s empty
|
|
// confirmation fires — silent.
|
|
coordinator.didUpdatePeerList([])
|
|
await drainMainActorTasks()
|
|
coordinator.didUpdatePeerList([peerA])
|
|
await drainMainActorTasks()
|
|
#expect(context.networkAvailableNotifications == [1])
|
|
}
|
|
|
|
@Test @MainActor
|
|
func didUpdatePeerList_meshInactivePeersNeverNotify() async {
|
|
let context = MockChatPeerListContext()
|
|
let coordinator = ChatPeerListCoordinator(context: context)
|
|
let peerA = PeerID(str: "0011223344556677")
|
|
|
|
// Peer present but neither connected nor reachable: no notification.
|
|
coordinator.didUpdatePeerList([peerA])
|
|
await drainMainActorTasks()
|
|
#expect(context.networkAvailableNotifications.isEmpty)
|
|
}
|
|
}
|