@2byte/tgbot-framework 1.0.14 → 1.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2byte/tgbot-framework",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "A TypeScript framework for creating Telegram bots with sections-based architecture (Bun optimized)",
   "main": "src/index.ts",
   "types": "src/index.ts",

package/src/core/App.ts

@@ -74,7 +74,7 @@ export class App {
     }
   > = new Map();
 
-  private messageHandlers: any[] = [];
+  private messageHandlers: RunSectionRoute[] | CallableFunction<this>[] = [];
 
   constructor() {
     this.middlewares.push(this.mainMiddleware.bind(this));
@@ -162,13 +162,12 @@ export class App {
       return this;
     }
 
-    messageHandlers(handlers: any[]): this {
+    messageHandlers(handlers: RunSectionRoute[] | CallableFunction<this>[]): this {
       this.app.messageHandlers = handlers;
       return this;
     }
 
     /**
-     *
      * @param keep Whether to keep section instances in memory after they are run.
      * If true, sections will not be reloaded on each request, improving performance for frequently accessed sections.
      * If false, sections will be reloaded each time they are accessed, ensuring the latest version is used.
@@ -433,16 +432,46 @@ export class App {
         !ctx.userSession.stateAfterValidatedUserResponse
       ) {
         this.messageHandlers.forEach(async (handler: any) => {
+          if (ctx.caught) {
+            this.debugLog("Message already caught by another handler, skipping remaining handlers.");
+            return;
+          }
+
+          const isHandlerRunSectionRoute = handler instanceof RunSectionRoute;
+
+          if (isHandlerRunSectionRoute) {
+            this.debugLog("Checking message handler section route:", handler);
+            await this.runSection(ctx, handler, {
+              cbBeforeRunMethod: async (sectionInstance: Section) => {
+                sectionInstance.runForMessageHandler = true;
+              },
+            });
+            if (ctx.caught) {
+              this.debugLog("Message handler route caught the message, skipping remaining handlers.");
+              return;
+            }
+          }
+
           const handlerIsClass =
             typeof handler === "function" && /^\s*class\s+/.test(handler.toString());
           const nameHandler = handlerIsClass
             ? handler.name
             : handler.constructor?.name || "unknown";
 
-          this.debugLog("Handling message with handler class:", nameHandler);
-
-          if (handlerIsClass) {
+          if (handlerIsClass && !ctx.caught) {
+            this.debugLog(`Running message handler class ${nameHandler} for user ${ctx.user.username}`);
             await new handler(this).handle(ctx);
+            if (ctx.caught) {
+              this.debugLog("Message handler class caught the message, skipping remaining handlers.");
+              return;
+            }
+          } else if (!handlerIsClass && typeof handler === "function" && !ctx.caught) {
+            this.debugLog(`Running message handler function ${nameHandler} for user ${ctx.user.username}`);
+            await handler(ctx);
+            if (ctx.caught) {
+              this.debugLog("Message handler function caught the message, skipping remaining handlers.");
+              return;
+            }
           }
         });
       } else {

package/src/illumination/RunSectionRoute.ts

@@ -63,6 +63,10 @@ export class RunSectionRoute {
     return this;
   }
 
+  static for(sectionId: string, methodName: string = 'index'): RunSectionRoute {
+    return new RunSectionRoute().section(sectionId).method(methodName);
+  }
+
   hasTriggers(): boolean {
     return this.runParams.triggers.length > 0;
   }

package/src/illumination/Section.ts

@@ -15,6 +15,7 @@ export class Section {
   static actionRoutes: { [key: string]: string };
   public sectionId: string = "BaseSection";
   public route: RunSectionRoute;
+  public runForMessageHandler: boolean = false;
   protected ctx: Telegraf2byteContext;
   protected bot: Telegraf<Telegraf2byteContext>;
   protected app: App;

package/src/illumination/Telegraf2byteContext.ts

@@ -11,6 +11,7 @@ export interface Telegraf2byteContext extends Context, ITelegraf2byteContextExtr
   user: UserModel;
   userStorage: UserStore;
   userSession: UserSession;
+  caught: boolean;
   // msgId?: number;
 }
 

package/src/workflow/services/MassSendApiService.ts

@@ -36,10 +36,10 @@ export class MassSendApiService extends ApiService<MassSendApiParams> {
           if (receivedData && typeof receivedData == "object") {
             userIds = receivedData?.userIds || [];
             message = receivedData?.message || "Hello from MassSendApiService";
+          
+            this.sendMassMessage(userIds, message, receivedData.extra);
           }
 
-          this.sendMassMessage(userIds, message, receivedData.extra);
-
           return Response.json({ status: 200, body: "Mass message sending initiated." });
         },
       },

package/templates/bot/package.json

@@ -21,7 +21,7 @@
   "author": "{{author}}",
   "license": "MIT",
   "dependencies": {
-    "@2byte/tgbot-framework": "^1.0.14"
+    "@2byte/tgbot-framework": "^1.0.15"
   },
   "devDependencies": {
     "@types/node": "^20.19.8",