From 787cacc8695f681120f6b82551f9f045d5631cfc Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 12 Jun 2021 17:13:14 -0700
Subject: [PATCH 1/5] errors: add ERR_DEBUGGER_ERROR

PR-URL: https://github.com/nodejs/node/pull/39024
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Jan Krems <jan.krems@gmail.com>
---
 doc/api/errors.md      | 9 +++++++++
 lib/internal/errors.js | 1 +
 2 files changed, 10 insertions(+)

diff --git a/doc/api/errors.md b/doc/api/errors.md
index b15ba7c188fe85..73b0a2b1b559b6 100644
--- a/doc/api/errors.md
+++ b/doc/api/errors.md
@@ -1007,6 +1007,14 @@ added: v15.0.0
 
 An attempt to invoke an unsupported crypto operation was made.
 
+<a id="ERR_DEBUGGER_ERROR"></a>
+### `ERR_DEBUGGER_ERROR`
+<!-- YAML
+added: REPLACEME
+-->
+
+An error occurred with the [debugger][].
+
 <a id="ERR_DLOPEN_FAILED"></a>
 ### `ERR_DLOPEN_FAILED`
 <!-- YAML
@@ -2832,6 +2840,7 @@ The native call from `process.cpuUsage` could not be processed.
 [`util.getSystemErrorName(error.errno)`]: util.md#util_util_getsystemerrorname_err
 [`zlib`]: zlib.md
 [crypto digest algorithm]: crypto.md#crypto_crypto_gethashes
+[debugger]: debugger.md
 [define a custom subpath]: packages.md#packages_subpath_exports
 [domains]: domain.md
 [event emitter-based]: events.md#events_class_eventemitter
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index a226b2d6898d4c..a32895a9488f2c 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -890,6 +890,7 @@ E('ERR_CRYPTO_SCRYPT_INVALID_PARAMETER', 'Invalid scrypt parameter', Error);
 E('ERR_CRYPTO_SCRYPT_NOT_SUPPORTED', 'Scrypt algorithm not supported', Error);
 // Switch to TypeError. The current implementation does not seem right.
 E('ERR_CRYPTO_SIGN_KEY_REQUIRED', 'No key provided to sign', Error);
