@contrast/contrast 1.0.22 → 2.0.0

package/src/utils/commonApi.js

@@ -12,7 +12,33 @@ const {
   parametersError,
   invalidHostNameError
 } = require('../common/errorHandling')
+const { performance } = require('perf_hooks')
+const requestUtils = require('./requestUtils')
+const oraFunctions = require('./oraWrapper')
 
+const getTimeout = config => {
+  if (config.timeout) {
+    return config.timeout
+  } else {
+    if (config.verbose) {
+      console.log('Timeout set to 5 minutes')
+    }
+    return 300
+  }
+}
+
+const handleTimeout = (startTime, timeout, reportSpinner) => {
+  const endTime = performance.now() - startTime
+  if (requestUtils.millisToSeconds(endTime) > timeout) {
+    oraFunctions.failSpinner(
+      reportSpinner,
+      'Contrast audit timed out at the specified timeout of ' +
+        timeout +
+        ' seconds.'
+    )
+    throw new Error('You can update the timeout using --timeout')
+  }
+}
 const handleResponseErrors = (res, api) => {
   if (res.statusCode === 400) {
     api === 'catalogue' ? badRequestError(true) : badRequestError(false)
@@ -71,5 +97,7 @@ module.exports = {
   getValidHost: getValidHost,
   getProtocol: getProtocol,
   handleResponseErrors: handleResponseErrors,
-  getHttpClient: getHttpClient
+  getHttpClient: getHttpClient,
+  handleTimeout: handleTimeout,
+  getTimeout: getTimeout
 }

package/src/utils/settingsHelper.js

@@ -1,24 +1,14 @@
-const commonApi = require('./commonApi')
-const { getMode } = require('./generalAPI')
-const { SAAS, MODE_BUILD } = require('../constants/constants')
+const generalAPI = require('./generalAPI')
+const { SAAS } = require('../constants/constants')
 
 const getSettings = async config => {
-  config.isEOP = (await getMode(config)).toUpperCase() === SAAS ? false : true
-  config.mode = MODE_BUILD
-  config.scaServices = await isSCAServicesAvailable(config)
-  return config
-}
+  config.isEOP =
+    (await generalAPI.getMode(config)).toUpperCase() === SAAS ? false : true
 
-const isSCAServicesAvailable = async config => {
-  const client = commonApi.getHttpClient(config)
-  return client
-    .scaServiceHealth(config)
-    .then(res => {
-      return res.body.status === 'UP'
-    })
-    .catch(err => {
-      console.log(err)
-    })
+  if (config.legacy === undefined) {
+    config.legacy = config.isEOP
+  }
+  return config
 }
 
 module.exports = {

package/dist/commands/fingerprint/processFingerprint.js

@@ -1,14 +0,0 @@
-"use strict";
-const fingerprintConfig = require('./fingerprintConfig');
-const autoDetection = require('../../scan/autoDetection');
-const saveResults = require('../../scan/saveResults');
-const processFingerprint = async (contrastConf, argvMain) => {
-    const config = await fingerprintConfig.getFingerprintConfig(contrastConf, 'fingerprint', argvMain);
-    let fingerprint = await autoDetection.autoDetectFingerprintInfo(config.file, config.depth);
-    let idArray = fingerprint.map(x => x.id);
-    await saveResults.writeResultsToFile(fingerprint, 'fingerPrintInfo.json');
-    return console.log(idArray);
-};
-module.exports = {
-    processFingerprint
-};

package/src/commands/fingerprint/processFingerprint.js

@@ -1,21 +0,0 @@
-const fingerprintConfig = require('./fingerprintConfig')
-const autoDetection = require('../../scan/autoDetection')
-const saveResults = require('../../scan/saveResults')
-const processFingerprint = async (contrastConf, argvMain) => {
-  const config = await fingerprintConfig.getFingerprintConfig(
-    contrastConf,
-    'fingerprint',
-    argvMain
-  )
-  let fingerprint = await autoDetection.autoDetectFingerprintInfo(
-    config.file,
-    config.depth
-  )
-  let idArray = fingerprint.map(x => x.id)
-  await saveResults.writeResultsToFile(fingerprint, 'fingerPrintInfo.json')
-  return console.log(idArray)
-}
-
-module.exports = {
-  processFingerprint
-}