juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-09-10 02:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

CrealityPrint: add ws_connect() helper

Browse Source 
Consolidate websocket connection setup into a reusable helper.
Migrate from tcp::socket to beast::tcp_stream for timeout support.
Set SO_RCVTIMEO read timeout (3s) and connect timeout (5s).
Refactor query_boxes_info() and start_print() to use ws_connect().

Signed-off-by: Igor Mammedov <niallain@gmail.com>
This commit is contained in:
Igor Mammedov
2026-04-27 19:29:24 +02:00
parent aa9d472d9e
commit 8e1ef9bc5f
1 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/slic3r/Utils/CrealityPrint.cpp
View File

@@ -196,6 +196,32 @@ std::string CrealityPrint::safe_filename(const std::string &filename) const
return safe_filename; return safe_filename;
} }
static void ws_connect(net::io_context& ioc, websocket::stream<beast::tcp_stream>& ws,
const std::string& host_url, const std::string& port)
{
std::string host = Http::get_host_from_url(host_url);
tcp::resolver resolver{ioc};
beast::get_lowest_layer(ws).expires_after(std::chrono::seconds(5));
auto const results = resolver.resolve(host, port);
beast::get_lowest_layer(ws).connect(results);
host += ':' + std::to_string(beast::get_lowest_layer(ws).socket().remote_endpoint().port());
ws.set_option(websocket::stream_base::decorator(
[](websocket::request_type& req) {
req.set(http::field::user_agent,
std::string(BOOST_BEAST_VERSION_STRING) + " websocket-client-coro");
}));
ws.handshake(host, "/");
#ifdef _WIN32
DWORD recv_timeout = 3000;
#else
struct timeval recv_timeout = {3, 0};
#endif
setsockopt(beast::get_lowest_layer(ws).socket().native_handle(),
SOL_SOCKET, SO_RCVTIMEO, reinterpret_cast<const char*>(&recv_timeout), sizeof(recv_timeout));
}
void CrealityPrint::query_model() const void CrealityPrint::query_model() const
{ {
if (!m_model.empty()) if (!m_model.empty())
@@ -217,46 +243,25 @@ bool CrealityPrint::supports_multi_color_print() const
bool CrealityPrint::start_print(wxString &msg, const std::string &filename) const bool CrealityPrint::start_print(wxString &msg, const std::string &filename) const
{ {
try { try {
std::string host = Http::get_host_from_url(m_host); net::io_context ioc;
auto const port = "9999"; websocket::stream<beast::tcp_stream> ws{ioc};
ws_connect(ioc, ws, m_host, "9999");
json j2 = { json j2 = {
{ "method", "set" }, { "method", "set" },
{ {
"params", { "params", {
{ "opGcodeFile", "printprt:/usr/data/printer_data/gcodes/" + filename } { "opGcodeFile", "printprt:/usr/data/printer_data/gcodes/" + filename }
} }
} }
}; };
net::io_context ioc;
tcp::resolver resolver{ioc};
websocket::stream<tcp::socket> ws{ioc};
auto const results = resolver.resolve(host, port);
auto ep = net::connect(ws.next_layer(), results);
host += ':' + std::to_string(ep.port());
ws.set_option(websocket::stream_base::decorator(
[](websocket::request_type& req)
{
req.set(http::field::user_agent,
std::string(BOOST_BEAST_VERSION_STRING) +
" websocket-client-coro");
}));
ws.handshake(host, "/");
ws.write(net::buffer(to_string(j2))); ws.write(net::buffer(to_string(j2)));
beast::flat_buffer buffer; beast::flat_buffer buffer;
ws.read(buffer); ws.read(buffer);
ws.close(websocket::close_code::normal);
return true; return true;
} catch(std::exception const& e) { } catch(std::exception const& e) {
BOOST_LOG_TRIVIAL(error) << "CrealityPrint: Error starting print: " << e.what(); BOOST_LOG_TRIVIAL(error) << "CrealityPrint: Error starting print: " << e.what();