Prevent head of line blocking and track server resource download progress
This commit is contained in:
parent
344ef4093a
commit
2aab3e9e60
14 changed files with 179 additions and 83 deletions
|
|
@ -93,8 +93,11 @@ void NetClient::parse_received_messages() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::pair<uint64_t, uint64_t> NetClient::get_progress_into_fragmented_message(const std::string& channel) {
|
NetLibrary::DownloadProgress NetClient::get_progress_into_fragmented_message(const std::string& channel) const {
|
||||||
auto& m = pfm[channel];
|
auto it = pfm.find(channel);
|
||||||
|
if(it == pfm.end())
|
||||||
|
return {0, 0};
|
||||||
|
auto& m = it->second;
|
||||||
if(m.partialFragmentMessage.empty())
|
if(m.partialFragmentMessage.empty())
|
||||||
return {0, 0};
|
return {0, 0};
|
||||||
return {m.partialFragmentMessageLoc, m.partialFragmentMessage.size()};
|
return {m.partialFragmentMessageLoc, m.partialFragmentMessage.size()};
|
||||||
|
|
@ -142,7 +145,7 @@ void NetClient::send_queued_messages() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool NetClient::is_disconnected() {
|
bool NetClient::is_disconnected() const {
|
||||||
return isDisconnected;
|
return isDisconnected;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,19 +25,27 @@ class NetClient : public std::enable_shared_from_this<NetClient> {
|
||||||
cereal::PortableBinaryOutputArchive m(*ss);
|
cereal::PortableBinaryOutputArchive m(*ss);
|
||||||
(m(items), ...);
|
(m(items), ...);
|
||||||
}
|
}
|
||||||
std::vector<std::shared_ptr<std::stringstream>> fragmentedMessage = fragment_message(ss->view(), NetLibrary::FRAGMENT_MESSAGE_STRIDE);
|
|
||||||
auto& messageQueue = messageQueues[channel];
|
auto& messageQueue = messageQueues[channel];
|
||||||
if(fragmentedMessage.empty())
|
|
||||||
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, nextMessageOrderToSend), ss);
|
if(channel == UNRELIABLE_COMMAND_CHANNEL) {
|
||||||
else if(channel != UNRELIABLE_COMMAND_CHANNEL) { // Just drop unreliable messages that are fragmented
|
if(ss->view().length() <= NetLibrary::MAX_UNRELIABLE_MESSAGE_SIZE) // Drop unreliable messages that are too big
|
||||||
for(auto& ss2 : fragmentedMessage)
|
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, nextMessageOrderToSend), ss);
|
||||||
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, nextMessageOrderToSend), ss2);
|
}
|
||||||
|
else {
|
||||||
|
std::vector<std::shared_ptr<std::stringstream>> fragmentedMessage = fragment_message(ss->view(), NetLibrary::FRAGMENT_MESSAGE_STRIDE);
|
||||||
|
if(fragmentedMessage.empty())
|
||||||
|
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, nextMessageOrderToSend), ss);
|
||||||
|
else {
|
||||||
|
for(auto& ss2 : fragmentedMessage)
|
||||||
|
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, nextMessageOrderToSend), ss2);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
void update();
|
void update();
|
||||||
void add_recv_callback(MessageCommandType commandID, const NetClientRecvCallback& callback);
|
void add_recv_callback(MessageCommandType commandID, const NetClientRecvCallback& callback);
|
||||||
bool is_disconnected();
|
bool is_disconnected() const;
|
||||||
std::pair<uint64_t, uint64_t> get_progress_into_fragmented_message(const std::string& channel);
|
NetLibrary::DownloadProgress get_progress_into_fragmented_message(const std::string& channel) const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::string localID;
|
std::string localID;
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,15 @@ class NetLibrary {
|
||||||
|
|
||||||
static constexpr size_t LOCALID_LEN = 5;
|
static constexpr size_t LOCALID_LEN = 5;
|
||||||
static constexpr size_t GLOBALID_LEN = 20;
|
static constexpr size_t GLOBALID_LEN = 20;
|
||||||
|
|
||||||
|
struct DownloadProgress {
|
||||||
|
uint64_t downloadedBytes;
|
||||||
|
uint64_t totalBytes;
|
||||||
|
};
|
||||||
|
|
||||||
private:
|
private:
|
||||||
static constexpr size_t FRAGMENT_MESSAGE_STRIDE = 4096;
|
static constexpr size_t FRAGMENT_MESSAGE_STRIDE = 512;
|
||||||
|
static constexpr size_t MAX_UNRELIABLE_MESSAGE_SIZE = 4096;
|
||||||
static constexpr size_t MAX_BUFFERED_DATA_PER_CHANNEL = 64000;
|
static constexpr size_t MAX_BUFFERED_DATA_PER_CHANNEL = 64000;
|
||||||
static constexpr std::chrono::seconds TIMEOUT_DURATION = std::chrono::seconds(30);
|
static constexpr std::chrono::seconds TIMEOUT_DURATION = std::chrono::seconds(30);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ void NetServer::update() {
|
||||||
clientsToAdd.clear();
|
clientsToAdd.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool NetServer::is_disconnected() {
|
bool NetServer::is_disconnected() const {
|
||||||
return isDisconnected;
|
return isDisconnected;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -178,6 +178,16 @@ void NetServer::ClientData::parse_received_messages(NetServer& server) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
NetLibrary::DownloadProgress NetServer::ClientData::get_progress_into_fragmented_message(const std::string& channel) const {
|
||||||
|
auto it = pfm.find(channel);
|
||||||
|
if(it == pfm.end())
|
||||||
|
return {0, 0};
|
||||||
|
auto& m = it->second;
|
||||||
|
if(m.partialFragmentMessage.empty())
|
||||||
|
return {0, 0};
|
||||||
|
return {m.partialFragmentMessageLoc, m.partialFragmentMessage.size()};
|
||||||
|
}
|
||||||
|
|
||||||
void NetServer::add_recv_callback(MessageCommandType commandID, const NetServerRecvCallback& callback) {
|
void NetServer::add_recv_callback(MessageCommandType commandID, const NetServerRecvCallback& callback) {
|
||||||
recvCallbacks[commandID] = callback;
|
recvCallbacks[commandID] = callback;
|
||||||
}
|
}
|
||||||
|
|
@ -186,6 +196,10 @@ void NetServer::add_disconnect_callback(const NetServerDisconnectCallback& callb
|
||||||
disconnectCallback = callback;
|
disconnectCallback = callback;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const std::vector<std::shared_ptr<NetServer::ClientData>> NetServer::get_client_list() const {
|
||||||
|
return clients;
|
||||||
|
}
|
||||||
|
|
||||||
NetServer::~NetServer() {
|
NetServer::~NetServer() {
|
||||||
if(directConnectClient)
|
if(directConnectClient)
|
||||||
directConnectClient->isDisconnected = true;
|
directConnectClient->isDisconnected = true;
|
||||||
|
|
|
||||||
|
|
@ -42,6 +42,7 @@ class NetServer : public std::enable_shared_from_this<NetServer> {
|
||||||
void send_queued_messages(NetServer& server);
|
void send_queued_messages(NetServer& server);
|
||||||
void parse_received_messages(NetServer& server);
|
void parse_received_messages(NetServer& server);
|
||||||
void send_str_as_bytes(std::shared_ptr<rtc::DataChannel> channel, const std::string& str);
|
void send_str_as_bytes(std::shared_ptr<rtc::DataChannel> channel, const std::string& str);
|
||||||
|
NetLibrary::DownloadProgress get_progress_into_fragmented_message(const std::string& channel) const;
|
||||||
|
|
||||||
std::atomic<bool> setToDisconnect = false;
|
std::atomic<bool> setToDisconnect = false;
|
||||||
std::chrono::steady_clock::time_point lastMessageTime;
|
std::chrono::steady_clock::time_point lastMessageTime;
|
||||||
|
|
@ -63,13 +64,19 @@ class NetServer : public std::enable_shared_from_this<NetServer> {
|
||||||
(m(items), ...);
|
(m(items), ...);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<std::shared_ptr<std::stringstream>> fragmentedMessage = fragment_message(ss->view(), NetLibrary::FRAGMENT_MESSAGE_STRIDE);
|
|
||||||
auto& messageQueue = client->messageQueues[channel];
|
auto& messageQueue = client->messageQueues[channel];
|
||||||
if(fragmentedMessage.empty())
|
if(channel == UNRELIABLE_COMMAND_CHANNEL) {
|
||||||
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, client->nextMessageOrderToSend), ss);
|
if(ss->view().length() <= NetLibrary::MAX_UNRELIABLE_MESSAGE_SIZE) // Drop unreliable messages that are too big
|
||||||
else if(channel != UNRELIABLE_COMMAND_CHANNEL) { // Just drop unreliable messages that are fragmented
|
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, client->nextMessageOrderToSend), ss);
|
||||||
for(auto& ss2 : fragmentedMessage)
|
}
|
||||||
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, client->nextMessageOrderToSend), ss2);
|
else {
|
||||||
|
std::vector<std::shared_ptr<std::stringstream>> fragmentedMessage = fragment_message(ss->view(), NetLibrary::FRAGMENT_MESSAGE_STRIDE);
|
||||||
|
if(fragmentedMessage.empty())
|
||||||
|
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, client->nextMessageOrderToSend), ss);
|
||||||
|
else {
|
||||||
|
for(auto& ss2 : fragmentedMessage)
|
||||||
|
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, client->nextMessageOrderToSend), ss2);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
template <typename... Args> void send_items_to_all_clients(const std::string& channel, Args&&... items) {
|
template <typename... Args> void send_items_to_all_clients(const std::string& channel, Args&&... items) {
|
||||||
|
|
@ -89,25 +96,40 @@ class NetServer : public std::enable_shared_from_this<NetServer> {
|
||||||
(m(items), ...);
|
(m(items), ...);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<std::shared_ptr<std::stringstream>> fragmentedMessage = fragment_message(ss->view(), NetLibrary::FRAGMENT_MESSAGE_STRIDE);
|
if(channel == UNRELIABLE_COMMAND_CHANNEL) {
|
||||||
|
if(ss->view().length() <= NetLibrary::MAX_UNRELIABLE_MESSAGE_SIZE) { // Drop unreliable messages that are too big
|
||||||
|
for(auto& client : clients) {
|
||||||
|
if(client && clientChecker(client)) {
|
||||||
|
auto& messageQueue = client->messageQueues[channel];
|
||||||
|
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, client->nextMessageOrderToSend), ss);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
std::vector<std::shared_ptr<std::stringstream>> fragmentedMessage = fragment_message(ss->view(), NetLibrary::FRAGMENT_MESSAGE_STRIDE);
|
||||||
|
|
||||||
for(auto& client : clients) {
|
for(auto& client : clients) {
|
||||||
if(client && clientChecker(client)) {
|
if(client && clientChecker(client)) {
|
||||||
auto& messageQueue = client->messageQueues[channel];
|
auto& messageQueue = client->messageQueues[channel];
|
||||||
if(fragmentedMessage.empty())
|
if(fragmentedMessage.empty())
|
||||||
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, client->nextMessageOrderToSend), ss);
|
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, client->nextMessageOrderToSend), ss);
|
||||||
else if(channel != UNRELIABLE_COMMAND_CHANNEL) { // Just drop unreliable messages that are fragmented
|
else {
|
||||||
for(auto& ss2 : fragmentedMessage)
|
for(auto& ss2 : fragmentedMessage)
|
||||||
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, client->nextMessageOrderToSend), ss2);
|
messageQueue.emplace(NetLibrary::calc_order_for_queued_message(channel, client->nextMessageOrderToSend), ss2);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool is_disconnected();
|
bool is_disconnected() const;
|
||||||
|
|
||||||
void add_recv_callback(MessageCommandType commandID, const NetServerRecvCallback& callback);
|
void add_recv_callback(MessageCommandType commandID, const NetServerRecvCallback& callback);
|
||||||
void add_disconnect_callback(const NetServerDisconnectCallback& callback);
|
void add_disconnect_callback(const NetServerDisconnectCallback& callback);
|
||||||
|
|
||||||
|
const std::vector<std::shared_ptr<ClientData>> get_client_list() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void parse_received_messages();
|
void parse_received_messages();
|
||||||
void send_queued_messages();
|
void send_queued_messages();
|
||||||
|
|
@ -117,8 +139,6 @@ class NetServer : public std::enable_shared_from_this<NetServer> {
|
||||||
|
|
||||||
std::string localID;
|
std::string localID;
|
||||||
|
|
||||||
std::mutex clientList;
|
|
||||||
|
|
||||||
std::vector<std::shared_ptr<ClientData>> clients;
|
std::vector<std::shared_ptr<ClientData>> clients;
|
||||||
|
|
||||||
// Adding an add list, because i dont want to block the entire clients vector with a mutex
|
// Adding an add list, because i dont want to block the entire clients vector with a mutex
|
||||||
|
|
|
||||||
|
|
@ -40,9 +40,18 @@ bool ConnectionManager::is_host_disconnected() {
|
||||||
return localServer && localServer->netServer->is_disconnected();
|
return localServer && localServer->netServer->is_disconnected();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::pair<uint64_t, uint64_t> ConnectionManager::client_get_resource_retrieval_progress() {
|
bool ConnectionManager::host_exists() {
|
||||||
if(client)
|
return localServer != nullptr;
|
||||||
return client->get_progress_into_fragmented_message(RESOURCE_COMMAND_CHANNEL);
|
}
|
||||||
else
|
|
||||||
return {0, 0};
|
bool ConnectionManager::client_exists() {
|
||||||
|
return client != nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unordered_map<ServerClientID, NetLibrary::DownloadProgress> ConnectionManager::server_get_resource_retrieval_progress() {
|
||||||
|
return localServer->resource_download_progress();
|
||||||
|
}
|
||||||
|
|
||||||
|
NetLibrary::DownloadProgress ConnectionManager::client_get_resource_retrieval_progress() {
|
||||||
|
return client->get_progress_into_fragmented_message(RESOURCE_COMMAND_CHANNEL);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,10 @@ class ConnectionManager {
|
||||||
}
|
}
|
||||||
bool is_client_disconnected();
|
bool is_client_disconnected();
|
||||||
bool is_host_disconnected();
|
bool is_host_disconnected();
|
||||||
std::pair<uint64_t, uint64_t> client_get_resource_retrieval_progress();
|
bool host_exists();
|
||||||
|
bool client_exists();
|
||||||
|
std::unordered_map<ServerClientID, NetLibrary::DownloadProgress> server_get_resource_retrieval_progress();
|
||||||
|
NetLibrary::DownloadProgress client_get_resource_retrieval_progress();
|
||||||
private:
|
private:
|
||||||
std::shared_ptr<NetClient> client;
|
std::shared_ptr<NetClient> client;
|
||||||
std::unique_ptr<MainServer> localServer;
|
std::unique_ptr<MainServer> localServer;
|
||||||
|
|
|
||||||
|
|
@ -725,8 +725,8 @@ void DrawingProgram::draw(SkCanvas* canvas, const DrawData& drawData) {
|
||||||
for(auto& c : updateableComponents) {
|
for(auto& c : updateableComponents) {
|
||||||
if(c->get_type() == DRAWCOMPONENT_IMAGE) {
|
if(c->get_type() == DRAWCOMPONENT_IMAGE) {
|
||||||
auto img = std::static_pointer_cast<DrawImage>(c);
|
auto img = std::static_pointer_cast<DrawImage>(c);
|
||||||
if(img->d.imageID == drawData.main->world->rMan.get_resource_being_retrieved() && img->d.imageID != ServerClientID{0, 0})
|
float progress = drawData.main->world->rMan.get_resource_retrieval_progress(img->d.imageID);
|
||||||
img->draw_download_progress_bar(canvas, drawData, drawData.main->world->rMan.get_resource_retrieval_progress());
|
img->draw_download_progress_bar(canvas, drawData, progress);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,28 +19,48 @@ ResourceManager::ResourceManager(World& initWorld):
|
||||||
|
|
||||||
void ResourceManager::init_client_callbacks() {
|
void ResourceManager::init_client_callbacks() {
|
||||||
world.con.client_add_recv_callback(CLIENT_NEW_RESOURCE_ID, [&](cereal::PortableBinaryInputArchive& message) {
|
world.con.client_add_recv_callback(CLIENT_NEW_RESOURCE_ID, [&](cereal::PortableBinaryInputArchive& message) {
|
||||||
message(resourceBeingRetrieved);
|
message(resourceBeingRetrievedClient);
|
||||||
});
|
});
|
||||||
world.con.client_add_recv_callback(CLIENT_NEW_RESOURCE_DATA, [&](cereal::PortableBinaryInputArchive& message) {
|
world.con.client_add_recv_callback(CLIENT_NEW_RESOURCE_DATA, [&](cereal::PortableBinaryInputArchive& message) {
|
||||||
message(resources[resourceBeingRetrieved]);
|
message(resources[resourceBeingRetrievedClient]);
|
||||||
Logger::get().log("INFO", "Received new resource with id: " + std::to_string(resourceBeingRetrieved.first) + " " + std::to_string(resourceBeingRetrieved.second) + " of size " + std::to_string(resources[resourceBeingRetrieved].data->size()));
|
Logger::get().log("INFO", "Received new resource with id: " + std::to_string(resourceBeingRetrievedClient.first) + " " + std::to_string(resourceBeingRetrievedClient.second) + " of size " + std::to_string(resources[resourceBeingRetrievedClient].data->size()));
|
||||||
resourceBeingRetrieved = {0, 0};
|
resourceBeingRetrievedClient = {0, 0};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
ServerClientID ResourceManager::get_resource_being_retrieved() {
|
float ResourceManager::get_resource_retrieval_progress(const ServerClientID& id) {
|
||||||
return resourceBeingRetrieved;
|
if(id == ServerClientID{0, 0})
|
||||||
}
|
|
||||||
|
|
||||||
float ResourceManager::get_resource_retrieval_progress() {
|
|
||||||
std::pair<uint64_t, uint64_t> progressBytes = world.con.client_get_resource_retrieval_progress();
|
|
||||||
if(progressBytes.second == 0)
|
|
||||||
return 0.0f;
|
return 0.0f;
|
||||||
else
|
if(world.con.host_exists() && !world.con.is_host_disconnected()) {
|
||||||
return static_cast<float>(progressBytes.first) / static_cast<float>(progressBytes.second);
|
auto it = serverDownloadProgress.find(id);
|
||||||
|
if(it == serverDownloadProgress.end())
|
||||||
|
return 0.0f;
|
||||||
|
else {
|
||||||
|
auto& progressBytes = it->second;
|
||||||
|
if(progressBytes.totalBytes == 0)
|
||||||
|
return 0.0f;
|
||||||
|
return static_cast<float>(progressBytes.downloadedBytes) / static_cast<float>(progressBytes.totalBytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if(world.con.client_exists() && !world.con.is_client_disconnected()) {
|
||||||
|
if(id != resourceBeingRetrievedClient)
|
||||||
|
return 0.0f;
|
||||||
|
else {
|
||||||
|
NetLibrary::DownloadProgress progressBytes = world.con.client_get_resource_retrieval_progress();
|
||||||
|
if(progressBytes.totalBytes == 0)
|
||||||
|
return 0.0f;
|
||||||
|
return static_cast<float>(progressBytes.downloadedBytes) / static_cast<float>(progressBytes.totalBytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return 0.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ResourceManager::update() {
|
void ResourceManager::update() {
|
||||||
|
if(!world.con.host_exists() || world.con.is_host_disconnected())
|
||||||
|
serverDownloadProgress.clear();
|
||||||
|
else
|
||||||
|
serverDownloadProgress = world.con.server_get_resource_retrieval_progress();
|
||||||
|
|
||||||
for(auto& [k, v] : displays)
|
for(auto& [k, v] : displays)
|
||||||
v->update(world);
|
v->update(world);
|
||||||
}
|
}
|
||||||
|
|
@ -92,8 +112,8 @@ ServerClientID ResourceManager::add_resource(const ResourceData& resource) {
|
||||||
}
|
}
|
||||||
ServerClientID newID = world.get_new_id();
|
ServerClientID newID = world.get_new_id();
|
||||||
resources[newID] = resource;
|
resources[newID] = resource;
|
||||||
world.con.client_send_items_to_server(RELIABLE_COMMAND_CHANNEL, SERVER_RESOURCE_INIT, newID);
|
world.con.client_send_items_to_server(RESOURCE_COMMAND_CHANNEL, SERVER_NEW_RESOURCE_ID, newID);
|
||||||
world.con.client_send_items_to_server(RESOURCE_COMMAND_CHANNEL, SERVER_RESOURCE_DATA, resource);
|
world.con.client_send_items_to_server(RESOURCE_COMMAND_CHANNEL, SERVER_NEW_RESOURCE_DATA, resource);
|
||||||
return newID;
|
return newID;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@
|
||||||
#include <cereal/types/string.hpp>
|
#include <cereal/types/string.hpp>
|
||||||
#include <cereal/types/unordered_map.hpp>
|
#include <cereal/types/unordered_map.hpp>
|
||||||
#include <queue>
|
#include <queue>
|
||||||
|
#include <Helpers/Networking/NetLibrary.hpp>
|
||||||
|
|
||||||
class World;
|
class World;
|
||||||
|
|
||||||
|
|
@ -44,12 +45,12 @@ class ResourceManager {
|
||||||
std::optional<ResourceData> get_resource(const ServerClientID& id) const;
|
std::optional<ResourceData> get_resource(const ServerClientID& id) const;
|
||||||
ClientPortionID get_max_id(ServerPortionID serverID) const;
|
ClientPortionID get_max_id(ServerPortionID serverID) const;
|
||||||
const std::unordered_map<ServerClientID, ResourceData>& resource_list();
|
const std::unordered_map<ServerClientID, ResourceData>& resource_list();
|
||||||
ServerClientID get_resource_being_retrieved();
|
float get_resource_retrieval_progress(const ServerClientID& id);
|
||||||
float get_resource_retrieval_progress();
|
|
||||||
|
|
||||||
World& world;
|
World& world;
|
||||||
private:
|
private:
|
||||||
ServerClientID resourceBeingRetrieved = {0, 0};
|
std::unordered_map<ServerClientID, NetLibrary::DownloadProgress> serverDownloadProgress;
|
||||||
|
ServerClientID resourceBeingRetrievedClient = {0, 0};
|
||||||
|
|
||||||
std::unordered_map<ServerClientID, ResourceData> resources;
|
std::unordered_map<ServerClientID, ResourceData> resources;
|
||||||
std::unordered_map<ServerClientID, std::shared_ptr<ResourceDisplay>> displays;
|
std::unordered_map<ServerClientID, std::shared_ptr<ResourceDisplay>> displays;
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,7 @@ class ClientData {
|
||||||
|
|
||||||
uint64_t canvasScale = 0;
|
uint64_t canvasScale = 0;
|
||||||
|
|
||||||
std::queue<ResourceData> pendingResourceData;
|
ServerClientID pendingResourceID = {0, 0};
|
||||||
std::queue<ServerClientID> pendingResourceID;
|
|
||||||
|
|
||||||
template <typename Archive> void serialize(Archive& a) {
|
template <typename Archive> void serialize(Archive& a) {
|
||||||
a(camCoords, windowSize, cursorPos, cursorColor, displayName);
|
a(camCoords, windowSize, cursorPos, cursorColor, displayName);
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,8 @@ enum ServerCommands : MessageCommandType {
|
||||||
SERVER_ERASE_SINGLE_COMPONENT,
|
SERVER_ERASE_SINGLE_COMPONENT,
|
||||||
SERVER_ERASE_MANY_COMPONENTS,
|
SERVER_ERASE_MANY_COMPONENTS,
|
||||||
SERVER_UPDATE_COMPONENT,
|
SERVER_UPDATE_COMPONENT,
|
||||||
SERVER_RESOURCE_INIT,
|
SERVER_NEW_RESOURCE_ID,
|
||||||
SERVER_RESOURCE_DATA,
|
SERVER_NEW_RESOURCE_DATA,
|
||||||
SERVER_CHAT_MESSAGE,
|
SERVER_CHAT_MESSAGE,
|
||||||
SERVER_NEW_BOOKMARK,
|
SERVER_NEW_BOOKMARK,
|
||||||
SERVER_REMOVE_BOOKMARK,
|
SERVER_REMOVE_BOOKMARK,
|
||||||
|
|
|
||||||
|
|
@ -185,33 +185,22 @@ MainServer::MainServer(World& initWorld, const std::string& serverLocalID):
|
||||||
comp->server_send_update(*this, isFinalUpdate);
|
comp->server_send_update(*this, isFinalUpdate);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
netServer->add_recv_callback(SERVER_RESOURCE_INIT, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
netServer->add_recv_callback(SERVER_NEW_RESOURCE_ID, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
||||||
auto& c = clients[client->customID];
|
auto& c = clients[client->customID];
|
||||||
ServerClientID newID;
|
message(c.pendingResourceID);
|
||||||
message(newID);
|
if(c.pendingResourceID == ServerClientID{0, 0})
|
||||||
if(c.pendingResourceData.empty())
|
throw std::runtime_error("[MainServer::MainServer] Received a null resource ID");
|
||||||
c.pendingResourceID.emplace(newID);
|
|
||||||
else {
|
|
||||||
netServer->send_items_to_all_clients_except(client, RESOURCE_COMMAND_CHANNEL, CLIENT_NEW_RESOURCE_ID, newID);
|
|
||||||
netServer->send_items_to_all_clients_except(client, RESOURCE_COMMAND_CHANNEL, CLIENT_NEW_RESOURCE_DATA, c.pendingResourceData.front());
|
|
||||||
data.resources.emplace(newID, c.pendingResourceData.front());
|
|
||||||
c.pendingResourceData.pop();
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
netServer->add_recv_callback(SERVER_RESOURCE_DATA, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
netServer->add_recv_callback(SERVER_NEW_RESOURCE_DATA, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
||||||
ResourceData resourceData;
|
ResourceData resourceData;
|
||||||
message(resourceData);
|
message(resourceData);
|
||||||
auto& c = clients[client->customID];
|
auto& c = clients[client->customID];
|
||||||
if(c.pendingResourceID.empty()) {
|
if(c.pendingResourceID == ServerClientID{0, 0})
|
||||||
c.pendingResourceData.emplace();
|
throw std::runtime_error("[MainServer::MainServer] Received data for a null resource ID");
|
||||||
c.pendingResourceData.back() = std::move(resourceData);
|
netServer->send_items_to_all_clients_except(client, RESOURCE_COMMAND_CHANNEL, CLIENT_NEW_RESOURCE_ID, c.pendingResourceID);
|
||||||
}
|
netServer->send_items_to_all_clients_except(client, RESOURCE_COMMAND_CHANNEL, CLIENT_NEW_RESOURCE_DATA, resourceData);
|
||||||
else {
|
data.resources.emplace(c.pendingResourceID, resourceData);
|
||||||
netServer->send_items_to_all_clients_except(client, RESOURCE_COMMAND_CHANNEL, CLIENT_NEW_RESOURCE_ID, c.pendingResourceID.front());
|
c.pendingResourceID = ServerClientID{0, 0};
|
||||||
netServer->send_items_to_all_clients_except(client, RESOURCE_COMMAND_CHANNEL, CLIENT_NEW_RESOURCE_DATA, resourceData);
|
|
||||||
data.resources.emplace(c.pendingResourceID.front(), resourceData);
|
|
||||||
c.pendingResourceID.pop();
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
netServer->add_recv_callback(SERVER_CHAT_MESSAGE, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
netServer->add_recv_callback(SERVER_CHAT_MESSAGE, [&](std::shared_ptr<NetServer::ClientData> client, cereal::PortableBinaryInputArchive& message) {
|
||||||
std::string chatMessage;
|
std::string chatMessage;
|
||||||
|
|
@ -326,6 +315,28 @@ void MainServer::update() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::unordered_map<ServerClientID, NetLibrary::DownloadProgress> MainServer::resource_download_progress() {
|
||||||
|
std::unordered_map<ServerClientID, NetLibrary::DownloadProgress> toRet;
|
||||||
|
|
||||||
|
if(!netServer)
|
||||||
|
return toRet;
|
||||||
|
|
||||||
|
for(auto& [serverID, c] : clients) {
|
||||||
|
if(c.pendingResourceID != ServerClientID{0, 0}) {
|
||||||
|
const std::vector<std::shared_ptr<NetServer::ClientData>>& clientListInNetServer = netServer->get_client_list();
|
||||||
|
auto netClientIt = std::find_if(clientListInNetServer.begin(), clientListInNetServer.end(), [&serverID](auto& nC) {
|
||||||
|
return nC->customID == serverID;
|
||||||
|
});
|
||||||
|
if(netClientIt != clientListInNetServer.end()) {
|
||||||
|
auto& netClient = *netClientIt;
|
||||||
|
toRet.emplace(c.pendingResourceID, netClient->get_progress_into_fragmented_message(RESOURCE_COMMAND_CHANNEL));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return toRet;
|
||||||
|
}
|
||||||
|
|
||||||
MainServer::~MainServer() {
|
MainServer::~MainServer() {
|
||||||
//netServer->close_server();
|
//netServer->close_server();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ class MainServer {
|
||||||
~MainServer();
|
~MainServer();
|
||||||
std::shared_ptr<NetServer> netServer;
|
std::shared_ptr<NetServer> netServer;
|
||||||
std::unordered_map<ServerPortionID, ClientData> clients;
|
std::unordered_map<ServerPortionID, ClientData> clients;
|
||||||
|
std::unordered_map<ServerClientID, NetLibrary::DownloadProgress> resource_download_progress();
|
||||||
private:
|
private:
|
||||||
World& world;
|
World& world;
|
||||||
void ensure_display_name_unique(std::string& displayName);
|
void ensure_display_name_unique(std::string& displayName);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue