refactor: eliminate fetchings logs without logging client

Agoric · Nov 22, 2024 · 0ce9bd2 · 0ce9bd2
1 parent cfa27e6
commit 0ce9bd2
Show file tree

Hide file tree

Showing 9 changed files with 88 additions and 236 deletions.
diff --git a/controllers/dateRangeController.js b/controllers/dateRangeController.js
@@ -45,20 +45,12 @@ export const handleDateRange = async (req, res) => {
   console.log(`Namespace Name: ${networks[network].namespace_name}`);
   console.log(`Pod Name: ${networks[network].pod_name}`);
 
-  const queryfilter = `
-    resource.labels.container_name="${networks[network].container_name}" AND
-    resource.labels.cluster_name="${networks[network].cluster_name}" AND
-    resource.labels.namespace_name="${networks[network].namespace_name}" AND
-    resource.labels.pod_name="${networks[network].pod_name}" AND
-    resource.type="k8s_container"
-  `;
-
-  console.log(`Fetching data from GCP for...`);
+  console.log(`Fetching data from GCP...`);
   const isSuccessful = await fetchAndStoreLogsFromGCP({
     startTime: formattedStartDate,
     endTime: formattedEndDate,
     inputFile,
-    queryfilter,
+    network,
   });
 
   if (!isSuccessful) {

diff --git a/public/css/styles.css b/public/css/styles.css
@@ -15,7 +15,8 @@ html {
   border-bottom: 2px solid #ddd;
 }
 
-.formDateRange {
+.formDateRange,
+.formBlockHeight {
   display: flex;
   flex-direction: column;
   align-items: start;
@@ -47,7 +48,7 @@ html {
   }
 }
 
-#submitSearchButton,
+#submitHeightButton,
 #uploadFileButton,
 #submitDateButton {
   background-color: #007bff;
@@ -95,16 +96,18 @@ select {
   font-weight: 500;
 }
 
-#dateForm > #fileHelperText > p {
+#dateForm > #fileHelperText > p,
+#blockHeightForm > #fileHelperText > p {
   margin: 0;
 }
 
-@media (max-width: 599px) {
+@media (max-width: 649px) {
   .topbar {
     flex-direction: column;
     gap: 20px;
   }
-  .formDateRange {
+  .formDateRange,
+  .formBlockHeight {
     display: block;
   }
 
@@ -127,22 +130,8 @@ select {
   #networkForm > #fileHelperText > p {
     display: none;
   }
-}
-
-#txHashInput,
-#searchTermInput {
-  display: none;
-}
 
-#searchForm {
-  display: flex;
-  flex-direction: column-reverse;
-  gap: 8px;
-  margin-bottom: 20px;
-}
-
-#searchFormTop,
-#searchFormBottom {
-  display: flex;
-  gap: 8px;
+  #blockHeightForm > #fileHelperText > p {
+    padding-bottom: 8px;
+  }
 }
diff --git a/public/index.html b/public/index.html
@@ -46,45 +46,28 @@
             </div>
         </form>
 
-        <form id="searchForm">
-            <div id="searchFormTop">
-                <select id="searchType" name="searchType">
-                    <option value="blockHeight">Block Height</option>
-                    <option value="txHash">Transaction Hash</option>
-                    <option value="searchTerm">Search Term</option>
-                </select>
+        <form id="blockHeightForm" class="formBlockHeight">
+            <div id="inputBlock">
+                <input type="number" id="blockHeight" name="blockHeight" required>
+                <div id="spinnerHeightForm" class="spinner"></div>
+                <button id="submitHeightButton" type="submit">Submit Height</button>
             </div>
-
-            <div id="searchFormBottom">
-                <div class="searchInput" id="blockHeightInput">
-                    <input type="number" id="blockHeight" name="blockHeight" required>
-                    <div class="spinner"></div>
-                </div>
-
-                <div class="searchInput" id="txHashInput">
-                    <input type="text" id="txHash" name="txHash" required>
-                </div>
-
-                <div class="searchInput" id="searchTermInput">
-                    <input type="text" id="searchTerm" name="searchTerm" required>
-                </div>
-
-                <div id="spinnerSearchForm" class="spinner"></div>
-                <button id="submitSearchButton" type="submit">Search</button>
+            <div id="fileHelperText">
+                <p id="helperText">Enter a Block Height</p>
             </div>
         </form>
 
-
-
-
     </div>
 
     <div class="mainBody">
         <img id="svgDisplay" src="" alt="Causeway SVG">
     </div>
 
     <script src="/scripts/ses/ses.umd.min.js" charset="utf-8"></script>
-    <script type="module" src="./scripts/index.js"></script>
+    <script src="./scripts/lockdown.js"></script>
+    <script src="scripts/upload.js"></script>
+    <script src="scripts/submitDateRange.js"></script>
+    <script src="scripts/submitHeight.js"></script>
 
 </body>
 

