NeuraLegion · derevnjuk · Mar 7, 2023 · Mar 7, 2023 · Mar 7, 2023 · Mar 7, 2023
diff --git a/cypress/app/index.ts b/cypress/app/index.ts
@@ -37,7 +37,8 @@ app.get('/', (_: Request, res: Response) =>
       { id: 'multi-targets', name: 'Multi targets' },
       { id: 'server-sent-events', name: 'Server-sent events' },
       { id: 'websocket', name: 'WebSocket' },
-      { id: 'large-content', name: 'Large content' }
+      { id: 'large-content', name: 'Large content' },
+      { id: 'post-data', name: 'Post data' }
     ]
   })
 );
@@ -86,6 +87,7 @@ app.get('/api/products', (_: Request, res: Response) =>
     ]
   })
 );
+app.get('/api/echo', (req: Request, res: Response) => res.json(req.body));
 app.get('/api/keys', (_: Request, res: Response) =>
   res.json({
     keys: Array(1000)

diff --git a/cypress/app/views/post-data.hbs b/cypress/app/views/post-data.hbs
@@ -0,0 +1,29 @@
+<html>
+  <head>
+    <meta charset='utf-8' />
+    <meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1' />
+    <meta name='viewport' content='width=device-width' />
+    <link rel="icon" href="data:;base64,iVBORw0KGgo=">
+
+    <title>Post Data</title>
+  </head>
+  <body>
+    <h1>Post Data</h1>
+    <pre></pre>
+  </body>
+  <script>
+    const postData = {
+      document: document.body.innerHTML,
+    };
+    const pre = document.querySelector('pre')
+
+    fetch('/api/echo', {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(postData)
+    })
+      .then(response => response.json())
+      .then(data => pre.innerText = JSON.stringify(data, null, 2))
+      .catch(error => console.error(error));
+  </script>
+</html>
diff --git a/cypress/e2e/record-har.cy.ts b/cypress/e2e/record-har.cy.ts
@@ -360,4 +360,23 @@ describe('Record HAR', () => {
         }
       });
   });
+
+  it('records a request body', () => {
+    cy.recordHar({ content: false });
+
+    cy.get('a[href$=post-data]').click();
+
+    cy.saveHar({ waitForIdle: true });
+
+    cy.findHar()
+      .its('log.entries')
+      .should('contain.something.like', {
+        request: {
+          url: /api\/echo$/,
+          postData: {
+            text: /^\{"document":"/
+          }
+        }
+      });
+  });
 });
diff --git a/src/cdp/DefaultNetwork.spec.ts b/src/cdp/DefaultNetwork.spec.ts
@@ -9,6 +9,7 @@ import {
   anything,
   deepEqual,
   instance,
+  match,
   mock,
   reset,
   verify,
@@ -369,6 +370,29 @@ describe('DefaultNetwork', () => {
         )
       ).once();
     });
+
+    it.each([
+      { input: 'Network.requestWillBeSent' },
+      { input: 'Network.webSocketCreated' }
+    ])(
+      'should associate a session with a request on $input',
+      async ({ input }) => {
+        // arrange
+        const requestId = '1';
+        const sessionId = '2';
+        when(clientMock.on(input, anyFunction())).thenCall((_, callback) =>
+          callback({ requestId }, sessionId)
+        );
+        // act
+        await sut.attachToTargets(listener);
+        // assert
+        verify(
+          loggerMock.debug(
+            match(`Session ${sessionId} associated with request: ${requestId}`)
+          )
+        ).once();
+      }
+    );
   });
 
   describe('detachFromTargets', () => {

diff --git a/src/cdp/DefaultNetwork.ts b/src/cdp/DefaultNetwork.ts
@@ -36,9 +36,9 @@ export class DefaultNetwork implements Network {
 
     this.cdp.on('event', this.networkEventListener);
     this.cdp.on('Target.attachedToTarget', this.attachedToTargetListener);
-
+    this.cdp.on('Network.requestWillBeSent', this.sessionListener);
+    this.cdp.on('Network.webSocketCreated', this.sessionListener);
     await this.ignoreCertificateError();
-    await this.trackSessions();
     await this.recursivelyAttachToTargets({ type: 'browser' });
   }
 
@@ -59,6 +59,7 @@ export class DefaultNetwork implements Network {
       ]);
     } catch (e) {
       // ADHOC: handle any unforeseen issues while detaching from targets.
+      this.logger.debug(`Unexpected error while detaching from targets: ${e}`);
     }
 
     this.sessions.clear();
@@ -88,11 +89,6 @@ export class DefaultNetwork implements Network {
     );
   }
 
