@contrast/agentify 1.43.0 → 1.45.0

package/lib/index.js

@@ -16,12 +16,14 @@
 'use strict';
 
 const Module = require('module');
-
+const path = require('path');
+const { IntentionalError, safeConsoleError } = require('@contrast/common');
+const { Core } = require('@contrast/core/lib/ioc/core');
 const {
   assertValidOpts,
   preStartupValidation,
 } = require('./utils');
-const { IntentionalError } = require('@contrast/common');
+
 
 const ERROR_MESSAGE = 'An error prevented the Contrast agent from installing. The application will be run without instrumentation.';
 /**
@@ -38,6 +40,7 @@ const DEFAULT_INSTALL_ORDER = [
   'contrastMethods',
   'deadzones',
   'scopes',
+  'secObs',
   'sources',
   'architectureComponents',
   'assess',
@@ -62,6 +65,10 @@ const DEFAULT_INSTALL_ORDER = [
  * @returns {import('.').Agentify}
  */
 module.exports = function init(core = {}) {
+  if (!(core instanceof Core)) core = new Core(core);
+
+  core.agentPath = path.resolve(__dirname, '..', '..');
+
   // used for data that needs to be transferred to threads. originally added
   // for the file descriptor so the main and esm thread logger instances can
   // share the same FD. over time, other module-specific data that needs to
@@ -74,6 +81,7 @@ module.exports = function init(core = {}) {
   if (!core.threadTransferData) {
     core.threadTransferData = Object.create(null);
   }
+
   core.startTime = process.hrtime.bigint();
   if (!core.Perf) {
     core.Perf = require('@contrast/perf');
@@ -83,7 +91,6 @@ module.exports = function init(core = {}) {
 
   let _callback;
   let _opts;
-  const _perfAgentify = new core.Perf('agentify');
 
   core.agentify = async function agentify(callback, opts = {}) {
     // options are hardcoded, so if this throws it's going to be in testing/dev situation
@@ -133,6 +140,8 @@ module.exports = function init(core = {}) {
 
       const plugin = await _callback?.(core);
 
+      core.messages.emit('ext:core.pre-install');
+
       for (const svcName of _opts.installOrder ?? []) {
         const svc = core[svcName];
         if (svc?.install) {
@@ -144,12 +153,15 @@ module.exports = function init(core = {}) {
       if (plugin?.install) {
         await plugin.install();
       }
-    } catch (err) {
-      console.error(err);
-      console.error(ERROR_MESSAGE);
 
+      core.messages.emit('ext:core.post-install');
+    } catch (err) {
       // TODO: Consider proper UNINSTALLATION and normal startup w/o agent
-      logger.error({ err }, ERROR_MESSAGE);
+      if (logger) {
+        logger.error({ err }, ERROR_MESSAGE);
+      } else {
+        safeConsoleError(new Error(ERROR_MESSAGE, { cause: err }));
+      }
     }
   }
 
@@ -158,7 +170,6 @@ module.exports = function init(core = {}) {
     preStartupValidation(core);
 
     const modules = [
-      { name: 'messages', spec: '@contrast/core/lib/messages' },
       { name: 'config', spec: '@contrast/config' },
       { name: 'logger', spec: '@contrast/logger', default: true },
       // call all configValidation functions here
@@ -180,7 +191,6 @@ module.exports = function init(core = {}) {
       { name: 'reporter', spec: '@contrast/reporter', default: true },
       { name: 'instrumentation', spec: '@contrast/instrumentation' },
       { name: 'metrics', spec: '@contrast/metrics' },
-
       // compose additional local services
       { name: 'heap-snapshots', spec: './heap-snapshots' },
       { name: 'sources', spec: './sources' },
@@ -213,12 +223,16 @@ module.exports = function init(core = {}) {
     // now load each module and, if a validator is available, run it.
     for (const { name, spec, default: isDefault } of modules) {
       // typescript inserts a default export for esm modules.
-      let mod = require(spec);
+      let component = require(spec);
       if (isDefault) {
-        mod = mod.default;
+        component = component.default;
       }
 
-      _perfAgentify.wrapInit(mod, spec)(core);
+      if (Core.isComponent(component)) {
+        core.initComponentSync(component);
+      } else {
+        core.initComponentFactory(component, spec);
+      }
 
       // perform any validations that can take place now that this module is loaded.
       if (name === 'logger') {
@@ -239,10 +253,10 @@ module.exports = function init(core = {}) {
     // IntentionalError is used when the agent is disabled by config. We want
     // to abort the installation but not issue any messages.
     if (!(err instanceof IntentionalError)) {
-      console.error(err);
-      console.error(ERROR_MESSAGE);
       if (core.logger) {
         core.logger?.error?.({ err }, ERROR_MESSAGE);
+      } else {
+        safeConsoleError(new Error(ERROR_MESSAGE, { cause: err }));
       }
     }
   }

package/lib/validators.js

@@ -15,7 +15,11 @@
 
 'use strict';
 
-const { IntentionalError, primordials: { ArrayPrototypeSlice, StringPrototypeToLowerCase } } = require('@contrast/common');
+const {
+  IntentionalError,
+  primordials: { ArrayPrototypeSlice, StringPrototypeToLowerCase },
+  safeConsoleWarn,
+} = require('@contrast/common');
 
 // v4 accepted `-c` or `--configFile` option in argv, but v5 does not. so if
 // something that looks like a config flag is present on the command line, we
@@ -31,7 +35,7 @@ function config(core) {
     if (core.logger) {
       core.logger.warn(msg);
     } else {
-      console.warn(msg);
+      safeConsoleWarn(msg);
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/agentify",
-  "version": "1.43.0",
+  "version": "1.45.0",
   "description": "Configures Contrast agent services and instrumentation within an application",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -20,21 +20,21 @@
     "test": "../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.30.0",
-    "@contrast/config": "1.41.0",
-    "@contrast/core": "1.46.0",
-    "@contrast/deadzones": "1.18.0",
-    "@contrast/dep-hooks": "1.15.0",
-    "@contrast/esm-hooks": "2.20.0",
+    "@contrast/common": "1.32.0",
+    "@contrast/config": "1.43.0",
+    "@contrast/core": "1.48.0",
+    "@contrast/deadzones": "1.20.0",
+    "@contrast/dep-hooks": "1.17.0",
+    "@contrast/esm-hooks": "2.22.0",
     "@contrast/find-package-json": "^1.1.0",
-    "@contrast/instrumentation": "1.25.0",
-    "@contrast/logger": "1.19.0",
-    "@contrast/metrics": "1.23.0",
-    "@contrast/patcher": "1.18.0",
+    "@contrast/instrumentation": "1.27.0",
+    "@contrast/logger": "1.21.0",
+    "@contrast/metrics": "1.25.0",
+    "@contrast/patcher": "1.20.0",
     "@contrast/perf": "1.3.1",
-    "@contrast/reporter": "1.42.0",
-    "@contrast/rewriter": "1.22.0",
-    "@contrast/scopes": "1.16.0",
+    "@contrast/reporter": "1.44.0",
+    "@contrast/rewriter": "1.24.0",
+    "@contrast/scopes": "1.18.0",
     "on-finished": "^2.4.1",
     "semver": "^7.6.0"
   }