@contrast/agent 5.39.0 → 5.40.0

package/lib/start-agent.js

@@ -19,7 +19,6 @@ const process = require('process');
 const { isMainThread, threadId } = require('worker_threads');
 const { safeConsoleError, safeConsoleWarn } = require('@contrast/common');
 const { Core } = require('@contrast/core/lib/ioc/core');
-const _agentify = require('@contrast/agentify');
 
 const {
   name: agentName,
@@ -30,6 +29,8 @@ const {
   }
 } = require('../package.json');
 
+const kContrastInitialized = Symbol(`${agentName}:initialized`);
+
 function initCore() {
   const core = new Core({
     agentName,
@@ -70,46 +71,55 @@ function loadFeatures(core) {
 }
 
 function startAgent({ type = 'cjs' } = {}) {
-  if (isMainThread) {
-    try {
-      const core = initCore();
-      const agentify = _agentify(core);
-
-      return agentify(loadFeatures, {
-        installOrder: [
-          'reporter',
-          'startupValidation',
-          'telemetry',
-          'contrastMethods',
-          'deadzones',
-          'scopes',
-          'secObs',
-          'sources',
-          'architectureComponents',
-          'routeCoverage',
-          'assess',
-          'protect',
-          'depHooks',
-          'libraryAnalysis',
-          'heapSnapshots',
-          'metrics',
-          'rewriteHooks',
-          'functionHooks',
-          'esmHooks',
-          'diagnostics',
-        ],
-        type
-      });
-    } catch (cause) {
-      // agentify should catch any startup errors and handle necessary logging,
-      // but this is just in case a fatal error occurs during composition.
-      safeConsoleError(new Error(
-        'Startup error was not handled by agentify. Application Will be run without instrumentation.',
-        { cause }
-      ));
-    }
-  } else {
+  if (!isMainThread) {
     safeConsoleWarn('Not in main thread. Thread (tid: %d) continuing without instrumentation.', threadId);
+    return;
+  }
+
+  if (global[kContrastInitialized]) {
+    safeConsoleWarn('%s has already been initialized. Continuing without reinstrumentation.', agentName);
+    return;
+  }
+
+  try {
+    global[kContrastInitialized] = true;
+
+    const core = initCore();
+    const agentify = require('@contrast/agentify')(core);
+
+    return agentify(loadFeatures, {
+      installOrder: [
+        'reporter',
+        'startupValidation',
+        'telemetry',
+        'contrastMethods',
+        'deadzones',
+        'scopes',
+        'secObs',
+        'sources',
+        'architectureComponents',
+        'routeCoverage',
+        'assess',
+        'protect',
+        'depHooks',
+        'libraryAnalysis',
+        'heapSnapshots',
+        'metrics',
+        'rewriteHooks',
+        'functionHooks',
+        'esmHooks',
+        'diagnostics',
+      ],
+      type
+    });
+  } catch (cause) {
+    delete global[kContrastInitialized];
+    // agentify should catch any startup errors and handle necessary logging,
+    // but this is just in case a fatal error occurs during composition.
+    safeConsoleError(new Error(
+      'Startup error was not handled by agentify. Application Will be run without instrumentation.',
+      { cause }
+    ));
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/agent",
-  "version": "5.39.0",
+  "version": "5.40.0",
   "description": "Assess and Protect agents for Node.js",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -27,15 +27,15 @@
     "test": "bash ../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/agentify": "1.52.0",
-    "@contrast/architecture-components": "1.42.0",
-    "@contrast/assess": "1.58.0",
-    "@contrast/common": "1.34.0",
-    "@contrast/core": "1.54.0",
-    "@contrast/library-analysis": "1.44.0",
-    "@contrast/protect": "1.64.0",
-    "@contrast/route-coverage": "1.45.0",
+    "@contrast/agentify": "1.52.2",
+    "@contrast/architecture-components": "1.42.2",
+    "@contrast/assess": "1.58.2",
+    "@contrast/common": "1.34.2",
+    "@contrast/core": "1.54.2",
+    "@contrast/library-analysis": "1.44.2",
+    "@contrast/protect": "1.64.2",
+    "@contrast/route-coverage": "1.45.2",
     "@contrast/sec-obs": "1.0.0-alpha.8",
-    "@contrast/telemetry": "1.29.0"
+    "@contrast/telemetry": "1.29.2"
   }
 }