fix timeout error (#96)

.travis.yml

@@ -2,7 +2,7 @@ language: node_js
 node_js:
   - "lts/*"
   - "12"
-  - "11"
+  - "10"
   - "8"
 
 sudo: required

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.2.1] - 2019-05-24
+### Added
+- fixed timeout error, lint fixes  
+- removed node 11 from tests because it turned EOL
+
 ## [2.2.0] - 2019-05-06
 ### Added
 - Send telemetry by command

README.md

@@ -5,7 +5,7 @@
 [PerimeterX](http://www.perimeterx.com) Shared base for NodeJS enforcers
 =============================================================
 
-> Latest stable version: [v2.2.0](https://www.npmjs.com/package/perimeterx-node-core)
+> Latest stable version: [v2.2.1](https://www.npmjs.com/package/perimeterx-node-core)
 
 This is a shared base implementation for PerimeterX Express enforcer and future NodeJS enforcers. For a fully functioning implementation example, see the [Node-Express enforcer](https://github.com/PerimeterX/perimeterx-node-express/) implementation.
 

lib/configloader.js

@@ -21,7 +21,7 @@ class ConfigLoader {
         };
         request.get(callData, this.config, (error, response) => {
             if (error || !response || !(response.statusCode === 200 || response.statusCode === 204)) {
-                this.config.logger.error(`Failed to get configurations: ${error}`);
+                this.config.logger.debug(`Failed to get configurations: ${error}`);
                 if (!checksum) { //no configuration loaded and we can't get configuration - disable module
                     this.config.logger.debug('Failed to pull initial config, switching module to disable until remote configuration found');
                     this.config.ENABLE_MODULE = false;

lib/pxapi.js

@@ -87,7 +87,7 @@ function callServer(ctx, config, callback) {
         data.additional['px_decoded_original_token'] = ctx.decodedOriginalToken;
     }
 
-    if(ctx.hmac) {
+    if (ctx.hmac) {
         data.additional['px_cookie_hmac'] = ctx.hmac;
     }
 

lib/pxconfig.js

@@ -63,7 +63,7 @@ class PxConfig {
                 }
             }
             mergedParams = Object.assign(configParams, fileMappedConfig);
-        } catch(err) {
+        } catch (err) {
             this.logger.error('Failed while trying to read the config json file, ' + err);
         }
         return mergedParams;

lib/pxenforcer.js

@@ -56,7 +56,7 @@ class PxEnforcer {
         }
 
         try {
-            if(telemetryHandler.isTelemetryCommand(req, this._config)) {
+            if (telemetryHandler.isTelemetryCommand(req, this._config)) {
                 this.pxClient.sendEnforcerTelemetry('command', this._config);
             }
         } catch (err) {
@@ -134,7 +134,7 @@ class PxEnforcer {
                     return callback(this._config.SCORE_EVALUATE_ACTION.S2S_BLOCK_TRAFFIC);
                 }
 
-                if(action === this._config.SCORE_EVALUATE_ACTION.S2S_TIMEOUT_PASS) {
+                if (action === this._config.SCORE_EVALUATE_ACTION.S2S_TIMEOUT_PASS) {
                     this.logger.debug(`Risk API timed out , round_trip_time: ${ctx.riskRtt}ms`);
                     return callback(this._config.SCORE_EVALUATE_ACTION.S2S_TIMEOUT_PASS);
                 }

lib/pxhttpc.js

@@ -29,7 +29,7 @@ function callServer(data, headers, uri, callType, config, callback) {
         request.post(callData, config, function (err, response) {
             let data;
             if (err) {
-                if (err === 'Error: Timeout has been reached.' || err === 'Error: Timeout reached') {
+                if (err.toString().toLowerCase().includes('timeout')) {
                     return callback('timeout');
                 } else {
                     return callback(`perimeterx server did not return a valid response. Error: ${err}`);

lib/pxutil.js

@@ -66,7 +66,7 @@ function filterSensitiveHeaders(headers, sensitiveKeys) {
             }
         }
         return retval;
-    } catch(e) {
+    } catch (e) {
         return headers;
     }
 }
@@ -81,7 +81,7 @@ function generateProxyHeaders(headers, ip, sensitiveHeaders, forwardedForHeader)
             filteredHeaders[forwardedForHeader] = ip;
         }
         return filteredHeaders;
-    } catch(e) {
+    } catch (e) {
         return headers;
     }
 }

lib/telemetry_handler.js

@@ -10,7 +10,7 @@ function isTelemetryCommand(req, config) {
     const logger = new PxLogger();
     const headerVal = req.headers[config.TELEMETRY_COMMAND_HEADER];
 
-    if(!headerVal) {
+    if (!headerVal) {
         return false;
     }
 
@@ -22,15 +22,15 @@ function isTelemetryCommand(req, config) {
     // value is in the form of timestamp:hmac_val
     const splittedValue = decodedString.split(':');
 
-    if(splittedValue.length !== 2) {
+    if (splittedValue.length !== 2) {
         logger.debug('Malformed header value - ${config.TELEMETRY_COMMAND_HEADER} = ${headerVal}');
         return false;
     }
 
     const [timestamp, hmac] = splittedValue;
 
     // timestamp
-    if(Number(timestamp) < new Date().getTime()) {
+    if (Number(timestamp) < new Date().getTime()) {
         logger.debug('Telemetry command has expired');
         return false;
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "perimeterx-node-core",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "PerimeterX NodeJS shared core for various applications to monitor and block traffic according to PerimeterX risk score",
   "main": "index.js",
   "scripts": {
@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "eslint": "^5.16.0",
-    "eslint-config-perimeterx": "^0.2.0",
+    "eslint-config-perimeterx": "^0.3.0",
     "mocha": "^5.2.0",
     "rewire": "^2.5.2",
     "should": "^8.3.0",