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

error callback introduced

Browse Source
This commit is contained in:
0xFEEDC0DE64
2022-07-08 20:54:34 +02:00
parent a70fd60dcf
commit 086f88c70a
2 changed files with 58 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/asio_web/sslwebsocketclient.cpp
View File

@ -40,6 +40,8 @@ SslWebsocketClient::SslWebsocketClient(asio::io_context &io_context, const std::
void SslWebsocketClient::start() void SslWebsocketClient::start()
{ {
ESP_LOGI(TAG, "called"); ESP_LOGI(TAG, "called");
clearError();
resolve(); resolve();
} }
@ -62,7 +64,8 @@ void SslWebsocketClient::onResolved(const std::error_code &error, asio::ip::tcp:
if (error) if (error)
{ {
ESP_LOGW(TAG, "Resolving failed: %i %s", error.value(), error.message().c_str()); ESP_LOGW(TAG, "Resolving failed: %i %s", error.value(), error.message().c_str());
m_error = Error { .mesage = fmt::format("Resolving failed: {}", error.value(), error.message()) }; m_error = Error { .message = fmt::format("Resolving failed: {}", error.value(), error.message()) };
handleErrorOccured(*m_error);
return; return;
} }
@ -86,7 +89,8 @@ void SslWebsocketClient::onConnected(const std::error_code &error)
if (error) if (error)
{ {
ESP_LOGW(TAG, "Connect failed: %i %s", error.value(), error.message().c_str()); ESP_LOGW(TAG, "Connect failed: %i %s", error.value(), error.message().c_str());
m_error = Error { .mesage = fmt::format("Connect failed: {}", error.value(), error.message()) }; m_error = Error { .message = fmt::format("Connect failed: {}", error.value(), error.message()) };
handleErrorOccured(*m_error);
return; return;
} }
@ -111,7 +115,8 @@ void SslWebsocketClient::onHandshaked(const std::error_code &error)
if (error) if (error)
{ {
ESP_LOGW(TAG, "SSL-Handshake failed: %i %s", error.value(), error.message().c_str()); ESP_LOGW(TAG, "SSL-Handshake failed: %i %s", error.value(), error.message().c_str());
m_error = Error { .mesage = fmt::format("SSL-Handshake failed: {}", error.value(), error.message()) }; m_error = Error { .message = fmt::format("SSL-Handshake failed: {}", error.value(), error.message()) };
handleErrorOccured(*m_error);
return; return;
} }
@ -148,8 +153,8 @@ void SslWebsocketClient::onSentRequest(const std::error_code &error, std::size_t
if (error) if (error)
{ {
ESP_LOGW(TAG, "Sending http request failed: %i %s", error.value(), error.message().c_str()); ESP_LOGW(TAG, "Sending http request failed: %i %s", error.value(), error.message().c_str());
if (!m_error) m_error = Error { .message = fmt::format("Sending http request failed: {}", error.value(), error.message()) };
m_error = Error { .mesage = fmt::format("Sending http request failed: {}", error.value(), error.message()) }; handleErrorOccured(*m_error);
m_sending = std::nullopt; m_sending = std::nullopt;
std::error_code shutdown_error; std::error_code shutdown_error;
m_socket.shutdown(shutdown_error); m_socket.shutdown(shutdown_error);
@ -180,7 +185,10 @@ void SslWebsocketClient::onReceivedResponse(const std::error_code &error, std::s
{ {
ESP_LOGI(TAG, "Receiving http response failed: %i %s", error.value(), error.message().c_str()); ESP_LOGI(TAG, "Receiving http response failed: %i %s", error.value(), error.message().c_str());
if (!m_error) if (!m_error)
m_error = Error { .mesage = fmt::format("Receiving http response failed: {}", error.value(), error.message()) }; {
m_error = Error { .message = fmt::format("Receiving http response failed: {}", error.value(), error.message()) };
handleErrorOccured(*m_error);
}
std::error_code shutdown_error; std::error_code shutdown_error;
m_socket.shutdown(shutdown_error); m_socket.shutdown(shutdown_error);
return; return;
@ -251,7 +259,10 @@ bool SslWebsocketClient::parseResponseLine(std::string_view line)
{ {
ESP_LOGW(TAG, "invalid response line (1): \"%.*s\"", line.size(), line.data()); ESP_LOGW(TAG, "invalid response line (1): \"%.*s\"", line.size(), line.data());
if (!m_error) if (!m_error)
m_error = Error { .mesage = fmt::format("invalid response line (1): \"{}\"", line) }; {
m_error = Error { .message = fmt::format("invalid response line (1): \"{}\"", line) };
handleErrorOccured(*m_error);
}
std::error_code shutdown_error; std::error_code shutdown_error;
m_socket.shutdown(shutdown_error); m_socket.shutdown(shutdown_error);
return false; return false;
@ -265,7 +276,10 @@ bool SslWebsocketClient::parseResponseLine(std::string_view line)
{ {
ESP_LOGW(TAG, "invalid response line (2): \"%.*s\"", line.size(), line.data()); ESP_LOGW(TAG, "invalid response line (2): \"%.*s\"", line.size(), line.data());
if (!m_error) if (!m_error)
m_error = Error { .mesage = fmt::format("invalid response line (2): \"{}\"", line) }; {
m_error = Error { .message = fmt::format("invalid response line (2): \"{}\"", line) };
handleErrorOccured(*m_error);
}
std::error_code shutdown_error; std::error_code shutdown_error;
m_socket.shutdown(shutdown_error); m_socket.shutdown(shutdown_error);
return false; return false;
@ -279,7 +293,10 @@ bool SslWebsocketClient::parseResponseLine(std::string_view line)
{ {
ESP_LOGW(TAG, "invalid response status: \"%.*s\"", status.size(), status.data()); ESP_LOGW(TAG, "invalid response status: \"%.*s\"", status.size(), status.data());
if (!m_error) if (!m_error)
m_error = Error { .mesage = fmt::format("invalid response status: \"{}\"", status) }; {
m_error = Error { .message = fmt::format("invalid response status: \"{}\"", status) };
handleErrorOccured(*m_error);
}
std::error_code shutdown_error; std::error_code shutdown_error;
m_socket.shutdown(shutdown_error); m_socket.shutdown(shutdown_error);
return false; return false;
@ -307,7 +324,10 @@ bool SslWebsocketClient::parseResponseHeader(std::string_view line)
{ {
ESP_LOGW(TAG, "invalid response header: %zd \"%.*s\"", line.size(), line.size(), line.data()); ESP_LOGW(TAG, "invalid response header: %zd \"%.*s\"", line.size(), line.size(), line.data());
if (!m_error) if (!m_error)
m_error = Error { .mesage = fmt::format("invalid response header: \"{}\"", line) }; {
m_error = Error { .message = fmt::format("invalid response header: \"{}\"", line) };
handleErrorOccured(*m_error);
}
std::error_code shutdown_error; std::error_code shutdown_error;
m_socket.shutdown(shutdown_error); m_socket.shutdown(shutdown_error);
return false; return false;
@ -326,7 +346,10 @@ bool SslWebsocketClient::parseResponseHeader(std::string_view line)
ESP_LOGW(TAG, "invalid Content-Length %.*s %.*s", value.size(), value.data(), ESP_LOGW(TAG, "invalid Content-Length %.*s %.*s", value.size(), value.data(),
parsed.error().size(), parsed.error().data()); parsed.error().size(), parsed.error().data());
if (!m_error) if (!m_error)
m_error = Error { .mesage = fmt::format("invalid Content-Length: \"{}\": {}", value, parsed.error()) }; {
m_error = Error { .message = fmt::format("invalid Content-Length: \"{}\": {}", value, parsed.error()) };
handleErrorOccured(*m_error);
}
std::error_code shutdown_error; std::error_code shutdown_error;
m_socket.shutdown(shutdown_error); m_socket.shutdown(shutdown_error);
return false; return false;
@ -386,7 +409,10 @@ bool SslWebsocketClient::parseResponseHeader(std::string_view line)
{ {
ESP_LOGW(TAG, "header Connection: Upgrade missing"); ESP_LOGW(TAG, "header Connection: Upgrade missing");
if (!m_error) if (!m_error)
m_error = Error { .mesage = "header Connection: Upgrade missing" }; {
m_error = Error { .message = "header Connection: Upgrade missing" };
handleErrorOccured(*m_error);
}
std::error_code shutdown_error; std::error_code shutdown_error;
m_socket.shutdown(shutdown_error); m_socket.shutdown(shutdown_error);
return false; return false;
@ -395,7 +421,10 @@ bool SslWebsocketClient::parseResponseHeader(std::string_view line)
{ {
ESP_LOGW(TAG, "header Upgrade: websocket missing"); ESP_LOGW(TAG, "header Upgrade: websocket missing");
if (!m_error) if (!m_error)
m_error = Error { .mesage = "header Upgrade: websocket missing" }; {
m_error = Error { .message = "header Upgrade: websocket missing" };
handleErrorOccured(*m_error);
}
std::error_code shutdown_error; std::error_code shutdown_error;
m_socket.shutdown(shutdown_error); m_socket.shutdown(shutdown_error);
return false; return false;
@ -431,7 +460,11 @@ void SslWebsocketClient::onReceiveWebsocket(const std::error_code &error, std::s
{ {
ESP_LOGI(TAG, "Receiving websocket response failed: %i %s", error.value(), error.message().c_str()); ESP_LOGI(TAG, "Receiving websocket response failed: %i %s", error.value(), error.message().c_str());
if (!m_error) if (!m_error)
m_error = Error { .mesage = fmt::format("Receiving websocket response failed: {}", error.value(), error.message()) }; {
m_error = Error { .message = fmt::format("Receiving websocket response failed: {}", error.value(), error.message()) };
handleErrorOccured(*m_error);
handleDisconnected();
}
std::error_code shutdown_error; std::error_code shutdown_error;
m_socket.shutdown(shutdown_error); m_socket.shutdown(shutdown_error);
return; return;
@ -610,7 +643,11 @@ void SslWebsocketClient::onMessageSent(std::error_code error, std::size_t length
{ {
ESP_LOGI(TAG, "Sending websocket message failed: %i %s", error.value(), error.message().c_str()); ESP_LOGI(TAG, "Sending websocket message failed: %i %s", error.value(), error.message().c_str());
if (!m_error) if (!m_error)
m_error = Error { .mesage = fmt::format("Sending websocket message failed: {}", error.value(), error.message()) }; {
m_error = Error { .message = fmt::format("Sending websocket message failed: {}", error.value(), error.message()) };
handleErrorOccured(*m_error);
handleDisconnected();
}
std::error_code shutdown_error; std::error_code shutdown_error;
m_socket.shutdown(shutdown_error); m_socket.shutdown(shutdown_error);
m_sending = std::nullopt; m_sending = std::nullopt;

11
src/asio_web/sslwebsocketclient.h
View File

@ -19,14 +19,15 @@ public:
void start(); void start();
struct Error {
espchrono::millis_clock::time_point timestamp = espchrono::millis_clock::now();
std::string message;
};
virtual void handleConnected() = 0; virtual void handleConnected() = 0;
virtual void handleDisconnected() = 0; virtual void handleDisconnected() = 0;
virtual void handleMessage(bool fin, uint8_t reserved, uint8_t opcode, bool mask, std::string_view payload) = 0; virtual void handleMessage(bool fin, uint8_t reserved, uint8_t opcode, bool mask, std::string_view payload) = 0;
virtual void handleErrorOccured(const Error &error) = 0;
struct Error {
espchrono::millis_clock::time_point timestamp = espchrono::millis_clock::now();
std::string mesage;
};
const std::optional<Error> &error() const { return m_error; } const std::optional<Error> &error() const { return m_error; }
void clearError() { m_error = std::nullopt; } void clearError() { m_error = std::nullopt; }