mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-04 14:20:58 +00:00
* Stop Malformed Network Responses from Crashing the App Duet, MKS and UltiMaker parsed print host replies with boost read_json inside the HTTP completion callback with no try, so an HTML or truncated reply threw out of the Physical Printer Test button and terminated the app, or killed the upload queue thread. The five identical copies of the parser (ESP3D's and Flashforge's were unused) are replaced by one shared PrintHost::get_err_code_from_body that reports a non-JSON reply as an error. The upload queue now catches a failing job per job, so one bad upload no longer leaves later jobs queued forever. Flashforge read material station slots with nlohmann value(), which throws on off-type fields or non-object entries. The parsing moves into Flashforge::parse_material_slots, which reads fields leniently with the existing try_parse_json_int and skips bad entries. UserManager::parse_json parsed the payload before its try block; the parse now happens inside it. * Keep UploadFinished Paired with UploadStarted When an Upload Throws The exception from a throwing upload was caught around perform_job, so the UploadFinished lifecycle event was skipped and plugins saw an upload start that never finished. The catch now sits around the upload call. The error is reported through the job's error callback and UploadFinished is fired with an error code, as for any other failed upload. The worker keeps running for the next job. The started, upload and finished sequence moved to PrintHostJobQueue::upload_job so it can be tested without the dialog.
175 lines
5.9 KiB
C++
175 lines
5.9 KiB
C++
#include "ESP3D.hpp"
|
|
|
|
#include <algorithm>
|
|
#include <ctime>
|
|
#include <chrono>
|
|
#include <thread>
|
|
#include <boost/filesystem/path.hpp>
|
|
#include <boost/format.hpp>
|
|
#include <boost/log/trivial.hpp>
|
|
#include <boost/property_tree/ptree.hpp>
|
|
#include <boost/property_tree/json_parser.hpp>
|
|
#include <boost/asio.hpp>
|
|
#include <boost/algorithm/string.hpp>
|
|
|
|
#include <wx/frame.h>
|
|
#include <wx/event.h>
|
|
#include <wx/progdlg.h>
|
|
#include <wx/sizer.h>
|
|
#include <wx/stattext.h>
|
|
#include <wx/textctrl.h>
|
|
#include <wx/checkbox.h>
|
|
|
|
#include "libslic3r/PrintConfig.hpp"
|
|
#include "slic3r/GUI/GUI.hpp"
|
|
#include "slic3r/GUI/I18N.hpp"
|
|
#include "slic3r/GUI/MsgDialog.hpp"
|
|
#include "Http.hpp"
|
|
#include "SerialMessage.hpp"
|
|
#include "SerialMessageType.hpp"
|
|
|
|
namespace fs = boost::filesystem;
|
|
namespace pt = boost::property_tree;
|
|
|
|
namespace Slic3r {
|
|
|
|
ESP3D::ESP3D(DynamicPrintConfig* config) : m_host(config->opt_string("print_host")), m_console_port("8888") {}
|
|
|
|
const char* ESP3D::get_name() const { return "ESP3D"; }
|
|
|
|
bool ESP3D::test(wxString& msg) const
|
|
{
|
|
bool ret = false;
|
|
std::string url_test = format_command("/command", "plain", "M105");
|
|
auto http = Http::get(url_test);
|
|
http.on_complete([&](std::string body, unsigned status) {
|
|
// check for OK
|
|
ret = true;
|
|
msg = get_test_ok_msg();
|
|
})
|
|
.on_error([&](std::string body, std::string error, unsigned status) {
|
|
ret = false;
|
|
msg = format_error(body , error, status);
|
|
})
|
|
.perform_sync();
|
|
return ret;
|
|
}
|
|
|
|
wxString ESP3D::get_test_ok_msg() const { return _(L("Connection to ESP3D is working correctly.")); }
|
|
|
|
wxString ESP3D::get_test_failed_msg(wxString& msg) const
|
|
{
|
|
return GUI::from_u8((boost::format("%s: %s") % _utf8(L("Could not connect to ESP3D")) % std::string(msg.ToUTF8())).str());
|
|
}
|
|
|
|
bool ESP3D::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn, InfoFn info_fn) const
|
|
{
|
|
std::string short_name = get_short_name(upload_data.upload_path.string());
|
|
bool res = false;
|
|
|
|
auto http = Http::post((boost::format("http://%1%/upload_serial") % m_host).str());
|
|
http.header("Connection", "keep-alive")
|
|
.form_add_file("file", upload_data.source_path, short_name)
|
|
.on_complete([&](std::string body, unsigned status) {
|
|
// check for OK
|
|
if (upload_data.post_action == PrintHostPostUploadAction::StartPrint) {
|
|
wxString errormsg;
|
|
res = start_print(errormsg, short_name);
|
|
if (!res) {
|
|
error_fn(std::move(errormsg));
|
|
}
|
|
}
|
|
})
|
|
.on_error([&](std::string body, std::string error, unsigned status) {
|
|
BOOST_LOG_TRIVIAL(error) << boost::format("ESP3D: Error uploading file: %1%, HTTP %2%, body: `%3%`") % error % status % body;
|
|
error_fn(format_error(body, error, status));
|
|
res = false;
|
|
})
|
|
.on_progress([&](Http::Progress progress, bool& cancel) {
|
|
// workaround:
|
|
// progress bar disappears before .on_complete
|
|
// ESP3D can be super slow, the user could close slicer before upload completes & M24 is sent because no progress bar
|
|
// M24 can only be sent after .on_complete
|
|
Http::Progress prog = std::move(progress);
|
|
prog.ulnow -= 1;
|
|
prorgess_fn(std::move(prog), cancel);
|
|
if (cancel) {
|
|
// Upload was canceled
|
|
BOOST_LOG_TRIVIAL(info) << "ESP3D: Upload canceled";
|
|
res = false;
|
|
}
|
|
})
|
|
.perform_sync();
|
|
|
|
return res;
|
|
}
|
|
|
|
bool ESP3D::start_print(wxString& msg, const std::string& filename) const
|
|
{
|
|
// For some reason printer firmware does not want to respond on gcode commands immediately after file upload.
|
|
// So we just introduce artificial delay to workaround it.
|
|
// ESP3D also locks the serial during SD transfer, this is safer
|
|
std::this_thread::sleep_for(std::chrono::milliseconds(1500));
|
|
|
|
bool ret = false;
|
|
auto select_file = (boost::format("%1% %2%") % "M23" % filename).str();
|
|
auto select = format_command("/command", "plain", Http::url_encode(select_file));
|
|
auto http_sel = Http::get(select);
|
|
http_sel
|
|
.on_complete([&](std::string body, unsigned status) {
|
|
ret = true;
|
|
})
|
|
.on_error([&](std::string body, std::string error, unsigned status) {
|
|
// error sending M23
|
|
ret = false;
|
|
msg = (wxString::FromUTF8(error));
|
|
})
|
|
.perform_sync();
|
|
|
|
if (!ret)
|
|
return ret;
|
|
|
|
auto start = format_command("/command", "plain", "M24");
|
|
auto http_start = Http::get(start);
|
|
http_start
|
|
.on_complete([&](std::string body, unsigned status) {
|
|
// print kicked off succesfully
|
|
ret = true;
|
|
})
|
|
.on_error([&](std::string body, std::string error, unsigned status) {
|
|
// error sending M24
|
|
ret = false;
|
|
msg = (wxString::FromUTF8(error));
|
|
})
|
|
.perform_sync();
|
|
|
|
return ret;
|
|
}
|
|
|
|
// ESP3D only accepts 8.3 filenames else it crashes marlin and other undefined behaviour
|
|
std::string ESP3D::get_short_name(const std::string& filename) const
|
|
{
|
|
std::string shortname = "";
|
|
boost::filesystem::path p(filename);
|
|
std::string stem = p.stem().string();
|
|
std::string extension = p.extension().string();
|
|
if (!extension.empty() && extension[0] == '.') {
|
|
extension = extension.substr(1);
|
|
}
|
|
stem = stem.substr(0, 8);
|
|
extension = extension.substr(0, 3);
|
|
if (!extension.empty()) {
|
|
shortname = stem + "." + extension;
|
|
} else {
|
|
shortname = stem;
|
|
}
|
|
return shortname;
|
|
}
|
|
|
|
std::string ESP3D::format_command(const std::string& path, const std::string& arg, const std::string& val) const
|
|
{
|
|
return (boost::format("http://%1%%2%?%3%=%4%") % m_host % path % arg % val).str();
|
|
}
|
|
|
|
} // namespace Slic3r
|