diff --git a/public/scripts/index.js b/public/scripts/index.js
diff --git a/public/scripts/submitHeight.js b/public/scripts/submitHeight.js
@@ -0,0 +1,38 @@
+document
+  .getElementById('blockHeightForm')
+  .addEventListener('submit', async (e) => {
+    e.preventDefault();
+
+    const height = document.getElementById('blockHeight').value;
+    const spinner = document.getElementById('spinnerHeightForm');
+    const submitButton = document.getElementById('submitHeightButton');
+    const network = document.getElementById('networkSelect').value;
+
+    spinner.style.display = 'inline-block';
+    submitButton.style.visibility = 'hidden';
+    try {
+      const response = await fetch('/submit-height', {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({ height, network }),
+      });
+
+      if (response.ok) {
+        const svgContent = await response.blob();
+        const url = URL.createObjectURL(svgContent);
+
+        const svgElement = document.getElementById('svgDisplay');
+        svgElement.src = url;
+        svgElement.style.display = 'inline-block';
+      } else {
+        console.error('Failed to upload file');
+      }
+    } catch (error) {
+      console.error('Error:', error);
+    } finally {
+      spinner.style.display = 'none';
+      submitButton.style.visibility = 'visible';
+    }
+  });
diff --git a/public/scripts/submitSearch.js b/public/scripts/submitSearch.js
diff --git a/services/fetchAndStoreHeightLogs.js b/services/fetchAndStoreHeightLogs.js
@@ -1,11 +1,12 @@
 // @ts-check
-import { fetchGCPLogs } from './fetchGCPLogs.js';
 import {
   findEntryWithTimestamp,
   calculateDaysDifference,
   fetchLogsInBatches,
+  fetchLogs,
 } from '../helpers/utils.js';
 import { fs } from 'zx';
+import { ADDITIONAL_QUERY_FILTERS } from '../helpers/constants.js';
 
 const fetchLogsByBlockEvents = async ({
   network,
@@ -36,7 +37,6 @@ const fetchLogsByBlockEvents = async ({
 export const fetchAndStoreHeightLogs = async ({
   blockHeight,
   inputFile,
-  queryfilter = '',
   network,
 }) => {
   try {
@@ -87,19 +87,23 @@ export const fetchAndStoreHeightLogs = async ({
 
     let allEntries = [];
 
-    const { entries } = await fetchGCPLogs({
+    const searchQuery = `
+    ${ADDITIONAL_QUERY_FILTERS}  
+    `;
+
+    const entries = await fetchLogs({
       startTime,
       endTime,
-      filter: queryfilter,
-      pageSize: 1000,
+      searchQuery,
+      network,
     });
 
     console.log('Fetched page size: ' + entries.length);
     allEntries = allEntries.concat(entries);
 
-    const logEntries = allEntries.map((entry) =>
-      JSON.stringify(entry.jsonPayload)
-    );
+    const logEntries = allEntries.map((entry) => {
+      return JSON.stringify(entry.data);
+    });
 
     if (!logEntries) {
       throw Error('No Entries found for the given Height');

diff --git a/services/fetchAndStoreLogsFromGCP.js b/services/fetchAndStoreLogsFromGCP.js
@@ -1,21 +1,28 @@
 // @ts-check
 import { fs } from 'zx';
-import { fetchGCPLogs } from './fetchGCPLogs.js';
+import { fetchLogs } from '../helpers/utils.js';
+import { ADDITIONAL_QUERY_FILTERS } from '../helpers/constants.js';
 
 export const fetchAndStoreLogsFromGCP = async ({
   startTime,
   endTime,
   inputFile,
+  network,
   queryfilter = '',
 }) => {
   try {
     let allEntries = [];
 
-    const { entries } = await fetchGCPLogs({
+    const searchQuery = `
+      ${queryfilter}
+      ${ADDITIONAL_QUERY_FILTERS}
+    `;
+
+    const entries = await fetchLogs({
       startTime,
       endTime,
-      filter: queryfilter,
-      pageSize: 1000,
+      searchQuery,
+      network,
     });
 
     if (!entries) {
@@ -25,9 +32,9 @@ export const fetchAndStoreLogsFromGCP = async ({
     console.log('Fetched page size: ' + entries.length);
     allEntries = allEntries.concat(entries);
 
-    const logEntries = allEntries.map((entry) =>
-      JSON.stringify(entry.jsonPayload)
-    );
+    const logEntries = allEntries.map((entry) => {
+      return JSON.stringify(entry.data);
+    });
 
     fs.writeFile(inputFile, logEntries.join('\n'), (err) => {
       if (err) {