3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-18 19:46:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Streaming clients can connect via Websockets

Browse source
This commit is contained in:
badaix 2020-07-02 22:26:53 +02:00
parent 5723791f8a
commit 01ce9a60c0
19 changed files with 789 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

131
server/stream_session.cpp
View file

@ -29,83 +29,13 @@ using namespace streamreader;
static constexpr auto LOG_TAG = "StreamSession";
StreamSession::StreamSession(boost::asio::io_context& ioc, MessageReceiver* receiver, tcp::socket&& socket)
: socket_(std::move(socket)), messageReceiver_(receiver), pcmStream_(nullptr), strand_(ioc)
StreamSession::StreamSession(boost::asio::io_context& ioc, MessageReceiver* receiver) : messageReceiver_(receiver), pcmStream_(nullptr), strand_(ioc)
{
base_msg_size_ = baseMessage_.getSize();
buffer_.resize(base_msg_size_);
}
StreamSession::~StreamSession()
{
stop();
}
std::string StreamSession::getIP()
{
try
{
return socket_.remote_endpoint().address().to_string();
}
catch (...)
{
return "0.0.0.0";
}
}
void StreamSession::read_next()
{
boost::asio::async_read(socket_, boost::asio::buffer(buffer_, base_msg_size_),
boost::asio::bind_executor(strand_, [ this, self = shared_from_this() ](boost::system::error_code ec, std::size_t length) mutable {
if (ec)
{
LOG(ERROR, LOG_TAG) << "Error reading message header of length " << length << ": " << ec.message() << "\n";
messageReceiver_->onDisconnect(this);
return;
}
baseMessage_.deserialize(buffer_.data());
LOG(DEBUG, LOG_TAG) << "getNextMessage: " << baseMessage_.type << ", size: " << baseMessage_.size << ", id: " << baseMessage_.id
<< ", refers: " << baseMessage_.refersTo << "\n";
if (baseMessage_.type > message_type::kLast)
{
LOG(ERROR, LOG_TAG) << "unknown message type received: " << baseMessage_.type << ", size: " << baseMessage_.size << "\n";
messageReceiver_->onDisconnect(this);
return;
}
else if (baseMessage_.size > msg::max_size)
{
LOG(ERROR, LOG_TAG) << "received message of type " << baseMessage_.type << " to large: " << baseMessage_.size << "\n";
messageReceiver_->onDisconnect(this);
return;
}
if (baseMessage_.size > buffer_.size())
buffer_.resize(baseMessage_.size);
boost::asio::async_read(
socket_, boost::asio::buffer(buffer_, baseMessage_.size),
boost::asio::bind_executor(strand_, [this, self](boost::system::error_code ec, std::size_t length) mutable {
if (ec)
{
LOG(ERROR, LOG_TAG) << "Error reading message body of length " << length << ": " << ec.message() << "\n";
messageReceiver_->onDisconnect(this);
return;
}
tv t;
baseMessage_.received = t;
if (messageReceiver_ != nullptr)
messageReceiver_->onMessageReceived(this, baseMessage_, buffer_.data());
read_next();
}));
}));
}
void StreamSession::setPcmStream(PcmStreamPtr pcmStream)
{
pcmStream_ = pcmStream;
@ -118,49 +48,29 @@ const PcmStreamPtr StreamSession::pcmStream() const
}
void StreamSession::start()
{
read_next();
// strand_.post([this]() { read_next(); });
}
void StreamSession::stop()
{
LOG(DEBUG, LOG_TAG) << "StreamSession::stop\n";
boost::system::error_code ec;
socket_.shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
if (ec)
LOG(ERROR, LOG_TAG) << "Error in socket shutdown: " << ec.message() << "\n";
socket_.close(ec);
if (ec)
LOG(ERROR, LOG_TAG) << "Error in socket close: " << ec.message() << "\n";
LOG(DEBUG, LOG_TAG) << "StreamSession stopped\n";
}
void StreamSession::send_next()
{
auto& buffer = messages_.front();
buffer.on_air = true;
boost::asio::async_write(socket_, buffer,
boost::asio::bind_executor(strand_, [ this, self = shared_from_this(), buffer ](boost::system::error_code ec, std::size_t length) {
messages_.pop_front();
if (ec)
{
LOG(ERROR, LOG_TAG) << "StreamSession write error (msg length: " << length << "): " << ec.message() << "\n";
messageReceiver_->onDisconnect(this);
return;
}
if (!messages_.empty())
send_next();
}));
strand_.post([ this, self = shared_from_this(), buffer ]() {
sendAsync(buffer, [this](boost::system::error_code ec, std::size_t length) {
messages_.pop_front();
if (ec)
{
LOG(ERROR, LOG_TAG) << "StreamSession write error (msg length: " << length << "): " << ec.message() << "\n";
messageReceiver_->onDisconnect(this);
return;
}
if (!messages_.empty())
send_next();
});
});
}
void StreamSession::sendAsync(shared_const_buffer const_buf, bool send_now)
void StreamSession::send(shared_const_buffer const_buf)
{
strand_.post([ this, self = shared_from_this(), const_buf, send_now ]() {
strand_.post([ this, self = shared_from_this(), const_buf ]() {
// delete PCM chunks that are older than the overall buffer duration
messages_.erase(std::remove_if(messages_.begin(), messages_.end(),
[this](const shared_const_buffer& buffer) {
@ -172,10 +82,7 @@ void StreamSession::sendAsync(shared_const_buffer const_buf, bool send_now)
}),
messages_.end());
if (send_now)
messages_.push_front(const_buf);
else
messages_.push_back(const_buf);
messages_.push_back(const_buf);
if (messages_.size() > 1)
{
@ -187,13 +94,13 @@ void StreamSession::sendAsync(shared_const_buffer const_buf, bool send_now)
}
void StreamSession::sendAsync(msg::message_ptr message, bool send_now)
void StreamSession::send(msg::message_ptr message)
{
if (!message)
return;
// TODO: better set the timestamp in send_next for more accurate time sync
sendAsync(shared_const_buffer(*message), send_now);
send(shared_const_buffer(*message));
}