WIP wait for response instead of request

Author: mydea

packages/integration-tests/utils/replayHelpers.ts

@@ -1,7 +1,7 @@
 import type { RecordingEvent, ReplayContainer } from '@sentry/replay/build/npm/types/types';
 import type { Breadcrumb, Event, ReplayEvent } from '@sentry/types';
 import pako from 'pako';
-import type { Page, Request } from 'playwright';
+import type { Page, Request, Response } from 'playwright';
 
 import { envelopeRequestParser } from './helpers';
 
@@ -37,8 +37,10 @@ type SnapshotNode = {
  * @param segmentId the segment_id of the replay event
  * @returns
  */
-export function waitForReplayRequest(page: Page, segmentId?: number): Promise<Request> {
-  return page.waitForRequest(req => {
+export function waitForReplayRequest(page: Page, segmentId?: number): Promise<Response> {
+  return page.waitForResponse(res => {
+    const req = res.request();
+
     const postData = req.postData();
     if (!postData) {
       return false;
@@ -78,7 +80,13 @@ export async function getReplaySnapshot(page: Page): Promise<ReplayContainer> {
 
 export const REPLAY_DEFAULT_FLUSH_MAX_DELAY = 5_000;
 
-export function getReplayEvent(replayRequest: Request): ReplayEvent {
+function getRequest(resOrReq: Request | Response): Request {
+  // @ts-ignore we check this
+  return typeof resOrReq.request === 'function' ? (resOrReq as Response).request() : (resOrReq as Request);
+}
+
+export function getReplayEvent(resOrReq: Request | Response): ReplayEvent {
+  const replayRequest = getRequest(resOrReq);
   const event = envelopeRequestParser(replayRequest);
   if (!isReplayEvent(event)) {
     throw new Error('Request is not a replay event');
@@ -103,7 +111,8 @@ type RecordingContent = {
  * @param replayRequest
  * @returns an object containing the replay breadcrumbs and performance spans
  */
-export function getCustomRecordingEvents(replayRequest: Request): CustomRecordingContent {
+export function getCustomRecordingEvents(resOrReq: Request | Response): CustomRecordingContent {
+  const replayRequest = getRequest(resOrReq);
   const recordingEvents = getDecompressedRecordingEvents(replayRequest);
 
   const breadcrumbs = getReplayBreadcrumbs(recordingEvents);
@@ -128,21 +137,25 @@ function getReplayPerformanceSpans(recordingEvents: RecordingEvent[]): Performan
     .map(data => data.payload) as PerformanceSpan[];
 }
 
-export function getFullRecordingSnapshots(replayRequest: Request): RecordingSnapshot[] {
+export function getFullRecordingSnapshots(resOrReq: Request | Response): RecordingSnapshot[] {
+  const replayRequest = getRequest(resOrReq);
   const events = getDecompressedRecordingEvents(replayRequest) as RecordingEvent[];
   return events.filter(event => event.type === 2).map(event => event.data as RecordingSnapshot);
 }
 
-function getIncrementalRecordingSnapshots(replayRequest: Request): RecordingSnapshot[] {
+function getIncrementalRecordingSnapshots(resOrReq: Request | Response): RecordingSnapshot[] {
+  const replayRequest = getRequest(resOrReq);
   const events = getDecompressedRecordingEvents(replayRequest) as RecordingEvent[];
   return events.filter(event => event.type === 3).map(event => event.data as RecordingSnapshot);
 }
 
-function getDecompressedRecordingEvents(replayRequest: Request): RecordingEvent[] {
+function getDecompressedRecordingEvents(resOrReq: Request | Response): RecordingEvent[] {
+  const replayRequest = getRequest(resOrReq);
   return replayEnvelopeRequestParser(replayRequest, 5) as RecordingEvent[];
 }
 
-export function getReplayRecordingContent(replayRequest: Request): RecordingContent {
+export function getReplayRecordingContent(resOrReq: Request | Response): RecordingContent {
+  const replayRequest = getRequest(resOrReq);
   const fullSnapshots = getFullRecordingSnapshots(replayRequest);
   const incrementalSnapshots = getIncrementalRecordingSnapshots(replayRequest);
   const customEvents = getCustomRecordingEvents(replayRequest);