src: share common code paths for SEA and embedder script

Since SEA is very similar in principle to embedding functionality,
it makes sense to share code paths where possible. This commit does
so and addresses a `TODO` while doing so.

It also adds a utility to directly run CJS code to the embedder
startup callback, which comes in handy for this purpose.

Finally, this commit is breaking because it aligns the behavior
of `require()`ing internal modules; previously, embedders could
use the `require` function that they received to do so.
(If this is not considered breaking because accessing internals
is not covered by the API, then this would need ABI compatibility
patches for becoming fully non-breaking.)

PR-URL: https://github.com/nodejs/node/pull/46825
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
This commit is contained in:
Anna Henningsen 2023-03-02 15:31:08 +01:00 committed by GitHub
parent 7bd909b603
commit 3803b028dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 145 additions and 184 deletions

View File

@ -0,0 +1,18 @@
'use strict';
const {
prepareMainThreadExecution,
markBootstrapComplete,
} = require('internal/process/pre_execution');
const { isSea } = internalBinding('sea');
const { emitExperimentalWarning } = require('internal/util');
const { embedderRequire, embedderRunCjs } = require('internal/util/embedding');
const { getEmbedderEntryFunction } = internalBinding('mksnapshot');
prepareMainThreadExecution(false, true);
markBootstrapComplete();
if (isSea()) {
emitExperimentalWarning('Single executable application');
}
return getEmbedderEntryFunction()(embedderRequire, embedderRunCjs);

View File

@ -1,13 +0,0 @@
'use strict';
// This runs necessary preparations to prepare a complete Node.js context
// that depends on run time states.
// It is currently only intended for preparing contexts for embedders.
const {
prepareMainThreadExecution,
markBootstrapComplete
} = require('internal/process/pre_execution');
prepareMainThreadExecution();
markBootstrapComplete();

View File

