@contrast/agent-bundle 5.42.0 → 5.45.1

package/node_modules/@contrast/reporter/node_modules/sonic-boom/types/index.d.ts

@@ -17,7 +17,6 @@ export type SonicBoomOpts = {
     append?: boolean
     mode?: string | number
     mkdir?: boolean
-    contentMode?: 'buffer' | 'utf8'
     retryEAGAIN?: (err: Error, writeBufferLen: number, remainingBufferLen: number) => boolean
 }
 
@@ -38,7 +37,7 @@ export class SonicBoom extends EventEmitter {
      * Writes the current buffer to the file if a write was not in progress.
      * Do nothing if minLength is zero or if it is already writing.
      */
-    flush(cb?: (err?: Error) => unknown): void;
+    flush(): void;
 
     /**
      * Reopen the file in place, useful for log rotation.

package/node_modules/@contrast/reporter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/reporter",
-  "version": "1.53.0",
+  "version": "1.55.1",
   "description": "Subscribes to agent messages and reports them",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -14,22 +14,22 @@
   "types": "lib/index.d.ts",
   "engines": {
     "npm": ">=6.13.7 <7 || >= 8.3.1",
-    "node": ">= 16.9.1"
+    "node": ">= 18.7.0"
   },
   "scripts": {
     "build": "tsc --build src/",
     "test": "bash ../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.35.0",
-    "@contrast/config": "1.50.0",
-    "@contrast/core": "1.55.0",
-    "@contrast/logger": "1.28.0",
-    "@contrast/perf": "1.3.1",
-    "@contrast/scopes": "1.25.0",
-    "axios": "^1.11.0",
+    "@contrast/common": "1.37.0",
+    "@contrast/config": "1.52.1",
+    "@contrast/core": "1.57.1",
+    "@contrast/logger": "1.30.1",
+    "@contrast/perf": "1.4.0",
+    "@contrast/scopes": "1.27.1",
+    "axios": "^1.12.2",
     "crc-32": "^1.2.2",
     "safe-stable-stringify": "^2.4.1",
-    "sonic-boom": "^3.2.0"
+    "sonic-boom": "3.2.0"
   }
 }

package/node_modules/@contrast/rewriter/lib/index.js

@@ -15,11 +15,9 @@
 // @ts-check
 'use strict';
 
-const Module = require('node:module');
 const { arch, platform } = require('node:os');
 const path = require('node:path');
 const { parseSync, transform, transformSync } = require('@swc/core');
-const { primordials: { StringPrototypeReplace, StringPrototypeSubstring } } = require('@contrast/common');
 const { Cache } = require('./cache');
 
 /**
@@ -34,43 +32,13 @@ const { Cache } = require('./cache');
 /**
  * @typedef {Object} RewriteOpts
  * @prop {string=} filename e.g. 'index.js'
- * @prop {boolean=} isModule if true, file is parsed as an ES module instead of a CJS script
  * @prop {boolean=} inject if true, injects ContrastMethods on the global object
- * @prop {boolean=} wrap if true, wraps the content with a modified module wrapper IIFE
  * @prop {boolean=} minify if true, minifies the output when source maps are enabled
  */
 
-// @ts-expect-error `wrapper` is missing from @types/node.
-const prefix = Module.wrapper[0];
-// @ts-expect-error `wrapper` is missing from @types/node, primordials overloads are poorly handled.
-const suffix = StringPrototypeReplace.call(Module.wrapper[1], /;$/, '.apply(this, arguments);');
-
 // @ts-expect-error `@contrast/agent-swc-plugin` .d.ts file doesn't exist.
 const { defaultRewriter, defaultUnwriter } = require('@contrast/agent-swc-plugin');
 
-/**
- * Wraps the source content as necessary to support rewriting.
- * Wrapping must occur before rewriting since the underlying rewriter cannot
- * parse certain valid statements such as `return` statements in a CJS script.
- * @param {string} content
- * @returns {string}
- */
-const wrap = (content) => {
-  let shebang = '';
-
-  // The shebang will be commented out since it cannot be present in a
-  // function body. swc doesn't include the commented shebang in the generated
-  // code despite including comments otherwise.
-  if (content.charAt(0) === '#') {
-    shebang = StringPrototypeSubstring.call(content, 0, content.indexOf('\n') + 1);
-    content = `//${content}`;
-  }
-
-  content = `${shebang}${prefix}${content}${suffix}`;
-
-  return content;
-};
-
 class Rewriter {
   /**
    * @param {Core} core
@@ -106,7 +74,6 @@ class Rewriter {
     return {
       swcrc: false,
       filename: opts.filename,
-      isModule: opts.isModule,
       env: {
         targets: {
           node: process.versions.node,
@@ -120,6 +87,11 @@ class Rewriter {
           }]],
           cacheRoot: path.join(nodeCfg.rewrite.cache.path, '.swc'),
         },
+        parser: {
+          syntax: 'ecmascript',
+          // prevents the parser from throwing without wrapping when encountering `return`.
+          allowReturnOutsideFunction: true,
+        },
         // disable most of the more invasive options.
         // see: https://terser.org/docs/options/#compress-options
         minify: minify ? { compress: { defaults: false } } : undefined
@@ -139,11 +111,6 @@ class Rewriter {
    */
   async rewrite(content, opts = {}) {
     this.logger.trace({ opts }, 'rewriting %s', opts.filename);
-
-    if (opts.wrap) {
-      content = wrap(content);
-    }
-
     return transform(content, this.rewriteConfig(opts));
   }
 
@@ -158,11 +125,6 @@ class Rewriter {
    */
   rewriteSync(content, opts = {}) {
     this.logger.trace({ opts }, 'rewriting %s', opts.filename);
-
-    if (opts.wrap) {
-      content = wrap(content);
-    }
-
     return transformSync(content, this.rewriteConfig(opts));
   }
 

package/node_modules/@contrast/rewriter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/rewriter",
-  "version": "1.31.0",
+  "version": "1.34.0",
   "description": "A transpilation tool mainly used for instrumentation",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -14,17 +14,17 @@
   "types": "types/index.d.ts",
   "engines": {
     "npm": ">=6.13.7 <7 || >= 8.3.1",
-    "node": ">= 16.9.1"
+    "node": ">= 18.7.0"
   },
   "scripts": {
     "test": "bash ../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/agent-swc-plugin": "3.1.0",
-    "@contrast/common": "1.35.0",
-    "@contrast/config": "1.50.0",
-    "@contrast/core": "1.55.0",
-    "@contrast/logger": "1.28.0",
-    "@swc/core": "1.11.24"
+    "@contrast/agent-swc-plugin": "3.2.0",
+    "@contrast/common": "1.37.0",
+    "@contrast/config": "1.52.1",
+    "@contrast/core": "1.57.1",
+    "@contrast/logger": "1.30.1",
+    "@swc/core": "1.13.3"
   }
 }

package/node_modules/@contrast/route-coverage/lib/install/express/express5.js

@@ -459,11 +459,6 @@ class ExpressInstrumentation {
     let templates = [];
     const info = funcInfo(handler);
 
-    // ignore 3rd-party mw/handlers
-    if (info.file?.includes?.('node_modules')) {
-      return null;
-    }
-
     let file = info.file ?
       StringPrototypeReplace.call(info.file, core.appInfo.app_dir, '') :
       '';

package/node_modules/@contrast/route-coverage/lib/install/restify.js

@@ -36,7 +36,7 @@ module.exports = function init(core) {
 
   return core.routeCoverage.restify = {
     install() {
-      depHooks.resolve({ name: 'restify', version: '>=8 <12' }, (restify) => {
+      depHooks.resolve({ name: 'restify', version: '>=10 <12' }, (restify) => {
         patcher.patch(restify, 'createServer', {
           name: 'restify.createServer',
           patchType,

package/node_modules/@contrast/route-coverage/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/route-coverage",
-  "version": "1.47.0",
+  "version": "1.49.1",
   "description": "Handles route discovery and observation",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -14,20 +14,20 @@
   "types": "lib/index.d.ts",
   "engines": {
     "npm": ">=6.13.7 <7 || >= 8.3.1",
-    "node": ">= 16.9.1"
+    "node": ">= 18.7.0"
   },
   "scripts": {
     "test": "bash ../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.35.0",
-    "@contrast/config": "1.50.0",
-    "@contrast/core": "1.55.0",
-    "@contrast/dep-hooks": "1.24.0",
-    "@contrast/fn-inspect": "^4.3.0",
-    "@contrast/logger": "1.28.0",
-    "@contrast/patcher": "1.27.0",
-    "@contrast/scopes": "1.25.0",
+    "@contrast/common": "1.37.0",
+    "@contrast/config": "1.52.1",
+    "@contrast/core": "1.57.1",
+    "@contrast/dep-hooks": "1.26.1",
+    "@contrast/fn-inspect": "^5.0.2",
+    "@contrast/logger": "1.30.1",
+    "@contrast/patcher": "1.29.1",
+    "@contrast/scopes": "1.27.1",
     "semver": "^7.6.0"
   }
 }

package/node_modules/@contrast/scopes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/scopes",
-  "version": "1.25.0",
+  "version": "1.27.1",
   "description": "Handles AsyncLocalStorage scopes",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -14,15 +14,15 @@
   "types": "lib/index.d.ts",
   "engines": {
     "npm": ">=6.13.7 <7 || >= 8.3.1",
-    "node": ">= 16.9.1"
+    "node": ">= 18.7.0"
   },
   "scripts": {
     "test": "bash ../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/core": "1.55.0",
-    "@contrast/dep-hooks": "1.24.0",
-    "@contrast/logger": "1.28.0",
-    "@contrast/patcher": "1.27.0"
+    "@contrast/core": "1.57.1",
+    "@contrast/dep-hooks": "1.26.1",
+    "@contrast/logger": "1.30.1",
+    "@contrast/patcher": "1.29.1"
   }
 }

package/node_modules/@contrast/sec-obs/lib/traces/http.js

@@ -86,7 +86,7 @@ module.exports = function(core) {
   return core.secObs.traces.http = {
     install() {
       // https://github.com/Contrast-Security-OSS/secobs-semantic-conventions/blob/main/docs/http/http-spans.md
-      ['http', 'https', 'spdy', 'http2'].forEach((moduleName) => {
+      ['http', 'https', 'http2'].forEach((moduleName) => {
         instrument({
           moduleName,
           patchObjects: [{

package/node_modules/@contrast/sec-obs/lib/traces/http.test.js

@@ -11,7 +11,7 @@ describe('observability root spans', function () {
   let core, startSpan, onFinishedMock, reqMock, resMock, emit;
 
   const modules = {};
-  //TODO: spdy and http2 tests
+  //TODO: http2 tests
   ['http', 'https'].forEach((moduleName) => {
     describe(moduleName, function() {
       beforeEach(function () {

package/node_modules/@contrast/sec-obs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/sec-obs",
-  "version": "1.0.0-alpha.9",
+  "version": "1.1.1",
   "description": "Contrast service providing framework-agnostic Observability support",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -11,20 +11,20 @@
   "types": "lib/index.d.ts",
   "engines": {
     "npm": ">=6.13.7 <7 || >= 8.3.1",
-    "node": ">= 16.9.1"
+    "node": ">= 18.7.0"
   },
   "scripts": {
     "test": "bash ../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.35.0",
-    "@contrast/config": "1.50.0",
-    "@contrast/core": "1.55.0",
-    "@contrast/dep-hooks": "1.24.0",
-    "@contrast/logger": "1.28.0",
-    "@contrast/patcher": "1.27.0",
-    "@contrast/rewriter": "1.31.0",
-    "@contrast/scopes": "1.25.0",
+    "@contrast/common": "1.37.0",
+    "@contrast/config": "1.52.1",
+    "@contrast/core": "1.57.1",
+    "@contrast/dep-hooks": "1.26.1",
+    "@contrast/logger": "1.30.1",
+    "@contrast/patcher": "1.29.1",
+    "@contrast/rewriter": "1.34.0",
+    "@contrast/scopes": "1.27.1",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/exporter-metrics-otlp-http": "^0.57.1",
     "@opentelemetry/exporter-trace-otlp-http": "^0.57.1",

package/node_modules/@contrast/sources/lib/index.js

@@ -92,7 +92,7 @@ class Sources {
   install() {
     const { instrumentation, sources } = this.core;
 
-    ['http', 'https', 'spdy', 'http2'].forEach((moduleName) => {
+    ['http', 'https', 'http2'].forEach((moduleName) => {
       instrumentation.instrument({
         moduleName,
         patchObjects: [{

package/node_modules/@contrast/sources/lib/index.test.js

@@ -24,32 +24,6 @@ describe('agentify sources', function () {
         protocol: 'https',
         serverType: 'https',
       },
-    },
-    {
-      name: 'spdy',
-      expected: {
-        port: 8080,
-        protocol: 'https',
-        serverType: 'spdy',
-      },
-    },
-    {
-      name: 'http2',
-      method: 'createServer',
-      expected: {
-        port: 8080,
-        protocol: 'https',
-        serverType: 'spdy',
-      },
-    },
-    {
-      name: 'http2',
-      method: 'createSecureServer',
-      expected: {
-        port: 8080,
-        protocol: 'https',
-        serverType: 'spdy',
-      },
     }
   ].forEach(({ name, method, expected }) => {
     describe(`${name} sources using ${method || 'Server'}()`, function () {

package/node_modules/@contrast/sources/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/sources",
-  "version": "1.1.0",
+  "version": "1.3.1",
   "description": "Instruments to have incoming messages run in async-local request scope.",
   "main": "lib/index.js",
   "scripts": {
@@ -9,8 +9,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@contrast/common": "1.35.0",
-    "@contrast/core": "1.55.0",
+    "@contrast/common": "1.37.0",
+    "@contrast/core": "1.57.1",
     "on-finished": "^2.4.1"
   }
 }

package/node_modules/@contrast/telemetry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/telemetry",
-  "version": "1.30.0",
+  "version": "1.32.1",
   "description": "Telemetry reporting for the Contrast Node.js agent.",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -19,11 +19,11 @@
     "test": "bash ../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.35.0",
-    "@contrast/config": "1.50.0",
-    "@contrast/core": "1.55.0",
-    "@contrast/logger": "1.28.0",
-    "axios": "^1.11.0",
+    "@contrast/common": "1.37.0",
+    "@contrast/config": "1.52.1",
+    "@contrast/core": "1.57.1",
+    "@contrast/logger": "1.30.1",
+    "axios": "^1.12.2",
     "getmac": "^6.3.0"
   }
 }

package/node_modules/@opentelemetry/semantic-conventions/README.md

@@ -23,10 +23,11 @@ This package has 2 separate entry-points:
 Exported constants follow this naming scheme:
 
 - `ATTR_${attributeName}` for attributes
+- `${attributeName}_VALUE_{$enumValue}` for enumerations of attribute values
 - `METRIC_${metricName}` for metric names
-- `${attributeName}_VALUE_{$enumValue}` for enumerations
+- `EVENT_${eventName}` for event names
 
-The `ATTR`, `METRIC`, and `VALUE` static strings were used to facilitate readability and filtering in auto-complete lists in IDEs.
+The `ATTR`, `METRIC`, `EVENT`, and `VALUE` static strings were used to facilitate readability and filtering in auto-complete lists in IDEs.
 
 ## Usage