mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-24 20:46:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't crash on compile error of hotloads

Browse Source 
Hotload functions aren't expected to throw an error. Instead return the
error to the function who is waiting for the module.
This commit is contained in:
phosit
2026-06-13 16:30:08 +02:00
parent db9f60b540
commit b0af0971e3
2 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/scriptinterface/ModuleLoader.cpp
+16 -8
View File
@@ -339,16 +339,24 @@ ModuleLoader::Future::Future(const Script::Request& rq, ModuleLoader& loader, Re
// - Accessing values which are not yet exported results in an error. These errors might implicitly be
// dropped.
JS::RootedObject mod{rq.cx, CompileModule(rq, loader.m_AllowModule, loader.m_Registry, modulePath,
result)};
JS::RootedObject promise{rq.cx, Evaluate(rq, mod)};
Evaluating& evaluatingStatus{std::get<Evaluating>(m_Status)};
evaluatingStatus.moduleNamespace = JS::GetModuleNamespace(rq.cx, mod);
try
{
JS::RootedObject mod{rq.cx, CompileModule(rq, loader.m_AllowModule, loader.m_Registry, modulePath,
result)};
JS::RootedObject promise{rq.cx, Evaluate(rq, mod)};
Evaluating& evaluatingStatus{std::get<Evaluating>(m_Status)};
evaluatingStatus.moduleNamespace = JS::GetModuleNamespace(rq.cx, mod);
SetReservedSlot(JS::PrivateValue(static_cast<void*>(&m_Status)));
SetReservedSlot(JS::PrivateValue(static_cast<void*>(&m_Status)));
if (!JS::AddPromiseReactions(rq.cx, promise, evaluatingStatus.fulfill, evaluatingStatus.reject))
throw std::runtime_error{"Failed adding promise reaction."};
if (!JS::AddPromiseReactions(rq.cx, promise, evaluatingStatus.fulfill, evaluatingStatus.reject))
throw std::runtime_error{"Failed adding promise reaction."};
}
catch(...)
{
if (std::holds_alternative<Evaluating>(m_Status))
m_Status = Rejected{std::current_exception()};
}
}
ModuleLoader::Future::Future(Future&& other) noexcept:
source/scriptinterface/tests/test_Module.h
+22 -16
View File
@@ -172,8 +172,9 @@ public:
const Script::Request rq{script};
TestLogger logger;
TS_ASSERT_THROWS(std::ignore = script.GetModuleLoader().LoadModule(rq,
"import_inside_function.js"), const std::invalid_argument&);
auto result = script.GetModuleLoader().LoadModule(rq, "import_inside_function.js");
auto& front = *result.begin();
TS_ASSERT_THROWS(std::ignore = front.Get(), const std::invalid_argument&);
const std::string log{logger.GetOutput()};
TS_ASSERT_STR_CONTAINS(log, "import_inside_function.js line 3");
TS_ASSERT_STR_CONTAINS(log, "import declarations may only appear at top level of a module");
@@ -185,8 +186,9 @@ public:
const Script::Request rq{script};
const TestLogger _;
TS_ASSERT_THROWS(std::ignore = script.GetModuleLoader().LoadModule(rq, "nonexistent.js"),
const std::runtime_error&);
auto result= script.GetModuleLoader().LoadModule(rq, "nonexistent.js");
auto& front = *result.begin();
TS_ASSERT_THROWS(std::ignore = front.Get(), const std::runtime_error&);
}
void test_EvaluateOnce()
@@ -407,10 +409,10 @@ public:
const Script::Request rq{script};
TestLogger logger;
TS_ASSERT_THROWS(std::ignore = script.GetModuleLoader().LoadModule(rq,
"export_default/invalid.js"), const std::invalid_argument&);
const std::string log{logger.GetOutput()};
TS_ASSERT_STR_CONTAINS(log, "export_default/invalid.js line 1");
auto result = script.GetModuleLoader().LoadModule(rq, "export_default/invalid.js");
auto& front = *result.begin();
TS_ASSERT_THROWS(std::ignore = front.Get(), const std::invalid_argument&);
TS_ASSERT_STR_CONTAINS(logger.GetOutput(), "export_default/invalid.js line 1");
}
void test_ExportDefaultDoesNotWorkAround()
@@ -720,8 +722,9 @@ public:
Script::Interface script{"Test", "Test", g_ScriptContext};
const Script::Request rq{script};
TS_ASSERT_THROWS_EQUALS(std::ignore = script.GetModuleLoader().LoadModule(rq,
"empty.js"), const std::runtime_error& e, e.what(),
auto result = script.GetModuleLoader().LoadModule(rq, "empty.js");
auto& front = *result.begin();
TS_ASSERT_THROWS_EQUALS(std::ignore = front.Get(), const std::runtime_error& e, e.what(),
"Importing file \"empty.js\" is disallowed.");
}
@@ -730,8 +733,9 @@ public:
Script::Interface script{"Test", "Test", g_ScriptContext, DisallowedfilePredicate};
const Script::Request rq{script};
TS_ASSERT_THROWS_EQUALS(std::ignore = script.GetModuleLoader().LoadModule(rq,
"restriction/disallowedfile.js"), const std::runtime_error& e, e.what(),
auto result = script.GetModuleLoader().LoadModule(rq, "restriction/disallowedfile.js");
auto& front = *result.begin();
TS_ASSERT_THROWS_EQUALS(std::ignore = front.Get(), const std::runtime_error& e, e.what(),
"Importing file \"restriction/disallowedfile.js\" is disallowed.");
}
@@ -740,8 +744,9 @@ public:
Script::Interface script{"Test", "Test", g_ScriptContext, DisallowedfilePredicate};
const Script::Request rq{script};
TestLogger logger;
TS_ASSERT_THROWS_EQUALS(std::ignore = script.GetModuleLoader().LoadModule(rq,
"restriction/import.js"), const std::invalid_argument& e, e.what(),
auto result = script.GetModuleLoader().LoadModule(rq, "restriction/import.js");
auto& front = *result.begin();
TS_ASSERT_THROWS_EQUALS(std::ignore = front.Get(), const std::invalid_argument& e, e.what(),
"Unable to link module.");
TS_ASSERT_STR_CONTAINS(logger.GetOutput(),
"Importing file \"restriction/disallowedfile.js\" is disallowed.");
@@ -752,8 +757,9 @@ public:
Script::Interface script{"Test", "Test", g_ScriptContext, DisallowedfilePredicate};
const Script::Request rq{script};
TestLogger logger;
TS_ASSERT_THROWS_EQUALS(std::ignore = script.GetModuleLoader().LoadModule(rq,
"restriction/fancy_import.js"), const std::invalid_argument& e, e.what(),
auto result = script.GetModuleLoader().LoadModule(rq, "restriction/fancy_import.js");
auto& front = *result.begin();
TS_ASSERT_THROWS_EQUALS(std::ignore = front.Get(), const std::invalid_argument& e, e.what(),
"Unable to link module.");
TS_ASSERT_STR_CONTAINS(logger.GetOutput(),
"Importing file \"restriction/disallowedfile.js\" is disallowed.");