mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
* chore: bump node in DEPS to v24.15.0 * fix(patch): adapt V8 sandboxed pointers for buffer kMaxLength Upstream replaced the hardcoded buffer length limit with a runtime kMaxLength variable, making the patch's regex workaround for sandbox vs non-sandbox limits unnecessary. Dropped the test-buffer-concat.js hunk. Ref: https://github.com/nodejs/node/pull/61721 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(patch): adapt deprecated GetIsolate for upstream refactors Upstream removed Uint32ToName from node_contextify.cc and node_webstorage.cc, and renamed LookupAndCompile to LookupAndCompileFunction in node_builtins.cc. Updated the GetIsolate deprecation patch to match. Ref: https://github.com/nodejs/node/pull/60846 Ref: https://github.com/nodejs/node/pull/60518 * chore: remove upstreamed patch The fix_generate_config_gypi_needs_to_generate_valid_json patch applied with "No changes -- Patch already applied", confirming the fix has been incorporated upstream. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * node#60518: src: build v8 tick processor as built-in source text modules Upstream restructured BuiltinLoader to auto-detect parameters by source type, removing the custom parameters overload. Added a new LookupAndCompileFunction overload for embedder scripts and updated node_util.cc to use it. Also suppressed exit-time-destructors warning from builtin_info.h in node_includes.h. Ref: https://github.com/nodejs/node/pull/60518 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(patch): add LookupAndCompileFunction overload for embedder scripts Ref: https://github.com/nodejs/node/pull/60518 * fix(patch): stop using v8::PropertyCallbackInfo<T>::This() in sqlite Ref: https://github.com/nodejs/node/issues/60616 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(patch): correct thenable snapshot for Chromium V8 The snapshot used `*` wildcards which don't match the actual output. Regenerated with NODE_REGENERATE_SNAPSHOTS=1 to capture the correct concrete frame + <node-internal-frames> output. Ref: https://chromium-review.googlesource.com/c/v8/v8/+/6826001 * fix(patch): GN build files for new merve dep Ref: https://github.com/nodejs/node/pull/61984 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(patch): adapt fileExists patch to resolve.js module reorg Ref: https://github.com/nodejs/node/pull/61769 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(patch): adapt new crypto tests for BoringSSL Guard aes-128-ccm test in test-crypto-authenticated.js behind cipher availability check. Skip Ed448/X448/DSA tests in test-crypto-key-objects-raw.js. Skip AES-KW tests in test-webcrypto-promise-prototype-pollution.mjs. Ref: https://github.com/nodejs/node/pull/62240 Ref: https://github.com/nodejs/node/pull/62455 * fix(patch): guard DH key test for BoringSSL BoringSSL does not support loading DH private keys from PEM, causing createPrivateKey to throw UNSUPPORTED_ALGORITHM. Ref: https://github.com/nodejs/node/pull/62240 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> * fix(patch): adapt cppgc_heap patch to upstream CppHeap handling Upstream Node moved CppHeap creation to run unconditionally before Isolate::Initialize via settings.cpp_heap. The patch's embedder-set params->cpp_heap was being overwritten by the new upstream default. Fold the patch into the upstream block so settings.cpp_heap still wins, an embedder-set params->cpp_heap is preserved, and a default is only created when neither is provided. Ref: https://github.com/nodejs/node/pull/58070 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: update patches (trivial only) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * fix(patch): normalize brotli decoder error codes for Chromium's brotli Electron uses Chromium's brotli (via the unbundling patch), which returns just the NAME from BrotliDecoderErrorString() instead of the full "_ERROR_..." prefix Node's bundled brotli emits. Upstream's web-compression spec-compliance fix (nodejs/node#62107) classifies brotli failures as TypeError via the "ERR__ERROR_" prefix, which doesn't match Chromium's output — so DecompressionStream surfaced a plain Error and the WPT decompression-bad-chunks suite failed for brotli. Normalize the emitted error code on the C++ side so the JS layer works against either brotli build. Ref: https://github.com/nodejs/node/pull/62107 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
200 lines
7.7 KiB
C++
200 lines
7.7 KiB
C++
// Copyright (c) 2019 GitHub, Inc.
|
|
// Use of this source code is governed by the MIT license that can be
|
|
// found in the LICENSE file.
|
|
|
|
#include "shell/common/node_util.h"
|
|
|
|
#include "base/compiler_specific.h"
|
|
#include "base/containers/to_value_list.h"
|
|
#include "base/json/json_writer.h"
|
|
#include "base/logging.h"
|
|
#include "base/memory/ptr_util.h"
|
|
#include "base/no_destructor.h"
|
|
#include "base/strings/strcat.h"
|
|
#include "base/strings/string_number_conversions.h"
|
|
#include "base/threading/thread_local.h"
|
|
#include "base/values.h"
|
|
#include "gin/converter.h"
|
|
#include "shell/browser/javascript_environment.h"
|
|
#include "shell/common/gin_converters/callback_converter.h"
|
|
#include "shell/common/node_includes.h"
|
|
#include "shell/common/process_util.h"
|
|
#include "third_party/electron_node/src/node_process-inl.h"
|
|
|
|
namespace electron::util {
|
|
|
|
v8::MaybeLocal<v8::Value> CompileAndCall(
|
|
v8::Isolate* const isolate,
|
|
v8::Local<v8::Context> context,
|
|
const char* id,
|
|
v8::LocalVector<v8::String>* parameters,
|
|
v8::LocalVector<v8::Value>* arguments) {
|
|
v8::TryCatch try_catch{isolate};
|
|
|
|
static base::NoDestructor<
|
|
base::ThreadLocalOwnedPointer<node::builtins::BuiltinLoader>>
|
|
builtin_loader;
|
|
if (!builtin_loader->Get()) {
|
|
builtin_loader->Set(base::WrapUnique(new node::builtins::BuiltinLoader));
|
|
}
|
|
v8::MaybeLocal<v8::Function> compiled =
|
|
builtin_loader->Get()->LookupAndCompileFunction(
|
|
context, id, parameters, node::Realm::GetCurrent(context));
|
|
|
|
if (compiled.IsEmpty()) {
|
|
// TODO(samuelmaddock): how can we get the compilation error message?
|
|
LOG(ERROR) << "CompileAndCall failed to compile electron script (" << id
|
|
<< ")";
|
|
return {};
|
|
}
|
|
|
|
v8::Local<v8::Function> fn = compiled.ToLocalChecked().As<v8::Function>();
|
|
v8::MaybeLocal<v8::Value> ret = fn->Call(
|
|
context, v8::Null(isolate), arguments->size(), arguments->data());
|
|
|
|
// This will only be caught when something has gone terrible wrong as all
|
|
// electron scripts are wrapped in a try {} catch {} by webpack
|
|
if (try_catch.HasCaught()) {
|
|
std::string msg = "no error message";
|
|
if (!try_catch.Message().IsEmpty()) {
|
|
gin::ConvertFromV8(isolate, try_catch.Message()->Get(), &msg);
|
|
} else if (try_catch.HasTerminated()) {
|
|
msg = "script execution has been terminated";
|
|
}
|
|
LOG(ERROR) << "CompileAndCall failed to evaluate electron script (" << id
|
|
<< "): " << msg;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
void EmitWarning(const std::string_view warning_msg,
|
|
const std::string_view warning_type) {
|
|
EmitWarning(JavascriptEnvironment::GetIsolate(), warning_msg, warning_type);
|
|
}
|
|
|
|
void EmitWarning(v8::Isolate* isolate,
|
|
const std::string_view warning_msg,
|
|
const std::string_view warning_type) {
|
|
node::Environment* env = node::Environment::GetCurrent(isolate);
|
|
if (!env) {
|
|
// No Node.js environment available, fall back to console logging.
|
|
LOG(WARNING) << "[" << warning_type << "] " << warning_msg;
|
|
return;
|
|
}
|
|
node::ProcessEmitWarningGeneric(env, warning_msg, warning_type);
|
|
}
|
|
|
|
void EmitDeprecationWarning(const std::string_view warning_msg,
|
|
const std::string_view deprecation_code) {
|
|
EmitDeprecationWarning(JavascriptEnvironment::GetIsolate(), warning_msg,
|
|
deprecation_code);
|
|
}
|
|
|
|
void EmitDeprecationWarning(v8::Isolate* isolate,
|
|
const std::string_view warning_msg,
|
|
const std::string_view deprecation_code) {
|
|
node::Environment* env = node::Environment::GetCurrent(isolate);
|
|
if (!env) {
|
|
// No Node.js environment available, fall back to console logging.
|
|
LOG(WARNING) << "[DeprecationWarning] " << warning_msg
|
|
<< " (code: " << deprecation_code << ")";
|
|
return;
|
|
}
|
|
node::ProcessEmitWarningGeneric(env, warning_msg, "DeprecationWarning",
|
|
deprecation_code);
|
|
}
|
|
|
|
node::Environment* CreateEnvironment(v8::Isolate* isolate,
|
|
node::IsolateData* isolate_data,
|
|
v8::Local<v8::Context> context,
|
|
const std::vector<std::string>& args,
|
|
const std::vector<std::string>& exec_args,
|
|
node::EnvironmentFlags::Flags env_flags,
|
|
std::string_view process_type) {
|
|
v8::TryCatch try_catch{isolate};
|
|
node::Environment* env = node::CreateEnvironment(isolate_data, context, args,
|
|
exec_args, env_flags);
|
|
if (auto message = try_catch.Message(); !message.IsEmpty()) {
|
|
base::DictValue dict;
|
|
|
|
if (std::string str; gin::ConvertFromV8(isolate, message->Get(), &str))
|
|
dict.Set("message", std::move(str));
|
|
|
|
if (std::string str; gin::ConvertFromV8(
|
|
isolate, message->GetScriptOrigin().ResourceName(), &str)) {
|
|
const auto line_num = message->GetLineNumber(context).FromJust();
|
|
const auto line_str = base::NumberToString(line_num);
|
|
dict.Set("location", base::StrCat({", at ", str, ":", line_str}));
|
|
}
|
|
|
|
if (std::string str; gin::ConvertFromV8(
|
|
isolate, message->GetSourceLine(context).ToLocalChecked(), &str))
|
|
dict.Set("source_line", std::move(str));
|
|
|
|
if (!std::empty(process_type))
|
|
dict.Set("process_type", process_type);
|
|
|
|
if (auto list = base::ToValueList(args); !std::empty(list))
|
|
dict.Set("args", std::move(list));
|
|
|
|
if (auto list = base::ToValueList(exec_args); !std::empty(list))
|
|
dict.Set("exec_args", std::move(list));
|
|
|
|
std::string errstr = "Failed to initialize Node.js.";
|
|
if (std::optional<std::string> jsonstr = base::WriteJsonWithOptions(
|
|
dict, base::JsonOptions::OPTIONS_PRETTY_PRINT))
|
|
errstr += base::StrCat({" ", *jsonstr});
|
|
|
|
LOG(ERROR) << errstr;
|
|
}
|
|
|
|
return env;
|
|
}
|
|
|
|
ExplicitMicrotasksScope::ExplicitMicrotasksScope(v8::MicrotaskQueue* queue)
|
|
: microtask_queue_(queue), original_policy_(queue->microtasks_policy()) {
|
|
// In browser-like processes, some nested run loops (macOS usually) may
|
|
// re-enter. This is safe because we expect the policy was explicit in the
|
|
// first place for those processes. However, in renderer processes, there may
|
|
// be unexpected behavior if this code is triggered within a pending microtask
|
|
// scope.
|
|
if (electron::IsBrowserProcess() || electron::IsUtilityProcess()) {
|
|
DCHECK_EQ(original_policy_, v8::MicrotasksPolicy::kExplicit);
|
|
} else {
|
|
DCHECK_EQ(microtask_queue_->GetMicrotasksScopeDepth(), 0);
|
|
}
|
|
|
|
microtask_queue_->set_microtasks_policy(v8::MicrotasksPolicy::kExplicit);
|
|
}
|
|
|
|
ExplicitMicrotasksScope::~ExplicitMicrotasksScope() {
|
|
microtask_queue_->set_microtasks_policy(original_policy_);
|
|
}
|
|
|
|
} // namespace electron::util
|
|
|
|
namespace electron::Buffer {
|
|
|
|
// SAFETY: There is no node::Buffer API that passes the UNSAFE_BUFFER_USAGE
|
|
// test, so let's isolate the unsafe API use into this function. Instead of
|
|
// calling `Buffer::Data()` and `Buffer::Length()` directly, the rest of our
|
|
// code should prefer to use spans returned by this function.
|
|
base::span<uint8_t> as_byte_span(v8::Local<v8::Value> node_buffer) {
|
|
auto* data = reinterpret_cast<uint8_t*>(node::Buffer::Data(node_buffer));
|
|
const auto size = node::Buffer::Length(node_buffer);
|
|
return UNSAFE_BUFFERS(base::span{data, size});
|
|
}
|
|
|
|
v8::MaybeLocal<v8::Object> Copy(v8::Isolate* isolate,
|
|
const base::span<const char> data) {
|
|
// SAFETY: span-friendly version of node::Buffer::Copy()
|
|
return UNSAFE_BUFFERS(node::Buffer::Copy(isolate, data.data(), data.size()));
|
|
}
|
|
|
|
v8::MaybeLocal<v8::Object> Copy(v8::Isolate* isolate,
|
|
const base::span<const uint8_t> data) {
|
|
return Copy(isolate, base::as_chars(data));
|
|
}
|
|
|
|
} // namespace electron::Buffer
|