edison/chanora
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(beta): External Beta — passwords, channel join, mute, bookmarks, encrypted identity

Browse Source 
The v0.3 client could only ever connect to a hardcoded default
channel with no password and offered no controls mid-call.
External Beta closes those gaps and tightens identity-at-rest.

User-facing additions
---------------------

* **Server password** on the connect form. Plumbed through
  `BridgeError`-aware `connect(host, nickname, password)`. Empty
  string means "no password" — no behaviour change for open
  servers.
* **Channel join**: tapping a row (or its login icon) in the
  channel tree issues a `client_move`. Names containing "🔒" or
  "password" prompt for a channel password first.
* **Self-mute** for both microphone (`client_input_muted`) and
  speaker (`client_output_muted`) via FilterChips. Output mute
  also flips the audio engine's local output-muted flag so
  playback silences immediately, before the server acknowledges.
* **Master output gain** slider (0–200%). Plumbed through an
  `AtomicU32` (f32 bits) on the engine that the cpal output
  callback multiplies into every sample.
* **Bookmarks**: SQLite-backed list with Save / Connect / Delete
  actions. Bookmarks persist across app restarts; tapping one
  pre-fills the form and dials immediately.

Hardening
---------

* **Encrypted identity at rest** (RISK-PoC-002 closure for the
  file-only threat model). ChaCha20-Poly1305 envelope: nonce +
  ciphertext written atomically with mode 0600; 32-byte DEK in a
  separate `identity.dek` file. Legacy plaintext identity files
  are auto-detected, read, and upgraded on the next save. Full OS-
  keyring integration is still v0.4 work — documented in the
  store's doc comment.
* **Mobile voice-comm routing**: on Android, `AudioEngine::start`
  uses JNI to set `AudioManager.setMode(MODE_IN_COMMUNICATION)`
  when `cfg.mobile_voice_preset` is true (default). This engages
  the device-side AEC/NS pipeline on most Pixel/Moto/Samsung
  hardware even though cpal still opens the AAudio default input
  preset. Full `setInputPreset(VOICE_COMMUNICATION)` switch is
  still RISK-AUDIO-MOBILE-001 (needs cpal upstream or an Oboe
  fork).
* **Log noise**: bridge default `EnvFilter` now silences
  `tsproto::resend=error` and `tsproto::packet_codec=error` so
  the redacted diagnostic export is human-readable. Still
  overridable via `RUST_LOG=...`.

Engineering
-----------

* **`chanora_storage`** gains `BookmarkRepository` (rusqlite
  bundled) with `add` / `update` / `delete` / `list`. The
  identity store now layers on `chacha20poly1305` + `rand` +
  `zeroize` for the envelope.
* **`chanora_protocol`** exposes `move_to_channel` and
  `set_muted` on `ProtocolClient`, dispatched through the
  existing `connection_task` request channel onto tsclientlib's
  generated `client.client_move(...)` and
  `state.client_update().set_input_muted/set_output_muted(...)`
  paths.
* **`chanora_core::ChanoraSession`** wires the bookmark store
  next to the identity store inside `init_storage`, and adds
  `list_bookmarks` / `add_bookmark` / `update_bookmark` /
  `delete_bookmark` / `move_to_channel` / `set_self_muted` /
  `set_output_gain`.
* **`chanora_audio::AudioEngine`** carries `output_gain` and
  `output_muted` atomics; the output callback consults both. The
  Android branch of `start()` engages MODE_IN_COMMUNICATION via
  a small JNI helper that reuses the `ndk_context` global set by
  the bridge's `android_init` hook.
* **`chanora_bridge::api`** adds `set_input_muted`,
  `set_output_muted`, `set_output_gain`, `move_to_channel`,
  `list_bookmarks`, `add_bookmark`, `update_bookmark`,
  `delete_bookmark`, and the `BridgeBookmark` DTO. FRB v2.12
  codegen regenerated.

Tests + CI
----------

