fix unzip issue, forcing HttpServer to stop before closing.

Source/Basic/Content.cpp

@@ -588,6 +588,11 @@ void Content::unzipAsync(String zipFile, String folderPath, const std::function<
 		return;
 	}
 	auto zip = std::make_shared<ZipFile>(fullZipPath);
+	if (!zip->isOK()) {
+		Error("failed to unzip file \"{}\"", zipFile.toString());
+		callback(false);
+		return;
+	}
 	std::string rootDir;
 	BLOCK_START
 	auto entries = zip->getDirEntries(""s, false);

Source/Basic/Director.cpp

@@ -22,6 +22,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #include "Effect/Effect.h"
 #include "Entity/Entity.h"
 #include "GUI/ImGuiDora.h"
+#include "Http/HttpServer.h"
 #include "Input/Controller.h"
 #include "Input/Keyboard.h"
 #include "Input/TouchDispather.h"
@@ -520,6 +521,12 @@ void Director::handleSDLEvent(const SDL_Event& event) {
 			_stoped = true;
 			Event::send("AppQuit"_slice);
 			cleanup();
+			if (Singleton<HttpServer>::isInitialized()) {
+				SharedHttpServer.stop();
+			}
+			if (Singleton<HttpClient>::isInitialized()) {
+				SharedHttpClient.stop();
+			}
 			break;
 		// The application is being terminated by the OS.
 		case SDL_APP_TERMINATING:

Source/Http/HttpServer.cpp

@@ -506,11 +506,32 @@ const char* HttpServer::getVersion() {
 	return CPPHTTPLIB_VERSION;
 }
 
-void HttpClient::downloadAsync(String url, String filePath, const std::function<void (bool interrupted, uint64_t current, uint64_t total)>& progress) {
+/* HttpClient */
+
+HttpClient::HttpClient()
+	: _thread(nullptr),
+	_stopped(false) {
+}
+
+HttpClient::~HttpClient() {
+	stop();
+}
+
+bool HttpClient::isStopped() const {
+	return _stopped;
+}
+
+void HttpClient::downloadAsync(String url, String filePath, const std::function<void(bool interrupted, uint64_t current, uint64_t total)>& progress) {
+	if (_stopped) {
+		progress(true, 0, 0);
+		return;
+	}
+	if (!_thread) {
+		_thread = SharedAsyncThread.newThread();
+	}
 	static std::regex urlRegex(
 		R"(^(([^:\/?#]+):)?(//([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?)",
-		std::regex::extended
-	);
+		std::regex::extended);
 	std::smatch matchResult;
 	auto urlStr = url.toString();
 	std::string schemeHostPort, pathToGet;
@@ -543,7 +564,7 @@ void HttpClient::downloadAsync(String url, String filePath, const std::function<
 		progress(true, 0, 0);
 		return;
 	}
-	SharedAsyncThread.run([schemeHostPort, fileStr = filePath.toString(), urlStr, progress, pathToGet]() {
+	_thread->run([schemeHostPort, fileStr = filePath.toString(), urlStr, progress, pathToGet]() {
 		try {
 			httplib::Client client(schemeHostPort);
 			client.enable_server_certificate_verification(false);
@@ -553,24 +574,28 @@ void HttpClient::downloadAsync(String url, String filePath, const std::function<
 				Error("invalid local file path \"{}\" to download to", fileStr);
 				return;
 			}
-			auto result = client.Get(pathToGet, [&](const char* data, size_t data_length) -> bool {
-				if (!out.write(data, data_length)) {
-					Error("failed to write downloaded file for \"{}\"", urlStr);
-					SharedApplication.invokeInLogic([progress]() {
-						progress(true, 0, 0);
+			auto result = client.Get(
+				pathToGet, [&](const char* data, size_t data_length) -> bool {
+					if (SharedHttpClient.isStopped()) {
+						return false;
+					} else if (!out.write(data, data_length)) {
+						Error("failed to write downloaded file for \"{}\"", urlStr);
+						SharedApplication.invokeInLogic([progress]() {
+							progress(true, 0, 0);
+						});
+						std::error_code err;
+						fs::remove_all(fileStr, err);
+						WarnIf(err, "failed to remove download file \"{}\" due to \"{}\".", fileStr, err.message());
+						return false;
+					}
+					return true;
+				},
+				[&](uint64_t current, uint64_t total) -> bool {
+					SharedApplication.invokeInLogic([progress, current, total]() {
+						progress(false, current, total);
 					});
-					std::error_code err;
-					fs::remove_all(fileStr, err);
-					WarnIf(err, "failed to remove download file \"{}\" due to \"{}\".", fileStr, err.message());
-					return false;
-				}
-				return true;
-			}, [&](uint64_t current, uint64_t total) -> bool {
-				SharedApplication.invokeInLogic([progress, current, total]() {
-					progress(false, current, total);
+					return true;
 				});
-				return true;
-			});
 			if (!result || result.error() != httplib::Error::Success) {
 				Error("failed to download \"{}\" due to {}", urlStr, httplib::to_string(result.error()));
 				SharedApplication.invokeInLogic([progress]() {
@@ -591,4 +616,8 @@ void HttpClient::downloadAsync(String url, String filePath, const std::function<
 	});
 }
 
+void HttpClient::stop() {
+	_stopped = true;
+}
+
 NS_DORA_END

Source/Http/HttpServer.h

@@ -84,7 +84,21 @@ class HttpServer {
 
 class HttpClient {
 public:
-	static void downloadAsync(String url, String filePath, const std::function<void (bool interrupted, uint64_t current, uint64_t total)>& progress);
+	PROPERTY_BOOL(Stopped);
+	virtual ~HttpClient();
+	void stop();
+	void downloadAsync(String url, String filePath, const std::function<void(bool interrupted, uint64_t current, uint64_t total)>& progress);
+
+protected:
+	HttpClient();
+
+private:
+	Async* _thread;
+	bool _stopped;
+	SINGLETON_REF(HttpClient, AsyncThread, Director);
 };
 
+#define SharedHttpClient \
+	Dora::Singleton<Dora::HttpClient>::shared()
+
 NS_DORA_END

Source/Lua/Builtin/Initialization.lua

@@ -51,6 +51,7 @@ do
 	dora.Keyboard = dora.Keyboard()
 	dora.DB = dora.DB()
 	dora.HttpServer = dora.HttpServer()
+	dora.HttpClient = dora.HttpClient()
 	dora.Platformer.Decision.AI = dora.Platformer.Decision.AI()
 	dora.Platformer.Data = dora.Platformer.Data()
 end

Source/Lua/LuaManual.h

@@ -245,6 +245,9 @@ int HttpServer_postSchedule(lua_State* L);
 int HttpServer_upload(lua_State* L);
 inline HttpServer* HttpServer_shared() { return &SharedHttpServer; }
 
+/* HttpClient */
+inline HttpClient* HttpClient_shared() { return &SharedHttpClient; }
+
 /* Effect */
 inline Pass* Effect_get(Effect* self, size_t index) { return self->get(index - 1); }
 

Tools/dora-dora/src/LogView.tsx

@@ -100,7 +100,11 @@ const LogView = memo((props: LogViewProps) => {
 						color: Color.TextSecondary
 					}}
 					rowHeight={22}
-					enableSearch stream follow/>
+					selectableLines
+					enableSearch
+					stream
+					follow
+				/>
 			</DialogContent>
 			<DialogActions>
 				<form noValidate autoComplete="off" style={{width: "100%"}} onSubmit={onSubmit}>

Tools/dora-dora/src/i18n.ts

@@ -55,7 +55,7 @@ i18n
 						runFailed: "failed to run {{title}}",
 						startUnzip: "start to unzip file {{title}}",
 						doneUnzip: "finished unziping file {{title}}",
-						failedUnzip: "failed to unzip file {{title}}, make sure no same named folder exist",
+						failedUnzip: "failed to unzip file {{title}}, make sure it's a ZIP and no same named folder exist",
 						failedTS: "TypeScript compile error, check log for details",
 					},
 					popup: {
@@ -172,7 +172,7 @@ i18n
 						runFailed: "运行 {{title}} 失败",
 						startUnzip: "开始解压缩 {{title}}",
 						doneUnzip: "完成解压缩 {{title}}",
-						failedUnzip: "解压缩 {{title}} 未成功，请确保目录下无同名文件夹",
+						failedUnzip: "解压缩 {{title}} 失败，请确认为 ZIP 文件且目录下无同名文件夹",
 						failedTS: "TypeScript 编译报错，请查看日志",
 					},
 					popup: {

Tools/tolua++/Dora.h

@@ -1112,7 +1112,8 @@ class HttpServer
 
 class HttpClient
 {
-	static void downloadAsync(String url, String filePath, tolua_function_void progress);
+	void downloadAsync(String url, String filePath, tolua_function_void progress);
+	static tolua_outside HttpClient* HttpClient_shared @ create();
 };
 
 namespace ML {