@contrast/instrumentation 1.8.0 → 1.10.0

package/lib/http.js

@@ -14,6 +14,7 @@
  */
 'use strict';
 
+const { StringPrototypeSubstring } = require('@contrast/common');
 const { get } = require('./utils');
 
 module.exports = function(core) {
@@ -27,6 +28,12 @@ module.exports = function(core) {
       patchObjects.forEach((obj) => {
         const { name, methods, around, patchType } = obj;
         methods.forEach((method) => {
+          const dotIdx = name.indexOf('.');
+          const firstName = dotIdx > -1 ? StringPrototypeSubstring.call(name, 0, dotIdx) : name;
+          // check for whether the target on the module exists first to avoid these Node warnings:
+          // (node:12155) Warning: Accessing non-existent property 'Server' of module exports inside circular dependency
+          if (!(firstName in module)) return;
+
           const patchObj = get(module, name);
           if (!patchObj) return;
 
@@ -46,8 +53,5 @@ module.exports = function(core) {
     'https'(opts) {
       hook('https', opts.patchObjects);
     },
-    'spdy'(opts) {
-      hook('spdy', opts.patchObjects);
-    }
   };
 };

package/lib/http2.js

@@ -60,6 +60,17 @@ module.exports = function (core) {
           });
         });
       });
+    },
+    'spdy'(opts) {
+      opts.patchObjects.forEach(({ methods, patchType, around }) => {
+        depHooks.resolve({ name: 'spdy', file: 'lib/spdy/server.js' }, (Server) => {
+          patcher.patch(Server, 'create', {
+            name: 'spdy.Server.create',
+            patchType,
+            post: createPostHook('spdy.Server.create', patchType, methods, around),
+          });
+        });
+      });
     }
   };
 };

package/lib/utils.js

@@ -14,13 +14,13 @@
  */
 'use strict';
 
-const { split } = require('@contrast/common');
+const { StringPrototypeSplit } = require('@contrast/common');
 
 function get(obj, name) {
   if (!name) return obj;
 
   let nest = obj;
-  for (const prop of split(name, '.')) {
+  for (const prop of StringPrototypeSplit.call(name, '.')) {
     nest = nest?.[prop];
     if (nest === undefined) break;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/instrumentation",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "description": "Shared hooks and patches between Protect and Assess components",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -11,12 +11,12 @@
   "types": "lib/index.d.ts",
   "engines": {
     "npm": ">=6.13.7 <7 || >= 8.3.1",
-    "node": ">= 14.18.0"
+    "node": ">= 16.9.1"
   },
   "scripts": {
     "test": "../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.21.0"
+    "@contrast/common": "1.21.2"
   }
 }