fix(cdp): call callback after session has been associated with request (

#231) closes #230
NeuraLegion · Mar 7, 2023 · 44a47e5 · 44a47e5
1 parent 25b9a69
commit 44a47e5
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 17 deletions.
diff --git a/cypress/app/index.ts b/cypress/app/index.ts
@@ -1,4 +1,4 @@
-import express, { Request, Response, json } from 'express';
+import express, { Request, Response, json, raw } from 'express';
 import minimist from 'minimist';
 import WebSocket, { Server } from 'ws';
 import { join } from 'path';
@@ -87,7 +87,12 @@ app.get('/api/products', (_: Request, res: Response) =>
     ]
   })
 );
-app.get('/api/echo', (req: Request, res: Response) => res.json(req.body));
+app.post(
+  '/api/echo',
+  raw({ type: ['text/xml', 'application/json'] }),
+  (req: Request, res: Response) =>
+    res.send(Buffer.isBuffer(req.body) ? req.body.toString() : 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
@@ -9,21 +9,44 @@
   </head>
   <body>
     <h1>Post Data</h1>
-    <pre></pre>
+    <details>
+      <summary>
+        Text
+      </summary>
+      <pre id="text"></pre>
+    </details>
+    <details>
+      <summary>
+        Blob
+      </summary>
+      <pre id="blob"></pre>
+    </details>
   </body>
   <script>
-    const postData = {
-      document: document.body.innerHTML,
-    };
-    const pre = document.querySelector('pre')
+    const text = document.querySelector('#text');
+    const blob = document.querySelector('#blob');
+    const blobContent = new XMLSerializer().serializeToString(document);
 
     fetch('/api/echo', {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(postData)
+      body: JSON.stringify({
+        name: 'John Doe',
+        email: '[email protected]',
+        message: 'Hello, world!'
+      })
     })
       .then(response => response.json())
-      .then(data => pre.innerText = JSON.stringify(data, null, 2))
+      .then(data => text.innerText = JSON.stringify(data, null, 2))
+      .catch(error => console.error(error));
+
+    fetch('/api/echo', {
+      method: 'POST',
+      headers: { 'Content-Type': 'text/xml' },
+      body: new Blob([blobContent])
+    })
+      .then(response => response.text())
+      .then(data => blob.innerText = data)
       .catch(error => console.error(error));
   </script>
 </html>
diff --git a/cypress/e2e/record-har.cy.ts b/cypress/e2e/record-har.cy.ts
@@ -361,7 +361,7 @@ describe('Record HAR', () => {
       });
   });
 
-  it('records a request body', () => {
+  it('records a text request body', () => {
     cy.recordHar({ content: false });
 
     cy.get('a[href$=post-data]').click();
@@ -374,7 +374,26 @@ describe('Record HAR', () => {
         request: {
           url: /api\/echo$/,
           postData: {
-            text: /^\{"document":"/
+            text: /^\{"name":"/
+          }
+        }
+      });
+  });
+
+  it('records a blob 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: /^<html xmlns/
           }
         }
       });

diff --git a/src/cdp/DefaultNetwork.spec.ts b/src/cdp/DefaultNetwork.spec.ts
@@ -34,10 +34,12 @@ describe('DefaultNetwork', () => {
   let sut!: DefaultNetwork;
 
   beforeEach(() => {
+    jest.useFakeTimers();
     sut = new DefaultNetwork(instance(clientMock), instance(loggerMock));
   });
 
   afterEach(() => {
+    jest.useRealTimers();
     listener.mockReset();
     reset<Client | Logger>(clientMock, loggerMock);
   });
@@ -74,6 +76,8 @@ describe('DefaultNetwork', () => {
       when(clientMock.on('event', anyFunction())).thenCall((_, callback) => {
         callback(unexpectedEvent);
         callback(expectedEvent);
+        // ADHOC: spawn `setImmediate` immediately
+        jest.runAllTimers();
       });
       // act
       await sut.attachToTargets(listener);

diff --git a/src/cdp/DefaultNetwork.ts b/src/cdp/DefaultNetwork.ts
@@ -104,12 +104,9 @@ export class DefaultNetwork implements Network {
     }
   }
 
-  private networkEventListener = async (eventMessage: EventMessage) => {
-    if (
-      this.matchNetworkEvents(eventMessage) &&
-      typeof this.listener === 'function'
-    ) {
-      this.listener(eventMessage);
+  private networkEventListener = (eventMessage: EventMessage) => {
+    if (this.matchNetworkEvents(eventMessage)) {
+      setImmediate(() => this.listener?.(eventMessage));
     }
   };