Merge cded0523a5 into 1b5ae86f7b

Added IDs to web request to prevent incompatibilities between web mods

loader/include/Geode/utils/web.hpp

@@ -113,7 +113,6 @@ namespace geode::utils::web {
         class Impl;
 
         std::shared_ptr<Impl> m_impl;
-
     public:
         WebRequest();
         ~WebRequest();
@@ -253,6 +252,13 @@ namespace geode::utils::web {
          */
         WebRequest& bodyJSON(matjson::Value const& json);
 
+        /**
+         * Gets the unique request ID
+         *
+         * @return size_t
+         */
+        size_t getID() const;
+
 
         /**
          * Gets the request method as a string

loader/src/utils/web.cpp

@@ -188,6 +188,8 @@ std::optional<float> WebProgress::uploadProgress() const {
 
 class WebRequest::Impl {
 public:
+    static std::atomic_size_t s_idCounter;
+
     std::string m_method;
     std::string m_url;
     std::unordered_map<std::string, std::string> m_headers;
@@ -203,6 +205,9 @@ public:
     std::string m_CABundleContent;
     ProxyOpts m_proxyOpts = {};
     HttpVersion m_httpVersion = HttpVersion::DEFAULT;
+    size_t m_id;
+
+    Impl() : m_id(s_idCounter++) {}
 
     WebResponse makeError(int code, std::string const& msg) {
         auto res = WebResponse();
@@ -212,6 +217,8 @@ public:
     }
 };
 
+std::atomic_size_t WebRequest::Impl::s_idCounter = 0;
+
 WebRequest::WebRequest() : m_impl(std::make_shared<Impl>()) {}
 WebRequest::~WebRequest() {}
 
@@ -584,6 +591,10 @@ WebRequest& WebRequest::bodyJSON(matjson::Value const& json) {
     return *this;
 }
 
+size_t WebRequest::getID() const {
+    return m_impl->m_id;
+}
+
 std::string WebRequest::getMethod() const {
     return m_impl->m_method;
 }