Talon
487a561963
Three reported bugs traced to one root cause plus two missing designed features:
1. Stale users + eternal PLC hiss (root cause): ConnSession::close() silently
erased dropped users without broadcasting UserEvent::LEFT, so peers never
learned the user left and their audio engines never called remove_stream —
Opus PLC synthesized comfort noise forever. Fix: broadcast_left() helper
+ close() broadcasts LEFT before erasing.
2. PLC cap (defense-in-depth): on_playback now caps pure PLC at ~2s, then
emits digital silence so a stale stream can never hiss forever even if
remove_stream is skipped. Resets automatically on fresh packets.
3. No timeout / no ping: client never sent Ping, server had no last_seen /
reaper, so half-open connections (NAT timeout, wifi loss, sleep) left
ghost users forever. Fix: client Ping every 15s with RTT measurement,
ConnSession::last_seen bumped on every inbound TCP/UDP frame, steady_timer
reaper sweeps every 15s and drops sessions older than 45s (configurable
via server::Config).
4. UDP KEEPALIVE: client sends plaintext kFrameKeepalive every 5s; server
bumps last_seen + echoes back. Keeps NAT bindings alive and lets media
activity defer the reaper independently of TCP.
5. Graceful client disconnect: vc_disconnect() sends Disconnect{code=0} via
a flag-based io-thread exit (no double-close race); server handles
client-sent Disconnect with immediate close() + LEFT broadcast.
3 new tests: disconnect_left, plc_cap, reaper_timeout. 21/21 ctest green.
Docs: protocol.md §6/§7, voice.md §6, architecture.md §5, PROGRESS.md.
55 lines
1.8 KiB
C++
55 lines
1.8 KiB
C++
/*
|
|
* server/server.h — VoiceCat server entry point.
|
|
*
|
|
* Design: docs/architecture.md §5. Headless process: TLS control listener,
|
|
* session registry, text relay, SQLite persistence. Zero-config first-run.
|
|
*/
|
|
#ifndef VOICECAT_SERVER_SERVER_H
|
|
#define VOICECAT_SERVER_SERVER_H
|
|
|
|
#include <cstdint>
|
|
#include <functional>
|
|
#include <mutex>
|
|
#include <string>
|
|
|
|
namespace voicecat::server {
|
|
|
|
struct Config {
|
|
std::string server_name = "VoiceCat Server";
|
|
std::string data_dir = "voicecat-data";
|
|
uint16_t bind_port = 8384; // 0 = let OS pick (useful for tests)
|
|
uint16_t media_port = 0; // M2 UDP media port; 0 = OS-assigned
|
|
bool allow_guests = true;
|
|
// Called with the actual bound TCP port once the acceptor is ready.
|
|
std::function<void(uint16_t)> on_ready;
|
|
// Called with the actual bound UDP media port once the relay is ready.
|
|
std::function<void(uint16_t)> on_media_ready;
|
|
|
|
// Keepalive reaper (docs/protocol.md §7): sweep every reaper_sweep_ms and drop any
|
|
// session whose last inbound TCP/UDP activity is older than reaper_timeout_ms. Defaults
|
|
// match the doc: 15s sweep, 45s timeout (3 missed 15s pongs). Set reaper_timeout_ms = 0
|
|
// to disable the reaper entirely (useful for tests that don't want it).
|
|
int64_t reaper_timeout_ms = 45000;
|
|
int64_t reaper_sweep_ms = 15000;
|
|
};
|
|
|
|
class Server {
|
|
public:
|
|
explicit Server(Config cfg) : cfg_(std::move(cfg)) {}
|
|
|
|
// Block until the server shuts down. Returns process exit code.
|
|
int run();
|
|
|
|
// Thread-safe stop: unblocks run() from any thread. No-op if not running.
|
|
void stop();
|
|
|
|
private:
|
|
Config cfg_;
|
|
std::mutex stop_mutex_;
|
|
std::function<void()> stop_fn_;
|
|
};
|
|
|
|
} // namespace voicecat::server
|
|
|
|
#endif // VOICECAT_SERVER_SERVER_H
|