From 19ba64cc04a6f4b30e1ff6e02337ee870293e607 Mon Sep 17 00:00:00 2001
From: gintil <michael994664@gmail.com>
Date: Thu, 23 Jan 2025 05:41:55 -0500
Subject: [PATCH] Adjust response body hash key to store fewer responses bodies

To save on storage space
---
 .../src/feed-fetcher/feed-fetcher.service.ts  | 67 ++++++++-----------
 1 file changed, 29 insertions(+), 38 deletions(-)

diff --git a/services/feed-requests/src/feed-fetcher/feed-fetcher.service.ts b/services/feed-requests/src/feed-fetcher/feed-fetcher.service.ts
index 160b2fdaf..972ed69da 100644
--- a/services/feed-requests/src/feed-fetcher/feed-fetcher.service.ts
+++ b/services/feed-requests/src/feed-fetcher/feed-fetcher.service.ts
@@ -34,24 +34,18 @@ const convertHeaderValue = (val?: string | string[] | null) => {
 const trimHeadersForStorage = (
   obj?: Record<string, string | undefined>,
 ): Record<string, string> => {
+  if (!obj) {
+    return {};
+  }
+
   const trimmed = Object.entries(obj || {}).reduce((acc, [key, val]) => {
     if (val) {
-      acc[key] = val;
+      acc[key.toLowerCase()] = val;
     }
 
     return acc;
   }, {} as Record<string, string>);
 
-  if (!obj) {
-    return trimmed;
-  }
-
-  for (const key in trimmed) {
-    if (trimmed[key]) {
-      trimmed[key.toLowerCase()] = trimmed[key];
-    }
-  }
-
   if (trimmed.authorization) {
     trimmed.authorization = 'SECRET';
   }
@@ -59,6 +53,27 @@ const trimHeadersForStorage = (
   return trimmed;
 };
 
+const convertFetchOptionsForHashKey = (options: FetchOptions) => {
+  const { headers, ...rest } = options;
+
+  const prunedHeaders = Object.entries(headers || {}).reduce(
+    (acc, [key, val]) => {
+      // these keys would result in a new hash every time, so ignore it to save space
+      if (key !== 'if-none-match' && key !== 'if-modified-since') {
+        acc[key] = val;
+      }
+
+      return acc;
+    },
+    {} as Record<string, string>,
+  );
+
+  return JSON.stringify({
+    ...rest,
+    headers: prunedHeaders,
+  });
+};
+
 interface FetchOptions {
   headers?: Record<string, string>;
   proxyUri?: string;
@@ -107,32 +122,6 @@ export class FeedFetcherService {
     return this.partitionedRequestsStore.getLatestNextRetryDate(lookupKey);
   }
 
-  // async getLatestRequestHeaders({
-  //   url,
-  // }: {
-  //   url: string;
-  // }): Promise<Response['headers']> {
-  //   const request = await this.requestRepo.findOne(
-  //     {
-  //       url,
-  //       status: RequestStatus.OK,
-  //     },
-  //     {
-  //       orderBy: {
-  //         createdAt: 'DESC',
-  //       },
-  //       populate: ['response'],
-  //       fields: ['response.headers'],
-  //     },
-  //   );
-
-  //   if (!request) {
-  //     return {};
-  //   }
-
-  //   return request.response?.headers || {};
-  // }
-
   async getLatestRequest({
     url,
     lookupKey,
@@ -283,7 +272,9 @@ export class FeedFetcherService {
           }
 
           const key =
-            url + JSON.stringify(request.fetchOptions) + res.status.toString();
+            url +
+            convertFetchOptionsForHashKey(request.fetchOptions) +
+            res.status.toString();
 
           if (text.length) {
             response.responseHashKey = sha1.copy().update(key).digest('hex');