3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-06-01 02:11:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add client support for websockets

Browse source
This commit is contained in:
badaix 2025-01-23 22:13:05 +01:00
parent 9fbf273caa
commit 6c02252d84
13 changed files with 393 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/streamreader/pcm_stream.hpp
View file

@ -24,12 +24,12 @@
#include "common/json.hpp"
#include "common/message/codec_header.hpp"
#include "common/sample_format.hpp"
#include "common/stream_uri.hpp"
#include "encoder/encoder.hpp"
#include "jsonrpcpp.hpp"
#include "properties.hpp"
#include "server_settings.hpp"
#include "stream_control.hpp"
#include "stream_uri.hpp"
// 3rd party headers
#include <boost/asio/io_context.hpp>

174
server/streamreader/stream_uri.cpp
View file

@ -1,174 +0,0 @@
/***
This file is part of snapcast
Copyright (C) 2014-2025 Johannes Pohl
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#ifndef NOMINMAX
#define NOMINMAX
#endif // NOMINMAX
// prototype/interface header file
#include "stream_uri.hpp"
// local headers
#include "common/aixlog.hpp"
#include "common/utils/string_utils.hpp"
using namespace std;
namespace strutils = utils::string;
static constexpr auto LOG_TAG = "StreamUri";
namespace streamreader
{
StreamUri::StreamUri(const std::string& uri)
{
parse(uri);
}
void StreamUri::parse(const std::string& stream_uri)
{
// https://en.wikipedia.org/wiki/Uniform_Resource_Identifier
// scheme:[//[user:password@]host[:port]][/]path[?query][#fragment]
// would be more elegant with regex. Not yet supported on my dev machine's gcc 4.8 :(
LOG(DEBUG, LOG_TAG) << "StreamUri: " << stream_uri << "\n";
size_t pos;
// Remove leading and trailing quotes
uri = strutils::trim_copy(stream_uri);
while (!uri.empty() && ((uri[0] == '\'') || (uri[0] == '"')))
uri = uri.substr(1);
while (!uri.empty() && ((uri[uri.length() - 1] == '\'') || (uri[uri.length() - 1] == '"')))
uri = uri.substr(0, this->uri.length() - 1);
// string decodedUri = strutils::uriDecode(uri);
// LOG(DEBUG, LOG_TAG) << "StreamUri decoded: " << decodedUri << "\n";
string tmp(uri);
// Parse scheme
pos = tmp.find(':');
if (pos == string::npos)
throw invalid_argument("missing ':'");
scheme = strutils::uriDecode(strutils::trim_copy(tmp.substr(0, pos)));
tmp = tmp.substr(pos + 1);
LOG(TRACE, LOG_TAG) << "scheme: '" << scheme << "', tmp: '" << tmp << "'\n";
// tmp = //[user:password@]host[:port][/]path[?query][#fragment]
if (tmp.find("//") != 0)
throw invalid_argument("missing host separator: '//'");
tmp = tmp.substr(2);
// tmp = [user:password@]host[:port][/]path[?query][#fragment]
pos = tmp.find('/');
if (pos == string::npos)
{
pos = tmp.find('?');
if (pos == string::npos)
pos = tmp.length();
}
// [user:password@]host[:port][/]path[?query][#fragment]
// pos: ^ or ^ or ^
host = strutils::uriDecode(strutils::trim_copy(tmp.substr(0, pos)));
tmp = tmp.substr(pos);
path = tmp;
pos = std::min(path.find('?'), path.find('#'));
path = strutils::uriDecode(strutils::trim_copy(path.substr(0, pos)));
LOG(TRACE, LOG_TAG) << "host: '" << host << "', tmp: '" << tmp << "', path: '" << path << "'\n";
string queryStr;
pos = tmp.find('?');
if (pos != string::npos)
{
tmp = tmp.substr(pos + 1);
queryStr = tmp;
LOG(TRACE, LOG_TAG) << "path: '" << path << "', tmp: '" << tmp << "', query: '" << queryStr << "'\n";
}
pos = tmp.find('#');
if (pos != string::npos)
{
queryStr = tmp.substr(0, pos);
tmp = tmp.substr(pos + 1);
fragment = strutils::uriDecode(strutils::trim_copy(tmp));
LOG(TRACE, LOG_TAG) << "query: '" << queryStr << "', fragment: '" << fragment << "', tmp: '" << tmp << "'\n";
}
vector<string> keyValueList = strutils::split(queryStr, '&');
for (auto& kv : keyValueList)
{
pos = kv.find('=');
if (pos != string::npos)
{
string key = strutils::uriDecode(strutils::trim_copy(kv.substr(0, pos)));
string value = strutils::uriDecode(strutils::trim_copy(kv.substr(pos + 1)));
query[key] = value;
}
}
LOG(DEBUG, LOG_TAG) << "StreamUri.toString: " << toString() << "\n";
}
std::string StreamUri::toString() const
{
// TODO: path must be properly be uri encoded
// scheme:[//[user:password@]host[:port]][/]path[?query][#fragment]
stringstream ss;
ss << scheme << "://" << host << path;
if (!query.empty())
{
ss << "?";
auto iter = query.begin();
while (true)
{
ss << iter->first << "=" << iter->second;
if (++iter == query.end())
break;
ss << "&";
}
}
if (!fragment.empty())
ss << "#" << fragment;
return ss.str();
}
json StreamUri::toJson() const
{
json j = {{"raw", toString()}, {"scheme", scheme}, {"host", host}, {"path", path}, {"fragment", fragment}, {"query", query}};
return j;
}
std::string StreamUri::getQuery(const std::string& key, const std::string& def) const
{
auto iter = query.find(key);
if (iter != query.end())
return iter->second;
return def;
}
bool StreamUri::operator==(const StreamUri& other) const
{
return (other.scheme == scheme) && (other.host == host) && (other.path == path) && (other.query == query) && (other.fragment == fragment);
}
} // namespace streamreader

80
server/streamreader/stream_uri.hpp
View file

@ -1,80 +0,0 @@
/***
This file is part of snapcast
Copyright (C) 2014-2025 Johannes Pohl
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
***/
#pragma once
// local headers
#include "common/json.hpp"
// standard headers
#include <map>
#include <string>
using json = nlohmann::json;
namespace streamreader
{
/// URI with the general format:
/// scheme:[//[user:password@]host[:port]][/]path[?query][#fragment]
struct StreamUri
{
/// c'tor construct from string @p uri
explicit StreamUri(const std::string& uri);
/// the complete uri
std::string uri;
/// the scheme component (pipe, http, file, tcp, ...)
std::string scheme;
// struct Authority
// {
// std::string username;
// std::string password;
// std::string host;
// size_t port;
// };
// Authority authority;
/// the host component
std::string host;
/// the path component
std::string path;
/// the query component: "key = value" pairs
std::map<std::string, std::string> query;
/// the fragment component
std::string fragment;
/// @return URI as json
json toJson() const;
/// @return value for a @p key or @p def, if key does not exist
std::string getQuery(const std::string& key, const std::string& def = "") const;
/// parse @p stream_uri string
void parse(const std::string& stream_uri);
/// @return uri as string
std::string toString() const;
/// @return true if @p other is equal to this
bool operator==(const StreamUri& other) const;
};
} // namespace streamreader