Send pause points to the server (#5721)

* Send pause points to the server
* Update dbg.js

Author: jasonLaster

src/actions/ast.js

@@ -93,7 +93,7 @@ export function setOutOfScopeLocations() {
 }
 
 export function setPausePoints(sourceId: SourceId) {
-  return async ({ dispatch, getState }: ThunkArgs) => {
+  return async ({ dispatch, getState, client }: ThunkArgs) => {
     const sourceRecord = getSource(getState(), sourceId);
     if (!sourceRecord) {
       return;
@@ -105,6 +105,8 @@ export function setPausePoints(sourceId: SourceId) {
     }
 
     const pausePoints = await getPausePoints(source.id);
+    await client.setPausePoints(sourceId, pausePoints);
+
     dispatch({
       type: "SET_PAUSE_POINTS",
       source,

src/actions/tests/ast.spec.js

@@ -32,9 +32,8 @@ const threadClient = {
       })
     );
   },
-  getFrameScopes: function() {
-    return Promise.resolve({});
-  },
+  setPausePoints: async () => {},
+  getFrameScopes: async () => {},
   evaluate: function(expression) {
     return new Promise((resolve, reject) =>
       resolve({ result: evaluationResult[expression] })

src/actions/tests/helpers/threadClient.js

@@ -34,7 +34,7 @@ export const simpleMockThreadClient = {
 
   setBreakpointCondition: (_id, _location, _condition, _noSliding) =>
     Promise.resolve({ sourceId: "a", line: 5 }),
-
+  setPausePoints: () => Promise.resolve({}),
   sourceContents: sourceId =>
     new Promise((resolve, reject) => {
       if (sources.includes(sourceId)) {
@@ -85,5 +85,6 @@ export const sourceThreadClient = {
       reject(`unknown source: ${sourceId}`);
     });
   },
+  threadClient: async () => {},
   getFrameScopes: async () => {}
 };

src/actions/tests/preview.spec.js

@@ -17,9 +17,8 @@ const threadClient = {
       })
     );
   },
-  getFrameScopes: function() {
-    return Promise.resolve({});
-  },
+  setPausePoints: async () => {},
+  getFrameScopes: async () => {},
   evaluate: function(expression) {
     return new Promise((resolve, reject) =>
       resolve({ result: evaluationResult[expression] })

src/client/firefox/commands.js

@@ -25,6 +25,8 @@ import type {
   BPClients
 } from "./types";
 
+import type { PausePoint } from "../../workers/parser";
+
 import { makePendingLocationId } from "../../utils/breakpoint";
 
 import { createSource, createBreakpointLocation } from "./create";
@@ -52,6 +54,10 @@ function setupCommands(dependencies: Dependencies): { bpClients: BPClients } {
   return { bpClients };
 }
 
+function sendPacket(packet: Object, callback?: Function) {
+  debuggerClient.request(packet).then(callback);
+}
+
 function resume(): Promise<*> {
   return new Promise(resolve => {
     threadClient.resume(resolve);
@@ -290,6 +296,10 @@ function disablePrettyPrint(sourceId: SourceId): Promise<*> {
   return sourceClient.disablePrettyPrint();
 }
 
+async function setPausePoints(sourceId: SourceId, pausePoints: PausePoint[]) {
+  return sendPacket({ to: sourceId, type: "setPausePoints", pausePoints });
+}
+
 function interrupt(): Promise<*> {
   return threadClient.interrupt();
 }
@@ -352,7 +362,9 @@ const clientCommands = {
   prettyPrint,
   disablePrettyPrint,
   fetchSources,
-  fetchWorkers
+  fetchWorkers,
+  sendPacket,
+  setPausePoints
 };
 
 export { setupCommands, clientCommands };

src/client/firefox/types.js

@@ -268,7 +268,8 @@ export type DebuggerClient = {
     traits: any
   },
   connect: () => Promise<*>,
-  listTabs: () => Promise<*>
+  listTabs: () => Promise<*>,
+  request: (packet: Object) => Promise<*>
 };
 
 export type TabClient = {

src/client/index.js

@@ -52,6 +52,7 @@ async function onConnect(
     store,
     actions,
     selectors,
+    connection,
     client: client.clientCommands
   });
 

src/reducers/ast.js

@@ -14,7 +14,11 @@ import * as I from "immutable";
 import makeRecord from "../utils/makeRecord";
 import { findEmptyLines } from "../utils/ast";
 
-import type { SymbolDeclarations, AstLocation } from "../workers/parser/types";
+import type {
+  SymbolDeclarations,
+  AstLocation,
+  PausePoint
+} from "../workers/parser";
 
 import type { Map } from "immutable";
 import type { Source } from "../types";
@@ -31,7 +35,7 @@ export type SourceMetaDataType = {
 };
 
 export type SourceMetaDataMap = Map<string, SourceMetaDataType>;
-export type PausePointsMap = Map<string, any>;
+export type PausePointsMap = Map<string, PausePoint>;
 
 export type Preview =
   | {| updating: true |}

src/utils/dbg.js

@@ -2,6 +2,7 @@ import { bindActionCreators } from "redux";
 import * as timings from "./timings";
 import { prefs, features } from "./prefs";
 import { isDevelopment } from "devtools-config";
+import { formatPausePoints } from "./pause/pausePoints";
 
 function findSource(dbg, url) {
   const sources = dbg.selectors.getSources();
@@ -15,9 +16,15 @@ function findSource(dbg, url) {
 }
 
 function sendPacket(dbg, packet, callback) {
-  dbg.connection.tabConnection.debuggerClient
-    .request(packet)
-    .then(callback || console.log);
+  dbg.client.sendPacket(packet, callback || console.log);
+}
+
+function sendPacketToThread(dbg, packet, callback) {
+  sendPacket(
+    dbg,
+    { to: dbg.connection.tabConnection.threadClient.actor, ...packet },
+    callback
+  );
 }
 
 function evaluate(dbg, expression, callback) {
@@ -37,6 +44,12 @@ function getCM() {
   return cm && cm.CodeMirror;
 }
 
+function _formatPausePoints(dbg, url) {
+  const source = dbg.helpers.findSource(url);
+  const pausePoints = dbg.selectors.getPausePoints(source);
+  console.log(formatPausePoints(source.text, pausePoints));
+}
+
 export function setupHelper(obj) {
   const selectors = bindSelectors(obj);
   const actions = bindActionCreators(obj.actions, obj.store.dispatch);
@@ -51,7 +64,11 @@ export function setupHelper(obj) {
     helpers: {
       findSource: url => findSource(dbg, url),
       evaluate: (expression, cbk) => evaluate(dbg, expression, cbk),
+      sendPacketToThread: (packet, cbk) => sendPacketToThread(dbg, packet, cbk),
       sendPacket: (packet, cbk) => sendPacket(dbg, packet, cbk)
+    },
+    formatters: {
+      pausePoints: url => _formatPausePoints(dbg, url)
     }
   };
 

src/utils/pause/pausePoints.js

@@ -0,0 +1,24 @@
+import { reverse, sortBy } from "lodash";
+function insertStrtAt(string, index, newString) {
+  const start = string.slice(0, index);
+  const end = string.slice(index);
+  return `${start}${newString}${end}`;
+}
+
+export function formatPausePoints(text, nodes) {
+  nodes = reverse(sortBy(nodes, ["location.line", "location.column"]));
+  const lines = text.split("\n");
+  nodes.forEach((node, index) => {
+    const { line, column } = node.location;
+    const { breakpoint, stepOver } = node.types;
+    const num = nodes.length - index;
+    const types = `${breakpoint ? "b" : ""}${stepOver ? "s" : ""}`;
+    lines[line - 1] = insertStrtAt(
+      lines[line - 1],
+      column,
+      `/*${types} ${num}*/`
+    );
+  });
+
+  return lines.join("\n");
+}