Merge pull request #132 from blockful/feat/multiple-handlers

feat: add multiple handlers support to TriggerProcessorService

Author: LeonardoVieira1630

apps/consumers/jest.config.js

@@ -0,0 +1,15 @@
+/** @type {import('jest').Config} */
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  roots: ['<rootDir>/src'],
+  testMatch: ['**/*.test.ts'],
+  collectCoverageFrom: [
+    'src/**/*.ts',
+    '!src/**/*.d.ts',
+    '!src/**/index.ts',
+  ],
+  moduleNameMapper: {
+    '^@/(.*)$': '<rootDir>/src/$1',
+  },
+};

apps/consumers/package.json

@@ -7,15 +7,20 @@
     "start": "node dist/index.js",
     "dev": "nodemon --exec 'ts-node' src/index.ts",
     "build": "tsc",
-    "check-types": "tsc --noEmit"
+    "check-types": "tsc --noEmit",
+    "test": "jest"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "description": "",
   "devDependencies": {
+    "@jest/globals": "^29.7.0",
+    "@types/jest": "^29.5.11",
     "@types/node": "^20.17.46",
+    "jest": "^29.7.0",
     "nodemon": "^3.1.0",
+    "ts-jest": "^29.1.1",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3"
   },

apps/consumers/src/app.ts

@@ -4,6 +4,7 @@ import { AxiosInstance } from 'axios';
 import { TelegramBotService } from './services/telegram-bot.service';
 import { DAOService } from './services/dao.service';
 import { WalletService } from './services/wallet.service';
+import { ExplorerService } from './services/explorer.service';
 import { EnsResolverService } from './services/ens-resolver.service';
 import { AnticaptureClient } from '@notification-system/anticapture-client';
 import { SubscriptionAPIService } from './services/subscription-api.service';
@@ -19,16 +20,17 @@ export class App {
     telegramBotToken: string, 
     subscriptionServerUrl: string, 
     httpClient: AxiosInstance,
-    rabbitmqUrl: string
+    rabbitmqUrl: string,
+    ensResolver: EnsResolverService
   ) {
     const subscriptionApi = new SubscriptionAPIService(subscriptionServerUrl);
     const anticaptureClient = new AnticaptureClient(httpClient);
-    const ensResolver = new EnsResolverService();
     const daoService = new DAOService(anticaptureClient, subscriptionApi);
     const walletService = new WalletService(subscriptionApi, ensResolver);
+    const explorerService = new ExplorerService();
     const bot = new Telegraf<ContextWithSession>(telegramBotToken);
     bot.use(session());
-    this.telegramBotService = new TelegramBotService(bot, daoService, walletService, ensResolver);
+    this.telegramBotService = new TelegramBotService(bot, daoService, walletService, explorerService, ensResolver);
     this.rabbitmqUrl = rabbitmqUrl;
   }
 

apps/consumers/src/index.ts

@@ -13,15 +13,20 @@
 import axios from 'axios';
 import { App } from './app';
 import { loadConfig } from './config/env';
+import { EnsResolverService } from './services/ens-resolver.service';
 
 const config = loadConfig();
 
