start work on downloadGJLevel ratelimit

SorkoPiko · Sep 21, 2024 · b07c142 · b07c142
1 parent 685238a
commit b07c142
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 6 deletions.
diff --git a/mod.json b/mod.json
@@ -8,7 +8,7 @@
 	},
 	"id": "sorkopiko.noratelimit",
 	"name": "No Rate Limit",
-	"version": "v1.0.3",
+	"version": "v1.0.4",
 	"developer": "SorkoPiko",
 	"description": "Prevents you from getting rate-limited by Robtop's API",
 	"links": {
@@ -33,6 +33,17 @@
 			"control": {
 				"slider": true
 			}
+		},
+		"maxDownloadLevelReqs": {
+			"name": "Max Level Download Requests per Minute",
+			"description": "The maximum amount of level download requests you can make to Robtop's API per minute (you get banned at 20)",
+			"type": "int",
+			"default": 18,
+			"min": 5,
+			"max": 19,
+			"control": {
+				"slider": true
+			}
 		}
 	},
 	"incompatibilities": [

diff --git a/src/hooks/CCHttpClient.cpp b/src/hooks/CCHttpClient.cpp
@@ -12,10 +12,22 @@ class $modify(NRLCCHttpClient, CCHttpClient) {
 
     void send(CCHttpRequest* request) {
         if (const std::string url = request->getUrl(); url.find("://www.boomlings.com") != std::string::npos && std::find(handledReqs.begin(), handledReqs.end(), request) == handledReqs.end()) {
+            auto downloadLevel = false;
+            if (url.find("://www.boomlings.com/database/downloadGJLevel22.php") != std::string::npos) {
+                downloadLevel = true;
+            }
             handledReqs.push_back(request);
-            if (const auto time = RequestStutter::getRequestTime(); time > 0) {
+            if (const auto time = RequestStutter::getRequestTime(downloadLevel); time > 0) {
                 log::info("delaying request by {}ms", time);
                 request->retain();
+                //CCScheduler::get()->scheduleSelector(
+                //    schedule_selector(NRLCCHttpClient::sendRequest),
+                //    this,
+                //    1,
+                //    0,
+                //    time / 1000.0f,
+                //    false
+                //);
                 std::thread([this, request, time] {
                     std::this_thread::sleep_for(std::chrono::milliseconds(time));
                     Loader::get()->queueInMainThread([this, request] {
@@ -28,4 +40,9 @@ class $modify(NRLCCHttpClient, CCHttpClient) {
         }
         CCHttpClient::send(request);
     }
+
+    //void sendRequest(float dt) {
+    //    CCHttpClient::send(m_fields->m_request);
+    //    m_fields->m_request->release();
+    //}
 };
diff --git a/src/hooks/GeodeWeb.cpp b/src/hooks/GeodeWeb.cpp
@@ -10,10 +10,16 @@ static std::vector<size_t> handledReqs;
 
 web::WebTask WebRequest_send(web::WebRequest* request, const std::string_view method, const std::string_view url) {
     if (url.find("://www.boomlings.com") != std::string::npos) {
-        if (const auto time = RequestStutter::getRequestTime(); time > 0 && std::find(handledReqs.begin(), handledReqs.end(), request->getID()) == handledReqs.end()) {
+        auto downloadLevel = false;
+        if (url.find("://www.boomlings.com/database/downloadGJLevel22.php") != std::string::npos) {
+            downloadLevel = true;
+        }
+        if (const auto time = RequestStutter::getRequestTime(downloadLevel); time > 0 && std::find(handledReqs.begin(), handledReqs.end(), request->getID()) == handledReqs.end()) {
             handledReqs.push_back(request->getID());
             log::info("delaying request by {}ms", time);
 
+
+            //Thanks SMJS for the task handler
             const auto req = new web::WebRequest(*request);
             const auto returnTask = web::WebTask::run([method, url, req, time](auto progress, auto cancelled) -> web::WebTask::Result {
                 std::unique_ptr<web::WebResponse> response;

diff --git a/src/managers/RequestStutter.cpp b/src/managers/RequestStutter.cpp
@@ -6,18 +6,36 @@
 using namespace geode::prelude;
 
 long long RequestStutter::lastRequestTime = 0;
+long long RequestStutter::lastDownloadLevelTime = 0;
 
 long long getCurrentTimestampMillis() {
     const auto now = std::chrono::system_clock::now();
     const auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch());
     return duration.count();
 }
 
-long long RequestStutter::getRequestTime() {
+long long RequestStutter::getRequestTime(bool downloadLevel) {
     const auto maxReqs = Mod::get()->getSettingValue<int64_t>("maxReqs");
     const auto delay = 60 * 1000 / maxReqs;
     const auto now = getCurrentTimestampMillis();
     const auto nextRequestTime = lastRequestTime + delay;
     lastRequestTime = std::max(nextRequestTime, now);
+    if (downloadLevel) {
+        return getDownloadLevelTime();
+    }
+    log::info("{}", lastRequestTime - now);
     return lastRequestTime - now;
+}
+
+long long RequestStutter::getDownloadLevelTime() {
+    const auto maxReqs = Mod::get()->getSettingValue<int64_t>("maxDownloadLevelReqs");
+    const auto delay = 60 * 1000 / maxReqs;
+    const auto now = getCurrentTimestampMillis();
+    if (lastDownloadLevelTime < lastRequestTime) {
+        lastDownloadLevelTime = lastRequestTime;
+    }
+    const auto nextRequestTime = lastDownloadLevelTime + delay;
+    lastDownloadLevelTime = std::max(nextRequestTime, now);
+    log::info("{}", lastDownloadLevelTime - now);
+    return lastDownloadLevelTime - now;
 }
diff --git a/src/managers/RequestStutter.hpp b/src/managers/RequestStutter.hpp
@@ -2,11 +2,12 @@
 #define REQUESTSTUTTER_HPP
 
 class RequestStutter {
-protected:
     static long long lastRequestTime;
+    static long long lastDownloadLevelTime;
+    static long long getDownloadLevelTime();
 
 public:
-    static long long getRequestTime();
+    static long long getRequestTime(bool downloadLevel);
 };
 
 #endif