@contrast/agent 5.0.0-beta.5 → 5.0.0-beta.6

package/lib/index.js

@@ -21,15 +21,20 @@ const archComponents = require('@contrast/architecture-components');
 const libraryUsage = require('@contrast/library-analysis');
 const protect = require('@contrast/protect');
 const routeCoverage = require('@contrast/route-coverage');
-const { name: agentName, version: agentVersion, engines: { node, npm } } = require('../package.json');
+const {
+  name: agentName,
+  version: agentVersion,
+  engines: {
+    node: nodeEngine,
+    npm: npmEngine
+  }
+} = require('../package.json');
 const { agentify } = require('@contrast/core')({ agentName, agentVersion });
 
 agentify((core) => {
-  core.npmVersionRange = npm;
-
-  if (!semver.satisfies(process.version, node)) {
+  if (!semver.satisfies(process.version, nodeEngine)) {
     let validRanges = '';
-    node.split('||').forEach((range) => {
+    nodeEngine.split('||').forEach((range) => {
       const minVersion = semver.minVersion(range).toString();
       const maxVersion = range.split('<').pop()
         .trim();
@@ -38,15 +43,42 @@ agentify((core) => {
     throw new Error(`Contrast only officially supports Node LTS versions between ${validRanges}but detected ${process.version}.`);
   }
 
+  core.startupValidation = {
+    /**
+     *  This will run after we onboard to the UI and pick up any remote settings.
+     */
+    install() {
+      if (
+        !core.config.getEffectiveValue('assess.enable') &&
+        !core.config.getEffectiveValue('protect.enable')
+      ) {
+        throw new Error('Neither Assess nor Protect are enabled. Check local configuration and UI settings');
+      }
+    }
+  };
+
+  core.npmVersionRange = npmEngine;
+  assess(core);
   archComponents(core);
   libraryUsage(core);
   routeCoverage(core);
-
-  if (!core.config.protect.enable && !core.config.assess.enable) {
-    throw new Error('Protect or Assess must be enabled!');
-  }
-
-  assess(core);
-  // Protect and Assess are compatible. Protect loads lastly, being the only non-passive feature.
-  protect(core);
+  protect(core); // protect loads lastly, being the only non-passive feature
+}, {
+  installOrder: [
+    'reporter',
+    'startupValidation',
+    'contrastMethods',
+    'deadzones',
+    'scopes',
+    'sources',
+    'architectureComponents',
+    'assess',
+    'protect',
+    'depHooks',
+    'routeCoverage',
+    'libraryAnalysis',
+    'heapSnapshots',
+    'rewriteHooks',
+    'functionHooks'
+  ],
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/agent",
-  "version": "5.0.0-beta.5",
+  "version": "5.0.0-beta.6",
   "description": "Assess and Protect agents for Node.js",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -18,11 +18,11 @@
   },
   "dependencies": {
     "@contrast/architecture-components": "1.13.1",
-    "@contrast/assess": "1.15.0",
-    "@contrast/core": "1.24.0",
-    "@contrast/library-analysis": "1.13.0",
-    "@contrast/route-coverage": "1.11.1",
-    "@contrast/protect": "1.26.0",
+    "@contrast/assess": "1.16.0",
+    "@contrast/core": "1.25.0",
+    "@contrast/library-analysis": "1.13.1",
+    "@contrast/route-coverage": "1.11.2",
+    "@contrast/protect": "1.27.0",
     "semver": "^7.3.7"
   }
 }