Skip to content

Commit

Permalink
fix: add missing destroy engine when load failed
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShrBox
ShrBox committed Jan 29, 2025
1 parent efb5b02 commit 63fc467
Showing 1 changed file with 40 additions and 31 deletions.
71 changes: 40 additions & 31 deletions src/lse/PluginManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ ll::Expected<> PluginManager::load(ll::mod::Manifest manifest) {
return ll::makeStringError("Plugin has already loaded");
}

auto& scriptEngine = *EngineManager::newEngine(manifest.name);
auto plugin = std::make_shared<Plugin>(manifest);
auto scriptEngine = EngineManager::newEngine(manifest.name);
auto plugin = std::make_shared<Plugin>(manifest);

try {
script::EngineScope engineScope(scriptEngine);
Expand All @@ -139,30 +139,30 @@ ll::Expected<> PluginManager::load(ll::mod::Manifest manifest) {
getEngineOwnData()->logger = ll::io::LoggerRegistry::getInstance().getOrCreate(manifest.name);

#ifdef LEGACY_SCRIPT_ENGINE_BACKEND_PYTHON
scriptEngine.eval("import sys as _llse_py_sys_module");
scriptEngine->eval("import sys as _llse_py_sys_module");
std::error_code ec;

// add plugin-own site-packages to sys.path
std::string pluginSitePackageFormatted = ll::string_utils::u8str2str(
std::filesystem::canonical(realPackageInstallDir.make_preferred(), ec).u8string()
);
if (!ec) {
scriptEngine.eval("_llse_py_sys_module.path.insert(0, r'" + pluginSitePackageFormatted + "')");
scriptEngine->eval("_llse_py_sys_module.path.insert(0, r'" + pluginSitePackageFormatted + "')");
}
// add plugin source dir to sys.path
std::string sourceDirFormatted =
ll::string_utils::u8str2str(std::filesystem::canonical(dirPath.make_preferred()).u8string());
scriptEngine.eval("_llse_py_sys_module.path.insert(0, r'" + sourceDirFormatted + "')");
scriptEngine->eval("_llse_py_sys_module.path.insert(0, r'" + sourceDirFormatted + "')");

// set __file__ and __name__
std::string entryPathFormatted = ll::string_utils::u8str2str(
std::filesystem::canonical(std::filesystem::path(entryPath).make_preferred()).u8string()
);
scriptEngine.set("__file__", entryPathFormatted);
scriptEngine->set("__file__", entryPathFormatted);
// engine->set("__name__", String::newString("__main__"));
#endif

BindAPIs(&scriptEngine);
BindAPIs(scriptEngine);

auto& self = LegacyScriptEngine::getInstance().getSelf();
#ifndef LEGACY_SCRIPT_ENGINE_BACKEND_NODEJS // NodeJs backend load depends code in another place
Expand All @@ -172,14 +172,14 @@ ll::Expected<> PluginManager::load(ll::mod::Manifest manifest) {
if (!baseLibContent) {
return ll::makeStringError("Failed to read BaseLib at {0}"_tr(baseLibPath.string()));
}
scriptEngine.eval(baseLibContent.value());
scriptEngine->eval(baseLibContent.value());
#endif
// Load the plugin entry.
auto entryPath = plugin->getModDir() / manifest.entry;
getEngineOwnData()->plugin = plugin;
#ifdef LEGACY_SCRIPT_ENGINE_BACKEND_PYTHON
if (!PythonHelper::loadPluginCode(
&scriptEngine,
scriptEngine,
ll::string_utils::u8str2str(entryPath.u8string()),
ll::string_utils::u8str2str(dirPath.u8string())
)) {
Expand All @@ -188,7 +188,7 @@ ll::Expected<> PluginManager::load(ll::mod::Manifest manifest) {
#endif
#ifdef LEGACY_SCRIPT_ENGINE_BACKEND_NODEJS
if (!NodeJsHelper::loadPluginCode(
&scriptEngine,
scriptEngine,
ll::string_utils::u8str2str(entryPath.u8string()),
ll::string_utils::u8str2str(dirPath.u8string())
)) {
Expand All @@ -198,46 +198,56 @@ ll::Expected<> PluginManager::load(ll::mod::Manifest manifest) {
#if (defined LEGACY_SCRIPT_ENGINE_BACKEND_QUICKJS) || (defined LEGACY_SCRIPT_ENGINE_BACKEND_LUA)
// Try loadFile
try {
scriptEngine.loadFile(entryPath.u8string());
scriptEngine->loadFile(entryPath.u8string());
} catch (const script::Exception&) {
// loadFile failed, try eval
auto pluginEntryContent = ll::file_utils::readFile(entryPath);
if (!pluginEntryContent) {
return ll::makeStringError("Failed to read plugin entry at {0}"_tr(entryPath.string()));
}
scriptEngine.eval(pluginEntryContent.value(), entryPath.u8string());
scriptEngine->eval(pluginEntryContent.value(), entryPath.u8string());
}
#endif
if (ll::getGamingStatus() == ll::GamingStatus::Running) { // Is hot load
LLSECallEventsOnHotLoad(&scriptEngine);
LLSECallEventsOnHotLoad(scriptEngine);
}
ExitEngineScope exit;
plugin->onLoad([](ll::mod::Mod&) { return true; });
plugin->onUnload([](ll::mod::Mod&) { return true; });

return plugin->onLoad().transform([&, this] { addMod(manifest.name, plugin); });
} catch (const Exception& e) {
EngineScope engineScope(scriptEngine);
auto error =
ll::makeStringError("Failed to load plugin {0}: {1}\n{2}"_tr(manifest.name, e.message(), e.stacktrace()));
ExitEngineScope exit;
LLSERemoveTimeTaskData(&scriptEngine);
LLSERemoveAllEventListeners(&scriptEngine);
LLSERemoveCmdRegister(&scriptEngine);
LLSERemoveCmdCallback(&scriptEngine);
LLSERemoveAllExportedFuncs(&scriptEngine);

scriptEngine.getData().reset();
if (scriptEngine) {
EngineScope engineScope(scriptEngine);
auto error = ll::makeStringError(
"Failed to load plugin {0}: {1}\n{2}"_tr(manifest.name, e.message(), e.stacktrace())
);
ExitEngineScope exit;

EngineManager::unregisterEngine(&scriptEngine);
#ifndef LEGACY_SCRIPT_ENGINE_BACKEND_NODEJS
LLSERemoveTimeTaskData(scriptEngine);
#endif
LLSERemoveAllEventListeners(scriptEngine);
LLSERemoveCmdRegister(scriptEngine);
LLSERemoveCmdCallback(scriptEngine);
LLSERemoveAllExportedFuncs(scriptEngine);

return error;
scriptEngine->getData().reset();
EngineManager::unregisterEngine(scriptEngine);
#ifdef LEGACY_SCRIPT_ENGINE_BACKEND_NODEJS
NodeJsHelper::stopEngine(scriptEngine);
#else
scriptEngine->destroy();
#endif
return error;
} else {
return ll::makeStringError("Failed to load plugin {0}: {1}"_tr(manifest.name, "ScriptEngine* is nullptr"));
}
}
}

ll::Expected<> PluginManager::unload(std::string_view name) {
try {
auto plugin = std::static_pointer_cast<Plugin>(getMod(name));
auto scriptEngine = EngineManager::getEngine(std::string(name));

#ifndef LEGACY_SCRIPT_ENGINE_BACKEND_NODEJS
Expand All @@ -249,8 +259,10 @@ ll::Expected<> PluginManager::unload(std::string_view name) {
LLSERemoveCmdCallback(scriptEngine);
LLSERemoveAllExportedFuncs(scriptEngine);

scriptEngine->getData().reset();
EngineManager::unregisterEngine(scriptEngine);
scriptEngine->getData().reset();

eraseMod(name);

ll::coro::keepThis([scriptEngine]() -> ll::coro::CoroTask<> {
using namespace ll::chrono_literals;
Expand All @@ -260,11 +272,8 @@ ll::Expected<> PluginManager::unload(std::string_view name) {
#else
scriptEngine->destroy(); // TODO: use unique_ptr to manage the engine.
#endif
co_return;
}).launch(ll::thread::ServerThreadExecutor::getDefault());

eraseMod(name);

return {};
} catch (const std::exception& e) {
return ll::makeStringError("Failed to unload plugin {0}: {1}"_tr(name, e.what()));
Expand Down

0 comments on commit 63fc467

Please sign in to comment.