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

api improvements

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-12-06 17:12:10 +01:00
parent 378da7c956
commit 67963224e7
2 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/asynchttprequest.cpp
View File

@@ -138,7 +138,7 @@ bool AsyncHttpRequest::taskRunning() const
return false; return false;
} }
tl::expected<void, std::string> AsyncHttpRequest::createClient(std::string_view url) tl::expected<void, std::string> AsyncHttpRequest::createClient(std::string_view url, esp_http_client_method_t method)
{ {
if (m_client) if (m_client)
{ {
@@ -149,7 +149,8 @@ tl::expected<void, std::string> AsyncHttpRequest::createClient(std::string_view
esp_http_client_config_t config{}; esp_http_client_config_t config{};
config.url = url.data(); config.url = url.data();
config.max_authorization_retries = 2; config.max_authorization_retries = 1;
config.method = method;
config.event_handler = staticHttpEventHandler; config.event_handler = staticHttpEventHandler;
config.user_data = this; config.user_data = this;
@@ -214,24 +215,37 @@ tl::expected<void, std::string> AsyncHttpRequest::start(std::string_view url,
return tl::make_unexpected(msg); return tl::make_unexpected(msg);
} }
if (auto result = createClient(url); !result) if (auto result = createClient(url, method); !result)
return tl::make_unexpected(std::move(result).error()); return tl::make_unexpected(std::move(result).error());
if (const auto result = m_client.set_method(method); result != ESP_OK)
return tl::make_unexpected(fmt::format("m_client.set_method() failed: {}", esp_err_to_name(result)));
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)
return tl::make_unexpected(fmt::format("m_client.set_header() failed: {} ({} {})", esp_err_to_name(result), iter->first, iter->second)); {
auto msg = fmt::format("m_client.set_header() failed: {} ({} {})", esp_err_to_name(result), iter->first, iter->second);
ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
return tl::make_unexpected(std::move(msg));
}
if (!requestBody.empty()) if (!requestBody.empty())
{ {
if (const auto result = m_client.open(requestBody.size()); result != ESP_OK) if (const auto result = m_client.open(requestBody.size()); result != ESP_OK)
return tl::make_unexpected(fmt::format("m_client.open() failed: {} ({})", esp_err_to_name(result), requestBody.size())); {
auto msg = fmt::format("m_client.open() failed: {} ({})", esp_err_to_name(result), requestBody.size());
ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
return tl::make_unexpected(std::move(msg));
}
if (const auto written = m_client.write(requestBody); written < 0) if (const auto written = m_client.write(requestBody); written < 0)
return tl::make_unexpected(fmt::format("m_client.write() failed: {}", written)); {
auto msg = fmt::format("m_client.write() failed: {}", written);
ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
return tl::make_unexpected(std::move(msg));
}
else if (written != requestBody.size()) else if (written != requestBody.size())
return tl::make_unexpected(fmt::format("m_client.write() written size mismatch: {} != {}", written, requestBody.size())); {
auto msg = fmt::format("m_client.write() written size mismatch: {} != {}", written, requestBody.size());
ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
return tl::make_unexpected(std::move(msg));
}
} }
m_buf.clear(); m_buf.clear();
@@ -242,8 +256,8 @@ tl::expected<void, std::string> AsyncHttpRequest::start(std::string_view url,
return {}; return {};
} }
tl::expected<void, std::string> AsyncHttpRequest::retry(std::string_view url, tl::expected<void, std::string> AsyncHttpRequest::retry(std::optional<std::string_view> url,
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)
{ {
@@ -267,29 +281,50 @@ tl::expected<void, std::string> AsyncHttpRequest::retry(std::string_view url,
return tl::make_unexpected(msg); return tl::make_unexpected(msg);
} }
if (!url.empty()) if (url)
if (const auto result = m_client.set_url(*url); result != ESP_OK)
{ {
const auto result = m_client.set_url(url); auto msg = fmt::format("m_client.set_url() failed: {} ({})", esp_err_to_name(result), *url);
ESP_LOG_LEVEL_LOCAL((result == ESP_OK ? ESP_LOG_DEBUG : ESP_LOG_ERROR), TAG, "m_client.set_url() returned: %s (%.*s)", esp_err_to_name(result), url.size(), url.data()); ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
if (result != ESP_OK) return tl::make_unexpected(std::move(msg));
return tl::make_unexpected(fmt::format("m_client.set_url() failed: {} ({})", esp_err_to_name(result), url));
} }
if (const auto result = m_client.set_method(method); result != ESP_OK) if (method)
return tl::make_unexpected(fmt::format("m_client.set_method() failed: {}", esp_err_to_name(result))); if (const auto result = m_client.set_method(*method); result != ESP_OK)
{
auto msg = fmt::format("m_client.set_method() failed: {}", esp_err_to_name(result));
ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
return tl::make_unexpected(std::move(msg));
}
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)
return tl::make_unexpected(fmt::format("m_client.set_header() failed: {} ({} {})", esp_err_to_name(result), iter->first, iter->second)); {
auto msg = fmt::format("m_client.set_header() failed: {} ({} {})", esp_err_to_name(result), iter->first, iter->second);
ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
return tl::make_unexpected(std::move(msg));
}
if (!requestBody.empty()) if (!requestBody.empty())
{ {
if (const auto result = m_client.open(requestBody.size()); result != ESP_OK) if (const auto result = m_client.open(requestBody.size()); result != ESP_OK)
return tl::make_unexpected(fmt::format("m_client.open() failed: {} ({})", esp_err_to_name(result), requestBody.size())); {
auto msg = fmt::format("m_client.open() failed: {} ({})", esp_err_to_name(result), requestBody.size());
ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
return tl::make_unexpected(std::move(msg));
}
if (const auto written = m_client.write(requestBody); written < 0) if (const auto written = m_client.write(requestBody); written < 0)
return tl::make_unexpected(fmt::format("m_client.write() failed: {}", written)); {
auto msg = fmt::format("m_client.write() failed: {}", written);
ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
return tl::make_unexpected(std::move(msg));
}
else if (written != requestBody.size()) else if (written != requestBody.size())
return tl::make_unexpected(fmt::format("m_client.write() written size mismatch: {} != {}", written, requestBody.size())); {
auto msg = fmt::format("m_client.write() written size mismatch: {} != {}", written, requestBody.size());
ESP_LOGW(TAG, "%.*s", msg.size(), msg.data());
return tl::make_unexpected(std::move(msg));
}
} }
m_buf.clear(); m_buf.clear();
@@ -456,6 +491,8 @@ void AsyncHttpRequest::requestTask()
do do
{ {
result = m_client.perform(); result = m_client.perform();
ESP_LOG_LEVEL_LOCAL((result == ESP_OK ? ESP_LOG_VERBOSE : (result == EAGAIN || result == EINPROGRESS ? ESP_LOG_INFO : ESP_LOG_WARN)),
TAG, "m_client.perform() returned: %s", esp_err_to_name(result));
if (m_eventGroup.clearBits(ABORT_REQUEST_BIT) & ABORT_REQUEST_BIT) if (m_eventGroup.clearBits(ABORT_REQUEST_BIT) & ABORT_REQUEST_BIT)
{ {
@@ -466,7 +503,6 @@ void AsyncHttpRequest::requestTask()
} }
while (result == EAGAIN || result == EINPROGRESS); while (result == EAGAIN || result == EINPROGRESS);
ESP_LOG_LEVEL_LOCAL((result == ESP_OK ? ESP_LOG_VERBOSE : ESP_LOG_ERROR), TAG, "m_client.perform() returned: %s", esp_err_to_name(result));
m_result = result; m_result = result;
m_statusCode = m_client.get_status_code(); m_statusCode = m_client.get_status_code();
} }

7
src/asynchttprequest.h
View File

@@ -28,7 +28,8 @@ public:
tl::expected<void, std::string> endTask(); tl::expected<void, std::string> endTask();
bool taskRunning() const; bool taskRunning() const;
tl::expected<void, std::string> createClient(std::string_view url); tl::expected<void, std::string> createClient(std::string_view url,
esp_http_client_method_t method = HTTP_METHOD_GET);
tl::expected<void, std::string> deleteClient(); tl::expected<void, std::string> deleteClient();
bool hasClient() const; bool hasClient() const;
@@ -36,8 +37,8 @@ public:
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 = {});
tl::expected<void, std::string> retry(std::string_view url, tl::expected<void, std::string> retry(std::optional<std::string_view> url = std::nullopt,
esp_http_client_method_t method = HTTP_METHOD_GET, 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 = {});
tl::expected<void, std::string> abort(); tl::expected<void, std::string> abort();