From 42ff5eaddfc06d3db2e81e052d4b715bd8c9879d Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Mon, 5 Sep 2022 23:44:48 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E5=9B=B4=E7=BB=95=20AsstHttp=20?= =?UTF-8?q?=E7=9A=84=E5=90=84=E7=A7=8D=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/AsstHttp.hpp | 44 ++++++++++++++++++++-------- src/MeoAssistant/AsstUtils.hpp | 2 +- src/MeoAssistant/AutoRecruitTask.cpp | 2 +- src/MeoAssistant/Logger.hpp | 11 +++---- src/MeoAssistant/ReportDataTask.cpp | 35 +++++++++++++--------- 5 files changed, 58 insertions(+), 36 deletions(-) diff --git a/src/MeoAssistant/AsstHttp.hpp b/src/MeoAssistant/AsstHttp.hpp index 84ab58c24f..47dd5f7ccc 100644 --- a/src/MeoAssistant/AsstHttp.hpp +++ b/src/MeoAssistant/AsstHttp.hpp @@ -10,23 +10,25 @@ namespace asst::http { - class Response : public std::string + class Response { private: + std::string m_raw_data; std::string m_last_error; unsigned m_status_code = 0; std::string_view m_protocol_version; std::string_view m_status_code_info; - std::string_view m_data; + std::string_view m_body; std::unordered_map m_headers; + static const inline std::unordered_set _accepted_protocol_version = { "HTTP/1.1", + "HTTP/2.0" }; bool _analyze_status_line(std::string_view status_line) { size_t _word_count = 0; for (const auto& word : utils::string_split(status_line, " ")) { ++_word_count; if (_word_count == 1) { - static const std::unordered_set accepted_protocol_version = { "HTTP/1.1" }; - if (!accepted_protocol_version.contains(word)) { + if (!_accepted_protocol_version.contains(word)) { m_last_error = "unsupported protocol version`" + std::string(word) + "`"; return false; } @@ -58,7 +60,7 @@ namespace asst::http { size_t _colon_pos = status_line.find(':'); if (_colon_pos == status_line.npos) { - m_last_error = "connot decode header `" + std::string(status_line) + "`"; + m_last_error = "cannot decode header `" + std::string(status_line) + "`"; return false; } m_headers[utils::view_cast(status_line.substr(0, _colon_pos) | views::transform([](char c) { @@ -71,10 +73,11 @@ namespace asst::http public: template requires std::is_constructible_v - Response(Args&&... args) : std::string(std::forward(args)...) + Response(Args&&... args) : m_raw_data(std::forward(args)...) { - std::string_view this_view = *this; + std::string_view this_view = m_raw_data; bool _is_status_line = true; + bool _is_data_line = false; for (const auto& line : utils::string_split(this_view, "\r\n")) { // status if (_is_status_line) { @@ -84,23 +87,37 @@ namespace asst::http _is_status_line = false; } // headers - else if (!line.empty()) { - if (!_analyze_headers_line(line)) { - return; + else if (!_is_data_line) { + if (!line.empty()) { + if (!_analyze_headers_line(line)) { + return; + } + } + else { + _is_data_line = true; // 当前行是空行，则下一行开始都是 data 段 } } // data else { - m_data = std::string_view(line.begin(), this_view.end()); + m_body = std::string_view(line.begin(), this_view.end()); return; } } } + Response() = default; + ~Response() = default; + + Response(Response&&) = default; + Response& operator=(Response&&) = default; + + Response(const Response&) = delete; + Response& operator=(const Response&) = delete; + unsigned status_code() const { return m_status_code; } std::string_view protocol_version() const { return m_protocol_version; } std::string_view status_code_info() const { return m_status_code_info; } - std::string_view data() const { return m_data; } + std::string_view body() const { return m_body; } std::optional find_header(const std::string& key) const { if (auto iter = m_headers.find(key); iter != m_headers.cend()) { @@ -111,7 +128,8 @@ namespace asst::http } } const auto& headers() const { return m_headers; } - const std::string& get_last_error() const noexcept { return m_last_error; } + const std::string& get_last_error() const { return m_last_error; } + operator std::string() const { return m_raw_data; } bool success() const { return m_status_code == 200; } bool status_2xx() const { return m_status_code >= 200 && m_status_code < 300; } diff --git a/src/MeoAssistant/AsstUtils.hpp b/src/MeoAssistant/AsstUtils.hpp index 4dbd29cf3b..110c0834c8 100644 --- a/src/MeoAssistant/AsstUtils.hpp +++ b/src/MeoAssistant/AsstUtils.hpp @@ -149,7 +149,7 @@ namespace asst::utils constexpr _iterator& operator++() { - const auto _end = _pre->_rng.cend(); + auto _end = _pre->_rng.cend(); if (_cur = _nxt.cbegin(); _cur == _end) { _trailing_empty = false; diff --git a/src/MeoAssistant/AutoRecruitTask.cpp b/src/MeoAssistant/AutoRecruitTask.cpp index 37aa0c7579..911ba39460 100644 --- a/src/MeoAssistant/AutoRecruitTask.cpp +++ b/src/MeoAssistant/AutoRecruitTask.cpp @@ -736,7 +736,7 @@ void asst::AutoRecruitTask::upload_to_yituliu(const json::value& details) m_report_yituliu_task_ptr->set_report_type(ReportType::YituliuBigData) .set_body(body.to_string()) - .set_retry_times(1) + .set_retry_times(0) .run(); } diff --git a/src/MeoAssistant/Logger.hpp b/src/MeoAssistant/Logger.hpp index 4de3fde851..8f9e0caf95 100644 --- a/src/MeoAssistant/Logger.hpp +++ b/src/MeoAssistant/Logger.hpp @@ -145,14 +145,11 @@ namespace asst } template - struct has_stream_insertion_operator : std::false_type - {}; + static constexpr bool has_stream_insertion_operator = false; template - struct has_stream_insertion_operator() << std::declval())>> - : std::true_type - {}; + static constexpr bool has_stream_insertion_operator< + Stream, T, std::void_t() << std::declval())>> = true; template static Stream& stream_put(Stream& s, std::filesystem::path&& v) @@ -170,7 +167,7 @@ namespace asst s << std::string(std::forward(v)); return s; } - else if constexpr (has_stream_insertion_operator::value) { + else if constexpr (has_stream_insertion_operator) { s << std::forward(v); return s; } diff --git a/src/MeoAssistant/ReportDataTask.cpp b/src/MeoAssistant/ReportDataTask.cpp index 2e568b7231..38100fcee2 100644 --- a/src/MeoAssistant/ReportDataTask.cpp +++ b/src/MeoAssistant/ReportDataTask.cpp @@ -112,13 +112,18 @@ asst::http::Response asst::ReportDataTask::report(const std::string& subtask, co else if (!retry_cond(response)) { break; } + else { + Log.trace("retrying... | why:", response.get_last_error(), "status_code:", response.status_code()); + } } cb_info["why"] = "上报失败"; - cb_info["details"] = json::object { { "error", response.get_last_error() }, - { "status_code", response.status_code() }, - { "status_code_info", std::string(response.status_code_info()) }, - { "response", std::string(response.data()) } }; + cb_info["details"] = json::object { + { "error", response.get_last_error() }, + { "status_code", response.status_code() }, + { "status_code_info", std::string(response.status_code_info()) }, + { "response", std::string(response.body()) }, + }; callback(AsstMsg::SubTaskError, cb_info); @@ -127,22 +132,24 @@ asst::http::Response asst::ReportDataTask::report(const std::string& subtask, co asst::http::Response asst::ReportDataTask::escape_and_request(const std::string& format) { - LogTraceFunction; - - std::string body_escape = utils::string_replace_all(m_body, { { "\"", "\\\"" } }); + std::string body_escape = utils::string_replace_all(m_body, "\"", "\\\""); #ifdef _WIN32 - std::string body_escapes = utils::utf8_to_unicode_escape(body_escape); -#else - std::string body_escapes = body_escape; + body_escape = utils::utf8_to_unicode_escape(body_escape); #endif std::string cmd_line = - utils::string_replace_all(format, { { "[body]", body_escapes }, { "[extra]", m_extra_param } }); + utils::string_replace_all(format, { { "[body]", body_escape }, { "[extra]", m_extra_param } }); - Log.info("request:\n", cmd_line); - http::Response response = utils::callcmd(cmd_line); - Log.info("response:\n", response); + Log.info("request:\n" + cmd_line); + std::string response = utils::callcmd(cmd_line); + Log.info("response:\n" + response); + + // Log.info("response:\n" + utils::string_replace_all(response, { + // { "\n", " [LF]\n" }, + // { "\r [LF]\n", " [CRLF]\n" }, + // { "\r", " [CR]\n" }, + // })); return response; }