Skip to content

bake: check for exceptions in the production build's module loader hooks and helpers #41185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
robobun wants to merge 6 commits into
base: main
Choose a base branch
from
Open

bake: check for exceptions in the production build's module loader hooks and helpers #41185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2eb727a
bake: check for exceptions in the production build's module loader ho…
robobun Sep 2, 2026
33d83ce
bake: throw instead of dereferencing a missing module registry entry
robobun Sep 2, 2026
cf24047
bake: shorten the contract comments on the production build helpers
robobun Sep 2, 2026
f34330b
bake: copy the namespace property key before interning it
robobun Sep 2, 2026
5e2dc54
bake: assert the full build output in the exception check tests
robobun Sep 2, 2026
c2073b9
ci: retrigger
robobun Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 10 additions & 21 deletions src/runtime/bake/BakeGlobalObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,37 +22,28 @@ bakeModuleLoaderImportModule(JSC::JSGlobalObject* global,
bool deferred)
{
UNUSED_PARAM(deferred);
auto& vm = JSC::getVM(global);
auto scope = DECLARE_THROW_SCOPE(vm);

WTF::String keyString = moduleNameValue->getString(global);
RETURN_IF_EXCEPTION(scope, nullptr);
if (keyString.startsWith("bake:/"_s)) {
auto& vm = JSC::getVM(global);
return JSC::importModule(global, JSC::Identifier::fromString(vm, keyString),
JSC::Identifier(), WTF::move(parameters), nullptr);
RELEASE_AND_RETURN(scope, JSC::importModule(global, JSC::Identifier::fromString(vm, keyString), JSC::Identifier(), WTF::move(parameters), nullptr));
}

if (!sourceOrigin.isNull() && sourceOrigin.string().startsWith("bake:/"_s)) {
auto& vm = JSC::getVM(global);
auto scope = DECLARE_THROW_SCOPE(vm);

WTF::String refererString = sourceOrigin.string();
WTF::String keyString = moduleNameValue->getString(global);

if (!keyString) {
auto promise = JSC::JSPromise::create(vm, global->promiseStructure());
promise->reject(vm, JSC::createError(global, "import() requires a string"_s));
return promise;
}

BunString refererBunString = Bun::toString(refererString);
BunString keyBunString = Bun::toString(keyString);
BunString result = BakeProdResolve(global, &refererBunString, &keyBunString);
RETURN_IF_EXCEPTION(scope, nullptr);

return JSC::importModule(global, JSC::Identifier::fromString(vm, result.transferToWTFString()),
JSC::Identifier(), WTF::move(parameters), nullptr);
RELEASE_AND_RETURN(scope, JSC::importModule(global, JSC::Identifier::fromString(vm, result.transferToWTFString()), JSC::Identifier(), WTF::move(parameters), nullptr));
}

// TODO: make static cast instead of jscast
return uncheckedDowncast<Zig::GlobalObject>(global)->moduleLoaderImportModule(global, moduleLoader, moduleNameValue, WTF::move(parameters), sourceOrigin, false);
RELEASE_AND_RETURN(scope, uncheckedDowncast<Zig::GlobalObject>(global)->moduleLoaderImportModule(global, moduleLoader, moduleNameValue, WTF::move(parameters), sourceOrigin, false));
}

JSC::Identifier bakeModuleLoaderResolve(JSC::JSGlobalObject* jsGlobal,
Expand Down Expand Up @@ -95,7 +86,7 @@ JSC::Identifier bakeModuleLoaderResolve(JSC::JSGlobalObject* jsGlobal,
}
}

return Zig::GlobalObject::moduleLoaderResolve(jsGlobal, loader, key, referrer, WTF::move(origin), useImportMap);
RELEASE_AND_RETURN(scope, Zig::GlobalObject::moduleLoaderResolve(jsGlobal, loader, key, referrer, WTF::move(origin), useImportMap));
}

static JSC::JSPromise* rejectedInternalPromise(JSC::JSGlobalObject* globalObject, JSC::JSValue value)
Expand Down Expand Up @@ -172,14 +163,12 @@ JSC::JSPromise* bakeModuleLoaderFetch(JSC::JSGlobalObject* globalObject,
#endif
JSString* bakePrefixRemovedString = jsNontrivialString(vm, bakePrefixRemoved);
JSValue bakePrefixRemovedJsvalue = bakePrefixRemovedString;
return Zig::GlobalObject::moduleLoaderFetch(globalObject, loader, bakePrefixRemovedJsvalue, referrer, WTF::move(parameters), WTF::move(script));
RELEASE_AND_RETURN(scope, Zig::GlobalObject::moduleLoaderFetch(globalObject, loader, bakePrefixRemovedJsvalue, referrer, WTF::move(parameters), WTF::move(script)));
}
return rejectedInternalPromise(globalObject, createTypeError(globalObject, "BakeGlobalObject does not have per-thread data configured"_s));
}

