From 78f16dba50af7ea7cc0b5f2685c9398f748fd7f1 Mon Sep 17 00:00:00 2001 From: SMJS Date: Wed, 2 Oct 2024 11:38:14 +0200 Subject: [PATCH] Added more hook stability --- CHANGELOG.md | 6 +++++- CMakeLists.txt | 2 +- mod.json | 4 ++-- proxy/Proxy.hpp | 5 +---- src/proxy/ProxyHandler.cpp | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79c558e..b059b4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # GDIntercept Changelog -## v0.6.5-alpha.6 (2024-09-27) - Race Condition Patch +## v0.6.6-alpha.6 (2024-10-02) - Hook Compatibility Patch + +- Added compatibility for hooks that modify the request data + +## v0.6.5-alpha.6 (2024-09-30) - Race Condition Patch - Patched all remaining race conditions (closed source for security reasons) diff --git a/CMakeLists.txt b/CMakeLists.txt index 16d61f6..fee05fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64") set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDLL) -project(GDIntercept VERSION 0.6.5) +project(GDIntercept VERSION 0.6.6) file(GLOB_RECURSE SOURCES "src/*.cpp") add_library(${PROJECT_NAME} SHARED ${SOURCES}) diff --git a/mod.json b/mod.json index bd94b50..fd66ce0 100644 --- a/mod.json +++ b/mod.json @@ -1,6 +1,6 @@ { - "geode": "3.7.1", - "version": "v0.6.5-alpha.6", + "geode": "3.8.1", + "version": "v0.6.6-alpha.6", "id": "smjs.gdintercept", "name": "GDIntercept", "api": { diff --git a/proxy/Proxy.hpp b/proxy/Proxy.hpp index 6b53757..dca906b 100644 --- a/proxy/Proxy.hpp +++ b/proxy/Proxy.hpp @@ -45,10 +45,7 @@ namespace proxy { }; - template - concept proxy_event = std::is_base_of_v; - - template + template requires std::is_base_of_v class ProxyFilter : public geode::EventFilter { public: geode::ListenerResult handle(geode::utils::MiniFunction callback, T* event) { diff --git a/src/proxy/ProxyHandler.cpp b/src/proxy/ProxyHandler.cpp index fdbbb54..eb87b09 100644 --- a/src/proxy/ProxyHandler.cpp +++ b/src/proxy/ProxyHandler.cpp @@ -180,7 +180,7 @@ m_finished(false) { m_info = new HttpInfo(ProxyHandler::paused, isRepeat, m_modRequest, method, url); ProxyHandler::registerProxy(this); - ProxyHandler::handledIDs.push_back(request->getID()); + ProxyHandler::handledIDs.push_back(m_modRequest->getID()); m_modTask = web::WebTask::run([this, url](auto progress, auto cancelled) -> web::WebTask::Result { web::WebResponse* response = nullptr;