Update logic to handle possible missing execution points in stacks

replayio · Nov 9, 2023 · fec16e9 · fec16e9
1 parent ee42b19
commit fec16e9
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/packages/replay-experimental/src/suspense/reactInternalsCaches.ts b/packages/replay-experimental/src/suspense/reactInternalsCaches.ts
@@ -52,6 +52,10 @@ export const reactRenderQueuedJumpLocationCache: Cache<
       earliestAppCodeFrame.index
     );
 
+    if (!pointDescription) {
+      return undefined;
+    }
+
     return {
       location,
       point: {

diff --git a/packages/replay-next/src/suspense/PointStackCache.ts b/packages/replay-next/src/suspense/PointStackCache.ts
@@ -29,7 +29,7 @@ export function updateMappedLocationForPointStackFrame(
   frame: PointStackFrame
 ) {
   updateMappedLocation(sources, frame.functionLocation);
-  if (frame.point.frame) {
+  if (frame.point?.frame) {
     updateMappedLocation(sources, frame.point.frame);
   }
 }

diff --git a/packages/replay-next/src/suspense/ResumeTargetCache.ts b/packages/replay-next/src/suspense/ResumeTargetCache.ts
@@ -73,7 +73,12 @@ export const resumeTargetCache = createCache<
 
       if (frameIndex > 0) {
         const pointStack = await pointStackCache.readAsync(0, frameIndex, replayClient, pausePoint);
-        currentPoint = pointStack[frameIndex].point.point;
+        const frame = pointStack[frameIndex];
+        if (!frame.point) {
+          // Avoid stepping in the top frame - we need to step in the _current_ frame.
+          return;
+        }
+        currentPoint = frame.point.point;
       }
     }
 

diff --git a/src/ui/suspense/frameCache.ts b/src/ui/suspense/frameCache.ts
@@ -88,7 +88,7 @@ export interface FormattedPointStackFrame {
   source: Source;
   functionLocation: Location;
   executionLocation: Location;
-  point: PointDescription;
+  point?: PointDescription;
   functionDetails?: FormattedEventListener;
 }
 
@@ -119,7 +119,7 @@ export const formattedPointStackCache: Cache<
       pointStack.map(async frame => {
         updateMappedLocationForPointStackFrame(sourcesById, frame);
         const functionLocation = getPreferredLocation(sourcesById, [], frame.functionLocation);
-        const executionLocation = getPreferredLocation(sourcesById, [], frame.point.frame ?? []);
+        const executionLocation = getPreferredLocation(sourcesById, [], frame.point?.frame ?? []);
 
         const source = sourcesById.get(functionLocation.sourceId)!;
 
@@ -158,7 +158,15 @@ export const formattedPointStackCache: Cache<
 
     let resultPoint = point;
     if (earliestAppCodeFrame) {
-      resultPoint = earliestAppCodeFrame.point;
+      if (earliestAppCodeFrame.point) {
+        // We _want_ to go to this line of code at the time that it ran.
+        // Technically the backend might not return an execution point for this stack frame.
+        // Handle that (hopefully unlikely) case by still using the original point
+        // at the "current" part of the stack trace, which would mean that we'd be showing
+        // the earlier stack frame but be paused at the "current" time.
+        resultPoint = earliestAppCodeFrame.point;
+      }
+
       const formattedFunction = await formatFunctionDetailsFromLocation(
         replayClient,
         "unknown",