-  private async trackSessions(): Promise<void> {
-    this.cdp.on('Network.requestWillBeSent', this.sessionListener);
-    this.cdp.on('Network.webSocketCreated', this.sessionListener);
-  }
-
   private async ignoreCertificateError(): Promise<void> {
     this.cdp.on('Security.certificateError', this.certificateErrorListener);
     try {
@@ -164,7 +160,12 @@ export class DefaultNetwork implements Network {
       | Protocol.Network.RequestWillBeSentEvent
       | Protocol.Network.WebSocketCreatedEvent,
     sessionId?: string
-  ) => this.sessions.set(requestId, sessionId);
+  ) => {
+    this.sessions.set(requestId, sessionId);
+    this.logger.debug(
+      `Session ${sessionId ?? 'N/A'} associated with request: ${requestId}`
+    );
+  };
 
   private attachedToTargetListener = async ({
     sessionId,
@@ -186,6 +187,7 @@ export class DefaultNetwork implements Network {
       }
     } catch (e) {
       this.logger.err(UNABLE_TO_ATTACH_TO_TARGET);
+      this.logger.err(e);
       throw e;
     }
   };

diff --git a/src/network/NetworkObserver.spec.ts b/src/network/NetworkObserver.spec.ts
@@ -200,9 +200,7 @@ describe('NetworkObserver', () => {
       // assert
       expect(result).toBe(false);
     });
-  });
 
-  describe('subscribe', () => {
     it('should attach to network events', async () => {
       // act
       await sut.subscribe(callback);
@@ -512,6 +510,79 @@ describe('NetworkObserver', () => {
       );
     });
 
+    it('should load the request body', async () => {
+      // arrange
+      when(networkMock.getRequestBody('1')).thenResolve({
+        postData: 'test'
+      });
+      when(networkMock.attachToTargets(anyFunction())).thenCall(async cb => {
+        await cb({
+          ...requestWillBeSentEvent,
+          params: {
+            ...requestWillBeSentEvent.params,
+            request: {
+              ...requestWillBeSentEvent.params.request,
+              method: 'POST',
+              hasPostData: true
+            }
+          }
+        });
+        await cb(responseReceivedEvent);
+        await cb(loadingFinishedEvent);
+      });
+      // act
+      await sut.subscribe(callback);
+      // assert
+      verify(networkMock.getRequestBody('1')).once();
+    });
+
+    it('should utilize the preloaded request body', async () => {
+      // arrange
+      when(networkMock.attachToTargets(anyFunction())).thenCall(async cb => {
+        await cb({
+          ...requestWillBeSentEvent,
+          params: {
+            ...requestWillBeSentEvent.params,
+            request: {
+              ...requestWillBeSentEvent.params.request,
+              method: 'POST',
+              postData: 'test',
+              hasPostData: true
+            }
+          }
+        });
+        await cb(responseReceivedEvent);
+        await cb(loadingFinishedEvent);
+      });
+      // act
+      await sut.subscribe(callback);
+      // assert
+      verify(networkMock.getRequestBody('1')).never();
+    });
+
+    it('should prevent loading the request body when the request method forbids the body', async () => {
+      // arrange
+      when(networkMock.attachToTargets(anyFunction())).thenCall(async cb => {
+        await cb({
+          ...requestWillBeSentEvent,
+          params: {
+            ...requestWillBeSentEvent.params,
+            request: {
+              ...requestWillBeSentEvent.params.request,
+              method: 'OPTIONS',
+              hasPostData: false
+            }
+          }
+        });
+        await cb(responseReceivedEvent);
+        await cb(loadingFinishedEvent);
+      });
+      // act
+      await sut.subscribe(callback);
+      // assert
+      verify(networkMock.getRequestBody('1')).never();
+    });
+
     it('should filter a request out when it does not match a filter criteria', async () => {
       // arrange
       when(requestFilterMock.wouldApply(anything())).thenReturn(true);

diff --git a/src/network/NetworkObserver.ts b/src/network/NetworkObserver.ts
@@ -457,17 +457,19 @@ export class NetworkObserver implements Observer<NetworkRequest> {
       request.headers
     );
     chromeRequest.setRequestFormData(
-      this.getRequestPostData(chromeRequest, request)
+      request.hasPostData
+        ? this.getRequestPostData(chromeRequest, request)
+        : Promise.resolve(undefined)
     );
     chromeRequest.initialPriority = request.initialPriority;
   }
 
   private getRequestPostData(
     request: NetworkRequest,
     rawRequest: Protocol.Network.Request
-  ): string | Promise<string | undefined> {
-    return rawRequest.hasPostData && rawRequest.postData
-      ? rawRequest.postData
+  ): Promise<string | undefined> {
+    return rawRequest.postData !== undefined
+      ? Promise.resolve(rawRequest.postData)
       : this.network
           .getRequestBody(request.requestId)
           .then(