fix: remove prerequests from automation client when bidi continue request errors (#31328)

* fix: make sure to remove prerequests when bidi interceptor is removed and requests are still in flight from the previous spec/tab [run ci]

* fix changelog

Author: AtofStryker

cli/CHANGELOG.md

@@ -3,6 +3,11 @@
 
 _Released 3/25/2025 (PENDING)_
 
+**Bugfixes:**
+
+- Applies a fix from [#30730](https://github.com/cypress-io/cypress/pull/30730) and [#30099](https://github.com/cypress-io/cypress/pull/30099) related to Node.js turning on ESM flags by default in Node.js version `20.19.0`. Fixed in [#31308](https://github.com/cypress-io/cypress/pull/31308).
+- Fixed an issue where Firefox BiDi was not correctly removing prerequests on expected network request failures. Fixes [#31325](https://github.com/cypress-io/cypress/issues/31325).
+
 **Dependency Updates:**
 
 - Upgraded `@cypress/request` from `3.0.7` to `3.0.8`. Addressed in [#31311](https://github.com/cypress-io/cypress/pull/31311).
@@ -12,11 +17,6 @@ _Released 3/25/2025 (PENDING)_
 - Upgraded `semver` from `7.5.3` to `7.7.1`. Addressed in [#31341](https://github.com/cypress-io/cypress/pull/31341).
 - Upgraded `systeminformation` from `5.21.7` to `5.22.8`. Addressed in [#31281](https://github.com/cypress-io/cypress/pull/31281).
 
-**Bugfixes:**
-
-- Applies a fix from [#30730](https://github.com/cypress-io/cypress/pull/30730) and [#30099](https://github.com/cypress-io/cypress/pull/30099) related to Node.js turning on ESM flags by default in Node.js version `20.19.0`. Fixed in [#31308](https://github.com/cypress-io/cypress/pull/31308).
-
-
 ## 14.2.0
 
 _Released 3/12/2025_

packages/server/lib/browsers/bidi_automation.ts

@@ -216,6 +216,10 @@ export class BidiAutomation {
           cookies: params.request.cookies,
         })
       } catch (err: unknown) {
+        debugVerbose(`error continuing request: %o`, err)
+        debugVerbose(`removing prerequest for request ID: ${params.request.request}`)
+        // if the continueRequest fails for any reason, we need to remove the prerequest from the automation client
+        this.automation.onRemoveBrowserPreRequest?.(params.request.request)
         // happens if you kill the Cypress app in the middle of request interception. This error can be ignored
         if (!(err as Error)?.message.includes('no such request')) {
           throw err

packages/server/test/unit/browsers/bidi_automation_spec.ts

@@ -368,14 +368,18 @@ describe('lib/browsers/bidi_automation', () => {
           })
         })
 
-        it('swallows "no such request" messages if thrown via killing the Cypress app', () => {
+        it('swallows "no such request" messages if thrown via killing the Cypress app and removes the related prerequest', async () => {
           BidiAutomation.create(mockWebdriverClient, mockAutomationClient)
 
           mockWebdriverClient.networkContinueRequest = sinon.stub().throws('no such request')
 
           expect(() => {
             mockWebdriverClient.emit('network.beforeRequestSent', mockRequest)
           }).not.to.throw()
+
+          await flushPromises()
+
+          expect(mockAutomationClient.onRemoveBrowserPreRequest).to.have.been.calledWith('request1')
         })
       })