Release 0.9.9.25 (#618)

gwdevhub · Apr 2, 2024 · 6a27245 · 6a27245
1 parent 6f4063a
commit 6a27245
Show file tree

Hide file tree

Showing 17 changed files with 48 additions and 196 deletions.
diff --git a/Daybreak.GWCA/CMakeLists.txt b/Daybreak.GWCA/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 9)
 set(VERSION_PATCH 9)
-set(VERSION_TWEAK 10)
+set(VERSION_TWEAK 25)
 
 set(VERSION_RC "${CMAKE_CURRENT_BINARY_DIR}/version.rc")
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/version.rc.in" "${VERSION_RC}" @ONLY)

diff --git a/Daybreak.GWCA/source/EntityNameModule.cpp b/Daybreak.GWCA/source/EntityNameModule.cpp
@@ -93,7 +93,6 @@ namespace Daybreak::Modules::EntityNameModule {
     }
 
     void GetName(const httplib::Request& req, httplib::Response& res) {
-        auto callbackEntry = new GW::HookEntry;
         uint32_t id = 0;
         auto it = req.params.find("id");
         if (it == req.params.end()) {
@@ -114,16 +113,14 @@ namespace Daybreak::Modules::EntityNameModule {
             id = static_cast<uint32_t>(result);
         }
 
-        auto response = new std::tuple<uint32_t, std::promise<NamePayload>>();
-        std::get<0>(*response) = id;
-        std::promise<NamePayload>& promise = std::get<1>(*response);
+        auto response = std::tuple<uint32_t, std::promise<NamePayload>>();
+        std::get<0>(response) = id;
+        std::promise<NamePayload>& promise = std::get<1>(response);
 
         EnsureInitialized();
-        PromiseQueue.emplace(response);
+        PromiseQueue.emplace(&response);
 
         json responsePayload = promise.get_future().get();
-        delete callbackEntry;
-        delete response;
         res.set_content(responsePayload.dump(), "text/json");
     }
 }
diff --git a/Daybreak.GWCA/source/GameModule.cpp b/Daybreak.GWCA/source/GameModule.cpp
@@ -593,15 +593,12 @@ namespace Daybreak::Modules::GameModule {
     }
 
     void GetGameInfo(const httplib::Request&, httplib::Response& res) {
-        auto callbackEntry = new GW::HookEntry;
-        auto response = new std::promise<GamePayload>;
+        auto response = std::promise<GamePayload>();
 
         EnsureInitialized();
-        PromiseQueue.emplace(response);
-        json responsePayload = response->get_future().get();
+        PromiseQueue.emplace(&response);
+        json responsePayload = response.get_future().get();
 
-        delete callbackEntry;
-        delete response;
         res.set_content(responsePayload.dump(), "text/json");
     }
 }
diff --git a/Daybreak.GWCA/source/GameStateModule.cpp b/Daybreak.GWCA/source/GameStateModule.cpp
@@ -100,15 +100,12 @@ namespace Daybreak::Modules::GameStateModule {
     }
 
     void GetGameStateInfo(const httplib::Request&, httplib::Response& res) {
-        auto callbackEntry = new GW::HookEntry;
-        auto response = new std::promise<GameStatePayload>;
+        auto response = std::promise<GameStatePayload>();
 
         EnsureInitialized();
-        PromiseQueue.emplace(response);
-        json responsePayload = response->get_future().get();
+        PromiseQueue.emplace(&response);
+        json responsePayload = response.get_future().get();
 
-        delete callbackEntry;
-        delete response;
         res.set_content(responsePayload.dump(), "text/json");
     }
 }
diff --git a/Daybreak.GWCA/source/InventoryModule.cpp b/Daybreak.GWCA/source/InventoryModule.cpp
@@ -102,15 +102,12 @@ namespace Daybreak::Modules::InventoryModule {
     }
 
     void GetInventoryInfo(const httplib::Request&, httplib::Response& res) {
-        auto callbackEntry = new GW::HookEntry;
-        auto response = new std::promise<InventoryPayload>;
+        auto response = std::promise<InventoryPayload>();
 
         EnsureInitialized();
-        PromiseQueue.emplace(response);
-        json responsePayload = response->get_future().get();
+        PromiseQueue.emplace(&response);
+        json responsePayload = response.get_future().get();
 
-        delete callbackEntry;
-        delete response;
         res.set_content(responsePayload.dump(), "text/json");
     }
 }
