src: make sure pass the cli_options to worker

theanarkh · theanarkh · commit eda633cc3b3a · 2024-05-04T14:39:37.000+08:00
diff --git a/src/node_worker.cc b/src/node_worker.cc
@@ -534,7 +534,9 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {
   }
 
   if (args[1]->IsObject() || args[2]->IsArray()) {
-    per_isolate_opts.reset(new PerIsolateOptions());
+    Mutex::ScopedLock lock(per_process::cli_options_mutex);
+    per_isolate_opts.reset(
+        new PerIsolateOptions(*per_process::cli_options->per_isolate));
 
     HandleEnvOptions(per_isolate_opts->per_env, [&env_vars](const char* name) {
       return env_vars->Get(name).FromMaybe("");
diff --git a/test/parallel/test-worker-cli-options.js b/test/parallel/test-worker-cli-options.js
@@ -0,0 +1,12 @@
+// Flags: --expose-internals
+'use strict';
+require('../common');
+const { Worker, isMainThread } = require('worker_threads');
+
+// Test if the flags is passed to worker threads
+// See https://github.com/nodejs/node/issues/52825
+new Worker(`
+    // If the --expose-internals flag does not pass to worker
+    // require function will throw an error
+    require('internal/options');
+`, { eval: true, env: process.env });

Original file line number	Diff line number	Diff line change
`@@ -534,7 +534,9 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {`
`534`	`534`	`}`
`535`	`535`
`536`	`536`	`if (args[1]->IsObject() \|\| args[2]->IsArray()) {`
`537`		`- per_isolate_opts.reset(new PerIsolateOptions());`
	`537`	`+ Mutex::ScopedLock lock(per_process::cli_options_mutex);`
	`538`	`+ per_isolate_opts.reset(`
	`539`	`+ new PerIsolateOptions(*per_process::cli_options->per_isolate));`
`538`	`540`
`539`	`541`	`HandleEnvOptions(per_isolate_opts->per_env, [&env_vars](const char* name) {`
`540`	`542`	`return env_vars->Get(name).FromMaybe("");`