mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

chore: error catching in node_bindings (#32858)

Browse source
This commit is contained in:
Shelley Vohr 2022-02-17 06:56:53 +01:00 • committed by GitHub
parent b1777c5ad1
commit 34129b83a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
shell/common/node_bindings.cc
View file

@ -462,8 +462,7 @@ node::Environment* NodeBindings::CreateEnvironment(
args.insert(args.begin() + 1, init_script); args.insert(args.begin() + 1, init_script);
isolate_data_ = isolate_data_ = node::CreateIsolateData(isolate, uv_loop_, platform);
node::CreateIsolateData(context->GetIsolate(), uv_loop_, platform);
node::Environment* env; node::Environment* env;
uint64_t flags = node::EnvironmentFlags::kDefaultFlags | uint64_t flags = node::EnvironmentFlags::kDefaultFlags |
@ -476,25 +475,25 @@ node::Environment* NodeBindings::CreateEnvironment(
// not to register its handler (overriding blinks) in non-browser processes. // not to register its handler (overriding blinks) in non-browser processes.
flags |= node::EnvironmentFlags::kNoRegisterESMLoader | flags |= node::EnvironmentFlags::kNoRegisterESMLoader |
node::EnvironmentFlags::kNoInitializeInspector; node::EnvironmentFlags::kNoInitializeInspector;
v8::TryCatch try_catch(context->GetIsolate()); }
env = node::CreateEnvironment(
isolate_data_, context, args, exec_args,
static_cast<node::EnvironmentFlags::Flags>(flags));
DCHECK(env);
// This will only be caught when something has gone terrible wrong as all v8::TryCatch try_catch(isolate);
// electron scripts are wrapped in a try {} catch {} by webpack
if (try_catch.HasCaught()) {
LOG(ERROR) << "Failed to initialize node environment in process: "
<< process_type;
}
} else {
env = node::CreateEnvironment( env = node::CreateEnvironment(
isolate_data_, context, args, exec_args, isolate_data_, context, args, exec_args,
static_cast<node::EnvironmentFlags::Flags>(flags)); static_cast<node::EnvironmentFlags::Flags>(flags));
DCHECK(env);
if (try_catch.HasCaught()) {
std::string err_msg =
"Failed to initialize node environment in process: " + process_type;
v8::Local<v8::Message> message = try_catch.Message();
std::string msg;
if (!message.IsEmpty() && gin::ConvertFromV8(isolate, message->Get(), &msg))
err_msg += " , with error: " + msg;
LOG(ERROR) << err_msg;
} }
DCHECK(env);
// Clean up the global _noBrowserGlobals that we unironically injected into // Clean up the global _noBrowserGlobals that we unironically injected into
// the global scope // the global scope
if (browser_env_ != BrowserEnvironment::kBrowser) { if (browser_env_ != BrowserEnvironment::kBrowser) {