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

refactor: clean up Node.js cli arg parsing (#39465)

Browse source 
* refactor: clean up Node.js arg parsing

* chore: feedback from review
This commit is contained in:
Shelley Vohr 2023-08-15 20:49:21 +02:00 • committed by GitHub
parent 1d20ec5b99
commit 22429e2112
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

23
shell/common/node_bindings.cc
View file

@ -386,7 +386,7 @@ bool NodeBindings::IsInitialized() {
// Initialize Node.js cli options to pass to Node.js
// See https://nodejs.org/api/cli.html#cli_options
void NodeBindings::SetNodeCliFlags() {
std::vector<std::string> NodeBindings::ParseNodeCliFlags() {
const auto argv = base::CommandLine::ForCurrentProcess()->argv();
std::vector<std::string> args;
@ -403,9 +403,7 @@ void NodeBindings::SetNodeCliFlags() {
const auto& option = arg;
#endif
const auto stripped = base::StringPiece(option).substr(0, option.find('='));
// Only allow in no-op (--) option or a small set of debug
// and trace related options.
// Only allow no-op or a small set of debug/trace related options.
if (IsAllowedOption(stripped) || stripped == "--")
args.push_back(option);
}
@ -417,16 +415,7 @@ void NodeBindings::SetNodeCliFlags() {
args.push_back("--no-experimental-fetch");
}
std::vector<std::string> errors;
const int exit_code = ProcessGlobalArgs(&args, nullptr, &errors,
node::kDisallowedInEnvironment);
const std::string err_str = "Error parsing Node.js cli flags ";
if (exit_code != 0) {
LOG(ERROR) << err_str;
} else if (!errors.empty()) {
LOG(ERROR) << err_str << base::JoinString(errors, " ");
}
return args;
}
void NodeBindings::Initialize(v8::Local<v8::Context> context) {
@ -442,13 +431,11 @@ void NodeBindings::Initialize(v8::Local<v8::Context> context) {
// Explicitly register electron's builtin bindings.
RegisterBuiltinBindings();
// Parse and set Node.js cli flags.
SetNodeCliFlags();
auto env = base::Environment::Create();
SetNodeOptions(env.get());
std::vector<std::string> argv = {"electron"};
// Parse and set Node.js cli flags.
std::vector<std::string> argv = ParseNodeCliFlags();
std::vector<std::string> exec_argv;
std::vector<std::string> errors;
uint64_t process_flags = node::ProcessFlags::kNoFlags;

2
shell/common/node_bindings.h
View file

@ -92,7 +92,7 @@ class NodeBindings {
// Setup V8, libuv.
void Initialize(v8::Local<v8::Context> context);
void SetNodeCliFlags();
std::vector<std::string> ParseNodeCliFlags();
// Create the environment and load node.js.
node::Environment* CreateEnvironment(v8::Handle<v8::Context> context,