node-tdd 4.0.3 → 4.0.5

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

@@ -1,75 +1,21 @@
 import crypto from 'crypto';
-import qs from 'querystring';
-import get from 'lodash.get';
+import { tryParseJson } from './util.js';
 
-import xml2js from 'xml2js';
-
-const parseRequestBody = (body) => Object.values(Object
-  .entries(qs.parse(body))
-  .filter(([k, v]) => k.startsWith('SendMessageBatchRequestEntry.'))
-  .sort((a, b) => a[0].localeCompare(b[0]))
-  .map(([k, v]) => [k.split('.'), v])
-  .reduce((p, [k, v]) => {
-    if (p[k[1]] === undefined) {
-      Object.assign(p, { [k[1]]: {} });
-    }
-    Object.assign(p[k[1]], { [k[2]]: v });
-    return p;
-  }, {}));
-
-const parseResponseBody = (body) => {
-  let parsed = null;
-  xml2js.parseString(body, (err, result) => {
-    parsed = result;
-  });
-  return parsed;
-};
-
-export default (requestBody, responseBody, scope) => {
+export default (requestBody, responseBody, scope, req) => {
   if (
-    !/^https:\/\/sqs\.[a-z0-9-]+\.amazonaws\.com:443$/.test(scope.basePath)
-    || !responseBody.startsWith('<?xml version="1.0"?><SendMessageBatchResponse')) {
+    scope?.basePath !== 'https://sqs.us-west-2.amazonaws.com:443'
+    || req?.options?.headers?.['x-amz-target'] !== 'AmazonSQS.SendMessageBatch'
+  ) {
     return responseBody;
   }
 
-  const responseBodyParsed = parseResponseBody(responseBody);
-
-  const resultEntries = parseRequestBody(requestBody)
-    .map(({ Id, MessageBody }, idx) => [
-      '<SendMessageBatchResultEntry>',
-      `<Id>${Id}</Id>`,
-      `<MessageId>${
-        get(responseBodyParsed, [
-          'SendMessageBatchResponse',
-          'SendMessageBatchResult',
-          0,
-          'SendMessageBatchResultEntry',
-          idx,
-          'MessageId'
-        ], crypto.randomUUID())
-      }</MessageId>`,
-      `<MD5OfMessageBody>${
-        crypto.createHash('md5').update(MessageBody).digest('hex')
-      }</MD5OfMessageBody>`,
-      '</SendMessageBatchResultEntry>'
-    ].join(''));
-  return [
-    '<?xml version="1.0"?>',
-    '<SendMessageBatchResponse xmlns="http://queue.amazonaws.com/doc/2012-11-05/">',
-    '<SendMessageBatchResult>',
-    ...resultEntries,
-    '</SendMessageBatchResult>',
-    '<ResponseMetadata>',
-    `<RequestId>${
-      get(responseBodyParsed, [
-        'SendMessageBatchResponse',
-        'ResponseMetadata',
-        0,
-        'RequestId',
-        0
-      ], crypto.randomUUID())
-    }</RequestId>`,
-    '</ResponseMetadata>',
-    '</SendMessageBatchResponse>'
-  ].join('');
+  const requestJson = tryParseJson(requestBody);
+  const responseJson = tryParseJson(responseBody);
+  return {
+    Successful: requestJson.Entries.map(({ Id, MessageBody }, idx) => ({
+      Id,
+      MessageId: responseJson?.Successful?.[idx]?.MessageId || crypto.randomUUID(),
+      MD5OfMessageBody: crypto.createHash('md5').update(MessageBody).digest('hex')
+    }))
+  };
 };

package/lib/modules/request-recorder.js

@@ -6,6 +6,7 @@ import Joi from 'joi-strict';
 import nock from 'nock';
 import get from 'lodash.get';
 import cloneDeep from 'lodash.clonedeep';
+import isEqual from 'lodash.isequal';
 import nockCommon from 'nock/lib/common.js';
 import compareUrls from '../util/compare-urls.js';
 import nockListener from './request-recorder/nock-listener.js';
@@ -224,12 +225,14 @@ export default (opts) => {
                 const responseBody = tryParseJson([
                   healSqsSendMessageBatch
                 ].reduce(
-                  (respBody, fn) => fn(requestBodyString, respBody, scope),
+                  (respBody, fn) => fn(requestBodyString, respBody, scope, req),
                   interceptor.body
                 ));
-                // eslint-disable-next-line no-param-reassign
-                interceptor.body = responseBody;
-                pendingMocks[idx].record.response = responseBody;
+                if (!isEqual(interceptor.body, responseBody)) {
+                  // eslint-disable-next-line no-param-reassign
+                  interceptor.body = responseBody;
+                  pendingMocks[idx].record.response = responseBody;
+                }
               }
 
               expectedCassette.push(pendingMocks[idx].record);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "node-tdd",
   "type": "module",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "description": "Drop in extension for mocha to abstract commonly used test setups",
   "main": "lib/index.js",
   "scripts": {
@@ -41,7 +41,7 @@
   },
   "homepage": "https://github.com/blackflux/node-tdd#readme",
   "devDependencies": {
-    "@aws-sdk/client-sqs": "3.385.0",
+    "@aws-sdk/client-sqs": "3.458.0",
     "@babel/core": "7.23.3",
     "@babel/eslint-parser": "7.23.3",
     "@babel/register": "7.22.15",
@@ -51,7 +51,7 @@
     "axios": "1.6.2",
     "c8": "8.0.1",
     "chai": "4.3.10",
-    "eslint": "8.53.0",
+    "eslint": "8.54.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-plugin-import": "2.29.0",
     "eslint-plugin-json": "3.1.0",
@@ -78,14 +78,14 @@
     "joi-strict": "3.0.1",
     "lodash.clonedeep": "4.5.0",
     "lodash.get": "4.4.2",
+    "lodash.isequal": "4.5.0",
     "lru-cache-ext": "4.0.0",
     "minimist": "1.2.8",
-    "nock": "13.3.8",
+    "nock": "13.4.0",
     "normalize-url": "2.0.1",
     "object-scan": "19.0.5",
     "smart-fs": "4.0.1",
     "timekeeper": "2.3.1",
-    "tmp": "0.2.1",
-    "xml2js": "0.6.2"
+    "tmp": "0.2.1"
   }
 }