From 8ba1d50cb7fc2e3dda6edb2d9e608583f40cee45 Mon Sep 17 00:00:00 2001 From: SherkeyXD <57581480+SherkeyXD@users.noreply.github.com> Date: Mon, 29 Jul 2024 20:41:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20core=E4=B8=8A=E6=8A=A5=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=BD=BF=E7=94=A8HTTP2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaCore/Task/ReportDataTask.cpp | 32 +++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/src/MaaCore/Task/ReportDataTask.cpp b/src/MaaCore/Task/ReportDataTask.cpp index 94d631f3dc..b8b537adde 100644 --- a/src/MaaCore/Task/ReportDataTask.cpp +++ b/src/MaaCore/Task/ReportDataTask.cpp @@ -12,10 +12,12 @@ #include #include -asst::ReportDataTask::ReportDataTask(const TaskCallback& task_callback, AbstractTask* upper_task) - : AbstractTask(nullptr, upper_task->inst(), upper_task->get_task_chain()), m_task_callback(task_callback), - m_upper_task(upper_task) -{} +asst::ReportDataTask::ReportDataTask(const TaskCallback& task_callback, AbstractTask* upper_task) : + AbstractTask(nullptr, upper_task->inst(), upper_task->get_task_chain()), + m_task_callback(task_callback), + m_upper_task(upper_task) +{ +} asst::ReportDataTask& asst::ReportDataTask::set_report_type(ReportType type) { @@ -88,7 +90,9 @@ void asst::ReportDataTask::report_to_penguin() constexpr int DefaultBackoff = 3 * 1000; // 3s int backoff = DefaultBackoff; - auto penguin_success_cond = [](const cpr::Response& response) -> bool { return response.status_code == 200; }; + auto penguin_success_cond = [](const cpr::Response& response) -> bool { + return response.status_code == 200; + }; auto penguin_retry_cond = [&](const cpr::Response& response) -> bool { if (!response.status_code) { return true; @@ -183,9 +187,14 @@ void asst::ReportDataTask::report_to_yituliu(ReportType reportType) report(yituliu_subtask_name, url, headers, timeout); } -cpr::Response asst::ReportDataTask::report(std::string_view subtask, const std::string& url, const cpr::Header& headers, - const int timeout, HttpResponsePred success_cond, - HttpResponsePred retry_cond, bool callback_on_failure) +cpr::Response asst::ReportDataTask::report( + std::string_view subtask, + const std::string& url, + const cpr::Header& headers, + const int timeout, + HttpResponsePred success_cond, + HttpResponsePred retry_cond, + bool callback_on_failure) { LogTraceFunction; @@ -201,7 +210,12 @@ cpr::Response asst::ReportDataTask::report(std::string_view subtask, const std:: cpr::Response response; for (int i = 0; i <= m_retry_times; ++i) { - response = cpr::Post(cpr::Url { url }, cpr::Body { m_body }, headers, cpr::Timeout { timeout }); + response = cpr::Post( + cpr::Url { url }, + cpr::Body { m_body }, + headers, + cpr::Timeout { timeout }, + cpr::HttpVersion { cpr::HttpVersionCode::VERSION_2_0 }); Log.info("Report response status code: ", response.status_code); for (const auto& [key, value] : response.header) { Log.info("Report response header: ", key, ":", value);