@contrast/agent 3.10.1 → 3.11.1

package/bin/VERSION

@@ -1 +1 @@
-2.19.0
+2.20.2

package/bootstrap.js

@@ -26,17 +26,20 @@ const orig = Module.runMain;
  * script from cli
  */
 Module.runMain = async function(...args) {
-  const { enabled } = await loader.init(process.argv);
-
-  if (enabled) {
-    await loader.bootstrap(process.argv);
+  try {
+    const { enabled } = await loader.init(process.argv);
+    if (enabled) {
+      await loader.bootstrap(process.argv);
+    }
+    await loader.resetArgs(process.argv[0], process.argv[1]);
+    loader.logTime(startTime, 'agent');
+    const appStartTime = process.hrtime();
+    orig.apply(this, args);
+    loader.logTime(appStartTime, 'application');
+    loader.logTime(startTime, 'agent & application');
+  
+  } catch(err) {
+    console.error(err);
+    process.exit(-1);
   }
-  await loader.resetArgs(process.argv[0], process.argv[1]);
-
-  loader.logTime(startTime, 'agent');
-
-  const appStartTime = process.hrtime();
-  orig.apply(this, args);
-  loader.logTime(appStartTime, 'application');
-  loader.logTime(startTime, 'agent & application');
 };

package/esm.mjs

@@ -57,7 +57,7 @@ export async function getSource(url, context, defaultGetSource) {
     loadedFromCache.add(filename);
     return { source: cached };
   } catch (err) {
-    logger.error(
+    logger.warn(
       'Failed to locate cached rewrite for %s, err: %o',
       filename,
       err

package/node_modules/unix-dgram/build/Makefile

@@ -309,7 +309,7 @@ endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
 cmd_regen_makefile = cd $(srcdir); /opt/hostedtoolcache/node/12.22.1/x64/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/home/runner/.cache/node-gyp/12.22.1" "-Dnode_gyp_dir=/opt/hostedtoolcache/node/12.22.1/x64/lib/node_modules/npm/node_modules/node-gyp" "-Dnode_lib_file=/home/runner/.cache/node-gyp/12.22.1/<(target_arch)/node.lib" "-Dmodule_root_dir=/home/runner/work/node-agent/node-agent/target/node_modules/unix-dgram" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/home/runner/work/node-agent/node-agent/target/node_modules/unix-dgram/build/config.gypi -I/opt/hostedtoolcache/node/12.22.1/x64/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/home/runner/.cache/node-gyp/12.22.1/include/node/common.gypi "--toplevel-dir=." binding.gyp
-Makefile: $(srcdir)/build/config.gypi $(srcdir)/../../../../../../.cache/node-gyp/12.22.1/include/node/common.gypi $(srcdir)/../../../../../../../../opt/hostedtoolcache/node/12.22.1/x64/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/binding.gyp
+Makefile: $(srcdir)/../../../../../../../../opt/hostedtoolcache/node/12.22.1/x64/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/build/config.gypi $(srcdir)/../../../../../../.cache/node-gyp/12.22.1/include/node/common.gypi $(srcdir)/binding.gyp
 	$(call do_cmd,regen_makefile)
 
 # "all" is a concatenation of the "all" targets from all the included

package/node_modules/unix-dgram/build/config.gypi

@@ -126,7 +126,7 @@
     "progress": "",
     "https_proxy": "",
     "save_prod": "",
-    "npm_session": "b887839b098f9a26",
+    "npm_session": "6e09f226531784f1",
     "audit": "true",
     "cidr": "",
     "onload_script": "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/agent",
-  "version": "3.10.1",
+  "version": "3.11.1",
   "description": "Node.js security instrumentation by Contrast Security",
   "keywords": [
     "security",
@@ -37,21 +37,12 @@
     "docker-pkg": "docker build -t node-agent .",
     "extract-licenses": "node scripts/extract-licenses",
     "fix": "eslint . --fix",
+    "prepare": "husky install || true",
     "preversion": "npm run test:gh-ci"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged && npx ls-lint"
-    }
-  },
   "lint-staged": {
-    "**/*.js": [
-      "eslint --fix",
-      "git add"
-    ],
-    "**/*.sh": [
-      "shellcheck -x"
-    ]
+    "*.js": "eslint --fix",
+    "*.sh": "shellcheck -x"
   },
   "bin": {
     "node-contrast": "cli.js",
@@ -77,15 +68,15 @@
     "@babel/template": "^7.10.4",
     "@babel/traverse": "^7.12.1",
     "@babel/types": "^7.12.1",
-    "@contrast/distringuish-prebuilt": "^2.0.0",
+    "@contrast/distringuish-prebuilt": "^2.0.2",
     "@contrast/escodegen": "^1.16.0",
-    "@contrast/esprima": "^4.1.1",
+    "@contrast/esprima": "^4.1.2",
     "@contrast/estraverse": "^5.1.0",
     "@contrast/flat": "^4.1.1",
-    "@contrast/fn-inspect": "^2.3.0",
+    "@contrast/fn-inspect": "^2.3.2",
     "@contrast/heapdump": "^1.0.0",
-    "@contrast/protobuf-api": "^3.1.0",
-    "@contrast/require-hook": "^2.0.0",
+    "@contrast/protobuf-api": "^3.2.0",
+    "@contrast/require-hook": "^2.0.3",
     "@contrast/synchronous-source-maps": "^1.1.0",
     "amqp-connection-manager": "^3.2.2",
     "amqplib": "^0.7.1",
@@ -100,7 +91,6 @@
     "crc-32": "^1.0.0",
     "find-cache-dir": "^3.3.1",
     "ipaddr.js": "^1.8.1",
-    "joi": "^17.4.0",
     "json-stable-stringify": "^1.0.1",
     "jspack": "0.0.4",
     "lodash": "^4.17.21",
@@ -110,7 +100,6 @@
     "on-finished": "^2.3.0",
     "parseurl": "^1.3.3",
     "prom-client": "^12.0.0",
-    "read-installed": "^4.0.0",
     "recursive-readdir": "^2.2.2",
     "request": "^2.88.0",
     "semver": "^7.3.2",
@@ -150,12 +139,13 @@
     "fetch-cookie": "^0.11.0",
     "form-data": "^3.0.0",
     "glob": "^7.1.4",
-    "husky": "^1.3.1",
+    "handlebars": "^4.7.7",
+    "husky": "^6.0.0",
     "joi": "^17.4.0",
     "jsdoc": "^3.6.3",
     "libxmljs": "file:test/mock/libxmljs",
     "libxmljs2": "file:test/mock/libxmljs2",
-    "lint-staged": "^8.1.6",
+    "lint-staged": "^11.0.0",
     "madge": "^4.0.1",
     "marsdb": "file:test/mock/marsdb",
     "mocha": "^8.2.0",
@@ -166,7 +156,7 @@
     "mysql": "file:test/mock/mysql",
     "nock": "^12.0.3",
     "node-fetch": "^2.6.1",
-    "npm-license-crawler": "^0.2.0",
+    "npm-license-crawler": "^0.2.1",
     "nyc": "^15.0.0",
     "pg": "file:test/mock/pg",
     "pino": "^6.7.0",
@@ -175,7 +165,7 @@
     "qs": "^6.9.4",
     "rethinkdb": "file:test/mock/rethinkdb",
     "sequelize": "^6.3.3",
-    "shellcheck": "^0.4.2",
+    "shellcheck": "^1.0.0",
     "sinon": "^7.2.2",
     "sinon-chai": "^3.3.0",
     "sqlite3": "file:test/mock/sqlite3",