Refactor ValidatorsProcessor for ordered cache updates and enhanced l…

…ogging; simplify ValidatorsService caching
0LNetworkCommunity · Nov 28, 2024 · 5588d34 · 5588d34
1 parent 3c1a94b
commit 5588d34
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 35 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Explorer API - Debug",
+      "type": "node-terminal",
+      "request": "launch",
+      "skipFiles": ["<node_internals>/**"],
+      "command": "npm run start:dev",
+      "cwd": "${workspaceFolder}/api",
+      "sourceMaps": true
+    }
+  ]
+}
diff --git a/api/src/ol/validators/validators.processor.ts b/api/src/ol/validators/validators.processor.ts
@@ -24,33 +24,38 @@ export class ValidatorsProcessor extends WorkerHost {
   }
 
   public async onModuleInit() {
+    // Note: this order is important
+    await this.updateValidatorsHandlersCache();
+    await this.updateVfnStatusCache();
+    await this.updateValidatorsCache();
+    await this.updateValidatorsVouchesCache();
+
+    // Clear all jobs in the queue
+    this.validatorsQueue.drain(true);
+
     await this.validatorsQueue.add('updateValidatorsHandlersCache', undefined, {
       repeat: {
         every: 12 * 60 * 60 * 1000, // 12 hours
       },
     });
-    this.updateValidatorsHandlersCache();
 
     await this.validatorsQueue.add('updateValidatorsCache', undefined, {
       repeat: {
         every: 30 * 1000, // 30 seconds
       },
     });
-    this.updateValidatorsCache();
 
     await this.validatorsQueue.add('updateVfnStatusCache', undefined, {
       repeat: {
         every: 5 * 60 * 1000, // 5 minutes
       },
     });
-    this.updateVfnStatusCache();
 
     await this.validatorsQueue.add('updateValidatorsVouchesCache', undefined, {
       repeat: {
         every: 60 * 1000, // 60 seconds
       },
     });
-    this.updateValidatorsVouchesCache();
 
     this.logger.log('ValidatorsProcessor initialized');
   }
@@ -75,43 +80,50 @@ export class ValidatorsProcessor extends WorkerHost {
     }
   }
 
+  private async updateValidatorsHandlersCache() {
+    const start = Date.now();
+    try {
+      const validatorsHandlers = await this.validatorsService.loadValidatorHandles();
+      const obj = Object.fromEntries(validatorsHandlers);
+      await redisClient.set(VALIDATORS_HANDLERS_CACHE_KEY, JSON.stringify(obj));
+      const duration = Date.now() - start;
+      this.logger.log(`Validators handlers cache updated in ${duration}ms`);
+    } catch (error) {
+      this.logger.error('Error updating validators handlers cache', error);
+    }
+  }
+
   private async updateVfnStatusCache() {
+    const start = Date.now();
     try {
       const vfnStatus = await this.validatorsService.queryValidatorsVfnStatus();
       await redisClient.set(VALIDATORS_VFN_STATUS_CACHE_KEY, JSON.stringify(vfnStatus));
-      this.logger.log('VFN status cache updated');
+      const duration = Date.now() - start;
+      this.logger.log(`VFN status cache updated in ${duration}ms`);
     } catch (error) {
       this.logger.error('Error updating VFN status cache', error);
     }
   }
 
   private async updateValidatorsCache() {
+    const start = Date.now();
     try {
       const validators = await this.validatorsService.queryValidators();
       await redisClient.set(VALIDATORS_CACHE_KEY, JSON.stringify(validators));
-      this.logger.log('Validators cache updated');
+      const duration = Date.now() - start;
+      this.logger.log(`Validators cache updated in ${duration}ms`);
     } catch (error) {
       this.logger.error('Error updating validators cache', error);
     }
   }
 
-  private async updateValidatorsHandlersCache() {
-    try {
-      const validatorsHandlers = await this.validatorsService.loadValidatorHandles();
-      await redisClient.set(
-        VALIDATORS_HANDLERS_CACHE_KEY,
-        JSON.stringify(JSON.stringify(Array.from(validatorsHandlers.entries()))),
-      );
-      this.logger.log('Validators handlers cache updated');
-    } catch (error) {
-      this.logger.error('Error updating validators handlers cache', error);
-    }
-  }
-
   private async updateValidatorsVouchesCache() {
+    const start = Date.now();
     try {
       const validatorsVouches = await this.validatorsService.queryValidatorsVouches();
       await redisClient.set(VALIDATORS_VOUCHES_CACHE_KEY, JSON.stringify(validatorsVouches));
+      const duration = Date.now() - start;
+      this.logger.log(`Validators vouches cache updated in ${duration}ms`);
     } catch (error) {
       this.logger.error('Error updating validators vouches cache', error);
     }

diff --git a/api/src/ol/validators/validators.service.ts b/api/src/ol/validators/validators.service.ts
@@ -77,18 +77,9 @@ export class ValidatorsService {
   public async getValidatorsHandlers(): Promise<Map<string, string>> {
     if (this.cacheEnabled) {
       const cacheHandlersString = await this.getFromCache<string>(VALIDATORS_HANDLERS_CACHE_KEY);
-      if (cacheHandlersString) {
-        try {
-          const map = new Map<string, string>();
-          const entries: [string, string][] = JSON.parse(cacheHandlersString);
-          entries.forEach((entry) => {
-            map.set(entry[0], entry[1]);
-          });
-          return map;
-        } catch (parseError) {
-          this.logger.error('Error parsing validators handlers cache', parseError);
-        }
-      }
+      return cacheHandlersString
+        ? new Map<string, string>(Object.entries(cacheHandlersString))
+        : new Map();
     }
 
     let handlers = new Map<string, string>();
@@ -97,10 +88,9 @@ export class ValidatorsService {
     } catch (error) {
       this.logger.error('Error loading validators handlers', error);
     } finally {
-      await this.setCache(
-        VALIDATORS_HANDLERS_CACHE_KEY,
-        JSON.stringify(Array.from(handlers.entries())),
-      );
+      const obj = Object.fromEntries(handlers);
+      await redisClient.set(VALIDATORS_HANDLERS_CACHE_KEY, JSON.stringify(obj));
+      this.logger.log('Validators handlers cache updated');
     }
 
     return handlers;