fix: fixed chinese path related problems #24 (#30)

Author: XY0797

src/legacy/main/Loader.cpp

@@ -42,16 +42,16 @@ void LoadDepends() {
                 if (!content) throw("Fail to open plugin file!");
                 depends.emplace(path, *content);
                 lse::getSelfPluginInstance().getLogger().info(
-                    "llse.loader.loadDepends.success"_tr(i.path().filename().string())
+                    "llse.loader.loadDepends.success"_tr(ll::string_utils::u8str2str(i.path().filename().u8string()))
                 );
             } catch (std::exception e) {
                 lse::getSelfPluginInstance().getLogger().warn(
-                    "llse.loader.loadDepends.fail"_tr(i.path().filename().string())
+                    "llse.loader.loadDepends.fail"_tr(ll::string_utils::u8str2str(i.path().filename().u8string()))
                 );
                 lse::getSelfPluginInstance().getLogger().warn(ll::string_utils::tou8str(e.what()));
             } catch (...) {
                 lse::getSelfPluginInstance().getLogger().warn(
-                    "llse.loader.loadDepends.fail"_tr(i.path().filename().string())
+                    "llse.loader.loadDepends.fail"_tr(ll::string_utils::u8str2str(i.path().filename().u8string()))
                 );
             }
         }

src/legacy/main/PluginManager.cpp

@@ -54,7 +54,7 @@ bool PluginManager::loadPlugin(const std::string& fileOrDirPath, bool isHotLoad,
     }
 
     // Get bacis information
