refactor(router): make MessageRouter depend on NostrOutboxService; update ChatViewModel wiring

fix(nostr-inbox): initialize NostrInboxService inside @MainActor initializers to satisfy actor isolation
refactor(nostr-outbox): add NostrOutboxService and migrate ChatViewModel geohash PM/ACK sends to it
2026-07-25 22:25:20 +00:00 · 2025-08-26 21:27:55 +02:00 · 2025-08-26 21:20:51 +02:00 · 2025-08-26 21:19:49 +02:00 · 2025-08-26 21:13:40 +02:00 · 2025-08-26 21:01:13 +02:00
1052 changed files with 2345 additions and 1332 deletions
@@ -71,3 +71,7 @@ __pycache__/
 # Local build results
 .Result*/
 .Result*.xcresult/
+TestResult.xcresult/
+*.xcresult/
+build.log
+*.log
@@ -2,7 +2,7 @@

 ## bitchat

-A decentralized peer-to-peer messaging app that works over Bluetooth mesh networks. No internet required, no servers, no phone numbers. It's the side-groupchat. 
+A decentralized peer-to-peer messaging app with dual transport architecture: local Bluetooth mesh networks for offline communication and internet-based Nostr protocol for global reach. No accounts, no phone numbers, no central servers. It's the side-groupchat.

 [bitchat.free](http://bitchat.free)

@@ -11,50 +11,99 @@ A decentralized peer-to-peer messaging app that works over Bluetooth mesh networ
 > [!WARNING]
 > Private messages have not received external security review and may contain vulnerabilities. Do not use for sensitive use cases, and do not rely on its security until it has been reviewed. Now uses the [Noise Protocol](http://www.noiseprotocol.org) for identity and encryption. Public local chat (the main feature) has no security concerns.

-
 ## License

 This project is released into the public domain. See the [LICENSE](LICENSE) file for details.

-
 ## Features

+- **Dual Transport Architecture**: Bluetooth mesh for offline + Nostr protocol for internet-based messaging
+- **Location-Based Channels**: Geographic chat rooms using geohash coordinates over global Nostr relays
+- **Intelligent Message Routing**: Automatically chooses best transport (Bluetooth → Nostr fallback)
 - **Decentralized Mesh Network**: Automatic peer discovery and multi-hop message relay over Bluetooth LE
 - **Privacy First**: No accounts, no phone numbers, no persistent identifiers
- **Private Message End-to-End Encryption**: [Noise Protocol](http://noiseprotocol.org)
+- **Private Message End-to-End Encryption**: [Noise Protocol](http://noiseprotocol.org) for mesh, NIP-17 for Nostr
 - **IRC-Style Commands**: Familiar `/slap`, `/msg`, `/who` style interface
 - **Universal App**: Native support for iOS and macOS
 - **Emergency Wipe**: Triple-tap to instantly clear all data
 - **Performance Optimizations**: LZ4 message compression, adaptive battery modes, and optimized networking

-
 ## [Technical Architecture](https://deepwiki.com/permissionlesstech/bitchat)

-### Binary Protocol
-bitchat uses an efficient binary protocol optimized for Bluetooth LE:
- Compact packet format with 1-byte type field
- TTL-based message routing (max 7 hops)
- Automatic fragmentation for large messages
- Message deduplication via unique IDs
+BitChat uses a **hybrid messaging architecture** with two complementary transport layers:

-### Mesh Networking
- Each device acts as both client and peripheral
- Automatic peer discovery and connection management
- Adaptive duty cycling for battery optimization
+### Bluetooth Mesh Network (Offline)
+
+- **Local Communication**: Direct peer-to-peer within Bluetooth range
+- **Multi-hop Relay**: Messages route through nearby devices (max 7 hops)
+- **No Internet Required**: Works completely offline in disaster scenarios
+- **Noise Protocol Encryption**: End-to-end encryption with forward secrecy
+- **Binary Protocol**: Compact packet format optimized for Bluetooth LE constraints
+- **Automatic Discovery**: Peer discovery and connection management
+- **Adaptive Power**: Battery-optimized duty cycling
+
+### Nostr Protocol (Internet)
+
+- **Global Reach**: Connect with users worldwide via internet relays
+- **Location Channels**: Geographic chat rooms using geohash coordinates
+- **290+ Relay Network**: Distributed across the globe for reliability
+- **NIP-17 Encryption**: Gift-wrapped private messages for internet privacy
+- **Ephemeral Keys**: Fresh cryptographic identity per geohash area
+
+### Channel Types
+
+#### `mesh #bluetooth`
+
+- **Transport**: Bluetooth Low Energy mesh network
+- **Scope**: Local devices within multi-hop range
+- **Internet**: Not required
+- **Use Case**: Offline communication, protests, disasters, remote areas
+
+#### Location Channels (`block #dr5rsj7`, `neighborhood #dr5rs`, `country #dr`)
+
+- **Transport**: Nostr protocol over internet
+- **Scope**: Geographic areas defined by geohash precision
+  - `block` (7 chars): City block level
+  - `neighborhood` (6 chars): District/neighborhood
+  - `city` (5 chars): City level
+  - `province` (4 chars): State/province
+  - `region` (2 chars): Country/large region
+- **Internet**: Required (connects to Nostr relays)
+- **Use Case**: Location-based community chat, local events, regional discussions
+
+### Direct Message Routing
+
+Private messages use **intelligent transport selection**:
+
+1. **Bluetooth First** (preferred when available)
+
+   - Direct connection with established Noise session
+   - Fastest and most private option
+
+2. **Nostr Fallback** (when Bluetooth unavailable)
+
+   - Uses recipient's Nostr public key
+   - NIP-17 gift-wrapping for privacy
+   - Routes through global relay network
+
+3. **Smart Queuing** (when neither available)
+   - Messages queued until transport becomes available
+   - Automatic delivery when connection established

 For detailed protocol documentation, see the [Technical Whitepaper](WHITEPAPER.md).

-
 ## Setup

 ### Option 1: Using XcodeGen (Recommended)

 1. Install XcodeGen if you haven't already:
+
   ```bash
   brew install xcodegen
   ```

 2. Generate the Xcode project:
+
   ```bash
   cd bitchat
   xcodegen generate
@@ -68,6 +117,7 @@ For detailed protocol documentation, see the [Technical Whitepaper](WHITEPAPER.m
 ### Option 2: Using Swift Package Manager

 1. Open the project in Xcode:
+
   ```bash
   cd bitchat
   open Package.swift
@@ -1 +0,0 @@
-[{"type":1,"name":"C5C67AE61A322FBBC90B5C8FE31F44"}]
@@ -1 +0,0 @@
-[{"type":1,"name":"E76911D1F63AFE862FE85FDD58BA22"}]
@@ -1 +0,0 @@
-[{"name":"2A06FD9C403255A7D7F7DD4C1D5411","type":1}]
@@ -1 +0,0 @@
-[{"name":"2B2DF013CC35109F0E84824218C371","type":1}]
@@ -1 +0,0 @@
-[{"name":"272A5ACD643F35A14D9D0C7D97FDBD","type":1}]
@@ -1 +0,0 @@
-[{"name":"02A2B24D353061AA8ED3B5CAE135FA","type":1}]
@@ -1 +0,0 @@
-[{"name":"1846F3D1223CD89DB37574063303CC","type":1}]
@@ -1 +0,0 @@
-[{"name":"298FB4DD003C4885F92C170D32954D","type":1}]
@@ -1 +0,0 @@
-[{"name":"6250CA76F834A1AB8ADA7C2BF60804","type":1}]
@@ -1 +0,0 @@
-[]
@@ -1 +0,0 @@
-[{"name":"16EB30938731948B7DE73214F4EF62","type":1}]
@@ -1 +0,0 @@
-[{"type":1,"name":"18D4B812B33D1DAC12B7B9582F980A"}]
@@ -1 +0,0 @@
-[{"name":"8F8E36790E3B91AC0D6C1DE4AA4B84","type":1}]
@@ -1 +0,0 @@
-[{"type":1,"name":"7241625CC9378F9B48DF34B4275067"}]
@@ -1 +0,0 @@
-[{"name":"F70FD7F495326FAAF8F5F6678ECDB7","type":1}]
@@ -1 +0,0 @@
-[{"name":"187DDE074D38699793B709B475FEA4","type":1}]
@@ -1 +0,0 @@
-[{"name":"3478DD5E223636AC67FC9FF0BF6BB8","type":1}]
@@ -1 +0,0 @@
-[{"name":"D33A1C5CD934A1BBDDABCE4299972C","type":1}]
@@ -1 +0,0 @@
-[{"name":"EE57C07C903ABD8ABB7B65891A4B42","type":1}]
@@ -1 +0,0 @@
-[{"name":"8D83F5E84E35D4934DDAD7B6D4D221","type":1}]
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
jack	ed105f311a	refactor(router): make MessageRouter depend on NostrOutboxService; update ChatViewModel wiring	2025-08-26 21:27:55 +02:00
jack	8ebb7411a7	fix(nostr-inbox): initialize NostrInboxService inside @MainActor initializers to satisfy actor isolation	2025-08-26 21:20:51 +02:00
jack	fb60c929eb	refactor(nostr-outbox): add NostrOutboxService and migrate ChatViewModel geohash PM/ACK sends to it Centralize Nostr geohash outbox (PM, DELIVERED, READ) into a service wrapping NostrTransport; inject into ChatViewModel and remove ad-hoc NostrTransport instantiations.	2025-08-26 21:19:49 +02:00
jack	678795adcf	fix(nostr): mark NostrInboxService @MainActor and use NostrEvent type; resolve Swift 6 actor isolation errors	2025-08-26 21:13:40 +02:00
jack	37e973bf9f	refactor(nostr): add NostrInboxService and route geohash/DM subscriptions through it; move de-dup away from ChatViewModel - Introduce Services/NostrInboxService to centralize subscribe/unsubscribe + event de-dup.\n- Wire ChatViewModel resubscribeCurrentGeohash, switchLocationChannel, sampling, and global DM subscribe to use the service.\n- Remove ChatViewModel's local processedNostrEvents tracking.	2025-08-26 21:01:13 +02:00
jack	8c002b8942	fix(init): initialize autocompleteService in DI initializer to satisfy Swift init rules	2025-08-26 20:15:03 +02:00
jack	6533629362	refactor(init): add dependency-injected initializer for ChatViewModel to enable composition/testing Provide an alternate initializer that accepts meshService, router, privateChatManager, unifiedPeerService, commandProcessor, and an optional ReadReceiptTracker. Keeps default init intact; both perform the same wiring and startup behavior.	2025-08-26 20:11:59 +02:00
jack	dd4e2f6e86	refactor(hex+fingerprint): centralize SHA256 fingerprint helper; reuse PeerIDResolver in ID checks - Move Data.sha256Fingerprint() to BinaryEncodingUtils for reuse; refactor NoiseEncryptionService to use it.\n- Replace manual short/full hex checks with PeerIDResolver in ChatViewModel, ContentView, and SecureIdentityStateManager.\n- Keep behavior identical; reduce ad-hoc string length/hex parsing.	2025-08-26 19:47:51 +02:00
jack	55187ac5c6	refactor(read-receipts): add ReadReceiptTracker and unify across VM + manager Introduce Services/ReadReceiptTracker as single source of truth with persistence. Wire into ChatViewModel and PrivateChatManager, replacing duplicated sentReadReceipts sets and persistence logic. Add to Xcode targets (iOS/macOS).	2025-08-26 18:50:52 +02:00
jack GitHub jack	d7b7f1f673	UI: diversify peer colors; smarter geo notifications; 21m live location (#531 ) - Use minimal-distance hue palette for mesh and geohash lists; align chat sender colors with list palette. - Add foreground geo notifications for different channels; deep-link to bitchat://geohash/<gh>; per-geohash 60s cooldown; respect self/blocks. - Global geohash sampling runs outside the sheet; delegate handles deeplinks and suppresses when already in-channel. - Switch location channel sheet to continuous CoreLocation with 21m distance filter; add config knob. - Only link geohash hashtags when standalone (no @name#abcd or word#abcd). - Include mesh-reachable peers in mesh counts and in "bitchatters nearby" notification. - Add TransportConfig knobs for palette and geo notifications. Co-authored-by: jack <jackjackbits@users.noreply.github.com>	2025-08-26 18:43:22 +02:00
JDandGitHub	7aa3622349	Update README to explain hybrid messaging architecture (#530 )	2025-08-26 18:42:21 +02:00
jack GitHub jack	96c6fc0c0d	Improve mesh relaying, presence, and DM robustness; signed public msgs; reachability UI; quicker announces; store-and-forward (#527 ) * 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>	2025-08-26 17:28:08 +02:00
jack GitHub jack	a7d5b2d7d9	Centralize remaining magic numbers; finalize logging hygiene across UI/BLE/Nostr (#522 ) * docs(plans): add refactor plan; chore(config): introduce TransportConfig and use in BLEService/ChatViewModel/PrivateChatManager; feat: add PeerDisplayNameResolver and apply in BLEService; chore: make TransportPeerSnapshot Equatable/Hashable; perf: simplify read-receipt persistence (no synchronize) * project: add TransportConfig.swift and PeerDisplayNameResolver.swift to iOS/macOS targets (no xcodegen) * chore: remove unnecessary UserDefaults.synchronize() calls (extension/app/VM) * project: fix TransportConfig reference path; remove recovered reference; hook correct fileRef in iOS/macOS sources * chore(BLE): move connect/duty/announce constants to TransportConfig and reference them * chore(NostrTransport): factor recipient npub resolution into helper; reduce duplication * chore(BLE): trim raw hex dump on central decode failure to length+prefix * project: remove duplicate TransportConfig.swift entries from Sources build phases * chore: centralize more constants in TransportConfig (BLE thresholds, Nostr read-ack, UI caps) and adopt in BLEService/ChatViewModel/NostrTransport * chore: centralize location + geohash constants (filters, lookback, relay count) and adopt in LocationChannelManager/ChatViewModel * chore: centralize compression, dedup, verification QR, relay backoff, georelay fetch constants; adopt across modules * chore: centralize more BLE/Nostr delays; tighten NostrRelayManager logs to concise summaries; adopt config for location/geohash/relays * refactor(config): centralize remaining magic numbers and finalize log hygiene Add comprehensive TransportConfig constants for UI, Nostr, and BLE; adopt across ChatViewModel, ContentView, BLEService, ShareViewController, and BitchatApp to remove scattered literals. Standardize Nostr lookbacks/limits, UI delays/animations, and BLE announce/duty-cycle/candidate caps. Preserve behavior while making tuning explicit and safe. Highlights:\n- UI: animations, scroll throttle, long-message thresholds, batch stagger, color hue tuning, rate-limit buckets, read-receipt debounce, startup delays, share accept/dismiss windows, migration cutoff.\n- Nostr: short display length (8), conv-key prefix length (16), DM lookback (24h), geohash sample lookback/limits; consistent use throughout ChatViewModel.\n- BLE: dynamic RSSI defaults, announce intervals/base+jitter, duty cycles (dense/sparse), fragment/ingress lifetimes, expected write timings/spacing, recent packet window (30s/100), peer inactivity timeout; unified candidate caps (100).\n- Share: use constant dismiss delay; App: use constant share accept window.\n\nRisk/impact: behavior-equivalent with centralized knobs; easier to tune without code edits. * project: add TransportConfig.swift to Share Extension target to fix build --------- Co-authored-by: jack <jackjackbits@users.noreply.github.com>	2025-08-25 21:18:51 +02:00
jack GitHub jack	680a390b2d	Nostr: sign events directly with Schnorr keys; update call sites to use Schnorr and remove temporary Signing.PrivateKey conversions (#521 ) Co-authored-by: jack <jackjackbits@users.noreply.github.com>	2025-08-25 18:31:53 +02:00
jack GitHub jack	60b0deee7b	Cleanup: remove dead code, normalize fingerprints, modernize share extension, trim test noise, and drop ‘preparing to share…’ message (#520 ) * Remove dead code and artifacts: drop PeerManager, unused views/types; delete LegacyTestProtocolTypes; update .gitignore; purge TestResult.xcresult and build.log * Tests: gate verbose prints under DEBUG; ChatViewModel: remove legacy fingerprint helper and rely on UnifiedPeerService * Share Extension: migrate to UIKit + UTTypes; drop Social/SLComposeServiceViewController * Remove 'preparing to share …' system message; send shared content immediately * Inline comment cleanup: drop legacy 'removed' breadcrumbs across protocols, services, view model, and views --------- Co-authored-by: jack <jackjackbits@users.noreply.github.com>	2025-08-25 18:01:19 +02:00
jackandGitHub	2f7c0aaaf7	Delete TestResult.xcresult directory	2025-08-25 16:36:36 +02:00
jack GitHub jack	7c4c3f1391	macOS geohash parity: shared LocationChannelsSheet with permission CTA, enable CoreLocation on macOS, unify geohash participants/DMs, update ContentView (unread + QR on macOS), commands: hide/block /fav & /unfav in geohash, remove /help, make /who show geohash participants, fix ViewBuilder mutation+sheet toolbar, entitlements for mac location (#519 ) Co-authored-by: jack <jackjackbits@users.noreply.github.com>	2025-08-25 16:29:52 +02:00
				`@@ -1 +0,0 @@`
				`[{"type":1,"name":"C5C67AE61A322FBBC90B5C8FE31F44"}]`
				`@@ -1 +0,0 @@`
				`[{"type":1,"name":"E76911D1F63AFE862FE85FDD58BA22"}]`
				`@@ -1 +0,0 @@`
				`[{"name":"2A06FD9C403255A7D7F7DD4C1D5411","type":1}]`
				`@@ -1 +0,0 @@`
				`[{"name":"2B2DF013CC35109F0E84824218C371","type":1}]`
				`@@ -1 +0,0 @@`
				`[{"name":"272A5ACD643F35A14D9D0C7D97FDBD","type":1}]`
				`@@ -1 +0,0 @@`
				`[{"name":"02A2B24D353061AA8ED3B5CAE135FA","type":1}]`
				`@@ -1 +0,0 @@`
				`[{"name":"1846F3D1223CD89DB37574063303CC","type":1}]`
				`@@ -1 +0,0 @@`
				`[{"name":"298FB4DD003C4885F92C170D32954D","type":1}]`
				`@@ -1 +0,0 @@`
				`[{"name":"6250CA76F834A1AB8ADA7C2BF60804","type":1}]`