ENH: add more test cases in NetworkTestDialog

Change-Id: I54f5a52d2bb993f3536c4ab75cb54190eafe49a5
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit b28b0d97ab51b0f2f9a6f37622e5cd93e8d8d8f6)

src/slic3r/GUI/NetworkTestDialog.cpp

@@ -55,16 +55,24 @@ wxBoxSizer* NetworkTestDialog::create_top_sizer(wxWindow* parent)
 {
 	auto sizer = new wxBoxSizer(wxVERTICAL);
 
-	btn_start = new wxButton(this, wxID_ANY, _L("Start Test"), wxDefaultPosition, wxDefaultSize, 0);
+	auto line_sizer = new wxBoxSizer(wxHORIZONTAL);
-	sizer->Add(btn_start, 0, wxALL, 5);
+	btn_start = new wxButton(this, wxID_ANY, _L("Start Test Multi-Thread"), wxDefaultPosition, wxDefaultSize, 0);
+	line_sizer->Add(btn_start, 0, wxALL, 5);
+
+	btn_start_sequence = new wxButton(this, wxID_ANY, _L("Start Test Single-Thread"), wxDefaultPosition, wxDefaultSize, 0);
+	line_sizer->Add(btn_start_sequence, 0, wxALL, 5);
 
 	btn_download_log = new wxButton(this, wxID_ANY, _L("Export Log"), wxDefaultPosition, wxDefaultSize, 0);
-	sizer->Add(btn_download_log, 0, wxALL, 5);
+	line_sizer->Add(btn_download_log, 0, wxALL, 5);
 	btn_download_log->Hide();
 
 	btn_start->Bind(wxEVT_BUTTON, [this](wxCommandEvent &evt) {
 			start_all_job();
 		});
+	btn_start_sequence->Bind(wxEVT_BUTTON, [this](wxCommandEvent &evt) {
+			start_all_job_sequence();
+		});
+	sizer->Add(line_sizer, 0, wxEXPAND, 5);
 	return sizer;
 }
 
@@ -118,10 +126,13 @@ wxBoxSizer* NetworkTestDialog::create_content_sizer(wxWindow* parent)
 	auto sizer = new wxBoxSizer(wxVERTICAL);
 
 	wxFlexGridSizer* grid_sizer;
-	grid_sizer = new wxFlexGridSizer(0, 2, 0, 0);
+	grid_sizer = new wxFlexGridSizer(0, 3, 0, 0);
 	grid_sizer->SetFlexibleDirection(wxBOTH);
 	grid_sizer->SetNonFlexibleGrowMode(wxFLEX_GROWMODE_SPECIFIED);
 
+	btn_link = new wxButton(this, wxID_ANY, _L("Test BambuLab"), wxDefaultPosition, wxDefaultSize, 0);
+	grid_sizer->Add(btn_link, 0, wxEXPAND | wxALL, 5);
+
 	text_link_title = new wxStaticText(this, wxID_ANY, _L("Test BambuLab:"), wxDefaultPosition, wxDefaultSize, 0);
 	text_link_title->Wrap(-1);
 	grid_sizer->Add(text_link_title, 0, wxALIGN_RIGHT | wxALL, 5);
@@ -130,6 +141,9 @@ wxBoxSizer* NetworkTestDialog::create_content_sizer(wxWindow* parent)
 	text_link_val->Wrap(-1);
 	grid_sizer->Add(text_link_val, 0, wxALL, 5);
 
+	btn_bing = new wxButton(this, wxID_ANY, _L("Test Bing.com"), wxDefaultPosition, wxDefaultSize, 0);
+	grid_sizer->Add(btn_bing, 0, wxEXPAND | wxALL, 5);
+
 	text_bing_title = new wxStaticText(this, wxID_ANY, _L("Test bing.com:"), wxDefaultPosition, wxDefaultSize, 0);
 	text_bing_title->Wrap(-1);
 	grid_sizer->Add(text_bing_title, 0, wxALIGN_RIGHT | wxALL, 5);
@@ -138,6 +152,9 @@ wxBoxSizer* NetworkTestDialog::create_content_sizer(wxWindow* parent)
 	text_bing_val->Wrap(-1);
 	grid_sizer->Add(text_bing_val, 0, wxALL, 5);
 
+	btn_iot = new wxButton(this, wxID_ANY, _L("Test HTTP"), wxDefaultPosition, wxDefaultSize, 0);
+	grid_sizer->Add(btn_iot, 0, wxEXPAND | wxALL, 5);
+
 	text_iot_title = new wxStaticText(this, wxID_ANY, _L("Test HTTP Service:"), wxDefaultPosition, wxDefaultSize, 0);
 	text_iot_title->Wrap(-1);
 	grid_sizer->Add(text_iot_title, 0, wxALIGN_RIGHT | wxALL, 5);
@@ -146,6 +163,9 @@ wxBoxSizer* NetworkTestDialog::create_content_sizer(wxWindow* parent)
 	text_iot_value->Wrap(-1);
 	grid_sizer->Add(text_iot_value, 0, wxALL, 5);
 
+	btn_oss = new wxButton(this, wxID_ANY, _L("Test storage"), wxDefaultPosition, wxDefaultSize, 0);
+	grid_sizer->Add(btn_oss, 0, wxEXPAND | wxALL, 5);
+
 	text_oss_title = new wxStaticText(this, wxID_ANY, _L("Test Storage Upload:"), wxDefaultPosition, wxDefaultSize, 0);
 	text_oss_title->Wrap(-1);
 	grid_sizer->Add(text_oss_title, 0, wxALIGN_RIGHT | wxALL, 5);
