Battle.net: Implemented cache stream items

5 files changed, 20 insertions, 1 deletions

diff --git a/src/server/bnetserver/Server/ModuleManager.cpp b/src/server/bnetserver/Server/ModuleManager.cpp
index 8dc43136739..05cee2ff42e 100644
--- a/src/server/bnetserver/Server/ModuleManager.cpp
+++ b/src/server/bnetserver/Server/ModuleManager.cpp
@@ -51,7 +51,8 @@ void Battlenet::ModuleManager::Load()
 Battlenet::ModuleInfo* Battlenet::ModuleManager::CreateModule(std::string const& os, std::string const& name) const
 {
     ModuleKey key { os, name };
-    ASSERT(_modules.count(key));
+    if (!_modules.count(key))
+        return nullptr;
 
     return new ModuleInfo(*_modules.at(key));
 }
diff --git a/src/server/bnetserver/Server/Session.cpp b/src/server/bnetserver/Server/Session.cpp
index 7090c1f0ca7..9a5f60b296e 100644
--- a/src/server/bnetserver/Server/Session.cpp
+++ b/src/server/bnetserver/Server/Session.cpp
@@ -477,6 +477,17 @@ void Battlenet::Session::HandleSocialNetworkCheckConnected(Friends::SocialNetwor
     AsyncWrite(socialNetworkCheckConnectedResult);
 }
 
+void Battlenet::Session::HandleGetStreamItemsRequest(Cache::GetStreamItemsRequest const& getStreamItemsRequest)
+{
+    if (ModuleInfo* module = sModuleMgr->CreateModule(getStreamItemsRequest.Locale, getStreamItemsRequest.ItemName))
+    {
+        Cache::GetStreamItemsResponse* getStreamItemsResponse = new Cache::GetStreamItemsResponse();
+        getStreamItemsResponse->Index = getStreamItemsRequest.Index;
+        getStreamItemsResponse->Modules.push_back(module);
+        AsyncWrite(getStreamItemsResponse);
+    }
+}
+
 inline std::string PacketToStringHelper(Battlenet::ClientPacket const* packet)
 {
     if (sLog->ShouldLog("session.packets", LOG_LEVEL_TRACE))
diff --git a/src/server/bnetserver/Server/Session.h b/src/server/bnetserver/Server/Session.h
index b2546c70cc6..a2c587841a4 100644
--- a/src/server/bnetserver/Server/Session.h
+++ b/src/server/bnetserver/Server/Session.h
@@ -81,6 +81,9 @@ namespace Battlenet
         // Friends
         void HandleSocialNetworkCheckConnected(Friends::SocialNetworkCheckConnected const& socialNetworkCheckConnected);
 
+        // Cache
+        void HandleGetStreamItemsRequest(Cache::GetStreamItemsRequest const& getStreamItemsRequest);
+
         void Start() override;
 
         void UpdateRealms(std::vector<Realm const*>& realms, std::vector<RealmId>& deletedRealms);
diff --git a/src/server/bnetserver/Server/SessionManager.cpp b/src/server/bnetserver/Server/SessionManager.cpp
index caa17364038..8dcee55ec6c 100644
--- a/src/server/bnetserver/Server/SessionManager.cpp
+++ b/src/server/bnetserver/Server/SessionManager.cpp
@@ -40,10 +40,12 @@ void Battlenet::SessionManager::AddSession(Session* session)
 {
     std::unique_lock<boost::shared_mutex> lock(_sessionMutex);
     _sessions[{ session->GetAccountId(), session->GetGameAccountId() }] = session;
+    _sessionsByAccountId[session->GetAccountId()].push_back(session);
 }
 
 void Battlenet::SessionManager::RemoveSession(Session* session)
 {
     std::unique_lock<boost::shared_mutex> lock(_sessionMutex);
     _sessions.erase({ session->GetAccountId(), session->GetGameAccountId() });
+    _sessionsByAccountId[session->GetAccountId()].remove(session);
 }
diff --git a/src/server/bnetserver/Server/SessionManager.h b/src/server/bnetserver/Server/SessionManager.h
index 4f8e0d9fa97..bbd78c052d2 100644
--- a/src/server/bnetserver/Server/SessionManager.h
+++ b/src/server/bnetserver/Server/SessionManager.h
@@ -44,6 +44,7 @@ namespace Battlenet
     {
         typedef SocketMgr<Session> BaseSocketMgr;
         typedef std::map<SessionInfo, Session*> SessionMap;
+        typedef std::map<uint32, std::list<Session*>> SessionByAccountMap;
 
     public:
         static SessionManager& Instance()
@@ -74,6 +75,7 @@ namespace Battlenet
         static void OnSocketAccept(tcp::socket&& sock);
 
         SessionMap _sessions;
+        SessionByAccountMap _sessionsByAccountId;
         boost::shared_mutex _sessionMutex;
     };
 }