fallback to database if not found in cache

Author: Patel-Raj

src/connection-manager/connections.ts

@@ -61,12 +61,6 @@ async function setHandlers(
   isInitialNode = false,
   retryCount = 0,
 ): Promise<void> {
-  // log.info(
-  //   `Initiated Websocket connection for: ${ws_url} on ${
-  //     networks ?? 'unknown network'
-  //   }`,
-  // )
-
   const ledger_hashes: string[] = []
   return new Promise(function setHandlersPromise(resolve, _reject) {
     ws.on('open', () => {
@@ -124,21 +118,21 @@ async function setHandlers(
         )
       }
     })
-    ws.on('close', async (code) => {
-      // log.error(
-      //   `Websocket closed for ${ws.url} on ${
-      //     networks ?? 'unknown network'
-      //   } with code ${code} and reason ${reason.toString('utf-8')}.`,
-      // )
+    ws.on('close', async (code, reason) => {
+      log.error(
+        `Websocket closed for ${ws.url} on ${
+          networks ?? 'unknown network'
+        } with code ${code} and reason ${reason.toString('utf-8')}.`,
+      )
 
       const delay = BASE_RETRY_DELAY * 2 ** retryCount
 
       if (CLOSING_CODES.includes(code) && delay <= MAX_RETRY_DELAY) {
-        // log.info(
-        //   `Reconnecting to ${ws.url} on ${
-        //     networks ?? 'unknown network'
-        //   } after ${delay}ms...`,
-        // )
+        log.info(
+          `Reconnecting to ${ws.url} on ${
+            networks ?? 'unknown network'
+          } after ${delay}ms...`,
+        )
         // Clean up the old Websocket connection
         connections.delete(ws.url)
         ws.terminate()
@@ -168,12 +162,12 @@ async function setHandlers(
       ws.terminate()
       resolve()
     })
-    ws.on('error', () => {
-      // log.error(
-      //   `Websocket connection error for ${ws.url} on ${
-      //     networks ?? 'unknown network'
-      //   } - ${err.message}`,
-      // )
+    ws.on('error', (err) => {
+      log.error(
+        `Websocket connection error for ${ws.url} on ${
+          networks ?? 'unknown network'
+        } - ${err.message}`,
+      )
 
       if (connections.get(ws.url)?.url === ws.url) {
         connections.delete(ws.url)

src/connection-manager/wsHandling.ts

@@ -9,13 +9,18 @@ import {
 import { AMENDMENTS_ID } from 'xrpl/dist/npm/models/ledger'
 import { LedgerResponseExpanded } from 'xrpl/dist/npm/models/methods/ledger'
 
-import { saveAmendmentStatus, saveAmendmentsStatus } from '../shared/database'
+import {
+  query,
+  saveAmendmentStatus,
+  saveAmendmentsStatus,
+} from '../shared/database'
 import {
   NETWORKS_HOSTS,
   deleteAmendmentStatus,
 } from '../shared/database/amendments'
 import {
   AmendmentStatus,
+  DatabaseValidator,
   FeeVote,
   StreamLedger,
   StreamManifest,
@@ -93,6 +98,37 @@ function isFlagLedgerPlusOne(ledger_index: number): boolean {
   return false
 }
 
+/**
+ * Returns network from the validation.
+ *
+ * @param validationData - Validation data received.
+ * @param validatorsCache - In memory validators cache.
+ * @returns String | undefined.
+ */
+async function getNetworkFromValidation(
+  validationData: ValidationRaw,
+  validatorsCache: Map<string, string>,
+): Promise<string | undefined> {
+  if (validatorsCache.has(validationData.validation_public_key)) {
+    return validatorsCache.get(validationData.validation_public_key)
+  }
+
+  try {
+    const validatorsFromDb: DatabaseValidator | undefined = await query(
+      'validators',
+    )
+      .select('*')
+      .where('signing_key', validationData.validation_public_key)
+      .first()
+
+    return validatorsFromDb?.networks ?? validationData.networks
+  } catch (err) {
+    log.error('Error fetching validators data', err)
+  }
+
+  return undefined
+}
+
 /**
  * Handles a WebSocket message received from a subscribe request.
  *
@@ -101,7 +137,7 @@ function isFlagLedgerPlusOne(ledger_index: number): boolean {
  * @param networks - The networks of subscribed node.
  * @param network_fee - The map of default fee for the network to be used in case the validator does not vote for a new fee.
  * @param ws - The WebSocket message received from.
- * @param validationNetworkDb -- The validation network map to fetch fee data.
+ * @param validationNetworkDb -- A map of validator signing_keys to their corresponding networks.
  * @returns Void.
  */
 // eslint-disable-next-line max-params -- Disabled for this function.
@@ -119,9 +155,10 @@ export async function handleWsMessageSubscribeTypes(
       validationData.networks = networks
     }
 
-    const validationNetwork =
-      validationNetworkDb.get(validationData.validation_public_key) ??
-      validationData.networks
+    const validationNetwork = await getNetworkFromValidation(
+      validationData,
+      validationNetworkDb,
+    )
 
     // Get the fee for the network to be used in case the validator does not vote for a new fee.
     if (validationNetwork) {