Merge pull request #105 from reportportal/develop

5.0.4 Release
reportportal · Apr 29, 2021 · f354502 · f354502
2 parents 541bce8 + b2f5b8f
commit f354502
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
+### Added
+- Timeout (default is 5000ms) on Axios Requests
+### Fixed
+- Security vulnerabilities ([axios](https://github.com/reportportal/client-javascript/issues/109))
+- [Issue](https://github.com/reportportal/client-javascript/issues/94) with the finish of a non-existent test item
 
 ## [5.0.3] - 2020-11-09
-
 ### Added
 - Environment variable
 

diff --git a/README.md b/README.md
@@ -11,6 +11,7 @@ Library is used only for implementors of custom listeners for ReportPortal.
 * [Nightwatch integration](https://github.com/reportportal/agent-js-nightwatch)
 * [Cucumber integration](https://github.com/reportportal/agent-js-cucumber)
 * [Codecept integration](https://github.com/reportportal/agent-js-codecept)
+* [Postman integration](https://github.com/reportportal/agent-js-postman)
 
 Examples for test framework integrations from the list above described in [examples](https://github.com/reportportal/examples-js) repository.
 
@@ -78,6 +79,9 @@ rpClient.checkConnect().then((response) => {
 });
 ```
 
+### timeout (5000ms) on axios requests
+There is a timeout on axios requests. If for instance the server your making a request to is taking too long to load, then axios timeout will work and you will see the error "Error: timeout of 5000ms exceeded".
+
 ### startLaunch
 startLaunch - starts a new launch, return temp id that you want to use for all of the items within this launch.
 ```javascript

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.0.3
+5.0.4-SNAPSHOT
diff --git a/lib/report-portal-client.js b/lib/report-portal-client.js
@@ -513,7 +513,7 @@ class RPClient {
         }, itemObj.children.length ? {} : { status: RP_STATUSES.PASSED }, finishTestItemRQ);
 
         itemObj.finishSend = true;
-        Promise.all(itemObj.children.map(itemId => this.map[itemId].promiseFinish))
+        Promise.all(itemObj.children.map(itemId => this.map[itemId] && this.map[itemId].promiseFinish))
             .then(() => {
                 this.cleanMap(itemObj.children);
                 this.finishTestItemPromiseStart(itemObj,

diff --git a/lib/rest.js b/lib/rest.js
@@ -1,6 +1,8 @@
 const axios = require('axios');
 const axiosRetry = require('axios-retry');
 
+const DEFAULT_MAX_CONNECTION_TIME_MS = 5000;
+
 axiosRetry(axios, { retryDelay: () => 100, retries: 10, retryCondition: axiosRetry.isRetryableError });
 
 class RestClient {
@@ -21,8 +23,9 @@ class RestClient {
         return axios({
             method,
             url,
-            headers: options.headers,
             data,
+            timeout: DEFAULT_MAX_CONNECTION_TIME_MS,
+            ...options,
         })
             .then(response => response.data)
             .catch((error) => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "node": ">= 8.0.x"
   },
   "dependencies": {
-    "axios": "^0.18.1",
+    "axios": "^0.21.1",
     "axios-retry": "^3.1.2",
     "glob": "^7.1.4",
     "uniqid": "^5.0.3",