Core ABI extensions (voicecat.h): - vc_list_channels / vc_list_users / vc_list_user_streams — pull-based snapshot getters for the channel-tree and user-list UI; session_model_mu_ guards cross-thread reads - VC_EVENT_JOIN_RESULT / vc_join_channel — channel join with optional password - VC_EVENT_SERVER_IDENTITY + vc_confirm_server_identity — TOFU gate that blocks io_thread_ until the UI approves or rejects; pins TLS leaf-cert SHA-256 (not declared Ed25519) - vc_get_server_identity_display — Ed25519 fingerprint for human-readable display only - VC_INPUT_ALWAYS_ON = 2 in vc_input_mode — transmit unconditionally, no VAD gate - vc_set_vad_threshold — live RMS threshold update (0.0–1.0); EnergyVadProcessor stores it atomically so the audio RT path reads without a lock C++ implementation: - SessionModel::apply_snapshot / apply_channel_event fixed to populate parent_id, password_protected, and max_users (were permanently zeroed) - TlsContext::peer_cert_fingerprint — SHA-256 of peer leaf cert DER via mbedTLS - TofuStore split into peek (read-only) + pin (write) so first-connect only persists after user approval; tofu_store_path in vc_config for per-user pin file location - TcpAcceptor uses dual-stack IPv6+IPv4 fallback (fixes localhost → ::1 on Windows) - windows-client CMake preset: Release shared DLL, static MinGW runtime, no tools/tests - New C++ tests: test_channel_user_list_abi, test_tofu_flow (14/14 green) Windows client (clients/windows/ — .NET 10 WinForms): - VoiceCat.Interop: LibraryImport P/Invoke surface, UnmanagedCallersOnly callbacks, Channel<VoiceCatEvent> event delivery drained by 30ms WinForms Timer - VoiceCat.App: ConnectDialog (saved servers, DPAPI password storage), ServerIdentity- Dialog (TOFU first-connect / mismatch warning), MainForm (channel TreeView, user ListBox, RichTextBox chat, voice controls, device pickers, VAD/PTT/always-on mode, per-user gain/mute/NR tuning, VAD sensitivity TrackBar, level meter ProgressBar) - PttKeyCaptureDialog — focus-scoped PTT key capture (documented limitation) - PerUserTuningDialog — real-time gain/mute/NR applied to all of a user's streams - Accessibility: explicit AccessibleName/Description on every control, & mnemonics, Activity log ListBox as durable screen-reader record, AutomationNotification for curated live announcements Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
135 lines
4.9 KiB
C++
135 lines
4.9 KiB
C++
#include "session/session.h"
|
|
|
|
#include <algorithm>
|
|
|
|
namespace voicecat::session {
|
|
|
|
const Channel* SessionModel::find_channel(uint32_t id) const {
|
|
for (auto& ch : channels_) if (ch.id == id) return &ch;
|
|
return nullptr;
|
|
}
|
|
|
|
const User* SessionModel::find_user(uint32_t id) const {
|
|
for (auto& u : users_) if (u.id == id) return &u;
|
|
return nullptr;
|
|
}
|
|
|
|
std::pair<const User*, const Stream*> SessionModel::find_user_by_ssrc(uint32_t ssrc) const {
|
|
for (auto& u : users_) {
|
|
for (auto& s : u.streams) {
|
|
if (s.ssrc == ssrc) return {&u, &s};
|
|
}
|
|
}
|
|
return {nullptr, nullptr};
|
|
}
|
|
|
|
#ifdef VOICECAT_HAS_NET
|
|
|
|
namespace {
|
|
std::vector<Stream> copy_streams(
|
|
const google::protobuf::RepeatedPtrField<voicecat::v1::StreamInfo>& src) {
|
|
std::vector<Stream> out;
|
|
out.reserve(src.size());
|
|
for (const auto& pb : src) {
|
|
Stream s;
|
|
s.stream_id = pb.stream_id();
|
|
s.ssrc = pb.ssrc();
|
|
s.kind = static_cast<int>(pb.kind());
|
|
s.label = pb.label();
|
|
s.sample_rate = pb.audio().sample_rate() ? pb.audio().sample_rate() : 48000;
|
|
s.frame_ms = pb.audio().frame_ms() ? pb.audio().frame_ms() : 20;
|
|
s.mode = static_cast<uint32_t>(pb.audio().mode());
|
|
s.bitrate_bps = pb.audio().bitrate_bps();
|
|
s.application = static_cast<uint32_t>(pb.audio().application());
|
|
s.fec = pb.audio().fec();
|
|
s.expected_packet_loss = pb.audio().expected_packet_loss();
|
|
s.dtx = pb.audio().dtx();
|
|
s.complexity = pb.audio().complexity();
|
|
out.push_back(std::move(s));
|
|
}
|
|
return out;
|
|
}
|
|
} // namespace
|
|
|
|
void SessionModel::apply_snapshot(const voicecat::v1::ServerStateSnapshot& snap) {
|
|
channels_.clear();
|
|
for (const auto& pb : snap.channels()) {
|
|
Channel ch;
|
|
ch.id = pb.id();
|
|
ch.parent_id = pb.parent_id();
|
|
ch.name = pb.name();
|
|
ch.password_protected = pb.password_protected();
|
|
ch.max_users = pb.max_users();
|
|
channels_.push_back(std::move(ch));
|
|
}
|
|
|
|
users_.clear();
|
|
for (const auto& pb : snap.users()) {
|
|
User u;
|
|
u.id = pb.id();
|
|
u.nickname = pb.nickname();
|
|
u.is_guest = pb.is_guest();
|
|
u.channel_id = pb.channel_id();
|
|
u.streams = copy_streams(pb.streams());
|
|
users_.push_back(std::move(u));
|
|
}
|
|
}
|
|
|
|
void SessionModel::apply_user_event(const voicecat::v1::UserEvent& ev) {
|
|
using Kind = voicecat::v1::UserEvent;
|
|
|
|
if (ev.kind() == Kind::JOINED || ev.kind() == Kind::UPDATED) {
|
|
const auto& pb = ev.user();
|
|
User u;
|
|
u.id = pb.id();
|
|
u.nickname = pb.nickname();
|
|
u.is_guest = pb.is_guest();
|
|
u.channel_id = pb.channel_id();
|
|
u.streams = copy_streams(pb.streams());
|
|
|
|
auto it = std::find_if(users_.begin(), users_.end(),
|
|
[&](const User& x) { return x.id == u.id; });
|
|
if (it != users_.end()) *it = std::move(u);
|
|
else users_.push_back(std::move(u));
|
|
|
|
} else if (ev.kind() == Kind::LEFT) {
|
|
uint32_t uid = ev.user().id();
|
|
users_.erase(std::remove_if(users_.begin(), users_.end(),
|
|
[uid](const User& x) { return x.id == uid; }),
|
|
users_.end());
|
|
}
|
|
}
|
|
|
|
void SessionModel::apply_channel_event(const voicecat::v1::ChannelEvent& ev) {
|
|
using Kind = voicecat::v1::ChannelEvent;
|
|
|
|
if (ev.kind() == Kind::CREATED || ev.kind() == Kind::UPDATED) {
|
|
const auto& pb = ev.channel();
|
|
Channel ch;
|
|
ch.id = pb.id();
|
|
ch.parent_id = pb.parent_id();
|
|
ch.name = pb.name();
|
|
ch.password_protected = pb.password_protected();
|
|
ch.max_users = pb.max_users();
|
|
|
|
auto it = std::find_if(channels_.begin(), channels_.end(),
|
|
[&](const Channel& x) { return x.id == ch.id; });
|
|
if (it != channels_.end()) *it = std::move(ch);
|
|
else channels_.push_back(std::move(ch));
|
|
|
|
} else if (ev.kind() == Kind::DELETED) {
|
|
// deleted_id, not channel().id() — the proto leaves `channel` unset for deletes
|
|
// (docs/protocol.md, core/proto/voicecat.proto's ChannelEvent). Pre-existing bug, dead
|
|
// code until something actually emits ChannelEvent (no channel CRUD exists yet — M5+),
|
|
// fixed here while touching this function for the M4 field-population fix.
|
|
uint32_t cid = ev.deleted_id();
|
|
channels_.erase(std::remove_if(channels_.begin(), channels_.end(),
|
|
[cid](const Channel& x) { return x.id == cid; }),
|
|
channels_.end());
|
|
}
|
|
}
|
|
|
|
#endif // VOICECAT_HAS_NET
|
|
|
|
} // namespace voicecat::session
|