diff --git a/Daybreak.GWCA/source/ItemNameModule.cpp b/Daybreak.GWCA/source/ItemNameModule.cpp
@@ -103,7 +103,6 @@ namespace Daybreak::Modules::ItemNameModule {
     }
 
     void GetName(const httplib::Request& req, httplib::Response& res) {
-        auto callbackEntry = new GW::HookEntry;
         uint32_t id = 0;
         std::vector<uint32_t> modifiers;
 
@@ -146,17 +145,15 @@ namespace Daybreak::Modules::ItemNameModule {
             }
         }
 
-        auto response = new std::tuple<uint32_t, std::vector<uint32_t>, std::promise<NamePayload>>();
-        std::get<0>(*response) = id;
-        std::promise<NamePayload>& promise = std::get<2>(*response);
-        std::get<1>(*response) = modifiers;
+        auto response = std::tuple<uint32_t, std::vector<uint32_t>, std::promise<NamePayload>>();
+        std::get<0>(response) = id;
+        std::promise<NamePayload>& promise = std::get<2>(response);
+        std::get<1>(response) = modifiers;
 
         EnsureInitialized();
-        PromiseQueue.emplace(response);
+        PromiseQueue.emplace(&response);
 
         json responsePayload = promise.get_future().get();
-        delete callbackEntry;
-        delete response;
         res.set_content(responsePayload.dump(), "text/json");
     }
 }
diff --git a/Daybreak.GWCA/source/LoginModule.cpp b/Daybreak.GWCA/source/LoginModule.cpp
@@ -51,15 +51,12 @@ namespace Daybreak::Modules::LoginModule {
     }
 
     void GetLoginInfo(const httplib::Request&, httplib::Response& res) {
-        auto callbackEntry = new GW::HookEntry;
-        auto response = new std::promise<LoginPayload>;
+        auto response = std::promise<LoginPayload>();
 
         EnsureInitialized();
-        PromiseQueue.emplace(response);
-        json responsePayload = response->get_future().get();
+        PromiseQueue.emplace(&response);
+        json responsePayload = response.get_future().get();
 
-        delete callbackEntry;
-        delete response;
         res.set_content(responsePayload.dump(), "text/json");
     }
 }
diff --git a/Daybreak.GWCA/source/MainPlayerModule.cpp b/Daybreak.GWCA/source/MainPlayerModule.cpp
@@ -467,15 +467,12 @@ namespace Daybreak::Modules::MainPlayerModule {
     }
 
     void GetMainPlayer(const httplib::Request&, httplib::Response& res) {
-        auto callbackEntry = new GW::HookEntry;
-        auto response = new std::promise<MainPlayer>;
+        auto response = std::promise<MainPlayer>();
 
         EnsureInitialized();
-        PromiseQueue.emplace(response);
-        json responsePayload = response->get_future().get();
+        PromiseQueue.emplace(&response);
+        json responsePayload = response.get_future().get();
 
-        delete callbackEntry;
-        delete response;
         res.set_content(responsePayload.dump(), "text/json");
     }
 }
diff --git a/Daybreak.GWCA/source/MapModule.cpp b/Daybreak.GWCA/source/MapModule.cpp
@@ -58,15 +58,12 @@ namespace Daybreak::Modules::MapModule {
     }
 
     void GetMapInfo(const httplib::Request&, httplib::Response& res) {
-        auto callbackEntry = new GW::HookEntry;
-        auto response = new std::promise<MapPayload>;
+        auto response = std::promise<MapPayload>();
 
         EnsureInitialized();
-        PromiseQueue.emplace(response);
-        json responsePayload = response->get_future().get();
+        PromiseQueue.emplace(&response);
+        json responsePayload = response.get_future().get();
 
-        delete callbackEntry;
-        delete response;
         res.set_content(responsePayload.dump(), "text/json");
     }
 }
diff --git a/Daybreak.GWCA/source/PathingMetadataModule.cpp b/Daybreak.GWCA/source/PathingMetadataModule.cpp
@@ -57,15 +57,12 @@ namespace Daybreak::Modules::PathingMetadataModule {
     }
 
     void GetPathingMetadata(const httplib::Request&, httplib::Response& res) {
-        auto callbackEntry = new GW::HookEntry;
-        auto response = new std::promise<PathingMetadataPayload>;
+        auto response = std::promise<PathingMetadataPayload>();
 
         EnsureInitialized();
-        PromiseQueue.emplace(response);
-        json responsePayload = response->get_future().get();
+        PromiseQueue.emplace(&response);
+        json responsePayload = response.get_future().get();
 
-        delete callbackEntry;
-        delete response;
         res.set_content(responsePayload.dump(), "text/json");
     }
 }
