@2byte/tgbot-framework 1.0.14 → 1.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2byte/tgbot-framework",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "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/Artisan.ts

@@ -33,57 +33,28 @@ export class Artisan {
     // Создаем файл секции
     fs.writeFileSync(sectionPath, template);
     console.log(`✅ Created section ${sectionName} at ${sectionPath}`);
+    console.log('To enable the section, add key  it to the sections array in ' + process.cwd() + '/sectionList.ts');
   }
 
   /**
    * Форматирует имя секции (первая буква заглавная, остальные строчные)
    */
   private formatSectionName(name: string): string {
-    return name.charAt(0).toUpperCase() + name.slice(1).toLowerCase();
+    return name.charAt(0).toUpperCase() + name.slice(1);
   }
 
   /**
    * Возвращает шаблон для новой секции
    */
   private getSectionTemplate(name: string): string {
-    return `import { Section } from "@2byte/tgbot-framework";
-import { SectionOptions } from "@2byte/tgbot-framework";
-import { InlineKeyboard } from "@2byte/tgbot-framework";
-
-export default class ${name}Section extends Section {
-  static command = "${name.toLowerCase()}";
-  static description = "${name} section";
-  static actionRoutes = {
-    "${name.toLowerCase()}.index": "index",
-  };
-  
-  public sectionId = "${name.toLowerCase()}";
-  private mainInlineKeyboard: InlineKeyboard;
-
-  constructor(options: SectionOptions) {
-    super(options);
-
-    this.mainInlineKeyboard = this.makeInlineKeyboard([
-      [this.makeInlineButton("🏠 На главную", "home.index")],
-    ]);
-  }
-
-  public async up(): Promise<void> {}
-  public async down(): Promise<void> {}
-  public async setup(): Promise<void> {}
-  public async unsetup(): Promise<void> {}
-
-  async index() {
-    const message = \`
-      👋 Welcome to ${name} Section
-    \`;
-
-    await this.message(message)
-      .inlineKeyboard(this.mainInlineKeyboard)
-      .send();
-  }
-}
-`;
+    const filePath = path.join(__dirname, '../../templates', 'TemplateSection.ts');
+    let template = fs.readFileSync(filePath, 'utf-8');
+    const nameCamelCase = name.charAt(0).toLowerCase() + name.slice(1);
+
+    template = template.replace(/\$\{name\}/g, nameCamelCase);
+    template = template.replace(/\$\{commandName\}/g, name.toLowerCase());
+    template = template.replace(/TemplateSection/g, `${name}Section`);
+    return template;
   }
 
   /**

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/types.ts

@@ -41,7 +41,7 @@ export interface RunnedSection {
 }
 
 export interface UserAttributes {
-  id?: number;
+  id: number;
   user_refid?: number;
   tg_id: number;
   tg_username: string;

package/src/user/UserModel.ts

@@ -47,10 +47,18 @@ export class UserModel extends Model {
     return this.attributes;
   }
 
-  get id(): number | undefined {
+  get id(): number {
     return this.attributes.id;
   }
 
+  get tgUsername(): string {
+    return this.attributes.tg_username;
+  }
+
+  get tgName(): string {
+    return this.attributes.tg_first_name + (this.attributes.tg_last_name ? " " + this.attributes.tg_last_name : "");
+  }
+
   get lastMessageIds(): number[] {
     return this.serviceAttributes.lastMessageIds;
   }
@@ -153,6 +161,7 @@ export class UserModel extends Model {
     
     const now = new Date().toISOString();
     return UserModel.make({
+      id: 0,
       tg_id: 0,
       tg_username: tgUsername,
       tg_first_name: tgUsername,
@@ -218,6 +227,10 @@ export class UserModel extends Model {
     return this.attributes.role;
   }
 
+  get roleIsAdmin(): boolean {
+    return this.attributes.role === 'admin';
+  }
+
   get language(): string {
     return this.attributes.language;
   }

package/src/workflow/services/MassSendApiService.ts

@@ -31,15 +31,14 @@ export class MassSendApiService extends ApiService<MassSendApiParams> {
           this.app.debugLog("Received data for mass message:", receivedData);
 
           let userIds: number[] = [];
-          let message: string = "Hello from MassSendApiService";
 
-          if (receivedData && typeof receivedData == "object") {
+          if (receivedData && typeof receivedData == "object" && receivedData.message) {
             userIds = receivedData?.userIds || [];
-            message = receivedData?.message || "Hello from MassSendApiService";
+            const message = receivedData?.message;
+          
+            this.sendMassMessage(userIds, message, receivedData.extra);
           }
 
-          this.sendMassMessage(userIds, message, receivedData.extra);
-
           return Response.json({ status: 200, body: "Mass message sending initiated." });
         },
       },

package/templates/TemplateSection.ts

@@ -0,0 +1,37 @@
+import { Section } from "@2byte/tgbot-framework";
+import { SectionOptions } from "@2byte/tgbot-framework";
+import { InlineKeyboard } from "@2byte/tgbot-framework";
+
+export default class TemplateSection extends Section {
+  static override command = "${commandName}";
+  static override description = "${name} section";
+  static override actionRoutes = {
+    "${name}.index": "index",
+  };
+  
+  public override sectionId = "${name}";
+  private mainInlineKeyboard: InlineKeyboard;
+
+  constructor(options: SectionOptions) {
+    super(options);
+
+    this.mainInlineKeyboard = this.makeInlineKeyboard().addFootFixedButtons(
+      this.makeInlineButton("🏠 На главную", "home.index")
+    );
+  }
+
+  public override async up(): Promise<void> {}
+  public override async down(): Promise<void> {}
+  public override async setup(): Promise<void> {}
+  public override async unsetup(): Promise<void> {}
+
+  async index() {
+    const message = `
+      👋 Welcome to ${this.ctx.user.attributes.tg_username} Section
+    `;
+
+    await this.message(message)
+      .inlineKeyboard(this.mainInlineKeyboard)
+      .send();
+  }
+}

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.16"
   },
   "devDependencies": {
     "@types/node": "^20.19.8",