@bifravst/http-api-mock 1.2.0 → 1.2.1

package/cdk/resources/http-api-mock-lambda.ts

@@ -14,6 +14,7 @@ import { URLSearchParams } from 'url'
 import { checkMatchingQueryParams } from './checkMatchingQueryParams.js'
 import { splitMockResponse } from './splitMockResponse.js'
 import { sortQueryString } from '../../src/sortQueryString.js'
+import { URLSearchParamsToObject } from '../../src/URLSearchParamsToObject.js'
 
 const db = new DynamoDBClient({})
 
@@ -37,44 +38,17 @@ export const handler = async (
 	await db.send(
 		new PutItemCommand({
 			TableName: process.env.REQUESTS_TABLE_NAME,
-			Item: {
-				methodPathQuery: {
-					S: `${event.httpMethod} ${pathWithQuery}`,
-				},
-				timestamp: {
-					S: new Date().toISOString(),
-				},
-				requestId: {
-					S: context.awsRequestId,
-				},
-				method: {
-					S: event.httpMethod,
-				},
-				path: {
-					S: pathWithQuery,
-				},
-				resource: { S: path },
-				query:
-					query === undefined
-						? { NULL: true }
-						: {
-								M: marshall(
-									[...query.entries()].reduce(
-										(o, [k, v]) => ({ ...o, [k]: v }),
-										{},
-									),
-								),
-							},
-				body: {
-					S: event.body ?? '{}',
-				},
-				headers: {
-					S: JSON.stringify(event.headers),
-				},
-				ttl: {
-					N: `${Math.round(Date.now() / 1000) + 5 * 60}`,
-				},
-			},
+			Item: marshall({
+				methodPathQuery: `${event.httpMethod} ${pathWithQuery}`,
+				timestamp: new Date().toISOString(),
+				requestId: context.awsRequestId,
+				method: event.httpMethod,
+				path,
+				query: query === undefined ? null : URLSearchParamsToObject(query),
+				body: event.body ?? '{}',
+				headers: JSON.stringify(event.headers),
+				ttl: Math.round(Date.now() / 1000) + 5 * 60,
+			}),
 		}),
 	)
 

package/dist/cdk/resources/http-api-mock-lambda.js

@@ -4,6 +4,7 @@ import { URLSearchParams } from 'url';
 import { checkMatchingQueryParams } from './checkMatchingQueryParams.js';
 import { splitMockResponse } from './splitMockResponse.js';
 import { sortQueryString } from '../../src/sortQueryString.js';
+import { URLSearchParamsToObject } from '../../src/URLSearchParamsToObject.js';
 const db = new DynamoDBClient({});
 export const handler = async (event, context) => {
     console.log(JSON.stringify({ event }));
@@ -15,38 +16,17 @@ export const handler = async (event, context) => {
     const pathWithQuery = sortQueryString(`${path}${query !== undefined ? `?${query.toString()}` : ''}`);
     await db.send(new PutItemCommand({
         TableName: process.env.REQUESTS_TABLE_NAME,
-        Item: {
-            methodPathQuery: {
-                S: `${event.httpMethod} ${pathWithQuery}`,
-            },
-            timestamp: {
-                S: new Date().toISOString(),
-            },
-            requestId: {
-                S: context.awsRequestId,
-            },
-            method: {
-                S: event.httpMethod,
-            },
-            path: {
-                S: pathWithQuery,
-            },
-            resource: { S: path },
-            query: query === undefined
-                ? { NULL: true }
-                : {
-                    M: marshall([...query.entries()].reduce((o, [k, v]) => ({ ...o, [k]: v }), {})),
-                },
-            body: {
-                S: event.body ?? '{}',
-            },
-            headers: {
-                S: JSON.stringify(event.headers),
-            },
-            ttl: {
-                N: `${Math.round(Date.now() / 1000) + 5 * 60}`,
-            },
-        },
+        Item: marshall({
+            methodPathQuery: `${event.httpMethod} ${pathWithQuery}`,
+            timestamp: new Date().toISOString(),
+            requestId: context.awsRequestId,
+            method: event.httpMethod,
+            path,
+            query: query === undefined ? null : URLSearchParamsToObject(query),
+            body: event.body ?? '{}',
+            headers: JSON.stringify(event.headers),
+            ttl: Math.round(Date.now() / 1000) + 5 * 60,
+        }),
     }));
     // Check if response exists
     console.debug(`Checking if response exists for ${event.httpMethod} ${pathWithQuery}...`);

package/dist/src/requests.d.ts

@@ -6,7 +6,6 @@ export type Request = {
     ttl: string;
     headers: Record<string, string>;
     method: string;
-    resource: string;
     requestId: string;
     body: string;
     methodPathQuery: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bifravst/http-api-mock",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Helper functions for AWS lambdas written in TypeScript.",
   "exports": {
     "./*": {
@@ -83,7 +83,7 @@
   ],
   "prettier": "@bifravst/prettier-config",
   "dependencies": {
-    "@aws-sdk/client-cloudformation": "^3.554.0",
+    "@aws-sdk/client-cloudformation": "^3.555.0",
     "@aws-sdk/client-dynamodb": "^3.554.0",
     "@aws-sdk/client-sts": "^3.554.0",
     "@aws-sdk/util-dynamodb": "^3.554.0",

package/src/requests.ts

@@ -8,7 +8,6 @@ export type Request = {
 	ttl: string //e.g. 1712322374
 	headers: Record<string, string> //e.g. '{"Accept":"*/*","Accept-Encoding":"br, gzip, deflate","Accept-Language":"*","CloudFront-Forwarded-Proto":"https","CloudFront-Is-Desktop-Viewer":"true","CloudFront-Is-Mobile-Viewer":"false","CloudFront-Is-SmartTV-Viewer":"false","CloudFront-Is-Tablet-Viewer":"false","CloudFront-Viewer-ASN":"2116","CloudFront-Viewer-Country":"NO","Host":"idj1fffo0k.execute-api.eu-west-1.amazonaws.com","sec-fetch-mode":"cors","User-Agent":"node","Via":"1.1 b053873243f91b1bb6dc406ce0c67db4.cloudfront.net (CloudFront)","X-Amz-Cf-Id":"_vJIGo6Z89QxDzoqOZL4G0PQqPFWGesVXVan4ND934_Urqn2ifSOsQ==","X-Amzn-Trace-Id":"Root=1-660ff61a-25e1219a7f153e1b0c768358","X-Forwarded-For":"194.19.86.146, 130.176.182.18","X-Forwarded-Port":"443","X-Forwarded-Proto":"https"}'
 	method: string //e.g.'GET'
-	resource: string //e.g. '555c3960-2092-438b-b2b0-f28eebd1f5bb'
 	requestId: string //e.g.'f34b042b-e9a2-4089-97a2-241516d40d64'
 	body: string //e.g.'{}'
 	methodPathQuery: string //e.g.'GET 555c3960-2092-438b-b2b0-f28eebd1f5bb'