node-tdd 3.4.0 → 3.4.3

package/lib/modules/random-seeder.js

@@ -12,6 +12,11 @@ export default (opts) => {
   }), 'Invalid Options Provided');
   let original = null;
 
+  const byteToHex = [];
+  for (let i = 0; i < 256; i += 1) {
+    byteToHex[i] = (i + 0x100).toString(16).slice(1);
+  }
+
   return {
     inject: () => {
       assert(original === null);
@@ -19,7 +24,8 @@ export default (opts) => {
       original = {
         crypto: {
           randomBytes: crypto.randomBytes,
-          randomFillSync: crypto.randomFillSync
+          randomFillSync: crypto.randomFillSync,
+          randomUUID: crypto.randomUUID
         },
         Math: {
           random: Math.random
@@ -39,7 +45,7 @@ export default (opts) => {
         let result = crypto
           .createHash('sha256')
           .update(opts.seed)
-          .update(key)
+          .update(opts.reseed === true ? 'null' : key)
           .update(String(executionCounts[key]))
           .digest();
         while (result.length < size) {
@@ -57,6 +63,49 @@ export default (opts) => {
         });
         return buffer;
       };
+      crypto.randomUUID = () => {
+        const rnds = crypto.randomBytes(16);
+
+        // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
+        // eslint-disable-next-line no-bitwise
+        rnds[6] = (rnds[6] & 0x0f) | 0x40;
+        // eslint-disable-next-line no-bitwise
+        rnds[8] = (rnds[8] & 0x3f) | 0x80;
+
+        return `${
+          byteToHex[rnds[0]]
+        }${
+          byteToHex[rnds[1]]
+        }${
+          byteToHex[rnds[2]]
+        }${
+          byteToHex[rnds[3]]
+        }-${
+          byteToHex[rnds[4]]
+        }${
+          byteToHex[rnds[5]]
+        }-${
+          byteToHex[rnds[6]]
+        }${
+          byteToHex[rnds[7]]
+        }-${
+          byteToHex[rnds[8]]
+        }${
+          byteToHex[rnds[9]]
+        }-${
+          byteToHex[rnds[10]]
+        }${
+          byteToHex[rnds[11]]
+        }${
+          byteToHex[rnds[12]]
+        }${
+          byteToHex[rnds[13]]
+        }${
+          byteToHex[rnds[14]]
+        }${
+          byteToHex[rnds[15]]
+        }`;
+      };
       Math.random = () => crypto.randomBytes(4).readUInt32LE() / 0xffffffff;
     },
     release: () => {

package/lib/modules/request-recorder/heal-sqs-send-message-batch.js

@@ -2,7 +2,6 @@ import crypto from 'crypto';
 import qs from 'querystring';
 import get from 'lodash.get';
 
-import { v4 as uuid4 } from 'uuid';
 import xml2js from 'xml2js';
 
 const parseRequestBody = (body) => Object.values(Object
@@ -47,7 +46,7 @@ export default (requestBody, responseBody, scope) => {
           'SendMessageBatchResultEntry',
           idx,
           'MessageId'
-        ], uuid4())
+        ], crypto.randomUUID())
       }</MessageId>`,
       `<MD5OfMessageBody>${
         crypto.createHash('md5').update(MessageBody).digest('hex')
@@ -68,7 +67,7 @@ export default (requestBody, responseBody, scope) => {
         0,
         'RequestId',
         0
-      ], uuid4())
+      ], crypto.randomUUID())
     }</RequestId>`,
     '</ResponseMetadata>',
     '</SendMessageBatchResponse>'

package/lib/modules/request-recorder.js

@@ -4,6 +4,7 @@ import path from 'path';
 import fs from 'smart-fs';
 import Joi from 'joi-strict';
 import nock from 'nock';
+import get from 'lodash.get';
 import cloneDeep from 'lodash.clonedeep';
 import compareUrls from 'compare-urls';
 import nockCommon from 'nock/lib/common.js';
@@ -120,8 +121,11 @@ export default (opts) => {
             }));
           });
         } else if (anyFlagPresent(['stub'])) {
+          const host = options.host || options.hostname;
+          const port = get(options, 'port', { http: 80, https: 443 }[protocol]);
+          const scope = `${protocol}://${host}:${port}`;
           expectedCassette.push({
-            scope: `${protocol}://${options.host || options.hostname}:${options.port}`,
+            scope,
             method: options.method,
             path: options.path,
             body: tryParseJson(body),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-tdd",
   "type": "module",
-  "version": "3.4.0",
+  "version": "3.4.3",
   "description": "Drop in extension for mocha to abstract commonly used test setups",
   "main": "lib/index.js",
   "scripts": {
@@ -87,7 +87,6 @@
     "smart-fs": "3.0.1",
     "timekeeper": "2.2.0",
     "tmp": "0.2.1",
-    "uuid": "8.3.0",
     "xml2js": "0.4.23"
   }
 }