mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-11 11:29:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support timeouts in SourceTextModule evaluation

Browse Source
This commit is contained in:
Kai Tamkun
2025-05-08 19:38:49 -07:00
parent 68866ab5c6
commit 1b0733661e
4 changed files with 78 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/bun.js/bindings/NodeVMSourceTextModule.cpp
View File

@@ -5,6 +5,7 @@
#include "JSModuleRecord.h"
#include "ModuleAnalyzer.h"
#include "Parser.h"
#include "Watchdog.h"
#include "../vm/SigintWatcher.h"
@@ -250,15 +251,17 @@ JSValue NodeVMSourceTextModule::evaluate(JSGlobalObject* globalObject, uint32_t
result = record->evaluate(globalObject, jsUndefined(), jsNumber(static_cast<int32_t>(JSGenerator::ResumeMode::NormalMode)));
};
if (timeout != 0 && breakOnSigint) {
// TODO(@heimskr): timeout support
auto holder = SigintWatcher::hold(nodeVmGlobalObject);
run();
} else if (timeout != 0) {
// TODO(@heimskr): timeout support
run();
} else if (breakOnSigint) {
auto holder = SigintWatcher::hold(nodeVmGlobalObject);
m_terminatedWithSigint = false;
if (timeout != 0) {
JSC::JSLockHolder locker(vm);
JSC::Watchdog& dog = vm.ensureWatchdog();
dog.enteredVM();
dog.setTimeLimit(WTF::Seconds::fromMilliseconds(timeout));
}
if (breakOnSigint) {
auto holder = SigintWatcher::hold(nodeVmGlobalObject, this);
run();
} else {
run();
@@ -268,15 +271,26 @@ JSValue NodeVMSourceTextModule::evaluate(JSGlobalObject* globalObject, uint32_t
scope.clearException();
vm.clearHasTerminationRequest();
status(Status::Errored);
throwError(globalObject, scope, ErrorCode::ERR_SCRIPT_EXECUTION_INTERRUPTED, "Script execution was interrupted by `SIGINT`"_s);
if (m_terminatedWithSigint) {
m_terminatedWithSigint = false;
throwError(globalObject, scope, ErrorCode::ERR_SCRIPT_EXECUTION_INTERRUPTED, "Script execution was interrupted by `SIGINT`"_s);
} else {
throwError(globalObject, scope, ErrorCode::ERR_SCRIPT_EXECUTION_TIMEOUT, makeString("Script execution timed out after "_s, timeout, "ms"_s));
}
return {};
}
m_terminatedWithSigint = false;
RETURN_IF_EXCEPTION(scope, (status(Status::Errored), JSValue {}));
status(Status::Evaluated);
return result;
}
void NodeVMSourceTextModule::sigintReceived()
{
m_terminatedWithSigint = true;
}
JSObject* NodeVMSourceTextModule::createPrototype(VM& vm, JSGlobalObject* globalObject)
{
return NodeVMModulePrototype::create(vm, NodeVMModulePrototype::createStructure(vm, globalObject, globalObject->objectPrototype()));