refactor: Make breakpoints more inspect friendly

Author: Jan Krems

lib/node-inspect.js

@@ -477,7 +477,7 @@ function createCommandContext(inspector) {
   const scripts = {};
   const watchedExpressions = [];
 
-  const knownBreakpoints = new Map();
+  const knownBreakpoints = [];
 
   const writer = createRemoteAwareWriter(true);
   const formatValue = value => writer(value);
@@ -504,19 +504,30 @@ function createCommandContext(inspector) {
     }
   }
 
-  function convertResultToRemoteObject({ result, wasThrown }) {
+  function convertResultToError(result) {
     const { className, description } = result;
-    if (wasThrown) {
-      const err = new Error(extractErrorMessage(description));
-      err.stack = description;
-      Object.defineProperty(err, 'name', { value: className });
-      return err;
-    }
+    const err = new Error(extractErrorMessage(description));
+    err.stack = description;
+    Object.defineProperty(err, 'name', { value: className });
+    return err;
+  }
+
+  function convertResultToRemoteObject({ result, wasThrown }) {
+    if (wasThrown) return convertResultToError(result);
     return new Proxy(new RemoteObject(result), createRemoteObjectProxyHandler(inspector.client));
   }
 
   function handleBreakpointResolved({ breakpointId, location }) {
-    knownBreakpoints.set(breakpointId, location);
+    const isExisting = knownBreakpoints.some(bp => {
+      if (bp.breakpointId === breakpointId) {
+        bp.location = location;
+        return true;
+      }
+      return false;
+    });
+    if (!isExisting) {
+      knownBreakpoints.push({ breakpointId, location });
+    }
   }
 
   const ctx = {
@@ -614,7 +625,10 @@ function createCommandContext(inspector) {
           callFrameId: currentFrame,
           expression: `debug(${script.slice(0, -2)})`,
           includeCommandLineAPI: true,
-        }).then(() => undefined); // hide the noise
+        }).then(({ result, wasThrown }) => {
+          if (wasThrown) return convertResultToError(result);
+          return undefined; // This breakpoint can't be removed the same way
+        });
       }
 
       // setBreakpoint('scriptname')
@@ -655,6 +669,11 @@ function createCommandContext(inspector) {
         .then(registerBreakpoint);
     },
 
+    clearBreakpoint() {
+      // TODO: Use Debugger.removeBreakpoint({ breakpointId })
+      throw new Error('Not implemented');
+    },
+
     get cont() {
       return Debugger.resume();
     },
@@ -703,8 +722,8 @@ function createCommandContext(inspector) {
             }
 
             let isBreakpoint = false;
-            knownBreakpoints.forEach(actualLocation => {
-              if (actualLocation.scriptId === scriptId && (actualLocation.lineNumber + 1) === i) {
+            knownBreakpoints.forEach(({ location }) => {
+              if (location.scriptId === scriptId && (location.lineNumber + 1) === i) {
                 isBreakpoint = true;
               }
             });