@contrast/route-coverage 1.25.0 → 1.27.0

package/lib/index.test.js

@@ -132,20 +132,5 @@ describe('route coverage', function () {
         );
       });
     });
-
-    it('skip adding normalizedUrl if assess store does not exist', function () {
-      const event = {
-        signature: 'hello',
-        url: 'url',
-        method: 'get',
-      };
-      core.routeCoverage.discover(event);
-
-      simulateRequestScope(() => {
-        core.routeCoverage.observe({ url: 'url', method: 'get' });
-        const store = core.scopes.sources.getStore();
-        expect(store.assess).to.be.undefined;
-      }, {});
-    });
   });
 });

package/lib/install/express.js

@@ -28,7 +28,7 @@ const METHODS = [
 
 const fnInspect = require('@contrast/fn-inspect');
 const { createSignature, patchType } = require('../utils/route-info');
-const { ArrayPrototypeJoin, StringPrototypeToLowerCase, isString } = require('@contrast/common');
+const { isString, primordials: { ArrayPrototypeJoin, StringPrototypeToLowerCase, StringPrototypeReplace, StringPrototypeReplaceAll, StringPrototypeSplit, StringPrototypeSlice } } = require('@contrast/common');
 
 // Spec: https://contrast.atlassian.net/wiki/spaces/NOD/pages/3454861621/Node.js+Agent+Route+Signatures#Express
 module.exports = function init(core) {
@@ -39,17 +39,35 @@ module.exports = function init(core) {
   const isRoute = (layer) => !!layer.route;
   const isRouter = (layer) => layer.name && StringPrototypeToLowerCase.call(layer.name) === 'router';
   const isValidPath = (path) => isString(path) || Array.isArray(path) || path instanceof RegExp;
-  const regExpToPath = (regex) => regex?.source?.split('/?')[0].replaceAll('\\', '').replace('^', '');
-  const format = (url) => Array.isArray(url) ? `/[${ArrayPrototypeJoin.call(url)}]` : url instanceof RegExp ? `/{${url.toString().slice(1, -1)}}` : url;
   const getHandleMethod = (layer) => fnInspect.funcInfo(layer.__handle)?.file.includes('express-async-errors') ? '__handle' : 'handle';
   const getLastLayer = (router) => router?.stack[router.stack.length - 1];
 
+  function regExpToPath(regex) {
+    if (regex.source) {
+      let [path] = StringPrototypeSplit.call(regex?.source, '/?');
+      path = StringPrototypeReplaceAll.call(path, '\\', '');
+      path = StringPrototypeReplace.call(path, '^', '');
+      return path;
+    }
+  }
+
+  function format(url) {
+    if (Array.isArray(url)) {
+      return `/[${ArrayPrototypeJoin.call(url)}]`;
+    } else if (url instanceof RegExp) {
+      return `/{${StringPrototypeSlice.call(url.toString(), 1, -1)}}`;
+    } else {
+      return url;
+    }
+  }
+
   function parseRoute(route) {
     const { path } = route;
     const method = route.methods._all ? 'all' : route.stack[0].method;
     return { url: format(path), method };
   }
 
+
   function createRouteInfo(url, method, obj) {
     return {
       signature: createSignature(url, method, obj),
@@ -67,7 +85,7 @@ module.exports = function init(core) {
       patchType,
       post({ args }) {
         const [req] = args;
-        const [url] = req.originalUrl.split('?');
+        const [url] = StringPrototypeSplit.call(req.originalUrl, '?');
         const { method } = req;
         if (url && method) {
           observe({ ...routeInfo, url, method: StringPrototypeToLowerCase.call(method) });

package/lib/install/fastify.js

@@ -15,7 +15,7 @@
 'use strict';
 
 const { getFastifyMethods } = require('../utils/methods');
-const { StringPrototypeToLowerCase } = require('@contrast/common');
+const { primordials: { StringPrototypeToLowerCase, StringPrototypeSplit } } = require('@contrast/common');
 const { patchType } = require('./../utils/route-info');
 
 // Spec: https://contrast.atlassian.net/wiki/spaces/NOD/pages/3454861621/Node.js+Agent+Route+Signatures#Fastify
@@ -56,7 +56,7 @@ module.exports = function init(core) {
     const pre = ({ args }) => {
       const [req] = args;
       const method = StringPrototypeToLowerCase.call(req.raw?.method);
-      const [url] = req.url.split(/\?/);
+      const [url] = StringPrototypeSplit.call(req.url, /\?/);
       routeCoverage.observe({ ...routeInfo, url, method });
     };
 

package/lib/install/hapi.js

@@ -14,7 +14,7 @@
  */
 'use strict';
 
-const { StringPrototypeToLowerCase } = require('@contrast/common');
+const { primordials: { StringPrototypeToLowerCase } } = require('@contrast/common');
 const { patchType } = require('./../utils/route-info');
 
 // Spec: https://contrast.atlassian.net/wiki/spaces/NOD/pages/3454861621/Node.js+Agent+Route+Signatures#Hapi

package/lib/install/koa.js

@@ -15,7 +15,7 @@
 'use strict';
 
 const { METHODS } = require('./../utils/methods');
-const { StringPrototypeToLowerCase, isString } = require('@contrast/common');
+const { isString, primordials: { StringPrototypeToLowerCase, StringPrototypeSplit } } = require('@contrast/common');
 const { createSignature, patchType } = require('./../utils/route-info');
 
 // Spec: https://contrast.atlassian.net/wiki/spaces/NOD/pages/3454861621/Node.js+Agent+Route+Signatures#Koa
@@ -74,7 +74,7 @@ module.exports = function init(core) {
               async function observationMiddleware(ctx, next) {
                 if (!ctx.request) return;
                 const { url: reqUrl, method } = ctx.request;
-                const [url] = reqUrl.split(/\?/);
+                const [url] = StringPrototypeSplit.call(reqUrl, /\?/);
                 routeCoverage.observe({ ...routeInfo, url, method: StringPrototypeToLowerCase.call(method) });
                 await next();
               }

package/lib/install/restify.js

@@ -14,7 +14,7 @@
  */
 'use strict';
 
-const { StringPrototypeToLowerCase, isString } = require('@contrast/common');
+const { isString, primordials: { StringPrototypeToLowerCase, StringPrototypeSplit } } = require('@contrast/common');
 const { createSignature, patchType } = require('../utils/route-info');
 
 // Spec: https://contrast.atlassian.net/wiki/spaces/NOD/pages/3454861621/Node.js+Agent+Route+Signatures#Restify
@@ -57,7 +57,7 @@ module.exports = function init(core) {
                   post({ args }) {
                     const [req] = args;
                     const { url: reqUrl, method } = req;
-                    const [url] = reqUrl.split('?');
+                    const [url] = StringPrototypeSplit.call(reqUrl, '?');
                     observe({ ...routeInfo, method: StringPrototypeToLowerCase.call(method), url });
                   }
                 });

package/lib/utils/methods.js

@@ -14,7 +14,6 @@
  */
 'use strict';
 
-// eslint-disable-next-line node/no-extraneous-require
 const semver = require('semver');
 const { METHODS } = require('http');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/route-coverage",
-  "version": "1.25.0",
+  "version": "1.27.0",
   "description": "Handles route discovery and observation",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -17,12 +17,13 @@
     "test": "../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/common": "1.25.0",
-    "@contrast/config": "1.33.0",
-    "@contrast/dep-hooks": "1.5.0",
+    "@contrast/common": "1.26.0",
+    "@contrast/config": "1.34.0",
+    "@contrast/dep-hooks": "1.7.0",
     "@contrast/fn-inspect": "^4.3.0",
-    "@contrast/logger": "1.10.0",
-    "@contrast/patcher": "1.9.0",
-    "@contrast/scopes": "1.6.0"
+    "@contrast/logger": "1.12.0",
+    "@contrast/patcher": "1.11.0",
+    "@contrast/scopes": "1.8.0",
+    "semver": "^7.6.0"
   }
 }