all

src/bots/handlers/serviceHandlers.ts

@@ -49,15 +49,32 @@ export const setupServiceHandlers = (bot: any) => {
   // Add handler for browse services button
   bot.action('browse_services', async (ctx: BotContext) => {
     await ctx.answerCbQuery();
-    await handleBrowseServices(ctx);
+    await handleBrowseServices(ctx, undefined); // Pass undefined for initial sortBy
   });
 
   // Add handler for services pagination
-  bot.action(/^services_page_(\d+)$/, async (ctx: BotContext) => {
+  bot.action(/^services_page_(\d+)(_([a-zA-Z]+))?$/, async (ctx: BotContext) => {
     await ctx.answerCbQuery();
     const match = ctx.match as RegExpMatchArray;
     const page = parseInt(match[1], 10);
-    await handleServicesPagination(ctx, page);
+    const sortBy = match[3] as 'az' | 'za' | undefined;
+    await handleServicesPagination(ctx, page, sortBy);
+  });
+
+  // Add handler for sorting services by A-Z
+  bot.action(/^sort_services_az_(\d+)$/, async (ctx: BotContext) => {
+    await ctx.answerCbQuery();
+    const match = ctx.match as RegExpMatchArray;
+    const page = parseInt(match[1], 10);
+    await handleServicesPagination(ctx, page, 'az');
+  });
+
+  // Add handler for sorting services by Z-A
+  bot.action(/^sort_services_za_(\d+)$/, async (ctx: BotContext) => {
+    await ctx.answerCbQuery();
+    const match = ctx.match as RegExpMatchArray;
+    const page = parseInt(match[1], 10);
+    await handleServicesPagination(ctx, page, 'za');
   });
 
   // Add handler for sorting countries by price
@@ -153,7 +170,7 @@ export const setupServiceHandlers = (bot: any) => {
       userSearchStates.delete(telegramId);
     }
     try {
-      await handleBrowseServices(ctx);
+      await handleBrowseServices(ctx, undefined); // Pass undefined to reset sort
     } catch (editError: any) {
       if (editError.message && editError.message.includes('message is not modified')) {
         logger.info(`Browse services message not modified (cancel_search). No action needed.`);
@@ -187,157 +204,191 @@ export const setupServiceHandlers = (bot: any) => {
 
   // Text handler for product/country search input
   bot.on('text', async (ctx: BotContext) => {
-    const telegramId = ctx.from?.id;
-    const userState = userSearchStates.get(telegramId);
-
-    if (!telegramId || (!userState?.waitingForProductSearch && !userState?.waitingForCountrySearch)) {
-      return; // Not in search state, let other text handlers process or ignore
-    }
-
-    // Ensure ctx.message is a text message. Telegraf's `bot.on('text')` guarantees this, but TypeScript needs explicit narrowing.
-    const message = ctx.message as Message.TextMessage; 
-
-    // Now 'text' property is safely accessible
-    const query = message.text?.toLowerCase().trim();
+    try {
+      const telegramId = ctx.from?.id;
+      const userState = userSearchStates.get(telegramId);
 
-    if (!query || query.length < 2) { // Require at least 2 characters for search
-      await ctx.reply(getInvalidSearchInputMessage(), {
-        reply_markup: Markup.inlineKeyboard([Markup.button.callback('↩️ Cancel Search', userState.waitingForProductSearch ? 'cancel_search' : `cancel_country_search_${userState.waitingForCountrySearch?.serviceId}_${userState.waitingForCountrySearch?.sortBy || 'default'}_${userState.waitingForCountrySearch?.page}`)]).reply_markup
-      });
-      return;
-    }
+      if (!telegramId || (!userState?.waitingForProductSearch && !userState?.waitingForCountrySearch)) {
+        return; // Not in search state, let other text handlers process or ignore
+      }
 
-    userSearchStates.delete(telegramId); // Clear search state after processing
+      // Ensure ctx.message is a text message. Telegraf's `bot.on('text')` guarantees this, but TypeScript needs explicit narrowing.
+      const message = ctx.message as Message.TextMessage; 
 
-    if (userState.waitingForProductSearch) {
-      // Filter products based on search query
-      const searchResults = Object.entries(fiveSimProducts).filter(([serviceId, serviceData]) => {
-        return serviceId.toLowerCase().includes(query) || serviceData.label_en.toLowerCase().includes(query);
-      });
+      // Now 'text' property is safely accessible
+      const query = message.text?.toLowerCase().trim();
 
-      if (searchResults.length === 0) {
-        await ctx.reply(getNoSearchResultsMessage(), {
-          reply_markup: Markup.inlineKeyboard([Markup.button.callback('🔙 Back to Services', 'browse_services')]).reply_markup
-        });
+      if (!query || query.length < 2) { // Require at least 2 characters for search
+        try {
+          await ctx.reply(getInvalidSearchInputMessage(), {
+            reply_markup: Markup.inlineKeyboard([Markup.button.callback('↩️ Cancel Search', userState.waitingForProductSearch ? 'cancel_search' : `cancel_country_search_${userState.waitingForCountrySearch?.serviceId}_${userState.waitingForCountrySearch?.sortBy || 'default'}_${userState.waitingForCountrySearch?.page}`)]).reply_markup
+          });
+        } catch (replyError: any) {
+          logger.error(`Error replying with invalid search input message: ${replyError.message}`);
+        }
         return;
       }
 
-      const buttons = [];
-      const rowSize = 2; // 2 buttons per row
-      const servicesPerPage = 20; 
-      const currentPage = 0; // Always start search results on the first page
+      userSearchStates.delete(telegramId); // Clear search state after processing
 
-      const startIndex = currentPage * servicesPerPage;
-      const endIndex = Math.min(startIndex + servicesPerPage, searchResults.length);
-      const pageServices = searchResults.slice(startIndex, endIndex);
+      if (userState.waitingForProductSearch) {
+        // Filter products based on search query
+        const searchResults = Object.entries(fiveSimProducts).filter(([serviceId, serviceData]) => {
+          return serviceId.toLowerCase().includes(query) || serviceData.label_en.toLowerCase().includes(query);
+        });
 
-      // Generate service buttons in pairs
-      for (let i = 0; i < pageServices.length; i += rowSize) {
-        const row = [];
-        for (let j = 0; j < rowSize && i + j < pageServices.length; j++) {
-          const [serviceId, serviceData] = pageServices[i + j];
-          row.push(
-            Markup.button.callback(
-              `${serviceData.icon} ${serviceData.label_en}`,
-              `service_${serviceId}`
-            )
-          );
+        if (searchResults.length === 0) {
+          try {
+            await ctx.reply(getNoSearchResultsMessage(), {
+              reply_markup: Markup.inlineKeyboard([Markup.button.callback('🔙 Back to Services', 'browse_services')]).reply_markup
+            });
+          } catch (replyError: any) {
+            logger.error(`Error replying with no search results message: ${replyError.message}`);
+          }
+          return;
         }
-        buttons.push(row);
-      }
 
-      buttons.push([Markup.button.callback('🔙 Back to Services', 'browse_services')]);
+        const buttons = [];
+        const rowSize = 2; // 2 buttons per row
+        const servicesPerPage = 20; 
+
+        const currentPage = 0; // Always start search results on the first page
+
+        const startIndex = currentPage * servicesPerPage;
+        const endIndex = Math.min(startIndex + servicesPerPage, searchResults.length);
+        const pageServices = searchResults.slice(startIndex, endIndex);
+
+        // Generate service buttons in pairs
+        for (let i = 0; i < pageServices.length; i += rowSize) {
+          const row = [];
+          for (let j = 0; j < rowSize && i + j < pageServices.length; j++) {
+            const [serviceId, serviceData] = pageServices[i + j];
+            row.push(
+              Markup.button.callback(
+                `${serviceData.icon} ${serviceData.label_en}`,
+                `service_${serviceId}`
+              )
+            );
+          }
+          buttons.push(row);
+        }
 
-      await ctx.reply(getServicesPaginationInfo(currentPage), {
-        parse_mode: 'HTML',
-        reply_markup: Markup.inlineKeyboard(buttons).reply_markup
-      });
+        buttons.push([Markup.button.callback('🔙 Back to Services', 'browse_services')]);
 
-    } else if (userState.waitingForCountrySearch) {
-      const { serviceId, sortBy, page } = userState.waitingForCountrySearch;
-      const allCountries = Object.entries(countryData); // Use all countries for search
+        try {
+          await ctx.reply(getServicesPaginationInfo(currentPage), {
+            parse_mode: 'HTML',
+            reply_markup: Markup.inlineKeyboard(buttons).reply_markup
+          });
+        } catch (replyError: any) {
+          logger.error(`Error replying with product search results: ${replyError.message}`);
+        }
 
-      const queryResults = allCountries.filter(([countryShortId, countryInfo]) => {
-        const searchTarget = `${countryInfo.label.toLowerCase()} ${countryInfo.flag.toLowerCase()} ${countryInfo.code.toLowerCase()} ${countryShortId.toLowerCase()}`;
-        return searchTarget.includes(query);
-      });
+      } else if (userState.waitingForCountrySearch) {
+        const { serviceId, sortBy, page } = userState.waitingForCountrySearch;
+        const allCountries = Object.entries(countryData); // Use all countries for search
 
-      // Get prices for the selected service to filter countries by availability and get min/max prices
-      let productPricesForService: any = {};
-      try {
-        const fullProductPrices = await virtualNumberService.getProductPrices(serviceId);
-        if (fullProductPrices && fullProductPrices[serviceId]) {
-          productPricesForService = fullProductPrices[serviceId];
-        }
-      } catch (error: any) {
-        logger.error(`Error fetching prices for service ${serviceId} during country search: ${error.message}`);
-        await ctx.reply(getServiceErrorMessage(serviceId), {
-          parse_mode: 'HTML',
-          reply_markup: Markup.inlineKeyboard([Markup.button.callback('🔙 Back to Services', 'browse_services')]).reply_markup
+        const queryResults = allCountries.filter(([countryShortId, countryInfo]) => {
+          const searchTarget = `${countryInfo.label.toLowerCase()} ${countryInfo.flag.toLowerCase()} ${countryInfo.code.toLowerCase()} ${countryShortId.toLowerCase()}`;
+          return searchTarget.includes(query);
         });
-        return;
-      }
 
-      const searchResults = queryResults.filter(([countryShortId, _]) => {
-        const countryOperators = productPricesForService[countryShortId];
-        // Only include countries that have available numbers for the current service
-        return countryOperators && Object.values(countryOperators).some((op: any) => op.count > 0);
-      }).map(([countryId, countryInfo]) => {
-        const operators = productPricesForService[countryId];
-        const prices = Object.values(operators)
-          .filter((op: any) => op.count > 0)
-          .map((op: any) => calculatePriceWithProfit(ctx, op.cost, 'RUB'));
-        
-        const minPrice = prices.length > 0 ? parseFloat(Math.min(...prices).toFixed(2)) : 0;
-        const maxPrice = prices.length > 0 ? parseFloat(Math.max(...prices).toFixed(2)) : 0;
-        
-        return { countryId, countryInfo, minPrice, maxPrice };
-      });
+        // Get prices for the selected service to filter countries by availability and get min/max prices
+        let productPricesForService: any = {};
+        try {
+          const fullProductPrices = await virtualNumberService.getProductPrices(serviceId);
+          if (fullProductPrices && fullProductPrices[serviceId]) {
+            productPricesForService = fullProductPrices[serviceId];
+          }
+        } catch (error: any) {
+          logger.error(`Error fetching prices for service ${serviceId} during country search: ${error.message}`);
+          try {
+            await ctx.reply(getServiceErrorMessage(serviceId), {
+              parse_mode: 'HTML',
+              reply_markup: Markup.inlineKeyboard([Markup.button.callback('🔙 Back to Services', 'browse_services')]).reply_markup
+            });
+          } catch (replyError: any) {
+            logger.error(`Error replying with service error message during country search: ${replyError.message}`);
+          }
+          return;
+        }
 
-      if (searchResults.length === 0) {
-        await ctx.reply(getNoCountrySearchResultsMessage(), {
-          reply_markup: Markup.inlineKeyboard([Markup.button.callback('↩️ Cancel Search', `cancel_country_search_${serviceId}_${sortBy || 'default'}_${page}`)]).reply_markup
+        const searchResults = queryResults.filter(([countryShortId, _]) => {
+          const countryOperators = productPricesForService[countryShortId];
+          // Only include countries that have available numbers for the current service
+          return countryOperators && Object.values(countryOperators).some((op: any) => op.count > 0);
+        }).map(([countryId, countryInfo]) => {
+          const operators = productPricesForService[countryId];
+          const prices = Object.values(operators)
+            .filter((op: any) => op.count > 0)
+            .map((op: any) => calculatePriceWithProfit(ctx, op.cost, 'RUB'));
+          
+          const minPrice = prices.length > 0 ? parseFloat(Math.min(...prices).toFixed(2)) : 0;
+          const maxPrice = prices.length > 0 ? parseFloat(Math.max(...prices).toFixed(2)) : 0;
+          
+          return { countryId, countryInfo, minPrice, maxPrice };
         });
-        return;
-      }
 
-      const buttons = [];
-      const rowSize = 2;
-      const countriesPerPage = 10; 
-      const totalPages = Math.ceil(searchResults.length / countriesPerPage);
-      const currentPage = 0; 
+        if (searchResults.length === 0) {
+          try {
+            await ctx.reply(getNoCountrySearchResultsMessage(), {
+              reply_markup: Markup.inlineKeyboard([Markup.button.callback('↩️ Cancel Search', `cancel_country_search_${serviceId}_${sortBy || 'default'}_${page}`)]).reply_markup
+            });
+          } catch (replyError: any) {
+            logger.error(`Error replying with no country search results message: ${replyError.message}`);
+          }
+          return;
+        }
 
-      const startIndex = currentPage * countriesPerPage;
-      const endIndex = Math.min(startIndex + countriesPerPage, searchResults.length);
-      const pageCountries = searchResults.slice(startIndex, endIndex);
+        const buttons = [];
+        const rowSize = 2;
+        const countriesPerPage = 10; 
 
-      for (let i = 0; i < pageCountries.length; i += rowSize) {
-        const row = [];
-        for (let j = 0; j < rowSize && i + j < pageCountries.length; j++) {
-          const { countryId, countryInfo, minPrice, maxPrice } = pageCountries[i + j];
-          
-          const priceText = minPrice === maxPrice 
-            ? `${minPrice}$`
-            : `${minPrice}$-${maxPrice}$`;
+        const currentPage = 0; 
 
-          row.push(
-            Markup.button.callback(
-              `${countryInfo.flag} ${countryInfo.label} (${priceText})`,
-              `country_${serviceId}_${countryId}`
-            )
-          );
-        }
-        if (row.length > 0) {
+        const startIndex = currentPage * countriesPerPage;
+        const endIndex = Math.min(startIndex + countriesPerPage, searchResults.length);
+        const pageCountries = searchResults.slice(startIndex, endIndex);
+
+        for (let i = 0; i < pageCountries.length; i += rowSize) {
+          const row = [];
+          for (let j = 0; j < rowSize && i + j < pageCountries.length; j++) {
+            const { countryId, countryInfo, minPrice, maxPrice } = pageCountries[i + j];
+            
+            const priceText = minPrice === maxPrice 
+              ? `${minPrice}$`
+              : `${minPrice}$-${maxPrice}$`;
+
+            row.push(
+              Markup.button.callback(
+                `${countryInfo.flag} ${countryInfo.label} (${priceText})`,
+                `country_${serviceId}_${countryId}`
+              )
+            );
+          }
           buttons.push(row);
         }
-      }
 
-      buttons.push([Markup.button.callback('↩️ Back to Countries', `cancel_country_search_${serviceId}_${sortBy || 'default'}_${page}`)]);
+        buttons.push([Markup.button.callback('↩️ Back to Countries', `cancel_country_search_${serviceId}_${sortBy || 'default'}_${page}`)]);
 
-      await ctx.reply(getCountriesListMessage(serviceId), {
-        parse_mode: 'HTML',
-        reply_markup: Markup.inlineKeyboard(buttons).reply_markup
-      });
+        try {
+          await ctx.reply(getCountriesListMessage(serviceId), {
+            parse_mode: 'HTML',
+            reply_markup: Markup.inlineKeyboard(buttons).reply_markup
+          });
+        } catch (replyError: any) {
+          logger.error(`Error replying with country search results: ${replyError.message}`);
+        }
+      }
+    } catch (handlerError: any) {
+      logger.error(`Unhandled error in text handler: ${handlerError.message}`);
+      try {
+        await ctx.reply('⚠️ An unexpected error occurred. Please try again or go back to the main menu.', {
+          reply_markup: getLoggedInMenuKeyboard().reply_markup
+        });
+      } catch (finalReplyError: any) {
+        logger.error(`Error sending final error message: ${finalReplyError.message}`);
+      }
     }
   });
 
@@ -356,7 +407,7 @@ export const setupServiceHandlers = (bot: any) => {
   });
 };
 
-export const handleBrowseServices = async (ctx: BotContext) => {
+export const handleBrowseServices = async (ctx: BotContext, sortBy?: 'az' | 'za') => {
   // 🔒 Authentication check
   const telegramId = ctx.from?.id;
   if (!telegramId || !authService.isUserLoggedIn(telegramId, ctx)) {
@@ -377,7 +428,7 @@ export const handleBrowseServices = async (ctx: BotContext) => {
       getServicesPaginationInfo(0),
       {
         parse_mode: 'HTML',
-        reply_markup: getServicesKeyboard(0).reply_markup
+        reply_markup: getServicesKeyboard(0, sortBy).reply_markup
       }
     );
   } catch (editError: any) {
@@ -389,11 +440,19 @@ export const handleBrowseServices = async (ctx: BotContext) => {
   }
 };
 
-export const handleServicesPagination = async (ctx: BotContext, page: number) => {
+export const handleServicesPagination = async (ctx: BotContext, page: number, sortBy?: 'az' | 'za') => {
   // 🔒 Authentication check
   const telegramId = ctx.from?.id;
   if (!telegramId || !authService.isUserLoggedIn(telegramId, ctx)) {
-    await ctx.editMessageText(getAuthRequiredMessage(), { reply_markup: getMainMenuKeyboard().reply_markup });
+    try {
+      await ctx.editMessageText(getAuthRequiredMessage(), { reply_markup: getMainMenuKeyboard().reply_markup });
+    } catch (editError: any) {
+      if (editError.message && editError.message.includes('message is not modified')) {
+        logger.info(`Auth required message not modified. No action needed.`);
+      } else {
+        logger.error(`Error editing auth required message: ${editError.message}`);
+      }
+    }
     return; // Explicitly return nothing after editing
   }
 
@@ -404,7 +463,7 @@ export const handleServicesPagination = async (ctx: BotContext, page: number) =>
         getServicesPaginationInfo(page),
         {
           parse_mode: 'HTML',
-          reply_markup: getServicesKeyboard(page).reply_markup
+          reply_markup: getServicesKeyboard(page, sortBy).reply_markup // Pass sortBy here
         }
       );
     } catch (editError: any) {

src/bots/utils/keyboardUtils.ts

@@ -36,7 +36,7 @@ export const getLoggedInMenuKeyboard = () => {
   ]);
 };
 
-export const getServicesKeyboard = (page: number = 0) => {
+export const getServicesKeyboard = (page: number = 0, sortBy?: 'az' | 'za') => {
   const buttons = [];
   const services = Object.entries(fiveSimProducts);
   const rowSize = 2; // 2 buttons per row
@@ -46,7 +46,19 @@ export const getServicesKeyboard = (page: number = 0) => {
   // Get services for current page
   const startIndex = page * servicesPerPage;
   const endIndex = Math.min(startIndex + servicesPerPage, services.length);
-  const pageServices = services.slice(startIndex, endIndex);
+  let pageServices = services.slice(startIndex, endIndex);
+
+  // Apply sorting for services
+  if (sortBy === 'az') {
+    pageServices.sort((a, b) => a[1].label_en.localeCompare(b[1].label_en));
+  } else if (sortBy === 'za') {
+    pageServices.sort((a, b) => b[1].label_en.localeCompare(a[1].label_en));
+  }
+
+  // Add sort button
+  const sortButtonText = sortBy === 'az' ? 'Sort Z-A ⬇️' : 'Sort A-Z ⬆️';
+  const sortButtonCallback = sortBy === 'az' ? `sort_services_za_${page}` : `sort_services_az_${page}`;
+  buttons.push([Markup.button.callback(sortButtonText, sortButtonCallback)]);
 
   // Generate service buttons in pairs
   for (let i = 0; i < pageServices.length; i += rowSize) {
@@ -69,7 +81,7 @@ export const getServicesKeyboard = (page: number = 0) => {
     paginationRow.push(
       Markup.button.callback(
         '⬅️ Previous',
-        `services_page_${page - 1}`
+        `services_page_${page - 1}${sortBy ? `_${sortBy}` : ''}`
       )
     );
   }
@@ -85,7 +97,7 @@ export const getServicesKeyboard = (page: number = 0) => {
     paginationRow.push(
       Markup.button.callback(
         'Next ➡️',
-        `services_page_${page + 1}`
+        `services_page_${page + 1}${sortBy ? `_${sortBy}` : ''}`
       )
     );
   }