@@ -154,6 +174,9 @@ wxBoxSizer* NetworkTestDialog::create_content_sizer(wxWindow* parent)
 	text_oss_value->Wrap(-1);
 	grid_sizer->Add(text_oss_value, 0, wxALL, 5);
 
+	btn_oss_upgrade = new wxButton(this, wxID_ANY, _L("Test storage upgrade"), wxDefaultPosition, wxDefaultSize, 0);
+	grid_sizer->Add(btn_oss_upgrade, 0, wxEXPAND | wxALL, 5);
+
 	text_oss_upgrade_title = new wxStaticText(this, wxID_ANY, _L("Test Storage Upgrade:"), wxDefaultPosition, wxDefaultSize, 0);
 	text_oss_upgrade_title->Wrap(-1);
 	grid_sizer->Add(text_oss_upgrade_title, 0, wxALIGN_RIGHT | wxALL, 5);
@@ -162,6 +185,9 @@ wxBoxSizer* NetworkTestDialog::create_content_sizer(wxWindow* parent)
 	text_oss_upgrade_value->Wrap(-1);
 	grid_sizer->Add(text_oss_upgrade_value, 0, wxALL, 5);
 
+	btn_oss_download = new wxButton(this, wxID_ANY, _L("Test storage download"), wxDefaultPosition, wxDefaultSize, 0);
+	grid_sizer->Add(btn_oss_download, 0, wxEXPAND | wxALL, 5);
+
 	text_oss_download_title = new wxStaticText(this, wxID_ANY, _L("Test Storage Download:"), wxDefaultPosition, wxDefaultSize, 0);
 	text_oss_download_title->Wrap(-1);
 	grid_sizer->Add(text_oss_download_title, 0, wxALIGN_RIGHT | wxALL, 5);
@@ -170,6 +196,9 @@ wxBoxSizer* NetworkTestDialog::create_content_sizer(wxWindow* parent)
 	text_oss_download_value->Wrap(-1);
 	grid_sizer->Add(text_oss_download_value, 0, wxALL, 5);
 
+	btn_oss_upload = new wxButton(this, wxID_ANY, _L("Test Storage Upload"), wxDefaultPosition, wxDefaultSize, 0);
+	grid_sizer->Add(btn_oss_upload, 0, wxEXPAND | wxALL, 5);
+
 	text_oss_upload_title = new wxStaticText(this, wxID_ANY, _L("Test Storage Upload:"), wxDefaultPosition, wxDefaultSize, 0);
 	text_oss_upload_title->Wrap(-1);
 	grid_sizer->Add(text_oss_upload_title, 0, wxALIGN_RIGHT | wxALL, 5);
@@ -178,11 +207,36 @@ wxBoxSizer* NetworkTestDialog::create_content_sizer(wxWindow* parent)
 	text_oss_upload_value->Wrap(-1);
 	grid_sizer->Add(text_oss_upload_value, 0, wxALL, 5);
 
+	btn_oss_upload->Hide();
 	text_oss_upload_title->Hide();
 	text_oss_upload_value->Hide();
 
 	sizer->Add(grid_sizer, 1, wxEXPAND, 5);
 
+	btn_link->Bind(wxEVT_BUTTON, [this](wxCommandEvent& evt) {
+		start_test_bambulab_thread();
+	});
+
+	btn_bing->Bind(wxEVT_BUTTON, [this](wxCommandEvent& evt) {
+		start_test_bing_thread();
+	});
+
+	btn_iot->Bind(wxEVT_BUTTON, [this](wxCommandEvent& evt) {
+		start_test_iot_thread();
+	});
+
+	btn_oss->Bind(wxEVT_BUTTON, [this](wxCommandEvent& evt) {
+		start_test_oss_thread();
+	});
+
+	btn_oss_upgrade->Bind(wxEVT_BUTTON, [this](wxCommandEvent& evt) {
+		start_test_oss_upgrade_thread();
+	});
+
+	btn_oss_download->Bind(wxEVT_BUTTON, [this](wxCommandEvent& evt) {
+		start_test_oss_download_thread();
+	});
+
 	return sizer;
 }
 wxBoxSizer* NetworkTestDialog::create_result_sizer(wxWindow* parent)
@@ -266,23 +320,37 @@ void NetworkTestDialog::start_all_job()
 	start_test_oss_thread();
 	start_test_oss_upgrade_thread();
 	start_test_oss_download_thread();
+	start_test_ping_thread();
 }
 
-void NetworkTestDialog::start_test_bing_thread()
+void NetworkTestDialog::start_all_job_sequence()
 {
-	if (m_in_testing[TEST_BING_JOB]) return;
+	m_sequence_job = new boost::thread([this] {
+		update_status(-1, "start_test_sequence");
+		start_test_bing();
+		if (m_closing) return;
+		start_test_bambulab();
+		if (m_closing) return;
+		start_test_oss();
+		if (m_closing) return;
+		start_test_oss_upgrade();
+		if (m_closing) return;
+		start_test_oss_download();
+		update_status(-1, "end_test_sequence");
+	});
+}
 