diff --git a/Daybreak.GWCA/source/PathingModule.cpp b/Daybreak.GWCA/source/PathingModule.cpp
@@ -84,15 +84,12 @@ namespace Daybreak::Modules::PathingModule {
     }
 
     void GetPathingData(const httplib::Request&, httplib::Response& res) {
-        auto callbackEntry = new GW::HookEntry;
-        auto response = new std::promise<PathingPayload>;
+        auto response = std::promise<PathingPayload>();
 
         EnsureInitialized();
-        PromiseQueue.emplace(response);
-        json responsePayload = response->get_future().get();
+        PromiseQueue.emplace(&response);
+        json responsePayload = response.get_future().get();
 
-        delete callbackEntry;
-        delete response;
         res.set_content(responsePayload.dump(), "text/json");
     }
 }
diff --git a/Daybreak.GWCA/source/PreGameModule.cpp b/Daybreak.GWCA/source/PreGameModule.cpp
@@ -60,15 +60,12 @@ namespace Daybreak::Modules::PreGameModule {
     }
 
     void GetPreGameInfo(const httplib::Request&, httplib::Response& res) {
-        auto callbackEntry = new GW::HookEntry;
-        auto response = new std::promise<PreGamePayload>;
+        auto response = std::promise<PreGamePayload>();
 
         EnsureInitialized();
-        PromiseQueue.emplace(response);
-        json responsePayload = response->get_future().get();
+        PromiseQueue.emplace(&response);
+        json responsePayload = response.get_future().get();
 
-        delete callbackEntry;
-        delete response;
         res.set_content(responsePayload.dump(), "text/json");
     }
 }
diff --git a/Daybreak.GWCA/source/SessionModule.cpp b/Daybreak.GWCA/source/SessionModule.cpp
@@ -62,15 +62,12 @@ namespace Daybreak::Modules::SessionModule {
     }
 
     void GetSessionInfo(const httplib::Request&, httplib::Response& res) {
-        auto callbackEntry = new GW::HookEntry;
-        auto response = new std::promise<SessionPayload>;
+        auto response = std::promise<SessionPayload>();
 
         EnsureInitialized();
-        PromiseQueue.emplace(response);
-        json responsePayload = response->get_future().get();
+        PromiseQueue.emplace(&response);
+        json responsePayload = response.get_future().get();
 
-        delete callbackEntry;
-        delete response;
         res.set_content(responsePayload.dump(), "text/json");
     }
 }
diff --git a/Daybreak.GWCA/source/TitleInfoModule.cpp b/Daybreak.GWCA/source/TitleInfoModule.cpp
@@ -128,7 +128,6 @@ namespace Daybreak::Modules::TitleInfoModule {
     }
 
     void GetTitleInfo(const httplib::Request& req, httplib::Response& res) {
-        auto callbackEntry = new GW::HookEntry;
         uint32_t id = 0;
         auto it = req.params.find("id");
         if (it == req.params.end()) {
@@ -149,16 +148,14 @@ namespace Daybreak::Modules::TitleInfoModule {
             id = static_cast<uint32_t>(result);
         }
 
-        auto response = new std::tuple<uint32_t, std::promise<TitleInfoPayload>>();
-        std::get<0>(*response) = id;
-        std::promise<TitleInfoPayload>& promise = std::get<1>(*response);
+        auto response = std::tuple<uint32_t, std::promise<TitleInfoPayload>>();
+        std::get<0>(response) = id;
+        std::promise<TitleInfoPayload>& promise = std::get<1>(response);
 
         EnsureInitialized();
-        PromiseQueue.emplace(response);
+        PromiseQueue.emplace(&response);
 
         json responsePayload = promise.get_future().get();
-        delete callbackEntry;
-        delete response;
         res.set_content(responsePayload.dump(), "text/json");
     }
 }
diff --git a/Daybreak.GWCA/source/UserModule.cpp b/Daybreak.GWCA/source/UserModule.cpp
@@ -66,15 +66,12 @@ namespace Daybreak::Modules::UserModule {
     }
 
     void GetUserInfo(const httplib::Request&, httplib::Response& res) {
-        auto callbackEntry = new GW::HookEntry;
-        auto response = new std::promise<UserPayload>;
+        auto response = std::promise<UserPayload>();
 
         EnsureInitialized();
-        PromiseQueue.emplace(response);
-        json responsePayload = response->get_future().get();
+        PromiseQueue.emplace(&response);
+        json responsePayload = response.get_future().get();
 
-        delete callbackEntry;
-        delete response;
         res.set_content(responsePayload.dump(), "text/json");
     }
 }