@2byte/tgbot-framework 1.0.10 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2byte/tgbot-framework",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "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

@@ -377,7 +377,7 @@ export class App {
         const sectionRoute = new RunSectionRoute()
           .section(sectionId)
           .method(method)
-          .actionPath(actionPath);
+          .callbackParams(actionPath, actionParams.toString());
 
         this.runSection(ctx, sectionRoute).catch((err) => {
           this.debugLog("Error running section:", err);
@@ -575,6 +575,7 @@ export class App {
 
           // Если указан runSection, выполняем его
           if (runSection) {
+            runSection.runAsCommand();
             await this.runSection(ctx, runSection);
           }
         } else {
@@ -825,11 +826,11 @@ export class App {
       runnedSection = findRunnedSection();
       if (runnedSection) {
         runnedSection.instance
-          .updateCtx(ctx);
+          .updateCtx(ctx)
+          .updateRoute(sectionRoute)
+          .setCallbackParams(sectionRoute.getCallbackParams());
 
-          if (sectionRoute.runIsCallbackQuery) {
-            runnedSection.route.runAsCallbackQuery();
-          }
+          runnedSection.route.runAsCallbackQuery(sectionRoute.runIsCallbackQuery);
 
         isRestoredSection = true;
       } else {

package/src/illumination/Message2Byte.ts

@@ -1,6 +1,6 @@
 import { Telegraf2byteContext } from "./Telegraf2byteContext";
 import { Input, Markup } from "telegraf";
-import type { ReplyKeyboardMarkup } from 'telegraf/core/types/telegram';
+import type { ReplyKeyboardMarkup } from "telegraf/core/types/telegram";
 import { InlineKeyboard } from "./InlineKeyboard";
 import { RequestInputOptions } from "../types";
 import { Message } from "telegraf/types";
@@ -198,21 +198,20 @@ export default class Message2byte {
       }
 
       const message = this.ctx.callbackQuery?.message as Message;
-      
+
       if (message) {
-        if ('media_group_id' in message || 'caption' in message) {
+        if ("media_group_id" in message || "caption" in message) {
           const editMessageCaption = this.editMessageCaption(this.messageValue, this.messageExtra);
 
-          if (editMessageCaption && 'message_id' in editMessageCaption) {
+          if (editMessageCaption && "message_id" in editMessageCaption) {
             this.messageId = editMessageCaption.message_id as number;
           }
 
           return editMessageCaption;
         } else {
-
           const editedText = this.editMessageText(this.messageValue, this.messageExtra);
 
-          if (editedText && 'message_id' in editedText) {
+          if (editedText && "message_id" in editedText) {
             // this.messageId = editedText.message_id as number;
           }
 
@@ -221,13 +220,15 @@ export default class Message2byte {
       } else {
         // this.messageExtra.message_id = this.messageId;
 
-        const messageEntity = await this.editMessageText(this.messageValue, this.messageExtra);
+        try {
+          const messageEntity = await this.editMessageText(this.messageValue, this.messageExtra);
 
-        if (typeof messageEntity === "object" && 'message_id' in messageEntity) {
-          this.messageId = messageEntity.message_id as number;
-        }
-        
-        return messageEntity;
+          if (typeof messageEntity === "object" && "message_id" in messageEntity) {
+            this.messageId = messageEntity.message_id as number;
+          }
+
+          return messageEntity;
+        } catch (e) {}
       }
     }
 

package/src/illumination/RunSectionRoute.ts

@@ -6,7 +6,7 @@ export class RunSectionRoute {
     method: null,
     methodArgs: null,
     callbackParams: new URLSearchParams(),
-    runAsCallcackQuery: false,
+    runAsCallbackQuery: false,
     actionPath: null,
     hearsKey: null,
   };
@@ -20,7 +20,7 @@ export class RunSectionRoute {
 
   method(name: string = 'index', isRunCallbackQuery: boolean = false): this {
     this.runParams.method = name;
-    this.runParams.runAsCallcackQuery = isRunCallbackQuery;
+    this.runParams.runAsCallbackQuery = isRunCallbackQuery;
     return this;
   }
 
@@ -32,13 +32,13 @@ export class RunSectionRoute {
   callbackParams(actionPath: string, params: string | Record<string, string>): this {
     this.runParams.callbackParams = new URLSearchParams(params);
     this.actionPath(actionPath);
-    this.runParams.runAsCallcackQuery = true;
+    this.runParams.runAsCallbackQuery = true;
     return this;
   }
 
   actionPath(path: string): this {
     this.runParams.actionPath = path;
-    this.runParams.runAsCallcackQuery = true;
+    this.runParams.runAsCallbackQuery = true;
     return this;
   }
 
@@ -47,13 +47,13 @@ export class RunSectionRoute {
     return this;
   }
 
-  runAsCommand(): this {
-    this.runParams.runAsCallcackQuery = false;
+  runAsCommand(flag: boolean = true): this {
+    this.runParams.runAsCallbackQuery = !flag;
     return this;
   }
 
-  runAsCallbackQuery(): this {
-    this.runParams.runAsCallcackQuery = true;
+  runAsCallbackQuery(flag: boolean = true): this {
+    this.runParams.runAsCallbackQuery = flag;
     return this;
   }
 
@@ -90,6 +90,6 @@ export class RunSectionRoute {
   }
 
   get runIsCallbackQuery(): boolean {
-    return this.runParams.runAsCallcackQuery;
+    return this.runParams.runAsCallbackQuery;
   }
 }

package/src/types.ts

@@ -133,7 +133,7 @@ export interface RunSectionRouteParams {
   method: string | null;
   methodArgs: any[] | null;
   callbackParams: URLSearchParams;
-  runAsCallcackQuery: boolean;
+  runAsCallbackQuery: boolean;
   actionPath: string | null;
   hearsKey: string | null;
 }

package/templates/bot/package.json

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