+// Create ENS resolver
+const ensResolver = new EnsResolverService();
+
 // Create and start the application
 const app = new App(
   config.telegramBotToken,
   config.subscriptionServerUrl,
   axios.create({ baseURL: config.anticaptureGraphqlEndpoint }),
-  config.rabbitmqUrl
+  config.rabbitmqUrl,
+  ensResolver
 );
 
 (async () => {

apps/consumers/src/interfaces/notification.interface.ts

@@ -4,11 +4,17 @@
  */
 
 export interface NotificationPayload {
-  userId?: string;
-  channelUserId: number;
+  userId: string;
+  channel: string;
+  channelUserId: string | number;
   message: string;
   metadata?: {
     addresses?: Record<string, string>; // key: placeholder name, value: ethereum address
+    transaction?: {
+      hash: string;
+      chainId: number;
+    };
+    [key: string]: any;
   };
 }
 

apps/consumers/src/services/explorer.service.test.ts

@@ -0,0 +1,64 @@
+import { ExplorerService } from './explorer.service';
+
+describe('ExplorerService', () => {
+  let explorerService: ExplorerService;
+
+  beforeEach(() => {
+    explorerService = new ExplorerService();
+  });
+
+  describe('getTransactionLink', () => {
+    it('should return Etherscan link for Ethereum mainnet (chainId: 1)', () => {
+      const hash = '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef';
+      const result = explorerService.getTransactionLink(1, hash);
+      expect(result).toBe('https://etherscan.io/tx/0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef');
+    });
+
+    it('should return Arbiscan link for Arbitrum (chainId: 42161)', () => {
+      const hash = '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef';
+      const result = explorerService.getTransactionLink(42161, hash);
+      expect(result).toBe('https://arbiscan.io/tx/0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef');
+    });
+
+    it('should return Optimistic Etherscan link for Optimism (chainId: 10)', () => {
+      const hash = '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef';
+      const result = explorerService.getTransactionLink(10, hash);
+      expect(result).toBe('https://optimistic.etherscan.io/tx/0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef');
+    });
+
+    it('should return empty string for unknown chain', () => {
+      const hash = '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef';
+      const result = explorerService.getTransactionLink(999999, hash);
+      expect(result).toBe('');
+    });
+
+    it('should return empty string for invalid hash format', () => {
+      const hash = 'invalid-hash';
+      const result = explorerService.getTransactionLink(1, hash);
+      expect(result).toBe('');
+    });
+
+    it('should return empty string for empty hash', () => {
+      const result = explorerService.getTransactionLink(1, '');
+      expect(result).toBe('');
+    });
+    
+    it('should return empty string for 0x-only hash', () => {
+      const result = explorerService.getTransactionLink(1, '0x');
+      expect(result).toBe('');
+    });
+
+    it('should handle undefined chainId gracefully', () => {
+      const hash = '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef';
+      const result = explorerService.getTransactionLink(undefined as any, hash);
+      expect(result).toBe('');
+    });
+
+    it('should handle null chainId gracefully', () => {
+      const hash = '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef';
+      const result = explorerService.getTransactionLink(null as any, hash);
+      expect(result).toBe('');
+    });
+  });
+
+});

apps/consumers/src/services/explorer.service.ts

@@ -0,0 +1,42 @@
+/**
+ * Explorer Service
+ * Handles blockchain explorer URL generation for transaction links using Viem.
+ */
+
+import * as chains from 'viem/chains';
+import { isHash, extractChain } from 'viem';
+import type { Chain } from 'viem';
+
+export class ExplorerService {
+  
+  /**
+   * Generate transaction URL for a given chain and transaction hash
+   * @param chainId The EIP-155 chain ID
+   * @param transactionHash The transaction hash
+   * @returns Clean transaction URL or empty string if hash is invalid
+   */
+  public getTransactionLink(chainId: number, transactionHash: string): string {
+    // Validate hash using viem's isHash utility
+    if (!isHash(transactionHash)) {
+      return '';
+    }
+    
+    const chain = extractChain({
+      chains: Object.values(chains),
+      id: chainId as any
+    });
+    
+    if (chain?.blockExplorers?.default?.url) {
+      // Ensure transaction hash is properly formatted with 0x prefix
+      const formattedHash = transactionHash.startsWith('0x') 
+        ? transactionHash 
+        : `0x${transactionHash}`;
+      
+      return `${chain.blockExplorers.default.url}/tx/${formattedHash}`;
+    }
+    
+    // Fallback when explorer is not available or chain not found
+    return '';
+  }
+
+}

apps/consumers/src/services/rabbitmq-notification-consumer.service.ts

@@ -1,17 +1,6 @@
 import { RabbitMQConnection, RabbitMQConsumer, RabbitMQMessage } from '@notification-system/rabbitmq-client';
 import { TelegramBotService } from './telegram-bot.service';
-
-/**
- * Interface for the notification payload received from RabbitMQ
- */
-interface NotificationPayload {
-  userId: string;
-  channelUserId: number;
-  message: string;
-  metadata?: {
-    addresses?: Record<string, string>;
-  };
-}
+import { NotificationPayload } from '../interfaces/notification.interface';
 
 /**
  * Service to consume notification messages from RabbitMQ and process them through TelegramBotService
@@ -55,12 +44,7 @@ export class RabbitMQNotificationConsumerService {
       return;
     }
     try {
-      await this.telegramBotService.sendNotification({
-        userId: message.payload.userId,
-        channelUserId: message.payload.channelUserId,
-        message: message.payload.message,
-        metadata: message.payload.metadata,
-      });
+      await this.telegramBotService.sendNotification(message.payload);
     } catch (error: any) {
       if (error?.response?.description === 'Bad Request: chat not found') {
         console.log('⚠️  Unable to send message to user:', message.payload.userId);

apps/consumers/src/services/telegram-bot.service.ts

@@ -8,6 +8,7 @@ import { Telegraf, Markup } from 'telegraf';
 import { WELCOME_MESSAGE, HELP_MESSAGE, DAOS_BUTTON_TEXT, LEARN_MORE_BUTTON_TEXT, MY_WALLETS_BUTTON_TEXT } from '../messages';
 import { DAOService } from '../services/dao.service';
 import { WalletService } from '../services/wallet.service';
+import { ExplorerService } from '../services/explorer.service';
 import { EnsResolverService } from '../services/ens-resolver.service';
 import { ContextWithSession } from '../interfaces/bot.interface';
 import { NotificationPayload } from '../interfaces/notification.interface';
@@ -16,17 +17,20 @@ export class TelegramBotService {
   private bot: Telegraf<ContextWithSession>;
   private daoService: DAOService;
   private walletService: WalletService;
+  private explorerService: ExplorerService;
   private ensResolver: EnsResolverService;
 
   constructor(
     bot: Telegraf<ContextWithSession>, 
     daoService: DAOService, 
     walletService: WalletService,
+    explorerService: ExplorerService,
     ensResolver: EnsResolverService
   ) {
     this.bot = bot;
     this.daoService = daoService;
     this.walletService = walletService;
+    this.explorerService = explorerService;
     this.ensResolver = ensResolver;
     this.setupCommands();
   }
@@ -143,6 +147,14 @@ export class TelegramBotService {
   public async sendNotification(payload: NotificationPayload): Promise<string> {
     let processedMessage = payload.message;
 
+    // Process transaction link if transaction metadata is provided
+    if (payload.metadata?.transaction) {
+      const { hash, chainId } = payload.metadata.transaction;
+      const txUrl = this.explorerService.getTransactionLink(chainId, hash);
+      const markdownLink = `[Transaction details](${txUrl})`;
+      processedMessage = processedMessage.replace('{{txLink}}', markdownLink);
+    }
+    
     // Process ENS names if addresses are provided in metadata
     if (payload.metadata?.addresses) {
       for (const [placeholder, address] of Object.entries(payload.metadata.addresses)) {
@@ -153,7 +165,8 @@ export class TelegramBotService {
 
     const sentMessage = await this.bot.telegram.sendMessage(
       payload.channelUserId, 
-      processedMessage
+      processedMessage,
+      { parse_mode: 'Markdown' }
     );
     return `${sentMessage.message_id}`;
   }

apps/consumers/tsconfig.json

@@ -17,5 +17,5 @@
     "resolveJsonModule": true
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist"]
+  "exclude": ["node_modules", "dist", "src/**/*.test.ts", "src/**/*.spec.ts"]
 }