fixed pg.events.listener

Author: ashkuc

apps/crawler/src/subscribers/pg.events.listener.ts

@@ -6,8 +6,8 @@ import {
   parseBlockNumbersPayload,
   parseBlockRangePayload,
   parseTokenRangePayload,
+  NextBlocksQueryParams,
 } from './pg.payload.parsers';
-import { BlockService } from '../services/block.service';
 import { TokenReScanner } from './token.rescaner';
 import { CollectionService } from '../services/collection.service';
 import { TokenService } from '../services/token/token.service';
@@ -20,24 +20,6 @@ enum PG_EVENTS_CHANNELS {
   RESCAN_TOKENS = 'rescan_tokens',
 }
 
-type ParsedRescanPayload = {
-  from: number;
-  to: number;
-  pageSize: number;
-  eventSections: string[];
-};
-
-type NextBlocksQueryParams = ParsedRescanPayload & {
-  page: number;
-};
-
-const DEFAULT_EVENT_SECTIONS_FOR_RESCAN = [
-  'common',
-  'unique',
-  'balances',
-  'appPromotion',
-];
-
 @Injectable()
 export class PgEventsListener implements OnApplicationBootstrap {
   readonly logger = new Logger(PgEventsListener.name);
@@ -52,8 +34,7 @@ export class PgEventsListener implements OnApplicationBootstrap {
     private blocksSubscriberService: BlocksSubscriberService,
     private collectionService: CollectionService,
     private tokenService: TokenService,
-    private blockService: BlockService,
-    private tokenReScanner: TokenReScanner,
+    private tokenReScanner: TokenReScanner
   ) {
     const config = {
       host: process.env.POSTGRES_HOST,
@@ -84,6 +65,7 @@ export class PgEventsListener implements OnApplicationBootstrap {
         [PG_EVENTS_CHANNELS.STOP_FAST_RESCAN]: async () =>
           this.stopFastRescan('manual'),
         [PG_EVENTS_CHANNELS.RESCAN_TOKENS]: this.handleRescanTokens,
+        [PG_EVENTS_CHANNELS.RESCAN_ALL_COLLECTION]: this.rescanAllCollections,
       };
 
       const handler = handlersMap[channel];
@@ -129,7 +111,7 @@ export class PgEventsListener implements OnApplicationBootstrap {
       return;
     }
 
-    const parsedPayload = PgEventsListener.parseBlockRangePayload(payload);
+    const parsedPayload = parseBlockRangePayload(payload);
     const { from, to, pageSize, eventSections } = parsedPayload;
     this.logger.log(`Going to start fast rescan from ${from} to ${to}`);
 
@@ -262,33 +244,4 @@ export class PgEventsListener implements OnApplicationBootstrap {
     client.release();
     this.logger.log(`Rescan for collection ${collectionId} finished`);
   }
-
-  static parseBlockNumbersPayload(payload: string): number[] {
-    return payload
-      .split(',')
-      .map((n) => parseInt(n.trim(), 10))
-      .filter((n) => !isNaN(n));
-  }
-
-  static parseBlockRangePayload(payload: string): ParsedRescanPayload {
-    const [numbersPart, sectionsPart] = payload.split('/');
-    const numbers = numbersPart.split('-').map((n) => parseInt(n.trim(), 10));
-
-    if (numbers.length < 2) {
-      throw new Error(
-        `Invalid block range payload ${payload}, expected format: from-to[-pageSize][/section,section]`
-      );
-    }
-
-    const [from, to, pageSize = 100] = numbers;
-
-    const eventSections = sectionsPart
-      .split(',')
-      .map((s) => s.trim())
-      .filter(Boolean);
-    if (eventSections.length === 0)
-      eventSections.push(...DEFAULT_EVENT_SECTIONS_FOR_RESCAN);
-
-    return { from, to, pageSize, eventSections };
-  }
 }

apps/crawler/src/subscribers/pg.payload.parsers.ts

@@ -1,3 +1,21 @@
+const DEFAULT_EVENT_SECTIONS_FOR_RESCAN = [
+  'common',
+  'unique',
+  'balances',
+  'appPromotion',
+];
+
+export type ParsedRescanPayload = {
+  from: number;
+  to: number;
+  pageSize: number;
+  eventSections: string[];
+};
+
+export type NextBlocksQueryParams = ParsedRescanPayload & {
+  page: number;
+};
+
 /**
  * Parse string like "1,2,3,4,5" to array of numbers
  * @param payload
@@ -14,23 +32,27 @@ export const parseBlockNumbersPayload = (payload: string): number[] => {
  * @param payload
  */
 export const parseBlockRangePayload = (
-  payload: string,
-): {
-  from: number;
-  to: number;
-  pageSize: number;
-} => {
-  const numbers = payload.split('-').map((n) => parseInt(n.trim(), 10));
+  payload: string
+): ParsedRescanPayload => {
+  const [numbersPart, sectionsPart] = payload.split('/');
+  const numbers = numbersPart.split('-').map((n) => parseInt(n.trim(), 10));
 
   if (numbers.length < 2) {
     throw new Error(
-      `Invalid block range payload ${payload}, expected format: from-to or from-to-pageSize`,
+      `Invalid block range payload ${payload}, expected format: from-to[-pageSize][/section,section]`
     );
   }
 
   const [from, to, pageSize = 100] = numbers;
 
-  return { from, to, pageSize };
+  const eventSections = sectionsPart
+    .split(',')
+    .map((s) => s.trim())
+    .filter(Boolean);
+  if (eventSections.length === 0)
+    eventSections.push(...DEFAULT_EVENT_SECTIONS_FOR_RESCAN);
+
+  return { from, to, pageSize, eventSections };
 };
 
 /**
@@ -43,21 +65,21 @@ export const parseTokenRangePayload = (payload: string) => {
 
   if (!collectionIdString || !tokenIdsString || !blockNumberString) {
     throw new Error(
-      `Invalid token range payload ${payload}, expected format: collectionId/tokenId,tokenId@blockNumber`,
+      `Invalid token range payload ${payload}, expected format: collectionId/tokenId,tokenId@blockNumber`
     );
   }
 
   const collectionId = parseInt(collectionIdString, 10);
   if (isNaN(collectionId)) {
     throw new Error(
-      `Invalid token range payload ${payload}, collectionId is not a number`,
+      `Invalid token range payload ${payload}, collectionId is not a number`
     );
   }
 
   const blockNumber = parseInt(blockNumberString, 10);
   if (isNaN(blockNumber)) {
     throw new Error(
-      `Invalid token range payload ${payload}, blockNumber is not a number`,
+      `Invalid token range payload ${payload}, blockNumber is not a number`
     );
   }
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "polkastats-backend-uniquenetwork",
-  "version": "2.0.95",
+  "version": "2.0.96",
   "description": "",
   "author": "Unique Network Team",
   "private": true,