@ -119,16 +119,25 @@ function main() {
const { const {
prepareMainThreadExecution prepareMainThreadExecution
} = require('internal/process/pre_execution'); } = require('internal/process/pre_execution');
const path = require('path');
let serializeMainFunction = getEmbedderEntryFunction(); let serializeMainFunction = getEmbedderEntryFunction();
const serializeMainArgs = [requireForUserSnapshot]; const serializeMainArgs = [requireForUserSnapshot];
if (serializeMainFunction) { // embedded case if (serializeMainFunction) { // embedded case
prepareMainThreadExecution(false, false); prepareMainThreadExecution(false, false);
// TODO(addaleax): Make this `embedderRunCjs` once require('module')
// is supported in snapshots.
const filename = process.execPath;
const dirname = path.dirname(filename);
function minimalRunCjs(source) {
const fn = compileSerializeMain(filename, source);
return fn(requireForUserSnapshot, filename, dirname);
}
serializeMainArgs.push(minimalRunCjs);
} else { } else {
prepareMainThreadExecution(true, false); prepareMainThreadExecution(true, false);
const file = process.argv[1]; const file = process.argv[1];
const path = require('path');
const filename = path.resolve(file); const filename = path.resolve(file);
const dirname = path.dirname(filename); const dirname = path.dirname(filename);
const source = readFileSync(file, 'utf-8'); const source = readFileSync(file, 'utf-8');

View File

@ -1,55 +0,0 @@
'use strict';
const {
prepareMainThreadExecution,
markBootstrapComplete,
} = require('internal/process/pre_execution');
const { getSingleExecutableCode } = internalBinding('sea');
const { emitExperimentalWarning } = require('internal/util');
const { Module, wrapSafe } = require('internal/modules/cjs/loader');
const { codes: { ERR_UNKNOWN_BUILTIN_MODULE } } = require('internal/errors');
prepareMainThreadExecution(false, true);
markBootstrapComplete();
emitExperimentalWarning('Single executable application');
// This is roughly the same as:
//
// const mod = new Module(filename);
// mod._compile(contents, filename);
//
// but the code has been duplicated because currently there is no way to set the
// value of require.main to module.
//
// TODO(RaisinTen): Find a way to deduplicate this.
const filename = process.execPath;
const contents = getSingleExecutableCode();
const compiledWrapper = wrapSafe(filename, contents);
const customModule = new Module(filename, null);
customModule.filename = filename;
customModule.paths = Module._nodeModulePaths(customModule.path);
const customExports = customModule.exports;
function customRequire(path) {
if (!Module.isBuiltin(path)) {
throw new ERR_UNKNOWN_BUILTIN_MODULE(path);
}
return require(path);
}
customRequire.main = customModule;
const customFilename = customModule.filename;
const customDirname = customModule.path;
compiledWrapper(
customExports,
customRequire,
customModule,
customFilename,
customDirname);

View File

@ -0,0 +1,47 @@
'use strict';
const { codes: { ERR_UNKNOWN_BUILTIN_MODULE } } = require('internal/errors');
const { Module, wrapSafe } = require('internal/modules/cjs/loader');
// This is roughly the same as:
//
// const mod = new Module(filename);
// mod._compile(contents, filename);
//
// but the code has been duplicated because currently there is no way to set the
// value of require.main to module.
//
// TODO(RaisinTen): Find a way to deduplicate this.
function embedderRunCjs(contents) {
const filename = process.execPath;
const compiledWrapper = wrapSafe(filename, contents);
const customModule = new Module(filename, null);
customModule.filename = filename;
customModule.paths = Module._nodeModulePaths(customModule.path);
const customExports = customModule.exports;
embedderRequire.main = customModule;
const customFilename = customModule.filename;
const customDirname = customModule.path;
return compiledWrapper(
customExports,
embedderRequire,
customModule,
customFilename,
customDirname);
}
function embedderRequire(path) {
if (!Module.isBuiltin(path)) {
throw new ERR_UNKNOWN_BUILTIN_MODULE(path);
}
return require(path);
}
module.exports = { embedderRequire, embedderRunCjs };

View File

@ -528,17 +528,15 @@ MaybeLocal<Value> LoadEnvironment(
return StartExecution(env, cb); return StartExecution(env, cb);
} }
MaybeLocal<Value> LoadEnvironment( MaybeLocal<Value> LoadEnvironment(Environment* env,
Environment* env, std::string_view main_script_source_utf8) {
const char* main_script_source_utf8) { CHECK_NOT_NULL(main_script_source_utf8.data());
CHECK_NOT_NULL(main_script_source_utf8);
return LoadEnvironment( return LoadEnvironment(
env, [&](const StartExecutionCallbackInfo& info) -> MaybeLocal<Value> { env, [&](const StartExecutionCallbackInfo& info) -> MaybeLocal<Value> {
std::string name = "embedder_main_" + std::to_string(env->thread_id()); Local<Value> main_script =
env->builtin_loader()->Add(name.c_str(), main_script_source_utf8); ToV8Value(env->context(), main_script_source_utf8).ToLocalChecked();
Realm* realm = env->principal_realm(); return info.run_cjs->Call(
env->context(), Null(env->isolate()), 1, &main_script);
return realm->ExecuteBootstrapper(name.c_str());
}); });
} }

View File

@ -406,14 +406,12 @@ inline builtins::BuiltinLoader* Environment::builtin_loader() {
return &builtin_loader_; return &builtin_loader_;
} }
inline const StartExecutionCallback& inline const StartExecutionCallback& Environment::embedder_entry_point() const {
Environment::embedder_mksnapshot_entry_point() const { return embedder_entry_point_;
return embedder_mksnapshot_entry_point_;
} }
inline void Environment::set_embedder_mksnapshot_entry_point( inline void Environment::set_embedder_entry_point(StartExecutionCallback&& fn) {
StartExecutionCallback&& fn) { embedder_entry_point_ = std::move(fn);
embedder_mksnapshot_entry_point_ = std::move(fn);
} }
inline double Environment::new_async_id() { inline double Environment::new_async_id() {

View File

@ -948,8 +948,8 @@ class Environment : public MemoryRetainer {
#endif // HAVE_INSPECTOR #endif // HAVE_INSPECTOR
inline const StartExecutionCallback& embedder_mksnapshot_entry_point() const; inline const StartExecutionCallback& embedder_entry_point() const;
inline void set_embedder_mksnapshot_entry_point(StartExecutionCallback&& fn); inline void set_embedder_entry_point(StartExecutionCallback&& fn);
inline void set_process_exit_handler( inline void set_process_exit_handler(
std::function<void(Environment*, ExitCode)>&& handler); std::function<void(Environment*, ExitCode)>&& handler);
@ -1133,7 +1133,7 @@ class Environment : public MemoryRetainer {
std::unique_ptr<Realm> principal_realm_ = nullptr; std::unique_ptr<Realm> principal_realm_ = nullptr;
builtins::BuiltinLoader builtin_loader_; builtins::BuiltinLoader builtin_loader_;
StartExecutionCallback embedder_mksnapshot_entry_point_; StartExecutionCallback embedder_entry_point_;
// Used by allocate_managed_buffer() and release_managed_buffer() to keep // Used by allocate_managed_buffer() and release_managed_buffer() to keep
// track of the BackingStore for a given pointer. // track of the BackingStore for a given pointer.

View File

@ -277,22 +277,17 @@ MaybeLocal<Value> StartExecution(Environment* env, StartExecutionCallback cb) {
if (cb != nullptr) { if (cb != nullptr) {
EscapableHandleScope scope(env->isolate()); EscapableHandleScope scope(env->isolate());
// TODO(addaleax): pass the callback to the main script more directly,
// e.g. by making StartExecution(env, builtin) parametrizable
env->set_embedder_entry_point(std::move(cb));
auto reset_entry_point =
OnScopeLeave([&]() { env->set_embedder_entry_point({}); });
if (env->isolate_data()->options()->build_snapshot) { const char* entry = env->isolate_data()->options()->build_snapshot
// TODO(addaleax): pass the callback to the main script more directly, ? "internal/main/mksnapshot"
// e.g. by making StartExecution(env, builtin) parametrizable : "internal/main/embedding";
env->set_embedder_mksnapshot_entry_point(std::move(cb));
auto reset_entry_point =
OnScopeLeave([&]() { env->set_embedder_mksnapshot_entry_point({}); });
return StartExecution(env, "internal/main/mksnapshot"); return scope.EscapeMaybe(StartExecution(env, entry));
}
if (StartExecution(env, "internal/main/environment").IsEmpty()) return {};
return scope.EscapeMaybe(cb({
env->process_object(),
env->builtin_module_require(),
}));
} }
// TODO(joyeecheung): move these conditions into JS land and let the // TODO(joyeecheung): move these conditions into JS land and let the
@ -312,18 +307,6 @@ MaybeLocal<Value> StartExecution(Environment* env, StartExecutionCallback cb) {
first_argv = env->argv()[1]; first_argv = env->argv()[1];
} }
#ifndef DISABLE_SINGLE_EXECUTABLE_APPLICATION
if (sea::IsSingleExecutable()) {
// TODO(addaleax): Find a way to reuse:
//
// LoadEnvironment(Environment*, const char*)
//
// instead and not add yet another main entry point here because this
// already duplicates existing code.
return StartExecution(env, "internal/main/single_executable_application");
}
#endif
if (first_argv == "inspect") { if (first_argv == "inspect") {
return StartExecution(env, "internal/main/inspect"); return StartExecution(env, "internal/main/inspect");
} }

View File

@ -682,6 +682,7 @@ NODE_EXTERN std::unique_ptr<InspectorParentHandle> GetInspectorParentHandle(
struct StartExecutionCallbackInfo { struct StartExecutionCallbackInfo {
v8::Local<v8::Object> process_object; v8::Local<v8::Object> process_object;
v8::Local<v8::Function> native_require; v8::Local<v8::Function> native_require;
v8::Local<v8::Function> run_cjs;
}; };
using StartExecutionCallback = using StartExecutionCallback =
@ -691,8 +692,7 @@ NODE_EXTERN v8::MaybeLocal<v8::Value> LoadEnvironment(
Environment* env, Environment* env,
StartExecutionCallback cb); StartExecutionCallback cb);
NODE_EXTERN v8::MaybeLocal<v8::Value> LoadEnvironment( NODE_EXTERN v8::MaybeLocal<v8::Value> LoadEnvironment(
Environment* env, Environment* env, std::string_view main_script_source_utf8);
const char* main_script_source_utf8);
NODE_EXTERN void FreeEnvironment(Environment* env); NODE_EXTERN void FreeEnvironment(Environment* env);
// Set a callback that is called when process.exit() is called from JS, // Set a callback that is called when process.exit() is called from JS,

View File

@ -185,17 +185,14 @@ static std::string OnDiskFileName(const char* id) {
MaybeLocal<String> BuiltinLoader::LoadBuiltinSource(Isolate* isolate, MaybeLocal<String> BuiltinLoader::LoadBuiltinSource(Isolate* isolate,
const char* id) const { const char* id) const {
auto source = source_.read(); auto source = source_.read();
#ifdef NODE_BUILTIN_MODULES_PATH #ifndef NODE_BUILTIN_MODULES_PATH
if (strncmp(id, "embedder_main_", strlen("embedder_main_")) == 0) { const auto source_it = source->find(id);
#endif // NODE_BUILTIN_MODULES_PATH if (UNLIKELY(source_it == source->end())) {
const auto source_it = source->find(id); fprintf(stderr, "Cannot find native builtin: \"%s\".\n", id);
if (UNLIKELY(source_it == source->end())) { ABORT();
fprintf(stderr, "Cannot find native builtin: \"%s\".\n", id);
ABORT();
}
return source_it->second.ToStringChecked(isolate);
#ifdef NODE_BUILTIN_MODULES_PATH
} }
return source_it->second.ToStringChecked(isolate);
#else // !NODE_BUILTIN_MODULES_PATH
std::string filename = OnDiskFileName(id); std::string filename = OnDiskFileName(id);
std::string contents; std::string contents;
@ -395,12 +392,6 @@ MaybeLocal<Function> BuiltinLoader::LookupAndCompile(Local<Context> context,
FIXED_ONE_BYTE_STRING(isolate, "internalBinding"), FIXED_ONE_BYTE_STRING(isolate, "internalBinding"),
FIXED_ONE_BYTE_STRING(isolate, "primordials"), FIXED_ONE_BYTE_STRING(isolate, "primordials"),
}; };
} else if (strncmp(id, "embedder_main_", strlen("embedder_main_")) == 0) {
// Synthetic embedder main scripts from LoadEnvironment(): process, require
parameters = {
FIXED_ONE_BYTE_STRING(isolate, "process"),
FIXED_ONE_BYTE_STRING(isolate, "require"),
};
} else { } else {
// others: exports, require, module, process, internalBinding, primordials // others: exports, require, module, process, internalBinding, primordials
parameters = { parameters = {
@ -457,12 +448,6 @@ MaybeLocal<Value> BuiltinLoader::CompileAndCall(Local<Context> context,
realm->builtin_module_require(), realm->builtin_module_require(),
realm->internal_binding_loader(), realm->internal_binding_loader(),
realm->primordials()}; realm->primordials()};
} else if (strncmp(id, "embedder_main_", strlen("embedder_main_")) == 0) {
// Synthetic embedder main scripts from LoadEnvironment(): process, require
arguments = {
realm->process_object(),
realm->builtin_module_require(),
};
} else { } else {
// This should be invoked with the other CompileAndCall() methods, as // This should be invoked with the other CompileAndCall() methods, as
// we are unable to generate the arguments. // we are unable to generate the arguments.

View File

@ -9,6 +9,7 @@
#include "node_internals.h" #include "node_internals.h"
#include "node_options-inl.h" #include "node_options-inl.h"
#include "node_realm.h" #include "node_realm.h"
#include "node_sea.h"
#include "node_snapshot_builder.h" #include "node_snapshot_builder.h"
#include "node_snapshotable.h" #include "node_snapshotable.h"
#include "node_v8_platform-inl.h" #include "node_v8_platform-inl.h"
@ -86,7 +87,16 @@ ExitCode NodeMainInstance::Run() {
void NodeMainInstance::Run(ExitCode* exit_code, Environment* env) { void NodeMainInstance::Run(ExitCode* exit_code, Environment* env) {
if (*exit_code == ExitCode::kNoFailure) { if (*exit_code == ExitCode::kNoFailure) {
LoadEnvironment(env, StartExecutionCallback{}); bool is_sea = false;
#ifndef DISABLE_SINGLE_EXECUTABLE_APPLICATION
if (sea::IsSingleExecutable()) {
is_sea = true;
LoadEnvironment(env, sea::FindSingleExecutableCode());
}
#endif
if (!is_sea) {
LoadEnvironment(env, StartExecutionCallback{});
}
*exit_code = *exit_code =
SpinEventLoopInternal(env).FromMaybe(ExitCode::kGenericUserError); SpinEventLoopInternal(env).FromMaybe(ExitCode::kGenericUserError);

View File

@ -4,8 +4,6 @@
#include "node_external_reference.h" #include "node_external_reference.h"
#include "node_internals.h" #include "node_internals.h"
#include "node_union_bytes.h" #include "node_union_bytes.h"
#include "simdutf.h"
#include "v8.h"
// The POSTJECT_SENTINEL_FUSE macro is a string of random characters selected by // The POSTJECT_SENTINEL_FUSE macro is a string of random characters selected by
// the Node.js project that is present only once in the entire binary. It is // the Node.js project that is present only once in the entire binary. It is
@ -19,7 +17,6 @@
#include <memory> #include <memory>
#include <string_view> #include <string_view>
#include <tuple> #include <tuple>
#include <vector>
#if !defined(DISABLE_SINGLE_EXECUTABLE_APPLICATION) #if !defined(DISABLE_SINGLE_EXECUTABLE_APPLICATION)
@ -29,9 +26,11 @@ using v8::Local;
using v8::Object; using v8::Object;
using v8::Value; using v8::Value;
namespace { namespace node {
namespace sea {
const std::string_view FindSingleExecutableCode() { std::string_view FindSingleExecutableCode() {
CHECK(IsSingleExecutable());
static const std::string_view sea_code = []() -> std::string_view { static const std::string_view sea_code = []() -> std::string_view {
size_t size; size_t size;
#ifdef __APPLE__ #ifdef __APPLE__
@ -49,44 +48,14 @@ const std::string_view FindSingleExecutableCode() {
return sea_code; return sea_code;
} }
void GetSingleExecutableCode(const FunctionCallbackInfo<Value>& args) {
node::Environment* env = node::Environment::GetCurrent(args);
static const std::string_view sea_code = FindSingleExecutableCode();
if (sea_code.empty()) {
return;
}
// TODO(joyeecheung): Use one-byte strings for ASCII-only source to save
// memory/binary size - using UTF16 by default results in twice of the size
// than necessary.
static const node::UnionBytes sea_code_union_bytes =
[]() -> node::UnionBytes {
size_t expected_u16_length =
simdutf::utf16_length_from_utf8(sea_code.data(), sea_code.size());
auto out = std::make_shared<std::vector<uint16_t>>(expected_u16_length);
size_t u16_length = simdutf::convert_utf8_to_utf16(
sea_code.data(),
sea_code.size(),
reinterpret_cast<char16_t*>(out->data()));
out->resize(u16_length);
return node::UnionBytes{out};
}();
args.GetReturnValue().Set(
sea_code_union_bytes.ToStringChecked(env->isolate()));
}
} // namespace
namespace node {
namespace sea {
bool IsSingleExecutable() { bool IsSingleExecutable() {
return postject_has_resource(); return postject_has_resource();
} }
void IsSingleExecutable(const FunctionCallbackInfo<Value>& args) {
args.GetReturnValue().Set(IsSingleExecutable());
}
std::tuple<int, char**> FixupArgsForSEA(int argc, char** argv) { std::tuple<int, char**> FixupArgsForSEA(int argc, char** argv) {
// Repeats argv[0] at position 1 on argv as a replacement for the missing // Repeats argv[0] at position 1 on argv as a replacement for the missing
// entry point file path. // entry point file path.
@ -113,12 +82,11 @@ void Initialize(Local<Object> target,
Local<Value> unused, Local<Value> unused,
Local<Context> context, Local<Context> context,
void* priv) { void* priv) {
SetMethod( SetMethod(context, target, "isSea", IsSingleExecutable);
context, target, "getSingleExecutableCode", GetSingleExecutableCode);
} }
void RegisterExternalReferences(ExternalReferenceRegistry* registry) { void RegisterExternalReferences(ExternalReferenceRegistry* registry) {
registry->Register(GetSingleExecutableCode); registry->Register(IsSingleExecutable);
} }
} // namespace sea } // namespace sea

View File

@ -5,12 +5,14 @@
#if !defined(DISABLE_SINGLE_EXECUTABLE_APPLICATION) #if !defined(DISABLE_SINGLE_EXECUTABLE_APPLICATION)
#include <string_view>
#include <tuple> #include <tuple>
namespace node { namespace node {
namespace sea { namespace sea {
bool IsSingleExecutable(); bool IsSingleExecutable();
std::string_view FindSingleExecutableCode();
std::tuple<int, char**> FixupArgsForSEA(int argc, char** argv); std::tuple<int, char**> FixupArgsForSEA(int argc, char** argv);
} // namespace sea } // namespace sea

View File

@ -1444,19 +1444,25 @@ void SerializeSnapshotableObjects(Realm* realm,
namespace mksnapshot { namespace mksnapshot {
// NB: This is also used by the regular embedding codepath.
void GetEmbedderEntryFunction(const FunctionCallbackInfo<Value>& args) { void GetEmbedderEntryFunction(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args); Environment* env = Environment::GetCurrent(args);
Isolate* isolate = env->isolate(); Isolate* isolate = env->isolate();
if (!env->embedder_mksnapshot_entry_point()) return; if (!env->embedder_entry_point()) return;
MaybeLocal<Function> jsfn = MaybeLocal<Function> jsfn =
Function::New(isolate->GetCurrentContext(), Function::New(isolate->GetCurrentContext(),
[](const FunctionCallbackInfo<Value>& args) { [](const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args); Environment* env = Environment::GetCurrent(args);
Local<Value> require_fn = args[0]; Local<Value> require_fn = args[0];
Local<Value> runcjs_fn = args[1];
CHECK(require_fn->IsFunction()); CHECK(require_fn->IsFunction());
CHECK(env->embedder_mksnapshot_entry_point()); CHECK(runcjs_fn->IsFunction());
env->embedder_mksnapshot_entry_point()( MaybeLocal<Value> retval = env->embedder_entry_point()(
{env->process_object(), require_fn.As<Function>()}); {env->process_object(),
require_fn.As<Function>(),
runcjs_fn.As<Function>()});
if (!retval.IsEmpty())
args.GetReturnValue().Set(retval.ToLocalChecked());
}); });
if (!jsfn.IsEmpty()) args.GetReturnValue().Set(jsfn.ToLocalChecked()); if (!jsfn.IsEmpty()) args.GetReturnValue().Set(jsfn.ToLocalChecked());
} }

View File

@ -40,6 +40,11 @@ assert.strictEqual(
child_process.spawnSync(binary, ['throw new Error()']).status, child_process.spawnSync(binary, ['throw new Error()']).status,
1); 1);
// Cannot require internals anymore:
assert.strictEqual(
child_process.spawnSync(binary, ['require("lib/internal/test/binding")']).status,
1);
assert.strictEqual( assert.strictEqual(
child_process.spawnSync(binary, ['process.exitCode = 8']).status, child_process.spawnSync(binary, ['process.exitCode = 8']).status,
8); 8);