@contrast/instrumentation 1.1.0 → 1.1.1

package/lib/http2.js

@@ -20,35 +20,39 @@ module.exports = function(core) {
     depHooks
   } = core;
 
+  function createPostHook(namePrefix, patchType, methods, around) {
+    return function post(data) {
+      const { result: server } = data;
+      const serverPrototype = server ? Object.getPrototypeOf(server) : null;
+
+      if (!serverPrototype) {
+        core.logger.error('Unable to patch server prototype, continue without instrumentation');
+        return;
+      }
+      methods.forEach((method) => {
+        patcher.patch(serverPrototype, method, {
+          name: `${namePrefix}.${method}`,
+          patchType,
+          around
+        });
+      });
+    };
+  }
+
   return {
     'http2'(opts) {
       depHooks.resolve({ name: 'http2' }, (http2) => {
-        opts.patchObjects.forEach((obj) => {
-          const { methods, patchType, patchObjects } = obj;
-          methods.forEach((method) => {
-            patcher.patch(http2, method, {
-              name: `http2.${method}`,
-              patchType,
-              post(data) {
-                const { result: server } = data;
-                const serverPrototype = server ? Object.getPrototypeOf(server) : null;
+        opts.patchObjects.forEach(({ methods, patchType, around }) => {
+          patcher.patch(http2, 'createServer', {
+            name: 'http2.createServer',
+            patchType,
+            post: createPostHook('http2.Server.prototype', patchType, methods, around),
+          });
 
-                if (!serverPrototype) {
-                  core.logger.error('Unable to patch server prototype, continue without instrumentation');
-                  return;
-                }
-                patchObjects.forEach((obj) => {
-                  const { name, methods, patchType, around } = obj;
-                  methods.forEach((method) => {
-                    patcher.patch(serverPrototype, method, {
-                      name: `http2.${name}.${method}`,
-                      patchType,
-                      around
-                    });
-                  });
-                });
-              }
-            });
+          patcher.patch(http2, 'createSecureServer', {
+            name: 'http2.createSecureServer',
+            patchType,
+            post: createPostHook('http2.SecureServer.prototype', patchType, methods, around)
           });
         });
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/instrumentation",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "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)",
@@ -16,4 +16,4 @@
   "scripts": {
     "test": "../scripts/test.sh"
   }
-}
+}