Five user-reported defects + one auto-test regression-catcher.
== TC-2.3: capability badge stuck at L0Focused on Korean Win 11 ==
Root cause: in WindowsRawInputBackend::start() (and the parallel
WindowsHookBackend), the worker thread's armed.store(ok, ...) only
ran AFTER GetMessageW returned (i.e. on WM_QUIT). During normal
arming the message pump runs forever, so armed stayed at its
initial false value, and descriptor() reported L0Focused even
though RegisterRawInputDevices had succeeded.
Fix: run_raw_input_loop and run_hook_loop now take armed as a
parameter and flip it to true inside the loop right after the
successful registration, before blocking on GetMessageW. The
outer setter is kept as a belt-and-braces clear-on-failure path.
Also drops the redundant outer 'Raw Input armed' / 'low-level
hook armed' log lines — the in-loop 'Raw Input devices
registered' / 'low-level hooks installed' messages already
convey arming success with full context.
New tests raw_input_backend_start_flips_armed_to_l2 and
hook_backend_start_flips_armed_to_l2 call real start(), sleep
80 ms, assert descriptor().level == L2GlobalHoldToTalk. Replaces
the previous #[ignore]'d real-start smoke test which never
asserted on the descriptor.
== TC-10: no-permission channel rejection invisible ==
Root cause 1: chanora_protocol::adapter::move_self_to used the
fire-and-forget send() on the client_move command. TS3 server
replies with a typed error event the adapter discarded, and
move_to_channel returned Ok regardless.
Root cause 2: even when chanora_core::voice_join detected the
non-confirmation via snapshot polling, the rolled-back error
flowed into the connect-form-area _error string which is hidden
post-connect. The user saw no feedback.
Fix:
* New ProtocolError::ServerRejected { code: u32, message: String }
carries the canonical TS3 error code per the official catalogue
at https://github.com/ReSpeak/tsdeclarations (Errors.csv).
* move_self_to now uses send_with_result, returns a MessageHandle.
The connection-task loop holds a pending_moves HashMap keyed by
MessageHandle, services StreamItem::MessageResult by looking up
and resolving the reply with either Ok or the typed
ServerRejected.
* Pending entries have a 3 s deadline so a server that never
replies doesn't leak the reply channel — expired entries fall
back to Ok and let the snapshot poll handle confirmation.
* voice_join short-circuits on ServerRejected (no need for the
full snapshot poll), still polls for confirmation as a
belt-and-braces fallback for legacy servers; on poll failure
emits ServerRejected with sentinel code 0x0001 (undefined).
* New BridgeError::ServerRejected mirror with the same fields;
CoreError → BridgeError mapping preserves the typed variant.
* Flutter _onJoinChannel shows a floating SnackBar with a
localised message selected by error code (channelJoinFailed*
l10n entries). 6 known codes mapped to specific messages
(insufficient permission, wrong password, channel full,
family limit, private channel, timeout); everything else
falls back to the server-supplied generic message.
== TC-13: mouse side-button capture only works on text field ==
The _PttBindingCaptureDialog wrapped its Column with a Listener
using the default HitTestBehavior.deferToChild. Pointer events
landing on the dialog's empty padding regions weren't claimed by
any child and so were never delivered to the Listener.
Fix: explicit HitTestBehavior.opaque so the entire dialog area
catches PointerDown events regardless of where the cursor sits.
== Channel tree hierarchy ==
Reported issue: tree rendered as flat list, no indication of
parent-child nesting. The bridge already carries the
field; the renderer just ignored it.
Fix in _SnapshotView: walk the (already DFS-sorted) channel list
and compute each row's depth from its parent's depth. Render
left-padding of depth * 18 dp. Cap depth at 6 to keep deep
hierarchies visually bounded; the cap plateaus silently (no
glyph, channel still tappable, data carries the real depth).
== Responsive layout ==
Connected layout is now LayoutBuilder-driven. Below 840 dp wide
(Material's tablet/desktop breakpoint) the original stacked
column layout is used (Voice Bar on top, channel tree below).
At 840 dp and above the layout becomes a side-by-side Row with
the Voice Bar pinned at 320 dp on the left and the channel tree
Expanded on the right.
Verification
- cargo check --workspace: clean.
- cargo test --workspace --lib: 80 / 0 / 1 (unchanged Linux total;
+2 new Windows-only tests not counted here).
- flutter analyze: clean (6 pre-existing Radio.groupValue infos).
- FRB bindings regenerated to expose BridgeError_ServerRejected.
112 lines
4.3 KiB
Rust
112 lines
4.3 KiB
Rust
//! # `chanora_bridge`
|
|
//!
|
|
//! Typed Flutter/Rust bridge — schema-controlled DTOs for commands,
|
|
//! results, and events. Backed by `flutter_rust_bridge` 2.x per
|
|
//! DEC-014.
|
|
//!
|
|
//! ## Alpha scope
|
|
//!
|
|
//! Exposes three commands that target the Alpha release goal:
|
|
//!
|
|
//! * `bridge_init()` — one-time process initialisation. Sets up
|
|
//! logging.
|
|
//! * `connect(host, nickname)` — connects to a TS3-compatible
|
|
//! server and returns a typed [`ConnectResultDto`] containing the
|
|
//! server snapshot.
|
|
//! * `disconnect()` — clean disconnect.
|
|
//! * `snapshot()` — re-fetch the current server snapshot.
|
|
//!
|
|
//! No audio commands cross the bridge in Alpha; audio is Beta scope.
|
|
//!
|
|
//! ## Boundary discipline
|
|
//!
|
|
//! Every type in this module is `Serialize + Deserialize` over owned
|
|
//! primitives or `String`s. No `tsclientlib`, `cpal`, or backend
|
|
//! types may appear in the public surface (SAD-067, SDD-079).
|
|
//!
|
|
//! Note: this crate cannot use `#![forbid(unsafe_code)]` because the
|
|
//! FRB-generated glue (in `frb_generated`) legitimately uses unsafe
|
|
//! for the FFI boundary. Hand-written code in this crate must
|
|
//! nonetheless avoid `unsafe` and is held to that standard by review.
|
|
|
|
#![warn(missing_docs)]
|
|
|
|
pub mod api;
|
|
mod frb_generated;
|
|
|
|
#[cfg(target_os = "android")]
|
|
mod android_init;
|
|
|
|
use thiserror::Error;
|
|
|
|
/// Errors raised at the bridge boundary. Production code must keep
|
|
/// these user-safe — no secrets, no protocol details, no path
|
|
/// information beyond what the redaction policy permits.
|
|
#[derive(Debug, Error, Clone, serde::Serialize, serde::Deserialize)]
|
|
pub enum BridgeError {
|
|
/// The caller submitted a malformed command DTO.
|
|
#[error("invalid command: {0}")]
|
|
InvalidCommand(String),
|
|
/// Hostname resolution failed. Distinct from `Connection` so the
|
|
/// UI can show a meaningful "Server not found" message.
|
|
#[error("dns: could not resolve '{host}': {reason}")]
|
|
DnsFailed {
|
|
/// The hostname (or `host:port`) the caller submitted.
|
|
host: String,
|
|
/// Reason from the platform resolver.
|
|
reason: String,
|
|
},
|
|
/// Connection layer failure (typed-mapped from CoreError).
|
|
#[error("connection: {0}")]
|
|
Connection(String),
|
|
/// Operation requires an active connection.
|
|
#[error("not connected")]
|
|
NotConnected,
|
|
/// Already connected; DEC-006 forbids a second concurrent
|
|
/// connection.
|
|
#[error("already connected")]
|
|
AlreadyConnected,
|
|
/// A server command was rejected by the TeamSpeak server. The
|
|
/// `code` is the canonical TS3 error number (see
|
|
/// https://github.com/ReSpeak/tsdeclarations Errors.csv); the
|
|
/// `message` is the server-supplied text. The UI uses `code`
|
|
/// to look up a localised explanation.
|
|
#[error("server rejected (code {code}): {message}")]
|
|
ServerRejected {
|
|
/// Raw TS3 error code.
|
|
code: u32,
|
|
/// Server-supplied message text.
|
|
message: String,
|
|
},
|
|
/// An unmapped error escaped the subsystem boundary. Production
|
|
/// callers should never see this; if they do, it is a mapping
|
|
/// bug here.
|
|
#[error("unmapped: {0}")]
|
|
Unmapped(String),
|
|
}
|
|
|
|
impl From<chanora_core::CoreError> for BridgeError {
|
|
fn from(e: chanora_core::CoreError) -> Self {
|
|
match e {
|
|
chanora_core::CoreError::NotConnected => BridgeError::NotConnected,
|
|
chanora_core::CoreError::AlreadyConnected => BridgeError::AlreadyConnected,
|
|
chanora_core::CoreError::AudioNotStarted => {
|
|
BridgeError::InvalidCommand("audio not started".to_string())
|
|
}
|
|
chanora_core::CoreError::Protocol(chanora_protocol::ProtocolError::DnsFailed {
|
|
host,
|
|
reason,
|
|
}) => BridgeError::DnsFailed { host, reason },
|
|
chanora_core::CoreError::Protocol(
|
|
chanora_protocol::ProtocolError::ServerRejected { code, message },
|
|
) => BridgeError::ServerRejected { code, message },
|
|
chanora_core::CoreError::Protocol(p) => BridgeError::Connection(format!("{p}")),
|
|
chanora_core::CoreError::Audio(a) => BridgeError::Connection(format!("audio: {a}")),
|
|
chanora_core::CoreError::Storage(s) => {
|
|
BridgeError::Connection(format!("storage: {s}"))
|
|
}
|
|
other => BridgeError::Unmapped(format!("{other}")),
|
|
}
|
|
}
|
|
}
|