auto result = Zig::GlobalObject::moduleLoaderFetch(globalObject, loader, key, referrer, WTF::move(parameters), WTF::move(script));
RETURN_IF_EXCEPTION(scope, rejectedInternalPromise(globalObject, scope.exception()->value()));
return result;
RELEASE_AND_RETURN(scope, Zig::GlobalObject::moduleLoaderFetch(globalObject, loader, key, referrer, WTF::move(parameters), WTF::move(script)));
}

GlobalObject* GlobalObject::create(JSC::VM& vm, JSC::Structure* structure,
Expand Down
88 changes: 68 additions & 20 deletions src/runtime/bake/BakeSourceProvider.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include "BakeGlobalObject.h"
#include "JavaScriptCore/CallData.h"
#include "JavaScriptCore/Completion.h"
#include "JavaScriptCore/Error.h"
#include "JavaScriptCore/Identifier.h"
#include "JavaScriptCore/JSCJSValue.h"
#include "JavaScriptCore/JSCast.h"
Expand All @@ -15,6 +16,7 @@
#include "JavaScriptCore/JSString.h"
#include "JavaScriptCore/JSModuleNamespaceObject.h"
#include "ImportMetaObject.h"
#include <wtf/text/MakeString.h>

namespace Bake {

Expand All @@ -24,6 +26,8 @@ extern "C" BunString BakeSourceProvider__getSourceSlice(SourceProvider* provider
return Bun::toStringView(provider->source());
}

// Rust calls the EncodedJSValue entry points below through `from_js_host_call`: empty return <=> exception pending.

extern "C" JSC::EncodedJSValue BakeLoadInitialServerCode(JSC::JSGlobalObject* global, BunString source, bool separateSSRGraph) {
auto& vm = JSC::getVM(global);
auto scope = DECLARE_THROW_SCOPE(vm);
Expand Down Expand Up @@ -51,11 +55,24 @@ extern "C" JSC::EncodedJSValue BakeLoadInitialServerCode(JSC::JSGlobalObject* gl
args.append(JSC::jsBoolean(separateSSRGraph)); // separateSSRGraph
args.append(Zig::ImportMetaObject::create(global, "bake://server-runtime.js"_s)); // importMeta

RELEASE_AND_RETURN(scope, JSC::JSValue::encode(JSC::profiledCall(global, JSC::ProfilingReason::API, fn, callData, JSC::jsUndefined(), args)));
// `JSC::call` returns undefined (not empty) when the callee throws.
JSC::JSValue result = JSC::profiledCall(global, JSC::ProfilingReason::API, fn, callData, JSC::jsUndefined(), args);
RETURN_IF_EXCEPTION(scope, {});
return JSC::JSValue::encode(result);
}

extern "C" JSC::JSPromise* BakeLoadModuleByKey(GlobalObject* global, JSC::JSString* key) {
return JSC::loadAndEvaluateModule(global, key->getString(global), nullptr, nullptr);
extern "C" JSC::EncodedJSValue BakeLoadModuleByKey(JSC::JSGlobalObject* global, JSC::EncodedJSValue keyValue) {
auto& vm = JSC::getVM(global);
auto scope = DECLARE_THROW_SCOPE(vm);

JSC::JSString* key = uncheckedDowncast<JSC::JSString>(JSC::JSValue::decode(keyValue));
String keyString = key->getString(global);
RETURN_IF_EXCEPTION(scope, {});

JSC::JSPromise* promise = JSC::loadAndEvaluateModule(global, keyString, nullptr, nullptr);
RETURN_IF_EXCEPTION(scope, {});
ASSERT(promise);
return JSC::JSValue::encode(promise);
}

extern "C" JSC::EncodedJSValue BakeLoadServerHmrPatch(GlobalObject* global, BunString source) {
Expand Down Expand Up @@ -108,42 +125,73 @@ extern "C" JSC::EncodedJSValue BakeLoadServerHmrPatchWithSourceMap(GlobalObject*
return JSC::JSValue::encode(result);
}

extern "C" JSC::EncodedJSValue BakeGetModuleNamespace(
JSC::JSGlobalObject* global,
JSC::JSValue keyValue
) {
JSC::JSString* key = uncheckedDowncast<JSC::JSString>(keyValue);
// nullptr <=> exception pending.
static JSC::JSModuleNamespaceObject* getModuleNamespace(JSC::JSGlobalObject* global, JSC::JSValue keyValue) {
auto& vm = JSC::getVM(global);
auto keyIdent = JSC::Identifier::fromString(vm, key->value(global));
auto scope = DECLARE_THROW_SCOPE(vm);

JSC::JSString* key = uncheckedDowncast<JSC::JSString>(keyValue);
String keyString = key->getString(global);
RETURN_IF_EXCEPTION(scope, nullptr);

auto keyIdent = JSC::Identifier::fromString(vm, keyString);
auto* entry = global->moduleLoader()->registryEntry(keyIdent);
ASSERT(entry); // should have called BakeLoadServerCode and wait for that promise
auto* module = entry ? entry->record() : nullptr;
ASSERT(module);
if (!module) [[unlikely]] {
throwTypeError(global, scope, makeString("Module \""_s, keyString, "\" is not in the module registry"_s));
return nullptr;
}
JSC::JSModuleNamespaceObject* namespaceObject = global->moduleLoader()->getModuleNamespaceObject(global, module);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
RETURN_IF_EXCEPTION(scope, nullptr);
ASSERT(namespaceObject);
return JSC::JSValue::encode(namespaceObject);
return namespaceObject;
}

extern "C" JSC::EncodedJSValue BakeGetModuleNamespace(
JSC::JSGlobalObject* global,
JSC::EncodedJSValue keyValue
) {
return JSC::JSValue::encode(getModuleNamespace(global, JSC::JSValue::decode(keyValue)));
}

extern "C" JSC::EncodedJSValue BakeGetDefaultExportFromModule(
JSC::JSGlobalObject* global,
JSC::JSValue keyValue
JSC::EncodedJSValue keyValue
) {
auto& vm = JSC::getVM(global);
return JSC::JSValue::encode(uncheckedDowncast<JSC::JSModuleNamespaceObject>(JSC::JSValue::decode(BakeGetModuleNamespace(global, keyValue)))->get(global, vm.propertyNames->defaultKeyword));
auto scope = DECLARE_THROW_SCOPE(vm);

JSC::JSModuleNamespaceObject* namespaceObject = getModuleNamespace(global, JSC::JSValue::decode(keyValue));
RETURN_IF_EXCEPTION(scope, {});

JSC::JSValue defaultExport = namespaceObject->get(global, vm.propertyNames->defaultKeyword);
RETURN_IF_EXCEPTION(scope, {});
return JSC::JSValue::encode(defaultExport);
}

// There were issues when trying to use JSValue.get from zig
// `bun_core::ffi::FfiSlice<u8>`: a borrowed `&[u8]` passed by value.
struct BakeModuleNamespaceKey {
const unsigned char* ptr;
size_t len;
};

// `moduleNamespaceValue` must be a namespace object from BakeGetModuleNamespace.
extern "C" JSC::EncodedJSValue BakeGetOnModuleNamespace(
JSC::JSGlobalObject* global,
JSC::JSModuleNamespaceObject* moduleNamespace,
const unsigned char* key,
size_t keyLength
JSC::EncodedJSValue moduleNamespaceValue,
BakeModuleNamespaceKey key
) {
auto& vm = JSC::getVM(global);
const auto propertyString = String(StringImpl::createWithoutCopying({ key, keyLength }));
auto scope = DECLARE_THROW_SCOPE(vm);

auto* moduleNamespace = uncheckedDowncast<JSC::JSModuleNamespaceObject>(JSC::JSValue::decode(moduleNamespaceValue));
// Copy: Identifier::fromString atomizes the impl in place, and the key is only borrowed for this call.
const auto propertyString = String::fromUTF8(std::span { key.ptr, key.len });
const auto identifier = JSC::Identifier::fromString(vm, propertyString);
const auto property = JSC::PropertyName(identifier);
return JSC::JSValue::encode(moduleNamespace->get(global, property));
JSC::JSValue value = moduleNamespace->get(global, property);
RETURN_IF_EXCEPTION(scope, {});
return JSC::JSValue::encode(value);
}

} // namespace Bake
Loading
Loading