From b40e1591d622215132c21ae3bccecbb0fad93be9 Mon Sep 17 00:00:00 2001
From: miherlosev <miherlosev@mail.ru>
Date: Wed, 27 Jul 2022 15:33:42 +0400
Subject: [PATCH 1/2] fix 'Memory leak on running more than 11 tests' (close
 #7188)

---
 .../dedicated/chrome/cdp-client/index.ts      | 29 +++++++++++++++----
 .../built-in/dedicated/chrome/index.js        |  6 ++++
 src/browser/provider/index.ts                 |  4 +++
 src/video-recorder/process.js                 |  5 ++++
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/browser/provider/built-in/dedicated/chrome/cdp-client/index.ts b/src/browser/provider/built-in/dedicated/chrome/cdp-client/index.ts
index 2cf7edb6f63..bd527ca7425 100644
--- a/src/browser/provider/built-in/dedicated/chrome/cdp-client/index.ts
+++ b/src/browser/provider/built-in/dedicated/chrome/cdp-client/index.ts
@@ -51,8 +51,9 @@ export class BrowserClient {
     private readonly _runtimeInfo: RuntimeInfo;
     private _parentTarget?: remoteChrome.TargetInfo;
     private readonly debugLogger: debug.Debugger;
-    private readonly _videoFramesBuffer: VideoFrameData[];
+    private _videoFramesBuffer: VideoFrameData[];
     private _lastFrame: VideoFrameData | null;
+    private _screencastFrameListenerAttached = false;
 
     public constructor (runtimeInfo: RuntimeInfo) {
         this._runtimeInfo = runtimeInfo;
@@ -358,16 +359,32 @@ export class BrowserClient {
         if (!client)
             return;
 
-        client.Page.on('screencastFrame', (event: ScreencastFrameEvent) => {
-            this._videoFramesBuffer.push({
-                data:      event.data,
-                sessionId: event.sessionId,
+        if (!this._screencastFrameListenerAttached) {
+            client.Page.on('screencastFrame', (event: ScreencastFrameEvent) => {
+                this._videoFramesBuffer.push({
+                    data:      event.data,
+                    sessionId: event.sessionId,
+                });
             });
-        });
+
+            this._screencastFrameListenerAttached = true;
+        }
 
         await client.Page.startScreencast(SCREENCAST_OPTIONS as StartScreencastRequest);
     }
 
+    public async stopCapturingVideo (): Promise<void> {
+        const client = await this.getActiveClient();
+
+        if (!client)
+            return;
+
+        await client.Page.stopScreencast();
+
+        this._lastFrame         = null;
+        this._videoFramesBuffer = [];
+    }
+
     public async getVideoFrameData (): Promise<Buffer | null> {
         const currentVideoFrame = this._videoFramesBuffer.shift() || this._lastFrame;
 
diff --git a/src/browser/provider/built-in/dedicated/chrome/index.js b/src/browser/provider/built-in/dedicated/chrome/index.js
index 811a8e70384..34d5cd3ba84 100644
--- a/src/browser/provider/built-in/dedicated/chrome/index.js
+++ b/src/browser/provider/built-in/dedicated/chrome/index.js
@@ -128,6 +128,12 @@ export default {
         await browserClient.startCapturingVideo();
     },
 
+    async stopCapturingVideo (browserId) {
+        const { browserClient } = this.openedBrowsers[browserId];
+
+        await browserClient.stopCapturingVideo();
+    },
+
     async getVideoFrameData (browserId) {
         const { browserClient } = this.openedBrowsers[browserId];
 
diff --git a/src/browser/provider/index.ts b/src/browser/provider/index.ts
index 7b5b85cc804..ef53d1debd6 100644
--- a/src/browser/provider/index.ts
+++ b/src/browser/provider/index.ts
@@ -417,6 +417,10 @@ export default class BrowserProvider {
         await this.plugin.startCapturingVideo(browserId);
     }
 
+    public async stopCapturingVideo (browserId: string): Promise<void> {
+        await this.plugin.stopCapturingVideo(browserId);
+    }
+
     public async hasCustomActionForBrowser (browserId: string): Promise<any> {
         return this.plugin.hasCustomActionForBrowser(browserId);
     }
diff --git a/src/video-recorder/process.js b/src/video-recorder/process.js
index b81575ebfb4..bcf6550176a 100644
--- a/src/video-recorder/process.js
+++ b/src/video-recorder/process.js
@@ -130,6 +130,10 @@ export default class VideoRecorder extends AsyncEmitter {
         await this.connection.provider.startCapturingVideo(this.connection.id);
     }
 
+    async _stopCapturing () {
+        await this.connection.provider.stopCapturingVideo(this.connection.id);
+    }
+
     async init () {
         this.ffmpegProcess = spawn(this.ffmpegPath, this.optionsList, { stdio: 'pipe' });
 
@@ -183,6 +187,7 @@ export default class VideoRecorder extends AsyncEmitter {
 
         this.closed = true;
 
+        await this._stopCapturing();
         await this.capturingPromise;
         await this.dispose();
     }

From c1294f994b24e71b1b28807dee768b695de5b028 Mon Sep 17 00:00:00 2001
From: miherlosev <miherlosev@mail.ru>
Date: Thu, 28 Jul 2022 11:35:38 +0400
Subject: [PATCH 2/2] fix tests in firefox

---
 src/browser/provider/plugin-host.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/browser/provider/plugin-host.js b/src/browser/provider/plugin-host.js
index d314614d630..2972f583573 100644
--- a/src/browser/provider/plugin-host.js
+++ b/src/browser/provider/plugin-host.js
@@ -143,6 +143,9 @@ export default class BrowserProviderPluginHost {
     async startCapturingVideo (/*browserId*/) {
     }
 
+    async stopCapturingVideo (/*browserId*/) {
+    }
+
     async getVideoFrameData (browserId) {
         const browserAlias = BrowserConnection.getById(browserId).browserInfo.alias;