1 files changed, 10 insertions, 5 deletions
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
index 6477c2d828..4817ec110a 100644
--- a/lib/internal/bootstrap/node.js
+++ b/lib/internal/bootstrap/node.js
@@ -24,6 +24,7 @@
                                 _shouldAbortOnUncaughtToggle },
                               { internalBinding, NativeModule }) {
   const exceptionHandlerState = { captureFn: null };
+  const isMainThread = internalBinding('worker').threadId === 0;
 
   function startup() {
     const EventEmitter = NativeModule.require('events');
@@ -100,7 +101,9 @@
       NativeModule.require('internal/inspector_async_hook').setup();
     }
 
-    _process.setupChannel();
+    if (isMainThread)
+      _process.setupChannel();
+
     _process.setupRawDebug(_rawDebug);
 
     const browserGlobals = !process._noBrowserGlobals;
@@ -175,8 +178,11 @@
     // are running from a script and running the REPL - but there are a few
     // others like the debugger or running --eval arguments. Here we decide
     // which mode we run in.
-
-    if (NativeModule.exists('_third_party_main')) {
+    if (internalBinding('worker').getEnvMessagePort() !== undefined) {
+      // This means we are in a Worker context, and any script execution
+      // will be directed by the worker module.
+      NativeModule.require('internal/worker').setupChild(evalScript);
+    } else if (NativeModule.exists('_third_party_main')) {
       // To allow people to extend Node in different ways, this hook allows
       // one to drop a file lib/_third_party_main.js into the build
       // directory which will be executed instead of Node's normal loading.
@@ -542,7 +548,7 @@
     return `process.binding('inspector').callAndPauseOnStart(${fn}, {})`;
   }
 
-  function evalScript(name) {
+  function evalScript(name, body = wrapForBreakOnFirstLine(process._eval)) {
     const CJSModule = NativeModule.require('internal/modules/cjs/loader');
     const path = NativeModule.require('path');
     const cwd = tryGetCwd(path);
@@ -550,7 +556,6 @@
     const module = new CJSModule(name);
     module.filename = path.join(cwd, name);
     module.paths = CJSModule._nodeModulePaths(cwd);
-    const body = wrapForBreakOnFirstLine(process._eval);
     const script = `global.__filename = ${JSON.stringify(name)};\n` +
                    'global.exports = exports;\n' +
                    'global.module = module;\n' +