* `chanora_storage` test count rises from 3 to 8 — bookmark CRUD
  round-trip, missing-row → `NotFound`, encrypted round-trip
  (verifies ciphertext is not the plaintext on disk), and the
  legacy plaintext upgrade path.
* New `.github/workflows/ci.yml`: `cargo check --workspace`,
  `cargo test --workspace --no-fail-fast`, `cargo clippy`
  (advisory), `flutter analyze`, and `flutter test` excluding
  the live-server `e2e` tag.

Live-verified on Moto G Stylus 5G against cn.teamspeak.app:
saved a bookmark, reconnected via it, joined a non-default
channel via tap, toggled both mutes, slid the volume, and the
redacted diagnostic export confirmed `AudioManager mode set to
MODE_IN_COMMUNICATION`, `client_move sent`, and `client_update
sent` lines.
This commit is contained in:
EdisonJwa
2026-05-15 01:59:27 +08:00
parent fd181c014c
commit 780fd7eca2
22 changed files with 2638 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/chanora_flutter/lib/main.dart
+378 -52
View File
@@ -1,13 +1,12 @@
// Chanora Flutter application — Beta build (v0.2.0-beta.1).
// Chanora Flutter application — External Beta build.
//
// Adds voice in/out via push-to-talk on top of the Alpha UI:
// 1. Connect form + channel/client tree (Alpha)
// 2. "Start audio" button after connect → opens the audio engine
// 3. Push-to-talk button: hold to transmit, release to stop
// 4. Live audio stats line (TX/RX frame counts)
//
// Audio rendering on the speaker is automatic once the engine
// starts; nothing to wire on the Dart side beyond that.
// Builds on Internal Beta v0.3.0-beta.1:
// * server password field
// * bookmark list with add / connect / delete actions
// * channel tap-to-join with optional channel password
// * self input + output mute toggles + master output gain slider
// * diagnostics dialog + reconnect banner + identity persistence
// (all carried over from v0.3.0-beta.1)
import 'dart:async';
@@ -23,13 +22,7 @@ import 'src/rust/frb_generated.dart';
Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized();
await RustLib.init();
// A.2 — wire identity persistence to the platform's app-private
// directory so the same TS3 UID is presented on every restart.
// Beta: stored as a plain 0600 file (RISK-PoC-002).
unawaited(_wireStorage());
// A.6.1 — push the OS-reported connectivity state into the core
// supervisor so reconnects redial promptly when the network
// returns.
unawaited(_wireConnectivity());
runApp(const ChanoraApp());
}
@@ -39,15 +32,11 @@ Future<void> _wireStorage() async {
final dir = await getApplicationSupportDirectory();
await rust.initStorage(dir: dir.path);
} catch (_) {
// Storage is best-effort — on failure the app still works but
// each session gets a fresh ephemeral identity.
// Best-effort; missing storage just means no identity persistence
// and no bookmark list this session.
}
}
/// Map `connectivity_plus`' list-of-results to our coarse tri-state.
/// We consider the device "Online" if any of the reported transports
/// is non-`none`. This is intentionally permissive — the supervisor's
/// watchdog still verifies reachability against the actual server.
rust.BridgeNetworkState _mapConnectivity(List<ConnectivityResult> results) {
if (results.isEmpty) return rust.BridgeNetworkState.unknown;
final allNone = results.every((r) => r == ConnectivityResult.none);
@@ -57,16 +46,10 @@ rust.BridgeNetworkState _mapConnectivity(List<ConnectivityResult> results) {
Future<void> _wireConnectivity() async {
final connectivity = Connectivity();
// Seed with the current value so the supervisor has a real reading
// before the first transition.
try {
final initial = await connectivity.checkConnectivity();
rust.setNetworkState(state: _mapConnectivity(initial));
} catch (_) {
// Best effort; if the plugin isn't available on this platform
// we stay at Unknown and the supervisor falls back to its
// watchdog-only behaviour.
}
} catch (_) {}
connectivity.onConnectivityChanged.listen((results) {
rust.setNetworkState(state: _mapConnectivity(results));
});
@@ -102,6 +85,7 @@ class _BetaHome extends StatefulWidget {
class _BetaHomeState extends State<_BetaHome> {
final _hostCtl = TextEditingController(text: 'cn.teamspeak.app');
final _nickCtl = TextEditingController(text: 'ChanoraBeta');
final _passwordCtl = TextEditingController();
_Phase _phase = _Phase.idle;
rust.BridgeSnapshot? _snapshot;
@@ -111,15 +95,31 @@ class _BetaHomeState extends State<_BetaHome> {
Timer? _statsTimer;
StreamSubscription<rust.BridgeEvent>? _eventsSub;
// A.6 reconnect banner state.
String? _lostReason;
int? _reconnectAttempt;
int? _reconnectDelay;
bool _inputMuted = false;
bool _outputMuted = false;
double _outputGain = 1.0;
List<rust.BridgeBookmark> _bookmarks = const [];
@override
void initState() {
super.initState();
_eventsSub = rust.eventsStream().listen(_onEvent);
unawaited(_reloadBookmarks());
}
Future<void> _reloadBookmarks() async {
try {
final list = await rust.listBookmarks();
if (!mounted) return;
setState(() => _bookmarks = list);
} catch (_) {
// Bookmark store missing on this platform — empty list is fine.
}
}
void _onEvent(rust.BridgeEvent evt) {
@@ -155,10 +155,6 @@ class _BetaHomeState extends State<_BetaHome> {
case rust.BridgeEvent_AudioStopped():
setState(() => _audioStarted = false);
case rust.BridgeEvent_SnapshotChanged():
// A.4: the supervisor's watchdog observed a tree change.
// Trigger a single async refresh so the channel/client
// list stays current without a polling timer on the Dart
// side.
unawaited(_onRefresh());
}
}
@@ -169,10 +165,15 @@ class _BetaHomeState extends State<_BetaHome> {
_statsTimer?.cancel();
_hostCtl.dispose();
_nickCtl.dispose();
_passwordCtl.dispose();
super.dispose();
}
Future<void> _onConnect() async {
Future<void> _onConnect({
String? host,
String? nickname,
String? password,
}) async {
setState(() {
_phase = _Phase.connecting;
_error = null;
@@ -180,8 +181,9 @@ class _BetaHomeState extends State<_BetaHome> {
});
try {
final snap = await rust.connect(
host: _hostCtl.text.trim(),
nickname: _nickCtl.text.trim(),
host: (host ?? _hostCtl.text).trim(),
nickname: (nickname ?? _nickCtl.text).trim(),
password: password ?? _passwordCtl.text,
);
if (!mounted) return;
setState(() {
@@ -225,6 +227,87 @@ class _BetaHomeState extends State<_BetaHome> {
}
}
Future<void> _toggleInputMute() async {
final next = !_inputMuted;
try {
await rust.setInputMuted(muted: next);
if (!mounted) return;
setState(() => _inputMuted = next);
} catch (e) {
if (!mounted) return;
setState(() => _error = e.toString());
}
}
Future<void> _toggleOutputMute() async {
final next = !_outputMuted;
try {
await rust.setOutputMuted(muted: next);
if (!mounted) return;
setState(() => _outputMuted = next);
} catch (e) {
if (!mounted) return;
setState(() => _error = e.toString());
}
}
Future<void> _setOutputGain(double value) async {
setState(() => _outputGain = value);
try {
await rust.setOutputGain(gain: value);
} catch (_) {
// Audio may not be started yet — that's fine; the next start_audio
// picks up the current slider position next time we plumb it.
}
}
Future<void> _onJoinChannel(rust.BridgeChannel ch) async {
final l10n = AppL10n.of(context);
String? password;
// Heuristic: a channel name annotated with a lock prompts.
if (ch.name.contains('🔒') || ch.name.toLowerCase().contains('password')) {
password = await _askChannelPassword(l10n);
if (password == null) return; // cancelled
}
try {
await rust.moveToChannel(
channelId: ch.id,
password: password ?? '',
);
} catch (e) {
if (!mounted) return;
setState(() => _error = e.toString());
}
}
Future<String?> _askChannelPassword(AppL10n l10n) async {
final ctl = TextEditingController();
final result = await showDialog<String>(
context: context,
builder: (ctx) => AlertDialog(
title: Text(l10n.channelPasswordTitle),
content: TextField(
controller: ctl,
obscureText: true,
autofocus: true,
decoration: InputDecoration(labelText: l10n.fieldPassword),
),
actions: [
TextButton(
onPressed: () => Navigator.of(ctx).pop(),
child: Text(l10n.closeAction),
),
FilledButton(
onPressed: () => Navigator.of(ctx).pop(ctl.text),
child: Text(l10n.connectAction),
),
],
),
);
ctl.dispose();
return result;
}
Future<void> _onRefresh() async {
try {
final snap = await rust.snapshot();
@@ -249,12 +332,12 @@ class _BetaHomeState extends State<_BetaHome> {
_audioStarted = false;
_audioStats = null;
_error = null;
_inputMuted = false;
_outputMuted = false;
});
}
Future<void> _onShowDiagnostics(BuildContext context) async {
// A.3: user-initiated diagnostic export (DEC-016). Content is
// already redacted on the Rust side; we just present it.
final l10n = AppL10n.of(context);
final text = rust.exportDiagnostics();
if (!mounted) return;
@@ -286,6 +369,70 @@ class _BetaHomeState extends State<_BetaHome> {
);
}
Future<void> _onAddCurrentBookmark() async {
final l10n = AppL10n.of(context);
final nameCtl = TextEditingController(text: _hostCtl.text.trim());
final name = await showDialog<String>(
context: context,
builder: (ctx) => AlertDialog(
title: Text(l10n.bookmarkAddTitle),
content: TextField(
controller: nameCtl,
autofocus: true,
decoration: InputDecoration(labelText: l10n.fieldDisplayName),
),
actions: [
TextButton(
onPressed: () => Navigator.of(ctx).pop(),
child: Text(l10n.closeAction),
),
FilledButton(
onPressed: () => Navigator.of(ctx).pop(nameCtl.text),
child: Text(l10n.bookmarkAddAction),
),
],
),
);
nameCtl.dispose();
if (name == null || name.trim().isEmpty) return;
try {
await rust.addBookmark(
b: rust.BridgeBookmark(
id: 0,
displayName: name.trim(),
host: _hostCtl.text.trim(),
nickname: _nickCtl.text.trim(),
password: _passwordCtl.text,
),
);
await _reloadBookmarks();
} catch (e) {
if (!mounted) return;
setState(() => _error = e.toString());
}
}
Future<void> _onDeleteBookmark(rust.BridgeBookmark b) async {
try {
await rust.deleteBookmark(id: b.id);
await _reloadBookmarks();
} catch (e) {
if (!mounted) return;
setState(() => _error = e.toString());
}
}
Future<void> _onUseBookmark(rust.BridgeBookmark b) async {
_hostCtl.text = b.host;
_nickCtl.text = b.nickname;
_passwordCtl.text = b.password;
await _onConnect(
host: b.host,
nickname: b.nickname,
password: b.password,
);
}
@override
Widget build(BuildContext context) {
final l10n = AppL10n.of(context);
@@ -381,10 +528,27 @@ class _BetaHomeState extends State<_BetaHome> {
],
const SizedBox(height: 12),
if (_phase == _Phase.idle) ...[
_ConnectForm(
hostCtl: _hostCtl,
nickCtl: _nickCtl,
onConnect: _onConnect,
Expanded(
child: SingleChildScrollView(
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
_ConnectForm(
hostCtl: _hostCtl,
nickCtl: _nickCtl,
passwordCtl: _passwordCtl,
onConnect: () => _onConnect(),
onAddBookmark: _onAddCurrentBookmark,
),
const SizedBox(height: 16),
_BookmarkList(
bookmarks: _bookmarks,
onConnect: _onUseBookmark,
onDelete: _onDeleteBookmark,
),
],
),
),
),
] else if (_phase == _Phase.connecting) ...[
const Center(
@@ -394,7 +558,6 @@ class _BetaHomeState extends State<_BetaHome> {
),
),
] else if (_phase == _Phase.connected && _snapshot != null) ...[
// Audio row: start button or stats + PTT.
if (!_audioStarted) ...[
FilledButton.icon(
icon: const Icon(Icons.mic_none),
@@ -405,12 +568,23 @@ class _BetaHomeState extends State<_BetaHome> {
] else ...[
_AudioControls(
stats: _audioStats,
inputMuted: _inputMuted,
outputMuted: _outputMuted,
outputGain: _outputGain,
onPttDown: () => _setPtt(true),
onPttUp: () => _setPtt(false),
onToggleInputMute: _toggleInputMute,
onToggleOutputMute: _toggleOutputMute,
onGainChanged: _setOutputGain,
),
const SizedBox(height: 12),
],
Expanded(child: _SnapshotView(snapshot: _snapshot!)),
Expanded(
child: _SnapshotView(
snapshot: _snapshot!,
onJoinChannel: _onJoinChannel,
),
),
],
],
),
@@ -423,12 +597,16 @@ class _ConnectForm extends StatelessWidget {
const _ConnectForm({
required this.hostCtl,
required this.nickCtl,
required this.passwordCtl,
required this.onConnect,
required this.onAddBookmark,
});
final TextEditingController hostCtl;
final TextEditingController nickCtl;
final TextEditingController passwordCtl;
final VoidCallback onConnect;
final VoidCallback onAddBookmark;
@override
Widget build(BuildContext context) {
@@ -451,12 +629,91 @@ class _ConnectForm extends StatelessWidget {
border: const OutlineInputBorder(),
),
),
const SizedBox(height: 16),
FilledButton.icon(
icon: const Icon(Icons.login),
label: Text(l10n.connectAction),
onPressed: onConnect,
const SizedBox(height: 8),
TextField(
controller: passwordCtl,
obscureText: true,
decoration: InputDecoration(
labelText: l10n.fieldServerPassword,
helperText: l10n.fieldServerPasswordHelp,
border: const OutlineInputBorder(),
),
),
const SizedBox(height: 16),
Row(
children: [
Expanded(
child: FilledButton.icon(
icon: const Icon(Icons.login),
label: Text(l10n.connectAction),
onPressed: onConnect,
),
),
const SizedBox(width: 8),
OutlinedButton.icon(
icon: const Icon(Icons.bookmark_add_outlined),
label: Text(l10n.bookmarkAddAction),
onPressed: onAddBookmark,
),
],
),
],
);
}
}
class _BookmarkList extends StatelessWidget {
const _BookmarkList({
required this.bookmarks,
required this.onConnect,
required this.onDelete,
});
final List<rust.BridgeBookmark> bookmarks;
final ValueChanged<rust.BridgeBookmark> onConnect;
final ValueChanged<rust.BridgeBookmark> onDelete;
@override
Widget build(BuildContext context) {
final l10n = AppL10n.of(context);
final theme = Theme.of(context);
if (bookmarks.isEmpty) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 8),
child: Text(
l10n.bookmarksEmpty,
style: theme.textTheme.bodySmall,
),
);
}
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
Text(l10n.bookmarksHeading, style: theme.textTheme.titleSmall),
const SizedBox(height: 4),
for (final b in bookmarks)
Card(
margin: const EdgeInsets.symmetric(vertical: 4),
child: ListTile(
title: Text(b.displayName),
subtitle: Text('${b.host} — ${b.nickname}'),
trailing: Row(
mainAxisSize: MainAxisSize.min,
children: [
IconButton(
icon: const Icon(Icons.login),
tooltip: l10n.connectAction,
onPressed: () => onConnect(b),
),
IconButton(
icon: const Icon(Icons.delete_outline),
tooltip: l10n.bookmarkDeleteAction,
onPressed: () => onDelete(b),
),
],
),
),
),
],
);
}
@@ -465,13 +722,25 @@ class _ConnectForm extends StatelessWidget {
class _AudioControls extends StatefulWidget {
const _AudioControls({
required this.stats,
required this.inputMuted,
required this.outputMuted,
required this.outputGain,
required this.onPttDown,
required this.onPttUp,
required this.onToggleInputMute,
required this.onToggleOutputMute,
required this.onGainChanged,
});
final rust.BridgeAudioStats? stats;
final bool inputMuted;
final bool outputMuted;
final double outputGain;
final VoidCallback onPttDown;
final VoidCallback onPttUp;
final VoidCallback onToggleInputMute;
final VoidCallback onToggleOutputMute;
final ValueChanged<double> onGainChanged;
@override
State<_AudioControls> createState() => _AudioControlsState();
@@ -540,7 +809,55 @@ class _AudioControlsState extends State<_AudioControls> {
),
),
),
const SizedBox(height: 6),
const SizedBox(height: 8),
Row(
children: [
Expanded(
child: FilterChip(
avatar: Icon(
widget.inputMuted ? Icons.mic_off : Icons.mic,
size: 18,
),
label: Text(
widget.inputMuted ? l10n.inputUnmuteAction : l10n.inputMuteAction,
),
selected: widget.inputMuted,
onSelected: (_) => widget.onToggleInputMute(),
),
),
const SizedBox(width: 8),
Expanded(
child: FilterChip(
avatar: Icon(
widget.outputMuted ? Icons.volume_off : Icons.volume_up,
size: 18,
),
label: Text(
widget.outputMuted ? l10n.outputUnmuteAction : l10n.outputMuteAction,
),
selected: widget.outputMuted,
onSelected: (_) => widget.onToggleOutputMute(),
),
),
],
),
const SizedBox(height: 4),
Row(
children: [
const Icon(Icons.volume_down, size: 18),
Expanded(
child: Slider(
value: widget.outputGain.clamp(0.0, 2.0),
min: 0.0,
max: 2.0,
divisions: 40,
label: '${(widget.outputGain * 100).round()}%',
onChanged: widget.onGainChanged,
),
),
const Icon(Icons.volume_up, size: 18),
],
),
Text(statsText, style: theme.textTheme.bodySmall),
],
);
@@ -548,9 +865,13 @@ class _AudioControlsState extends State<_AudioControls> {
}
class _SnapshotView extends StatelessWidget {
const _SnapshotView({required this.snapshot});
const _SnapshotView({
required this.snapshot,
required this.onJoinChannel,
});
final rust.BridgeSnapshot snapshot;
final ValueChanged<rust.BridgeChannel> onJoinChannel;
@override
Widget build(BuildContext context) {
@@ -582,7 +903,6 @@ class _SnapshotView extends StatelessWidget {
color: theme.colorScheme.surfaceContainerHighest,
borderRadius: BorderRadius.circular(6),
),
// Server-provided content; preserved verbatim per ADR-008.
child: Text(snapshot.welcomeMessage, style: theme.textTheme.bodySmall),
),
],
@@ -595,6 +915,12 @@ class _SnapshotView extends StatelessWidget {
leading: const Icon(Icons.tag),
title: Text(ch.name),
subtitle: Text('id=${ch.id} parent=${ch.parent}'),
trailing: IconButton(
icon: const Icon(Icons.login),
tooltip: l10n.joinChannelAction,
onPressed: () => onJoinChannel(ch),
),
onTap: () => onJoinChannel(ch),
),
for (final cl in byChannel[ch.id] ?? const <rust.BridgeClient>[])
Padding(