-
-
Notifications
You must be signed in to change notification settings - Fork 449
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ensure live status requests are always batched (#4713)
- Loading branch information
Showing
20 changed files
with
582 additions
and
282 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,190 @@ | ||
| #include "controllers/twitch/LiveController.hpp" | ||
|
|
||
| #include "common/QLogging.hpp" | ||
| #include "providers/twitch/api/Helix.hpp" | ||
| #include "providers/twitch/TwitchChannel.hpp" | ||
| #include "util/Helpers.hpp" | ||
|
|
||
| #include <QDebug> | ||
|
|
||
| namespace { | ||
|
|
||
| // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables) | ||
| const auto &LOG = chatterinoTwitchLiveController; | ||
|
|
||
| } // namespace | ||
|
|
||
| namespace chatterino { | ||
|
|
||
| TwitchLiveController::TwitchLiveController() | ||
| { | ||
| QObject::connect(&this->refreshTimer, &QTimer::timeout, [this] { | ||
| this->request(); | ||
| }); | ||
| this->refreshTimer.start(TwitchLiveController::REFRESH_INTERVAL); | ||
|
|
||
| QObject::connect(&this->immediateRequestTimer, &QTimer::timeout, [this] { | ||
| QStringList channelIDs; | ||
|
|
||
| { | ||
| std::unique_lock immediateRequestsLock( | ||
| this->immediateRequestsMutex); | ||
| for (const auto &channelID : this->immediateRequests) | ||
| { | ||
| channelIDs.append(channelID); | ||
| } | ||
| this->immediateRequests.clear(); | ||
| } | ||
|
|
||
| if (channelIDs.isEmpty()) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| this->request(channelIDs); | ||
| }); | ||
| this->immediateRequestTimer.start( | ||
| TwitchLiveController::IMMEDIATE_REQUEST_INTERVAL); | ||
| } | ||
|
|
||
| void TwitchLiveController::add(const std::shared_ptr<TwitchChannel> &newChannel) | ||
| { | ||
| assert(newChannel != nullptr); | ||
|
|
||
| const auto channelID = newChannel->roomId(); | ||
| assert(!channelID.isEmpty()); | ||
|
|
||
| { | ||
| std::unique_lock lock(this->channelsMutex); | ||
| this->channels[channelID] = newChannel; | ||
| } | ||
|
|
||
| { | ||
| std::unique_lock immediateRequestsLock(this->immediateRequestsMutex); | ||
| this->immediateRequests.emplace(channelID); | ||
| } | ||
| } | ||
|
|
||
| void TwitchLiveController::request(std::optional<QStringList> optChannelIDs) | ||
| { | ||
| QStringList channelIDs; | ||
|
|
||
| if (optChannelIDs) | ||
| { | ||
| channelIDs = *optChannelIDs; | ||
| } | ||
| else | ||
| { | ||
| std::shared_lock lock(this->channelsMutex); | ||
|
|
||
| for (const auto &channelList : this->channels) | ||
| { | ||
| channelIDs.append(channelList.first); | ||
| } | ||
| } | ||
|
|
||
| if (channelIDs.isEmpty()) | ||
| { | ||
| return; | ||
| } | ||
|
|
||
| auto batches = | ||
| splitListIntoBatches(channelIDs, TwitchLiveController::BATCH_SIZE); | ||
|
|
||
| qCDebug(LOG) << "Make" << batches.size() << "requests"; | ||
|
|
||
| for (const auto &batch : batches) | ||
| { | ||
| // TODO: Explore making this concurrent | ||
| getHelix()->fetchStreams( | ||
| batch, {}, | ||
| [this, batch{batch}](const auto &streams) { | ||
| std::unordered_map<QString, std::optional<HelixStream>> results; | ||
|
|
||
| for (const auto &channelID : batch) | ||
| { | ||
| results[channelID] = std::nullopt; | ||
| } | ||
|
|
||
| for (const auto &stream : streams) | ||
| { | ||
| results[stream.userId] = stream; | ||
| } | ||
|
|
||
| QStringList deadChannels; | ||
|
|
||
| { | ||
| std::shared_lock lock(this->channelsMutex); | ||
| for (const auto &result : results) | ||
| { | ||
| auto it = this->channels.find(result.first); | ||
| if (it != channels.end()) | ||
| { | ||
| if (auto channel = it->second.lock(); channel) | ||
| { | ||
| channel->updateStreamStatus(result.second); | ||
| } | ||
| else | ||
| { | ||
| deadChannels.append(result.first); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (!deadChannels.isEmpty()) | ||
| { | ||
| std::unique_lock lock(this->channelsMutex); | ||
| for (const auto &deadChannel : deadChannels) | ||
| { | ||
| this->channels.erase(deadChannel); | ||
| } | ||
| } | ||
| }, | ||
| [] { | ||
| qCWarning(LOG) << "Failed stream check request"; | ||
| }, | ||
| [] {}); | ||
|
|
||
| // TODO: Explore making this concurrent | ||
| getHelix()->fetchChannels( | ||
| batch, | ||
| [this, batch{batch}](const auto &helixChannels) { | ||
| QStringList deadChannels; | ||
|
|
||
| { | ||
| std::shared_lock lock(this->channelsMutex); | ||
| for (const auto &helixChannel : helixChannels) | ||
| { | ||
| auto it = this->channels.find(helixChannel.userId); | ||
| if (it != this->channels.end()) | ||
| { | ||
| if (auto channel = it->second.lock(); channel) | ||
| { | ||
| channel->updateStreamTitle(helixChannel.title); | ||
| channel->updateDisplayName(helixChannel.name); | ||
| } | ||
| else | ||
| { | ||
| deadChannels.append(helixChannel.userId); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (!deadChannels.isEmpty()) | ||
| { | ||
| std::unique_lock lock(this->channelsMutex); | ||
| for (const auto &deadChannel : deadChannels) | ||
| { | ||
| this->channels.erase(deadChannel); | ||
| } | ||
| } | ||
| }, | ||
| [] { | ||
| qCWarning(LOG) << "Failed stream check request"; | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| } // namespace chatterino |
Oops, something went wrong.