Merge pull request #96 from semrush/browser-protocol-timeout

Browser protocol timeout
semrush · Sep 19, 2023 · 332c6e0 · 332c6e0
2 parents 3d2a45f + 2a0b8f9
commit 332c6e0
Show file tree

Hide file tree

Showing 9 changed files with 760 additions and 655 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v1
         with:
-          node-version: 20.5
+          node-version: 20.6
 
       - name: yarn
         run: yarn --frozen-lockfile

diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 override APPLICATION_NAME=purr
-override NODE_VERSION=20.5
+override NODE_VERSION=20.6
 
 DOCKER_IMAGE?=ghcr.io/semrush/purr
 DOCKER_TAG?=latest

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,4 +1,4 @@
-ARG NODE_VERSION=20.5
+ARG NODE_VERSION=20.6
 
 FROM node:${NODE_VERSION} as vendor
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@semrush/purr",
-  "version": "3.14.1",
+  "version": "3.15.2",
   "description": "",
   "main": "src/cli.cjs",
   "scripts": {
@@ -57,7 +57,7 @@
     "lodash.isempty": "^4.4.0",
     "lodash.isundefined": "^3.0.1",
     "morgan": "^1.10.0",
-    "nodemon": "^2.0.4",
+    "nodemon": "^3.0.1",
     "nunjucks": "^3.2.4",
     "prom-client": "^14.2.0",
     "puppeteer": "^21.1.0",

diff --git a/src/browser/browser.js b/src/browser/browser.js
@@ -57,6 +57,7 @@ exports.getBrowser = async (userAgent = config.userAgent, customArgs = []) => {
 
     dumpio: config.browserDumpIO,
     headless: config.browserHeadless ? 'new' : 'headful',
+    protocolTimeout: config.browserProtocolTimeout,
   });
 };
 

diff --git a/src/config/__tests__/configuration.test.js b/src/config/__tests__/configuration.test.js
@@ -17,6 +17,7 @@ describe('Test Configuration class', () => {
       blockedResourceDomains: [],
       browserDumpIO: false,
       browserHeadless: true,
+      browserProtocolTimeout: 180000,
       checksDir: '/rootDir/data/checks',
       checksQueueName: 'checks-queue',
       chromiumLaunchArgs: [],

diff --git a/src/config/configuration.js b/src/config/configuration.js
@@ -195,6 +195,11 @@ class Configuration {
       false
     );
 
+    this.browserProtocolTimeout = getDefault(
+      envParams.BROWSER_PROTOCOL_TIMEOUT,
+      180000
+    );
+
     if (this.artifactsGroupByCheckName && isUndefined(this.artifactsDir)) {
       throw new Error(
         'Enabled group artifacts by check name and artifacts path not specified'

diff --git a/src/config/env.js b/src/config/env.js
@@ -225,6 +225,14 @@ const DEFAULT_ENV_PARAMS = {
    * @default {true}
    */
   BROWSER_DUMP_IO: false,
+
+  /**
+   * Browser protocol timeout
+   *
+   * @type {number}
+   * @default {180000}
+   */
+  BROWSER_PROTOCOL_TIMEOUT: 180000,
 };
 
 class EnvParams {

diff --git a/yarn.lock b/yarn.lock
-Original file line number
+Diff line change
@@ Expand Up @@
         dumpio: config.browserDumpIO,
         headless: config.browserHeadless ? 'new' : 'headful',
+        protocolTimeout: config.browserProtocolTimeout,
       });
     };
@@ Expand Down @@