-	test_job[TEST_BING_JOB] = new boost::thread([this] {
+void NetworkTestDialog::start_test_bing()
-		m_in_testing[TEST_BING_JOB] = true;
+{
-		update_status(TEST_BING_JOB, "test bing start...");
+	m_in_testing[TEST_BING_JOB] = true;
+	update_status(TEST_BING_JOB, "test bing start...");
 
-		std::string url = "https://www.bing.com";
+	std::string url = "http://www.bing.com/";
-		Slic3r::Http http = Slic3r::Http::get(url);
+	Slic3r::Http http = Slic3r::Http::get(url);
 
-		int result = -1;
+	int result = -1;
-		http.header("accept", "application/json")
+	http.timeout_max(10)
-			.timeout_max(10)
+		.on_complete([this, &result](std::string body, unsigned status) {
-			.on_complete([this, &result](std::string body, unsigned status) {
 			try {
 				if (status == 200) {
 					result = 0;
@@ -291,367 +359,414 @@ void NetworkTestDialog::start_test_bing_thread()
 			catch (...) {
 				;
 			}
-				})
+		})
-			.on_ip_resolve([this](std::string ip) {
+		.on_ip_resolve([this](std::string ip) {
-					wxString ip_report = wxString::Format("test bing ip resolved = %s", ip);
+			wxString ip_report = wxString::Format("test bing ip resolved = %s", ip);
-					update_status(TEST_BING_JOB, ip_report);
+			update_status(TEST_BING_JOB, ip_report);
-				})
+		})
-			.on_error([this](std::string body, std::string error, unsigned int status) {
+		.on_error([this](std::string body, std::string error, unsigned int status) {
+		wxString info = wxString::Format("status=%u, body=%s, error=%s", status, body, error);
+		this->update_status(TEST_BING_JOB, "test bing failed");
+		this->update_status(-1, info);
+	}).perform_sync();
+	if (result == 0) {
+		update_status(TEST_BING_JOB, "test bing ok");
+	}
+	m_in_testing[TEST_BING_JOB] = false;
+}
+
+void NetworkTestDialog::start_test_bambulab()
+{
+	m_in_testing[TEST_BAMBULAB_JOB] = true;
+	update_status(TEST_BAMBULAB_JOB, "test bambulab start...");
+
+	std::string platform = "windows";
+
+#ifdef __WINDOWS__
+	platform = "windows";
+#endif
+#ifdef __APPLE__
+	platform = "macos";
+#endif
+#ifdef __LINUX__
+	platform = "linux";
+#endif
+	std::string query_params = (boost::format("?name=slicer&version=%1%&guide_version=%2%")
+		% VersionInfo::convert_full_version(SLIC3R_VERSION)
+		% VersionInfo::convert_full_version("0.0.0.1")
+		).str();
+
+	AppConfig* app_config = wxGetApp().app_config;
+	std::string url = wxGetApp().get_http_url(app_config->get_country_code()) + query_params;
+	Slic3r::Http http = Slic3r::Http::get(url);
+	int result = -1;
+	http.header("accept", "application/json")
+		.timeout_max(10)
+		.on_complete([this, &result](std::string body, unsigned status) {
+			try {
+				if (status == 200) {
+					result = 0;
+				}
+			}
+			catch (...) {
+				;
+			}
+		})
+		.on_ip_resolve([this](std::string ip) {
+			wxString ip_report = wxString::Format("test bambulab ip resolved = %s", ip);
+			update_status(TEST_BAMBULAB_JOB, ip_report);
+		})
+		.on_error([this](std::string body, std::string error, unsigned int status) {
 			wxString info = wxString::Format("status=%u, body=%s, error=%s", status, body, error);
-			this->update_status(TEST_BING_JOB, "test bing failed");
+			this->update_status(TEST_BAMBULAB_JOB, "test bambulab failed");
 			this->update_status(-1, info);
 		}).perform_sync();
-		if (result == 0) {
+	if (result == 0) {
-			update_status(TEST_BING_JOB, "test bing ok");
+		update_status(TEST_BAMBULAB_JOB, "test bambulab ok");
+	}
+	m_in_testing[TEST_BAMBULAB_JOB] = false;
+}
+
+void NetworkTestDialog::start_test_iot()
+{
+	m_in_testing[TEST_IOT_JOB] = true;
+	update_status(TEST_IOT_JOB, "test http start...");
+	NetworkAgent* agent = wxGetApp().getAgent();
+	if (agent) {
+		unsigned int http_code;
+		std::string http_body;
+		if (!agent->is_user_login()) {
+			update_status(TEST_IOT_JOB, "please login first");
+		} else {
+			int result = agent->get_user_print_info(&http_code, &http_body);
+			if (result == 0) {
+				update_status(TEST_IOT_JOB, "test http ok");
+			} else {
+				update_status(TEST_IOT_JOB, "test http failed");
+				wxString info = wxString::Format("test http failed, status = %u, error = %s", http_code, http_body);
+				update_status(-1, info);
+			}
 		}
-		m_in_testing[TEST_BING_JOB] = false;
+	} else {
+		update_status(TEST_IOT_JOB, "please install network module first");
+	}
+	m_in_testing[TEST_IOT_JOB] = false;
+}
+
+void NetworkTestDialog::start_test_oss()
+{
+	m_in_testing[TEST_OSS_JOB] = true;
+	update_status(TEST_OSS_JOB, "test storage start...");
+
+	std::string url = "http://upload-file.bambulab.com";
+
+	AppConfig* config = wxGetApp().app_config;
+	if (config) {
+		if (config->get_country_code() == "CN")
+			url = "http://upload-file.bambulab.cn";
+	}
+
+	Slic3r::Http http = Slic3r::Http::get(url);
+
+	int result = -1;
+	http.timeout_max(15)
+		.on_complete([this, &result](std::string body, unsigned status) {
+		try {
+			if (status == 200) {
+				result = 0;
+			}
+		}
+		catch (...) {
+			;
+		}
+			})
+		.on_ip_resolve([this](std::string ip) {
+			wxString ip_report = wxString::Format("test oss ip resolved = %s", ip);
+			update_status(TEST_OSS_JOB, ip_report);
+		})
+		.on_error([this, &result](std::string body, std::string error, unsigned int status) {
+			if (status == 403) {
+				result = 0;
+			} else {
+				wxString info = wxString::Format("status=%u, body=%s, error=%s", status, body, error);
+				this->update_status(TEST_OSS_JOB, "test storage failed");
+				this->update_status(-1, info);
+			}
+		}).perform_sync();
+		if (result == 0) {
+			update_status(TEST_OSS_JOB, "test storage ok");
+		}
+	m_in_testing[TEST_OSS_JOB] = false;
+}
+
+void NetworkTestDialog::start_test_oss_upgrade()
+{
+	m_in_testing[TEST_OSS_UPGRADE_JOB] = true;
+	update_status(TEST_OSS_UPGRADE_JOB, "test storage upgrade start...");
+
+	std::string url = "http://upgrade-file.bambulab.com";
+
+	AppConfig* config = wxGetApp().app_config;
+	if (config) {
+		if (config->get_country_code() == "CN")
+			url = "http://upgrade-file.bambulab.cn";
+	}
+
+	Slic3r::Http http = Slic3r::Http::get(url);
+
+	int result = -1;
+	http.timeout_max(15)
+		.on_complete([this, &result](std::string body, unsigned status) {
+		try {
+			if (status == 200) {
+				result = 0;
+			}
+		}
+		catch (...) {
+			;
+		}
+			})
+		.on_ip_resolve([this](std::string ip) {
+				wxString ip_report = wxString::Format("test storage upgrade ip resolved = %s", ip);
+				update_status(TEST_OSS_UPGRADE_JOB, ip_report);
+			})
+		.on_error([this, &result](std::string body, std::string error, unsigned int status) {
+			if (status == 403) {
+				result = 0;
+			}
+			else {
+				wxString info = wxString::Format("status=%u, body=%s, error=%s", status, body, error);
+				this->update_status(TEST_OSS_UPGRADE_JOB, "test storage upgrade failed");
+				this->update_status(-1, info);
+			}
+		}).perform_sync();
+
+	if (result == 0) {
+		update_status(TEST_OSS_UPGRADE_JOB, "test storage upgrade ok");
+	}
+	m_in_testing[TEST_OSS_UPGRADE_JOB] = false;
+}
+
+void NetworkTestDialog::start_test_oss_download()
+{
+	int result = 0;
+	// get country_code
+	AppConfig* app_config = wxGetApp().app_config;
+	if (!app_config) {
+		update_status(TEST_OSS_DOWNLOAD_JOB, "app config is nullptr");
+		return;
+	}
+
+	m_in_testing[TEST_OSS_DOWNLOAD_JOB] = true;
+	update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download start...");
+	m_download_cancel = false;
+	// get temp path
+	fs::path target_file_path = (fs::temp_directory_path() / "test_storage_download.zip");
+	fs::path tmp_path = target_file_path;
+	tmp_path += (boost::format(".%1%%2%") % get_current_pid() % ".tmp").str();
+
+	// get_url
+	std::string url = wxGetApp().get_plugin_url(app_config->get_country_code());
+	std::string download_url;
+	Slic3r::Http http_url = Slic3r::Http::get(url);
+	update_status(-1, "[test_oss_download]: url=" + url);
+
+	http_url.on_complete(
+		[&download_url](std::string body, unsigned status) {
+			try {
+				json j = json::parse(body);
+				std::string message = j["message"].get<std::string>();
+
+				if (message == "success") {
+					json resource = j.at("resources");
+					if (resource.is_array()) {
+						for (auto iter = resource.begin(); iter != resource.end(); iter++) {
+							Semver version;
+							std::string url;
+							std::string type;
+							std::string vendor;
+							std::string description;
+							for (auto sub_iter = iter.value().begin(); sub_iter != iter.value().end(); sub_iter++) {
+								if (boost::iequals(sub_iter.key(), "type")) {
+									type = sub_iter.value();
+									BOOST_LOG_TRIVIAL(info) << "[test_storage_download]: get version of settings's type, " << sub_iter.value();
+								}
+								else if (boost::iequals(sub_iter.key(), "version")) {
+									version = *(Semver::parse(sub_iter.value()));
+								}
+								else if (boost::iequals(sub_iter.key(), "description")) {
+									description = sub_iter.value();
+								}
+								else if (boost::iequals(sub_iter.key(), "url")) {
+									url = sub_iter.value();
+								}
+							}
+							BOOST_LOG_TRIVIAL(info) << "[test_storage_download]: get type " << type << ", version " << version.to_string() << ", url " << url;
+							download_url = url;
+						}
+					}
+				}
+				else {
+					BOOST_LOG_TRIVIAL(info) << "[test_storage_download]: get version of plugin failed, body=" << body;
+				}
+			}
+			catch (...) {
+				BOOST_LOG_TRIVIAL(error) << "[test_storage_download]: catch unknown exception";
+				;
+			}
+		}).on_error(
+			[&result, this](std::string body, std::string error, unsigned int status) {
+				BOOST_LOG_TRIVIAL(error) << "[test_storage_download] on_error: " << error << ", body = " << body;
+				wxString info = wxString::Format("status=%u, body=%s, error=%s", status, body, error);
+				this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download failed");
+				this->update_status(-1, info);
+				result = -1;
+		}).perform_sync();
+
+	if (result < 0) {
+		this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download failed");
+		m_in_testing[TEST_OSS_DOWNLOAD_JOB] = false;
+		return;
+	}
+
+	if (download_url.empty()) {
+		BOOST_LOG_TRIVIAL(info) << "[test_oss_download]: no availaible plugin found for this app version: " << SLIC3R_VERSION;
+		this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download failed");
+		m_in_testing[TEST_OSS_DOWNLOAD_JOB] = false;
+		return;
+	}
+	if (m_download_cancel) {
+		this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download canceled");
+		m_in_testing[TEST_OSS_DOWNLOAD_JOB] = false;
+		return;
+	}
+
+	bool cancel = false;
+	BOOST_LOG_TRIVIAL(info) << "[test_storage_download] get_url = " << download_url;
+
+	// download
+	Slic3r::Http http = Slic3r::Http::get(download_url);
+	int reported_percent = 0;
+	http.on_progress(
+		[this, &result, &reported_percent](Slic3r::Http::Progress progress, bool& cancel) {
+			int percent = 0;
+			if (progress.dltotal != 0) {
+				percent = progress.dlnow * 100 / progress.dltotal;
+			}
+			if (percent - reported_percent >= 10) {
+				reported_percent = percent;
+				std::string download_progress_info = (boost::format("downloading %1%%%") % percent).str();
+				this->update_status(TEST_OSS_DOWNLOAD_JOB, download_progress_info);
+			}
+
+			BOOST_LOG_TRIVIAL(info) << "[test_storage_download] progress: " << reported_percent;
+			cancel = m_download_cancel;
+
+			if (cancel)
+				result = -1;
+		})
+		.on_complete([this, tmp_path, target_file_path](std::string body, unsigned status) {
+			BOOST_LOG_TRIVIAL(info) << "[test_storage_download] completed";
+			bool cancel = false;
+			fs::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
+			file.write(body.c_str(), body.size());
+			file.close();
+			fs::rename(tmp_path, target_file_path);
+			this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download ok");
+		})
+		.on_error([this, &result](std::string body, std::string error, unsigned int status) {
+			BOOST_LOG_TRIVIAL(error) << "[test_oss_download] downloading... on_error: " << error << ", body = " << body;
+			wxString info = wxString::Format("status=%u, body=%s, error=%s", status, body, error);
+			this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download failed");
+			this->update_status(-1, info);
+			result = -1;
+		});
+	http.perform_sync();
+	if (result < 0) {
+		this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download failed");
+	} else {
+		this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download ok");
+	}
+	m_in_testing[TEST_OSS_DOWNLOAD_JOB] = false;
+	return;
+}
+
+void NetworkTestDialog::start_test_oss_upload()
+{
+	;
+}
+
+void NetworkTestDialog::start_test_ping_thread()
+{
+	test_job[TEST_PING_JOB] = new boost::thread([this] {
+		m_in_testing[TEST_PING_JOB] = true;
+
+		m_in_testing[TEST_PING_JOB] = false;
+	});
+}
+
+void NetworkTestDialog::start_test_bing_thread()
+{
+	test_job[TEST_BING_JOB] = new boost::thread([this] {
+		start_test_bing();
 	});
 }
 
 void NetworkTestDialog::start_test_bambulab_thread()
 {
 	if (m_in_testing[TEST_BAMBULAB_JOB]) return;
-
 	test_job[TEST_BAMBULAB_JOB] = new boost::thread([this] {
-		m_in_testing[TEST_BAMBULAB_JOB] = true;
+		start_test_bambulab();
-		update_status(TEST_BAMBULAB_JOB, "test bambulab start...");
-
-		std::string platform = "windows";
-
-#ifdef __WINDOWS__
-		platform = "windows";
-#endif
-#ifdef __APPLE__
-		platform = "macos";
-#endif
-#ifdef __LINUX__
-		platform = "linux";
-#endif
-		std::string query_params = (boost::format("?name=slicer&version=%1%&guide_version=%2%")
-			% VersionInfo::convert_full_version(SLIC3R_VERSION)
-			% VersionInfo::convert_full_version("0.0.0.1")
-			).str();
-
-		AppConfig* app_config = wxGetApp().app_config;
-		std::string url = wxGetApp().get_http_url(app_config->get_country_code()) + query_params;
-		Slic3r::Http http = Slic3r::Http::get(url);
-		int result = -1;
-		http.header("accept", "application/json")
-			.timeout_max(10)
-			.on_complete([this, &result](std::string body, unsigned status) {
-				try {
-					if (status == 200) {
-						result = 0;
-					}
-				}
-				catch (...) {
-					;
-				}
-			})
-			.on_ip_resolve([this](std::string ip) {
-				wxString ip_report = wxString::Format("test bambulab ip resolved = %s", ip);
-				update_status(TEST_BAMBULAB_JOB, ip_report);
-			})
-			.on_error([this](std::string body, std::string error, unsigned int status) {
-				wxString info = wxString::Format("status=%u, body=%s, error=%s", status, body, error);
-				this->update_status(TEST_BAMBULAB_JOB, "test bambulab failed");
-				this->update_status(-1, info);
-			}).perform_sync();
-		if (result == 0) {
-			update_status(TEST_BAMBULAB_JOB, "test bambulab ok");
-		}
-		m_in_testing[TEST_BAMBULAB_JOB] = false;
 	});
 }
 
 void NetworkTestDialog::start_test_iot_thread()
 {
 	if (m_in_testing[TEST_IOT_JOB]) return;
-
 	test_job[TEST_IOT_JOB] = new boost::thread([this] {
-		m_in_testing[TEST_IOT_JOB] = true;
+		start_test_iot();
-		update_status(TEST_IOT_JOB, "test http start...");
-		NetworkAgent* agent = wxGetApp().getAgent();
-		if (agent) {
-			unsigned int http_code;
-			std::string http_body;
-			if (!agent->is_user_login()) {
-				update_status(TEST_IOT_JOB, "please login first");
-			} else {
-				int result = agent->get_user_print_info(&http_code, &http_body);
-				if (result == 0) {
-					update_status(TEST_IOT_JOB, "test http ok");
-				} else {
-					update_status(TEST_IOT_JOB, "test http failed");
-					wxString info = wxString::Format("test http failed, status = %u, error = %s", http_code, http_body);
-					update_status(-1, info);
-				}
-			}
-		} else {
-			update_status(TEST_IOT_JOB, "please install network module first");
-		}
-		m_in_testing[TEST_IOT_JOB] = false;
 	});
 }
 
 void NetworkTestDialog::start_test_oss_thread()
 {
 	test_job[TEST_OSS_JOB] = new boost::thread([this] {
-		m_in_testing[TEST_OSS_JOB] = true;
+		start_test_oss();
-		update_status(TEST_OSS_JOB, "test storage start...");
-
-		std::string url = "http://upload-file.bambulab.com";
-
-		AppConfig* config = wxGetApp().app_config;
-		if (config) {
-			if (config->get_country_code() == "CN")
-				url = "http://upload-file.bambulab.cn";
-		}
-
-		Slic3r::Http http = Slic3r::Http::get(url);
-
-		int result = -1;
-		http.timeout_max(15)
-			.on_complete([this, &result](std::string body, unsigned status) {
-			try {
-				if (status == 200) {
-					result = 0;
-				}
-			}
-			catch (...) {
-				;
-			}
-				})
-			.on_ip_resolve([this](std::string ip) {
-				wxString ip_report = wxString::Format("test oss ip resolved = %s", ip);
-				update_status(TEST_OSS_JOB, ip_report);
-			})
-			.on_error([this, &result](std::string body, std::string error, unsigned int status) {
-				if (status == 403) {
-					result = 0;
-				} else {
-					wxString info = wxString::Format("status=%u, body=%s, error=%s", status, body, error);
-					this->update_status(TEST_OSS_JOB, "test storage failed");
-					this->update_status(-1, info);
-				}
-			}).perform_sync();
-			if (result == 0) {
-				update_status(TEST_OSS_JOB, "test storage ok");
-			}
-		m_in_testing[TEST_OSS_JOB] = false;
 	});
 }
 
 void NetworkTestDialog::start_test_oss_upgrade_thread()
 {
 	test_job[TEST_OSS_UPGRADE_JOB] = new boost::thread([this] {
-		m_in_testing[TEST_OSS_UPGRADE_JOB] = true;
+		start_test_oss_upgrade();
-		update_status(TEST_OSS_UPGRADE_JOB, "test storage upgrade start...");
-
-		std::string url = "http://upgrade-file.bambulab.com";
-
-		AppConfig* config = wxGetApp().app_config;
-		if (config) {
-			if (config->get_country_code() == "CN")
-				url = "http://upgrade-file.bambulab.cn";
-		}
-
-		Slic3r::Http http = Slic3r::Http::get(url);
-
-		int result = -1;
-		http.timeout_max(15)
-			.on_complete([this, &result](std::string body, unsigned status) {
-			try {
-				if (status == 200) {
-					result = 0;
-				}
-			}
-			catch (...) {
-				;
-			}
-				})
-			.on_ip_resolve([this](std::string ip) {
-					wxString ip_report = wxString::Format("test storage upgrade ip resolved = %s", ip);
-					update_status(TEST_OSS_UPGRADE_JOB, ip_report);
-				})
-			.on_error([this, &result](std::string body, std::string error, unsigned int status) {
-				if (status == 403) {
-					result = 0;
-				}
-				else {
-					wxString info = wxString::Format("status=%u, body=%s, error=%s", status, body, error);
-					this->update_status(TEST_OSS_UPGRADE_JOB, "test storage upgrade failed");
-					this->update_status(-1, info);
-				}
-			}).perform_sync();
-
-		if (result == 0) {
-			update_status(TEST_OSS_UPGRADE_JOB, "test storage upgrade ok");
-		}
-		m_in_testing[TEST_OSS_UPGRADE_JOB] = false;
 	});
 }
 
 void NetworkTestDialog::start_test_oss_download_thread()
 {
 	test_job[TEST_OSS_DOWNLOAD_JOB] = new boost::thread([this] {
-		int result = 0;
+		start_test_oss_download();
-		// get country_code
-		AppConfig* app_config = wxGetApp().app_config;
-		if (!app_config) {
-			update_status(TEST_OSS_DOWNLOAD_JOB, "app config is nullptr");
-			return;
-		}
-
-		m_in_testing[TEST_OSS_DOWNLOAD_JOB] = true;
-		update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download start...");
-		m_download_cancel = false;
-		// get temp path
-		fs::path target_file_path = (fs::temp_directory_path() / "test_storage_download.zip");
-		fs::path tmp_path = target_file_path;
-		tmp_path += (boost::format(".%1%%2%") % get_current_pid() % ".tmp").str();
-
-		// get_url
-		std::string url = wxGetApp().get_plugin_url(app_config->get_country_code());
-		std::string download_url;
-		Slic3r::Http http_url = Slic3r::Http::get(url);
-		update_status(-1, "[test_oss_download]: url=" + url);
-
-		http_url.on_complete(
-			[&download_url](std::string body, unsigned status) {
-				try {
-					json j = json::parse(body);
-					std::string message = j["message"].get<std::string>();
-
-					if (message == "success") {
-						json resource = j.at("resources");
-						if (resource.is_array()) {
-							for (auto iter = resource.begin(); iter != resource.end(); iter++) {
-								Semver version;
-								std::string url;
-								std::string type;
-								std::string vendor;
-								std::string description;
-								for (auto sub_iter = iter.value().begin(); sub_iter != iter.value().end(); sub_iter++) {
-									if (boost::iequals(sub_iter.key(), "type")) {
-										type = sub_iter.value();
-										BOOST_LOG_TRIVIAL(info) << "[test_storage_download]: get version of settings's type, " << sub_iter.value();
-									}
-									else if (boost::iequals(sub_iter.key(), "version")) {
-										version = *(Semver::parse(sub_iter.value()));
-									}
-									else if (boost::iequals(sub_iter.key(), "description")) {
-										description = sub_iter.value();
-									}
-									else if (boost::iequals(sub_iter.key(), "url")) {
-										url = sub_iter.value();
-									}
-								}
-								BOOST_LOG_TRIVIAL(info) << "[test_storage_download]: get type " << type << ", version " << version.to_string() << ", url " << url;
-								download_url = url;
-							}
-						}
-					}
-					else {
-						BOOST_LOG_TRIVIAL(info) << "[test_storage_download]: get version of plugin failed, body=" << body;
-					}
-				}
-				catch (...) {
-					BOOST_LOG_TRIVIAL(error) << "[test_storage_download]: catch unknown exception";
-					;
-				}
-			}).on_error(
-				[&result, this](std::string body, std::string error, unsigned int status) {
-					BOOST_LOG_TRIVIAL(error) << "[test_storage_download] on_error: " << error << ", body = " << body;
-					wxString info = wxString::Format("status=%u, body=%s, error=%s", status, body, error);
-					this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download failed");
-					this->update_status(-1, info);
-					result = -1;
-			}).perform_sync();
-
-		if (result < 0) {
-			this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download failed");
-			m_in_testing[TEST_OSS_DOWNLOAD_JOB] = false;
-			return;
-		}
-
-		if (download_url.empty()) {
-			BOOST_LOG_TRIVIAL(info) << "[test_oss_download]: no availaible plugin found for this app version: " << SLIC3R_VERSION;
-			this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download failed");
-			m_in_testing[TEST_OSS_DOWNLOAD_JOB] = false;
-			return;
-		}
-		if (m_download_cancel) {
-			this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download canceled");
-			m_in_testing[TEST_OSS_DOWNLOAD_JOB] = false;
-			return;
-		}
-
-		bool cancel = false;
-		BOOST_LOG_TRIVIAL(info) << "[test_storage_download] get_url = " << download_url;
-
-		// download
-		Slic3r::Http http = Slic3r::Http::get(download_url);
-		int reported_percent = 0;
-		http.on_progress(
-			[this, &result, &reported_percent](Slic3r::Http::Progress progress, bool& cancel) {
-				int percent = 0;
-				if (progress.dltotal != 0) {
-					percent = progress.dlnow * 100 / progress.dltotal;
-				}
-				if (percent - reported_percent >= 10) {
-					reported_percent = percent;
-					std::string download_progress_info = (boost::format("downloading %1%%%") % percent).str();
-					this->update_status(TEST_OSS_DOWNLOAD_JOB, download_progress_info);
-				}
-
-				BOOST_LOG_TRIVIAL(info) << "[test_storage_download] progress: " << reported_percent;
-				cancel = m_download_cancel;
-
-				if (cancel)
-					result = -1;
-			})
-			.on_complete([this, tmp_path, target_file_path](std::string body, unsigned status) {
-				BOOST_LOG_TRIVIAL(info) << "[test_storage_download] completed";
-				bool cancel = false;
-				fs::fstream file(tmp_path, std::ios::out | std::ios::binary | std::ios::trunc);
-				file.write(body.c_str(), body.size());
-				file.close();
-				fs::rename(tmp_path, target_file_path);
-				this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download ok");
-			})
-			.on_error([this, &result](std::string body, std::string error, unsigned int status) {
-				BOOST_LOG_TRIVIAL(error) << "[test_oss_download] downloading... on_error: " << error << ", body = " << body;
-				wxString info = wxString::Format("status=%u, body=%s, error=%s", status, body, error);
-				this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download failed");
-				this->update_status(-1, info);
-				result = -1;
-			});
-		http.perform_sync();
-		if (result < 0) {
-			this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download failed");
-		} else {
-			this->update_status(TEST_OSS_DOWNLOAD_JOB, "test storage download ok");
-		}
-		m_in_testing[TEST_OSS_DOWNLOAD_JOB] = false;
-		return;
 	});
 }
 
 void NetworkTestDialog::start_test_oss_upload_thread()
 {
-	;
+	test_job[TEST_OSS_UPLOAD_JOB] = new boost::thread([this] {
+		start_test_oss_upload();
+	});
 }
 
 void NetworkTestDialog::on_close(wxCloseEvent& event)
 {
 	m_download_cancel = true;
+	m_closing = true;
 	for (int i = 0; i < TEST_JOB_MAX; i++) {
 		if (test_job[i]) {
 			test_job[i]->join();
 			test_job[i] = nullptr;
 		}
 	}
+
 	event.Skip();
 }
 
@@ -668,6 +783,8 @@ void NetworkTestDialog::set_default()
 		m_in_testing[i] = false;
 	}
 
+	m_sequence_job = nullptr;
+
 	text_version_val->SetLabelText(get_studio_version());
 	txt_sys_info_value->SetLabelText(get_os_info());
 	txt_dns_info_value->SetLabelText(get_dns_info());
@@ -678,7 +795,9 @@ void NetworkTestDialog::set_default()
 	text_oss_upgrade_value->SetLabelText(NA_STR);
 	text_oss_download_value->SetLabelText(NA_STR);
 	text_oss_upload_value->SetLabelText(NA_STR);
+	//text_ping_value->SetLabelText(NA_STR);
 	m_download_cancel = false;
+	m_closing = false;
 }
 
 

src/slic3r/GUI/NetworkTestDialog.hpp

@@ -40,13 +40,15 @@ enum TestJob {
 	TEST_OSS_UPGRADE_JOB = 4,
 	TEST_OSS_DOWNLOAD_JOB = 5,
 	TEST_OSS_UPLOAD_JOB = 6,
-	TEST_JOB_MAX = 7
+	TEST_PING_JOB = 7,
+	TEST_JOB_MAX = 8
 };
 
 class NetworkTestDialog : public DPIDialog
 {
 protected:
 	wxButton* btn_start;
+	wxButton* btn_start_sequence;
 	wxButton* btn_download_log;
 	wxStaticText* text_basic_info;
 	wxStaticText* text_version_title;
@@ -55,20 +57,29 @@ protected:
 	wxStaticText* txt_sys_info_value;
 	wxStaticText* txt_dns_info_title;
 	wxStaticText* txt_dns_info_value;
+	wxButton*     btn_link;
 	wxStaticText* text_link_title;
 	wxStaticText* text_link_val;
+	wxButton*     btn_bing;
 	wxStaticText* text_bing_title;
 	wxStaticText* text_bing_val;
+	wxButton*     btn_iot;
 	wxStaticText* text_iot_title;
 	wxStaticText* text_iot_value;
+	wxButton*     btn_oss;
 	wxStaticText* text_oss_title;
 	wxStaticText* text_oss_value;
+	wxButton*     btn_oss_upgrade;
 	wxStaticText* text_oss_upgrade_title;
 	wxStaticText* text_oss_upgrade_value;
+	wxButton*     btn_oss_download;
 	wxStaticText* text_oss_download_title;
 	wxStaticText* text_oss_download_value;
+	wxButton*     btn_oss_upload;
 	wxStaticText* text_oss_upload_title;
 	wxStaticText* text_oss_upload_value;
+	wxStaticText* text_ping_title;
+	wxStaticText* text_ping_value;
 	wxStaticText* text_result;
 	wxTextCtrl* txt_log;
 
@@ -78,8 +89,10 @@ protected:
 	wxBoxSizer* create_result_sizer(wxWindow* parent);
 
 	boost::thread* test_job[TEST_JOB_MAX];
+	boost::thread* m_sequence_job { nullptr };
 	bool		   m_in_testing[TEST_JOB_MAX];
 	bool           m_download_cancel = false;
+	bool           m_closing = false;
 
 	void init_bind();
 
@@ -96,6 +109,7 @@ public:
 	wxString get_dns_info();
 
 	void start_all_job();
+	void start_all_job_sequence();
 	void start_test_bing_thread();
 	void start_test_bambulab_thread();
 	void start_test_iot_thread();
@@ -103,6 +117,15 @@ public:
 	void start_test_oss_upgrade_thread();
 	void start_test_oss_download_thread();
 	void start_test_oss_upload_thread();
+	void start_test_ping_thread();
+
+	void start_test_bing();
+	void start_test_bambulab();
+	void start_test_iot();
+	void start_test_oss();
+	void start_test_oss_upgrade();
+	void start_test_oss_download();
+	void start_test_oss_upload();
 
 	void on_close(wxCloseEvent& event);