mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-04 22:31:02 +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.
145 lines
4.1 KiB
C++
145 lines
4.1 KiB
C++
#include "MKS.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 {
|
|
|
|
MKS::MKS(DynamicPrintConfig* config) :
|
|
m_host(config->opt_string("print_host")), m_console_port("8080")
|
|
{}
|
|
|
|
const char* MKS::get_name() const { return "MKS"; }
|
|
|
|
bool MKS::test(wxString& msg) const
|
|
{
|
|
Utils::TCPConsole console(m_host, m_console_port);
|
|
Slic3r::Utils::SerialMessage s("M105", Slic3r::Utils::Command);
|
|
console.enqueue_cmd(s);
|
|
bool ret = console.run_queue();
|
|
|
|
if (!ret)
|
|
msg = wxString::FromUTF8(console.error_message().c_str());
|
|
|
|
return ret;
|
|
}
|
|
|
|
wxString MKS::get_test_ok_msg() const
|
|
{
|
|
return _(L("Connection to MKS is working correctly."));
|
|
}
|
|
|
|
wxString MKS::get_test_failed_msg(wxString& msg) const
|
|
{
|
|
return GUI::from_u8((boost::format("%s: %s")
|
|
% _utf8(L("Could not connect to MKS"))
|
|
% std::string(msg.ToUTF8())).str());
|
|
}
|
|
|
|
bool MKS::upload(PrintHostUpload upload_data, ProgressFn prorgess_fn, ErrorFn error_fn, InfoFn info_fn) const
|
|
{
|
|
bool res = true;
|
|
|
|
auto upload_cmd = get_upload_url(upload_data.upload_path.string());
|
|
BOOST_LOG_TRIVIAL(info) << boost::format("MKS: Uploading file %1%, filepath: %2%, print: %3%, command: %4%")
|
|
% upload_data.source_path
|
|
% upload_data.upload_path
|
|
% (upload_data.post_action == PrintHostPostUploadAction::StartPrint)
|
|
% upload_cmd;
|
|
|
|
auto http = Http::post(std::move(upload_cmd));
|
|
http.set_post_body(upload_data.source_path);
|
|
|
|
http.on_complete([&](std::string body, unsigned status) {
|
|
BOOST_LOG_TRIVIAL(debug) << boost::format("MKS: File uploaded: HTTP %1%: %2%") % status % body;
|
|
|
|
int err_code = get_err_code_from_body(body);
|
|
if (err_code != 0) {
|
|
BOOST_LOG_TRIVIAL(error) << boost::format("MKS: Request completed but error code was received: %1%") % err_code;
|
|
error_fn(format_error(body, _u8L("Unknown error occurred"), 0));
|
|
res = false;
|
|
}
|
|
else if (upload_data.post_action == PrintHostPostUploadAction::StartPrint) {
|
|
wxString errormsg;
|
|
res = start_print(errormsg, upload_data.upload_path.string());
|
|
if (!res) {
|
|
error_fn(std::move(errormsg));
|
|
}
|
|
}
|
|
})
|
|
.on_error([&](std::string body, std::string error, unsigned status) {
|
|
BOOST_LOG_TRIVIAL(error) << boost::format("MKS: 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) {
|
|
prorgess_fn(std::move(progress), cancel);
|
|
if (cancel) {
|
|
// Upload was canceled
|
|
BOOST_LOG_TRIVIAL(info) << "MKS: Upload canceled";
|
|
res = false;
|
|
}
|
|
}).perform_sync();
|
|
|
|
|
|
return res;
|
|
}
|
|
|
|
std::string MKS::get_upload_url(const std::string& filename) const
|
|
{
|
|
return (boost::format("http://%1%/upload?X-Filename=%2%")
|
|
% m_host
|
|
% Http::url_encode(filename)).str();
|
|
}
|
|
|
|
bool MKS::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.
|
|
// TODO: Inspect reasons
|
|
std::this_thread::sleep_for(std::chrono::milliseconds(1500));
|
|
|
|
Utils::TCPConsole console(m_host, m_console_port);
|
|
Slic3r::Utils::SerialMessage s(std::string("M23 ") + filename, Slic3r::Utils::Command);
|
|
console.enqueue_cmd(s);
|
|
s.message = "M24";
|
|
console.enqueue_cmd(s);
|
|
|
|
bool ret = console.run_queue();
|
|
|
|
if (!ret)
|
|
msg = wxString::FromUTF8(console.error_message().c_str());
|
|
|
|
return ret;
|
|
}
|
|
|
|
} // Slic3r
|