mirror of
https://github.com/permissionlesstech/bitchat.git
synced 2026-07-25 06:25:20 +00:00
* Nearby notes: tap-to-reveal before any relay REQ, plus shared subscription pool The nearby-notes counter used to open a live building-precision (precision-8) geohash REQ to the closest geo relays whenever the mesh public timeline was visible — a passive location side-channel with no opt-in. Now nothing subscribes until one explicit act reveals the counter for the session: tapping the new "check for notes left here" line on the empty mesh timeline (static, no network), opening the notices sheet's geo tab, or a successful /drop. The app-info setting stays the default-ON kill switch and still gates /drop. Subscription hygiene alongside: - LocationNotesManager.deinit now unsubscribes its live REQ (hopping to the main actor like the timer teardown) instead of only invalidating timers. - New refcounted LocationNotesPool dedupes the counter's and the notices sheet's identical 9-cell kind-1 REQs into one shared manager per geohash; both callers release-and-reacquire instead of retargeting in place, and the sheet releases its ref on dismissal. The reveal affordance is localized across all 29 catalog locales, and new NearbyNotesCounterTests cover the no-REQ-before-reveal contract, the 9-cell filter, NIP-40 expiry handling, single unsubscribe on deactivate, and pool refcounting. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * Review fixes: permission-gate the hint, exclude building cell from pre-reveal sampling, explicit-act reveal only Fixes the verified review findings on the tap-to-reveal PR: - Permission dead-end: the "check for notes left here" hint now renders only when location permission is already authorized (it never prompts). Previously a location-denied install could tap it, flip the sticky revealed flag, and get nothing for the rest of the session because retarget() guards on authorization. Predicate lives on NearbyNotesCounter.offersRevealHint(permissionState:) and is reactive to the published permission state. - Building-cell sampling: background geohash sampling subscribed geo-sample-<gh> for every regional level including the precision-8 building cell, pre-reveal — contradicting the claim that nothing building-precision hits a relay before the explicit act. GeoChannelCoordinator now excludes the building level until NearbyNotesCounter.revealed (injectable publisher for tests); coarser levels keep the nearby-conversation hint and participant counts working, and bookmarks stay exempt (bookmarking is explicit). - Implicit reveal: opening the notices sheet no longer reveals — the sheet auto-lands on the geo tab whenever a location channel is selected, so browsing a remote geohash and opening notices revealed the LOCAL building subscription. reveal() now fires only on the person actively picking the geo segment, and only when the sheet has a geo scope (the empty-mesh hint tap and /drop stay as before). - Subscription hygiene: switching the sheet geo → mesh releases the pooled notes manager (the REQ was left streaming behind the mesh board); switching back re-acquires from the pool. The dismissal release stays balanced — liveGeoManager is nil after the tab-switch release. - VoiceOver: the hint button exposes the plain localized action text instead of the decorated "* 📍 … *" label. - Removed LocationNotesManager.setGeohash: zero callers, and calling it on a pooled instance would corrupt the pool's keying and refcounts. New tests: hint permission gate, explicit-geo-tab reveal contract, building-cell sampling exclusion before/after reveal, pool release/re-acquire round trip. Full suite (1467) green; iOS simulator build green. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Deflake peer-snapshot binding waits: longTimeout for the multi-hop pipeline CI failed once on initialization_bindsPeerSnapshotsIntoAllPeers: the snapshot -> allPeers binding crosses the mock transport's unstructured Task, UnifiedPeerService.updatePeers, a receive(on: main), and another Task { @MainActor } in bindPeerService — all contending with every parallel worker. On the failing runner the whole suite took 10.1s (usually ~4.4s locally), so the positive 5s defaultTimeout wait lost the race. That's exactly the case TestConstants.longTimeout documents; passing runs return as soon as the condition holds and never pay it. Not caused by the tap-to-reveal changes: nothing on that pipeline was touched, and 20 full parallel-suite loops each on the branch and on origin/main reproduce zero failures locally. The two sibling waits on the same pipeline in this file get the same timeout. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: jack <jackjackbits@users.noreply.github.com> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
62 lines
2.3 KiB
Swift
62 lines
2.3 KiB
Swift
//
|
|
// LocationNotesPool.swift
|
|
// bitchat
|
|
//
|
|
// Refcounted pool of LocationNotesManager instances keyed by geohash, so
|
|
// surfaces watching the same place (the nearby-notes counter and the notices
|
|
// sheet's geo tab) share one relay subscription instead of opening two
|
|
// identical 9-cell REQs.
|
|
// This is free and unencumbered software released into the public domain.
|
|
//
|
|
|
|
import Foundation
|
|
|
|
@MainActor
|
|
final class LocationNotesPool {
|
|
static let shared = LocationNotesPool()
|
|
|
|
private var entries: [String: (manager: LocationNotesManager, refs: Int)] = [:]
|
|
private let makeManager: @MainActor (String) -> LocationNotesManager
|
|
|
|
/// The factory is injectable so tests can pool managers built over stub
|
|
/// dependencies; live use derives one real manager per geohash.
|
|
init(makeManager: @escaping @MainActor (String) -> LocationNotesManager = { LocationNotesManager(geohash: $0) }) {
|
|
self.makeManager = makeManager
|
|
}
|
|
|
|
/// Returns the shared manager for `geohash` (case-insensitive), creating
|
|
/// it on first acquire and reviving a cancelled one on re-acquire.
|
|
/// Callers must never `cancel` a pooled manager — release it and acquire
|
|
/// the new geohash instead.
|
|
func acquire(_ geohash: String) -> LocationNotesManager {
|
|
let key = geohash.lowercased()
|
|
if let entry = entries[key] {
|
|
entries[key] = (entry.manager, entry.refs + 1)
|
|
if entry.manager.state == .idle {
|
|
entry.manager.refresh()
|
|
}
|
|
return entry.manager
|
|
}
|
|
let manager = makeManager(key)
|
|
entries[key] = (manager, 1)
|
|
return manager
|
|
}
|
|
|
|
/// Balances `acquire`: the last release cancels the subscription and
|
|
/// drops the entry. Releasing an instance the pool doesn't own (a
|
|
/// test-injected manager) degrades to a plain `cancel()`.
|
|
func release(_ manager: LocationNotesManager?) {
|
|
guard let manager else { return }
|
|
guard let entry = entries[manager.geohash], entry.manager === manager else {
|
|
manager.cancel()
|
|
return
|
|
}
|
|
if entry.refs <= 1 {
|
|
entries[manager.geohash] = nil
|
|
manager.cancel()
|
|
} else {
|
|
entries[manager.geohash] = (entry.manager, entry.refs - 1)
|
|
}
|
|
}
|
|
}
|