+E('ERR_DEBUGGER_ERROR', '%s', Error);
 E('ERR_DIR_CLOSED', 'Directory handle was closed', Error);
 E('ERR_DIR_CONCURRENT_OPERATION',
   'Cannot do synchronous work on directory handle with concurrent ' +

From c22eec85b477f73e95235caadbcaa2bb433e5f49 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sat, 12 Jun 2021 17:35:49 -0700
Subject: [PATCH 2/5] debugger: use ERR_DEBUGGER_ERROR in debugger client

PR-URL: https://github.com/nodejs/node/pull/39024
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Jan Krems <jan.krems@gmail.com>
---
 lib/internal/inspector/inspect_client.js | 25 +++++++++++-------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/lib/internal/inspector/inspect_client.js b/lib/internal/inspector/inspect_client.js
index 4c89c56af93ef6..cd277a4cf5a946 100644
--- a/lib/internal/inspector/inspect_client.js
+++ b/lib/internal/inspector/inspect_client.js
@@ -1,11 +1,7 @@
-// TODO(aduh95): use errors exported by the internal/errors module
-/* eslint-disable no-restricted-syntax */
-
 'use strict';
 
 const {
   ArrayPrototypePush,
-  Error,
   ErrorCaptureStackTrace,
   FunctionPrototypeBind,
   JSONParse,
@@ -15,6 +11,7 @@ const {
 } = primordials;
 
 const Buffer = require('buffer').Buffer;
+const { ERR_DEBUGGER_ERROR } = require('internal/errors').codes;
 const { EventEmitter } = require('events');
 const http = require('http');
 const URL = require('url');
@@ -39,7 +36,7 @@ const kEightBytePayloadLengthField = 127;
 const kMaskingKeyWidthInBytes = 4;
 
 function unpackError({ code, message, data }) {
-  const err = new Error(`${message} - ${data}`);
+  const err = new ERR_DEBUGGER_ERROR(`${message} - ${data}`);
   err.code = code;
   ErrorCaptureStackTrace(err, unpackError);
   return err;
@@ -101,14 +98,14 @@ function decodeFrameHybi17(data) {
   const masked = (secondByte & kMaskBit) !== 0;
   const compressed = reserved1;
   if (compressed) {
-    throw new Error('Compressed frames not supported');
+    throw new ERR_DEBUGGER_ERROR('Compressed frames not supported');
   }
   if (!final || reserved2 || reserved3) {
-    throw new Error('Only compression extension is supported');
+    throw new ERR_DEBUGGER_ERROR('Only compression extension is supported');
   }
 
   if (masked) {
-    throw new Error('Masked server frame - not supported');
+    throw new ERR_DEBUGGER_ERROR('Masked server frame - not supported');
   }
 
   let closed = false;
@@ -119,7 +116,7 @@ function decodeFrameHybi17(data) {
     case kOpCodeText:
       break;
     default:
-      throw new Error(`Unsupported op code ${opCode}`);
+      throw new ERR_DEBUGGER_ERROR(`Unsupported op code ${opCode}`);
   }
 
   let payloadLength = secondByte & kPayloadLengthMask;
@@ -183,7 +180,7 @@ class Client extends EventEmitter {
       debuglog('< %s', payloadStr);
       const lastChar = payloadStr[payloadStr.length - 1];
       if (payloadStr[0] !== '{' || lastChar !== '}') {
-        throw new Error(`Payload does not look like JSON: ${payloadStr}`);
+        throw new ERR_DEBUGGER_ERROR(`Payload does not look like JSON: ${payloadStr}`);
       }
       let payload;
       try {
@@ -204,7 +201,7 @@ class Client extends EventEmitter {
         this.emit('debugEvent', method, params);
         this.emit(method, params);
       } else {
-        throw new Error(`Unsupported response: ${payloadStr}`);
+        throw new ERR_DEBUGGER_ERROR(`Unsupported response: ${payloadStr}`);
       }
     }
   }
@@ -226,7 +223,7 @@ class Client extends EventEmitter {
   callMethod(method, params) {
     return new Promise((resolve, reject) => {
       if (!this._socket) {
-        reject(new Error('Use `run` to start the app again.'));
+        reject(new ERR_DEBUGGER_ERROR('Use `run` to start the app again.'));
         return;
       }
       const data = { id: ++this._lastId, method, params };
@@ -254,13 +251,13 @@ class Client extends EventEmitter {
         function parseChunks() {
           const resBody = Buffer.concat(chunks).toString();
           if (httpRes.statusCode !== 200) {
-            reject(new Error(`Unexpected ${httpRes.statusCode}: ${resBody}`));
+            reject(new ERR_DEBUGGER_ERROR(`Unexpected ${httpRes.statusCode}: ${resBody}`));
             return;
           }
           try {
             resolve(JSONParse(resBody));
           } catch {
-            reject(new Error(`Response didn't contain JSON: ${resBody}`));
+            reject(new ERR_DEBUGGER_ERROR(`Response didn't contain JSON: ${resBody}`));
 
           }
         }

From fa009e1428f3f59cfed9cf96c59291594b6ac089 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 13 Jun 2021 05:00:09 -0700
Subject: [PATCH 3/5] debugger: use error codes in debugger REPL

PR-URL: https://github.com/nodejs/node/pull/39024
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Jan Krems <jan.krems@gmail.com>
---
 lib/internal/inspector/inspect_repl.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/internal/inspector/inspect_repl.js b/lib/internal/inspector/inspect_repl.js
index 3cb4d52f43aaf1..5393cb32718300 100644
--- a/lib/internal/inspector/inspect_repl.js
+++ b/lib/internal/inspector/inspect_repl.js
@@ -1,5 +1,5 @@
 // TODO(trott): enable ESLint
-/* eslint-disable getter-return, no-restricted-syntax */
+/* eslint-disable getter-return */
 
 'use strict';
 
@@ -18,7 +18,6 @@ const {
   ArrayPrototypeSome,
   ArrayPrototypeSplice,
   Date,
-  Error,
   FunctionPrototypeCall,
   JSONStringify,
   MathMax,
@@ -47,9 +46,12 @@ const {
   StringPrototypeStartsWith,
   StringPrototypeToUpperCase,
   StringPrototypeTrim,
-  TypeError,
 } = primordials;
 
+const { ERR_DEBUGGER_ERROR } = require('internal/errors').codes;
+
+const { validateString } = require('internal/validators');
+
 const FS = require('fs');
 const Path = require('path');
 const Repl = require('repl');
@@ -176,7 +178,7 @@ function extractErrorMessage(stack) {
 
 function convertResultToError(result) {
   const { className, description } = result;
-  const err = new Error(extractErrorMessage(description));
+  const err = new ERR_DEBUGGER_ERROR(extractErrorMessage(description));
   err.stack = description;
   ObjectDefineProperty(err, 'name', { value: className });
   return err;
@@ -357,7 +359,7 @@ function createRepl(inspector) {
 
   function getCurrentLocation() {
     if (!selectedFrame) {
-      throw new Error('Requires execution to be paused');
+      throw new ERR_DEBUGGER_ERROR('Requires execution to be paused');
     }
     return selectedFrame.location;
   }
@@ -543,7 +545,7 @@ function createRepl(inspector) {
     // Repl asked for scope variables
     if (code === '.scope') {
       if (!selectedFrame) {
-        throw new Error('Requires execution to be paused');
+        throw new ERR_DEBUGGER_ERROR('Requires execution to be paused');
       }
       const scopes = await selectedFrame.loadScopes();
       return ArrayPrototypeMap(scopes, (scope) => scope.completionGroup);
@@ -706,9 +708,7 @@ function createRepl(inspector) {
         registerBreakpoint);
     }
 
-    if (typeof script !== 'string') {
-      throw new TypeError(`setBreakpoint() expects a string, got ${script}`);
-    }
+    validateString(script, 'script');
 
     // setBreakpoint('fn()'): Break when a function is called
     if (StringPrototypeEndsWith(script, '()')) {

From 6dbff83730ecba32df3f734c474a02614ff6b8a6 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 13 Jun 2021 05:14:01 -0700
Subject: [PATCH 4/5] errors: add ERR_DEBUGGER_STARTUP_ERROR

PR-URL: https://github.com/nodejs/node/pull/39024
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Jan Krems <jan.krems@gmail.com>
---
 doc/api/errors.md      | 8 ++++++++
 lib/internal/errors.js | 1 +
 2 files changed, 9 insertions(+)

diff --git a/doc/api/errors.md b/doc/api/errors.md
index 73b0a2b1b559b6..7ac741bba68737 100644
--- a/doc/api/errors.md
+++ b/doc/api/errors.md
@@ -1015,6 +1015,14 @@ added: REPLACEME
 
 An error occurred with the [debugger][].
 
+<a id="ERR_DEBUGGER_STARTUP_ERROR"></a>
+### `ERR_DEBUGGER_STARTUP_ERROR`
+<!-- YAML
+added: REPLACEME
+-->
+
+The [debugger][] timed out waiting for the required host/port to be free.
+
 <a id="ERR_DLOPEN_FAILED"></a>
 ### `ERR_DLOPEN_FAILED`
 <!-- YAML
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
index a32895a9488f2c..13b56311d370b8 100644
--- a/lib/internal/errors.js
+++ b/lib/internal/errors.js
@@ -891,6 +891,7 @@ E('ERR_CRYPTO_SCRYPT_NOT_SUPPORTED', 'Scrypt algorithm not supported', Error);
 // Switch to TypeError. The current implementation does not seem right.
 E('ERR_CRYPTO_SIGN_KEY_REQUIRED', 'No key provided to sign', Error);
 E('ERR_DEBUGGER_ERROR', '%s', Error);
+E('ERR_DEBUGGER_STARTUP_ERROR', '%s', Error);
 E('ERR_DIR_CLOSED', 'Directory handle was closed', Error);
 E('ERR_DIR_CONCURRENT_OPERATION',
   'Cannot do synchronous work on directory handle with concurrent ' +

From 767996047c0e05ffd4a49bdd08c5e031bd874dc2 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Sun, 13 Jun 2021 05:53:05 -0700
Subject: [PATCH 5/5] debugger: use ERR_DEBUGGER_STARTUP_ERROR in _inspect.js

PR-URL: https://github.com/nodejs/node/pull/39024
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Jan Krems <jan.krems@gmail.com>
---
 lib/internal/inspector/_inspect.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/internal/inspector/_inspect.js b/lib/internal/inspector/_inspect.js
index 204e037064daf2..e2309fcc68c268 100644
--- a/lib/internal/inspector/_inspect.js
+++ b/lib/internal/inspector/_inspect.js
@@ -8,7 +8,6 @@ const {
   ArrayPrototypePop,
   ArrayPrototypeShift,
   ArrayPrototypeSlice,
-  Error,
   FunctionPrototypeBind,
   Number,
   Promise,
@@ -46,12 +45,7 @@ const { 0: InspectClient, 1: createRepl } =
 
 const debuglog = util.debuglog('inspect');
 
-class StartupError extends Error {
-  constructor(message) {
-    super(message);
-    this.name = 'StartupError';
-  }
-}
+const { ERR_DEBUGGER_STARTUP_ERROR } = require('internal/errors').codes;
 
 async function portIsFree(host, port, timeout = 9999) {
   if (port === 0) return; // Binding to a random port.
@@ -66,7 +60,7 @@ async function portIsFree(host, port, timeout = 9999) {
   while (true) {
     await asyncIterator.next();
     if (signal.aborted) {
-      throw new StartupError( // eslint-disable-line no-restricted-syntax
+      throw new ERR_DEBUGGER_STARTUP_ERROR(
         `Timeout (${timeout}) waiting for ${host}:${port} to be free`);
     }
     const error = await new Promise((resolve) => {
@@ -342,7 +336,7 @@ function startInspect(argv = ArrayPrototypeSlice(process.argv, 2),
   stdin.resume();
 
   function handleUnexpectedError(e) {
-    if (!(e instanceof StartupError)) {
+    if (e.code !== 'ERR_DEBUGGER_STARTUP_ERROR') {
       console.error('There was an internal error in Node.js. ' +
                     'Please report this bug.');
       console.error(e.message);