From 971948749a5832e7aeb89f7e7ab74424767e60db Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 23 Apr 2021 13:53:54 -0700
Subject: [PATCH] debugger: fix race condition/deadlock on initialization
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/38161
Backport-PR-URL: https://github.com/nodejs/node/pull/38858
Refs: https://github.com/nodejs/node/discussions/36481
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Jan Krems <jan.krems@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Stephen Belanger <admin@stephenbelanger.com>
Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
---
 lib/internal/inspector/inspect_repl.js | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/lib/internal/inspector/inspect_repl.js b/lib/internal/inspector/inspect_repl.js
index 57a76b3b7f0dfb..32ee1c3f8c31ba 100644
--- a/lib/internal/inspector/inspect_repl.js
+++ b/lib/internal/inspector/inspect_repl.js
@@ -1062,19 +1062,16 @@ function createRepl(inspector) {
   }
 
   function initAfterStart() {
-    const setupTasks = [
-      Runtime.enable(),
-      Profiler.enable(),
-      Profiler.setSamplingInterval({ interval: 100 }),
-      Debugger.enable(),
-      Debugger.setPauseOnExceptions({ state: 'none' }),
-      Debugger.setAsyncCallStackDepth({ maxDepth: 0 }),
-      Debugger.setBlackboxPatterns({ patterns: [] }),
-      Debugger.setPauseOnExceptions({ state: pauseOnExceptionState }),
-      restoreBreakpoints(),
-      Runtime.runIfWaitingForDebugger(),
-    ];
-    return Promise.all(setupTasks);
+    return Runtime.enable()
+      .then(() => Profiler.enable())
+      .then(() => Profiler.setSamplingInterval({ interval: 100 }))
+      .then(() => Debugger.enable())
+      .then(() => Debugger.setPauseOnExceptions({ state: 'none' }))
+      .then(() => Debugger.setAsyncCallStackDepth({ maxDepth: 0 }))
+      .then(() => Debugger.setBlackboxPatterns({ patterns: [] }))
+      .then(() => Debugger.setPauseOnExceptions({ state: pauseOnExceptionState }))
+      .then(() => restoreBreakpoints())
+      .then(() => Runtime.runIfWaitingForDebugger())
   }
 
   return function startRepl() {