-    bool   isPluginPackage = std::filesystem::is_directory(fileOrDirPath);
+    bool isPluginPackage = std::filesystem::is_directory(ll::string_utils::str2wstr(fileOrDirPath));
     string backendType     = getPluginBackendType(fileOrDirPath);
     if (backendType.empty()) {
         lse::getSelfPluginInstance().getLogger().error(fileOrDirPath + " is not a valid plugin path!");

src/lse/Entry.cpp

@@ -150,10 +150,10 @@ auto loadBaseLib(ll::plugin::NativePlugin& self) -> bool {
     auto content = ll::file_utils::readFile(path);
 
     if (!content) {
-        throw std::runtime_error(fmt::format("failed to read {}", path.string()));
+        throw std::runtime_error(fmt::format("failed to read {}", ll::string_utils::u8str2str(path.u8string())));
     }
 
-    depends.emplace(path.string(), *content);
+    depends.emplace(ll::string_utils::u8str2str(path.u8string()), *content);
 
     return true;
 }

src/lse/PluginManager.cpp

@@ -67,10 +67,10 @@ auto PluginManager::load(ll::plugin::Manifest manifest) -> bool {
 
         logger.info("loading plugin {}", manifest.name);
 
-        auto pluginDir = std::filesystem::canonical(ll::plugin::getPluginsRoot() / manifest.name);
-        auto entryPath = pluginDir / manifest.entry;
+        auto pluginDir = std::filesystem::canonical(ll::plugin::getPluginsRoot() / ll::string_utils::str2wstr(manifest.name));
+        auto entryPath = pluginDir / ll::string_utils::str2wstr(manifest.entry);
 
-        if (!::PluginManager::loadPlugin(entryPath.string(), false, true)) {
+        if (!::PluginManager::loadPlugin(ll::string_utils::u8str2str(entryPath.u8string()), false, true)) {
             throw std::runtime_error(fmt::format("failed to load plugin {}", manifest.name));
         }
         return true;

src/lse/PluginMigration.cpp

@@ -31,7 +31,7 @@ auto migratePlugin(const std::filesystem::path& path) -> void {
 
     auto& logger = self.getLogger();
 
-    logger.info("migrating legacy plugin at {}", path.string());
+    logger.info("migrating legacy plugin at {}", ll::string_utils::u8str2str(path.u8string()));
 
     auto& pluginManager = getPluginManager();
 
@@ -43,22 +43,22 @@ auto migratePlugin(const std::filesystem::path& path) -> void {
 
     if (std::filesystem::exists(pluginDir / pluginFileName)) {
         throw std::runtime_error(
-            fmt::format("failed to migrate legacy plugin at {}: {} already exists", path.string(), pluginDir.string())
+            fmt::format("failed to migrate legacy plugin at {}: {} already exists", ll::string_utils::u8str2str(path.u8string()), ll::string_utils::u8str2str(pluginDir.u8string()))
         );
     }
 
     if (!std::filesystem::exists(pluginDir)) {
         if (!std::filesystem::create_directory(pluginDir)) {
-            throw std::runtime_error(fmt::format("failed to create directory {}", pluginDir.string()));
+            throw std::runtime_error(fmt::format("failed to create directory {}", ll::string_utils::u8str2str(pluginDir.u8string())));
         }
     }
 
     // Move plugin file.
     std::filesystem::rename(path, pluginDir / pluginFileName);
 
     ll::plugin::Manifest manifest{
-        .entry = pluginFileName.string(),
-        .name  = pluginFileBaseName.string(),
+        .entry = ll::string_utils::u8str2str(pluginFileName.u8string()),
+        .name  = ll::string_utils::u8str2str(pluginFileBaseName.u8string()),
         .type  = pluginType,
         .dependencies =
             std::unordered_set<ll::plugin::Dependency>{

xmake.lua

@@ -1,70 +1,49 @@
 add_rules("mode.debug", "mode.release")
 
 add_repositories("liteldev-repo https://github.com/LiteLDev/xmake-repo.git")
+
 add_requires(
     "demangler v2.0.0",
     "dyncall 1.4",
     "fmt 10.1.1",
     "legacymoney 0.2.0",
     "legacyparticleapi 0.2.0",
+    "legacyremotecall 0.2.0",
     "levilamina 0.7.2",
     "lightwebsocketclient 1.0.0",
     "magic_enum v0.9.0",
+    "more-events develop",
     "nlohmann_json 3.11.2",
     "openssl 1.1.1-w",
     "simpleini v4.19",
     "sqlite3 3.43.0+200",
-    "toml++ v3.4.0",
-    "legacyremotecall 0.2.0"
+    "toml++ v3.4.0"
 )
-add_requires("cpp-httplib v0.14.0", {configs={shared=false, ssl=true, zlib=true}})
-add_requires("scriptx", {configs={backend=get_config("backend")}})
+add_requires("cpp-httplib v0.14.0", {configs={ssl=true, zlib=true}})
+
+if is_config("backend", "lua") then
+    add_requires("scriptx 3.2.0", {configs={backend="Lua"}})
+
+elseif is_config("backend", "quickjs") then
+    add_requires("scriptx 3.2.0", {configs={backend="QuickJs"}})
 
-set_runtimes("MD") -- For compatibility with the /MD build configuration of ScriptX.
+end
+
+if not has_config("vs_runtime") then
+    set_runtimes("MD")
+end
 
 option("backend")
     set_default("lua")
     set_values("lua", "quickjs")
 
-package("quickjs")
-    add_urls("https://github.com/LiteLDev/ScriptX/releases/download/prebuilt/quickjs.zip")
-    add_versions("latest", "af0c38b0cf80aa1deb58e727e408477fffcc6f5f57da537dffc335861d652ed0")
+package("more-events")
+    add_urls("https://github.com/LiteLDev/MoreEvents.git")
 
-    on_install(function (package)
-        os.cp("*", package:installdir())
-    end)
-
-package("scriptx")
-    add_configs("backend", {default = "lua", values = {"lua", "quickjs"}})
-    add_includedirs(
-        "src/include/"
-    )
-    add_urls("https://github.com/LiteLDev/ScriptX/releases/download/prebuilt/scriptx.zip")
-    add_versions("latest", "dd5fb21370a59f38e4c33f48f4a6eecb25692283e4d49bbee983453e05b128ab")
+    add_deps("levilamina 0.7.2")
 
     on_install(function (package)
-        os.cp("*", package:installdir())
-    end)
-
-    on_load(function (package)
-        local backend = package:config("backend")
-
-        local deps = {
-            lua = "lua v5.4.6",
-            quickjs = "quickjs",
-        }
-
-        local scriptx_backends = {
-            lua = "Lua",
-            quickjs = "QuickJs",
-        }
-
-        print("Using ScriptX config: backend=" .. backend .. ", scriptx_backend=" .. scriptx_backends[backend])
-        
-        package:add("defines", "SCRIPTX_BACKEND=" .. scriptx_backends[backend])
-        package:add("defines", "SCRIPTX_BACKEND_TRAIT_PREFIX=../backend/" .. scriptx_backends[backend] .. "/trait/Trait")
-        package:add("deps", deps[backend])
-        package:add("links", "scriptx_" .. scriptx_backends[backend])
+        import("package.tools.xmake").install(package)
     end)
 
 target("legacy-script-engine")
@@ -92,15 +71,16 @@ target("legacy-script-engine")
         "fmt",
         "legacymoney",
         "legacyparticleapi",
+        "legacyremotecall",
         "levilamina",
         "lightwebsocketclient",
         "magic_enum",
+        "moreevents",
         "nlohmann_json",
         "scriptx",
         "simpleini",
         "sqlite3",
-        "toml++",
-        "legacyremotecall"
+        "toml++"
     )
     add_shflags(
         "/DELAYLOAD:bedrock_server.dll" -- To use forged symbols of SymbolProvider.
@@ -134,3 +114,4 @@ target("legacy-script-engine")
 
         plugin_packer.pack_plugin(target,plugin_define)
     end)
+