feedc0de/espasynchttpreq
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Added support for old and new IDF

Browse Source
This commit is contained in:
0xFEEDC0DE64
2022-01-03 17:18:12 +01:00
parent 1c21c48e40
commit 719d1854ef
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/asynchttprequest.cpp
View File

@@ -195,8 +195,7 @@ bool AsyncHttpRequest::hasClient() const
tl::expected<void, std::string> AsyncHttpRequest::start(std::string_view url, tl::expected<void, std::string> AsyncHttpRequest::start(std::string_view url,
esp_http_client_method_t method, esp_http_client_method_t method,
const std::map<std::string, std::string> &requestHeaders, const std::map<std::string, std::string> &requestHeaders,
std::string_view requestBody, std::string_view requestBody, int timeout_ms)
int timeout_ms)
{ {
if (!m_taskHandle) if (!m_taskHandle)
{ {
@@ -262,8 +261,11 @@ tl::expected<void, std::string> AsyncHttpRequest::start(std::string_view url,
tl::expected<void, std::string> AsyncHttpRequest::retry(std::optional<std::string_view> url, tl::expected<void, std::string> AsyncHttpRequest::retry(std::optional<std::string_view> url,
std::optional<esp_http_client_method_t> method, std::optional<esp_http_client_method_t> method,
const std::map<std::string, std::string> &requestHeaders, const std::map<std::string, std::string> &requestHeaders,
std::string_view requestBody, std::string_view requestBody
std::optional<int> timeout_ms) #ifndef OLD_IDF
, std::optional<int> timeout_ms
#endif
)
{ {
if (!m_taskHandle) if (!m_taskHandle)
{ {
@@ -301,6 +303,7 @@ tl::expected<void, std::string> AsyncHttpRequest::retry(std::optional<std::strin
return tl::make_unexpected(std::move(msg)); return tl::make_unexpected(std::move(msg));
} }
#ifndef OLD_IDF
if (timeout_ms) if (timeout_ms)
if (const auto result = m_client.set_timeout_ms(*timeout_ms); result != ESP_OK) if (const auto result = m_client.set_timeout_ms(*timeout_ms); result != ESP_OK)
{ {
@@ -308,6 +311,7 @@ tl::expected<void, std::string> AsyncHttpRequest::retry(std::optional<std::strin
ESP_LOGW(TAG, "%.*s", msg.size(), msg.data()); ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
return tl::make_unexpected(std::move(msg)); return tl::make_unexpected(std::move(msg));
} }
#endif
for (auto iter = std::cbegin(requestHeaders); iter != std::cend(requestHeaders); iter++) for (auto iter = std::cbegin(requestHeaders); iter != std::cend(requestHeaders); iter++)
if (const auto result = m_client.set_header(iter->first, iter->second); result != ESP_OK) if (const auto result = m_client.set_header(iter->first, iter->second); result != ESP_OK)

10
src/asynchttprequest.h
View File

@@ -37,13 +37,15 @@ public:
tl::expected<void, std::string> start(std::string_view url, tl::expected<void, std::string> start(std::string_view url,
esp_http_client_method_t method = HTTP_METHOD_GET, esp_http_client_method_t method = HTTP_METHOD_GET,
const std::map<std::string, std::string> &requestHeaders = {}, const std::map<std::string, std::string> &requestHeaders = {},
std::string_view requestBody = {}, std::string_view requestBody = {}, int timeout_ms = 0);
int timeout_ms = 0);
tl::expected<void, std::string> retry(std::optional<std::string_view> url = std::nullopt, tl::expected<void, std::string> retry(std::optional<std::string_view> url = std::nullopt,
std::optional<esp_http_client_method_t> method = std::nullopt, std::optional<esp_http_client_method_t> method = std::nullopt,
const std::map<std::string, std::string> &requestHeaders = {}, const std::map<std::string, std::string> &requestHeaders = {},
std::string_view requestBody = {}, std::string_view requestBody = {}
std::optional<int> timeout_ms = {}); #ifndef OLD_IDF
,std::optional<int> timeout_ms = {}
#endif
);
tl::expected<void, std::string> abort(); tl::expected<void, std::string> abort();
bool inProgress() const; bool inProgress() const;