telegram-botbuilder 1.1.7 → 1.1.9

package/lib/bot-service.d.ts

@@ -15,6 +15,7 @@ export declare class BotBuilder {
     use(func: BotBuilderMiddleware): void;
     private _mwba;
     private _runmw;
+    private _hashbtn;
     constructor(schema: Schema, token: string, options?: TelegramBot.ConstructorOptions);
     private _getDialog;
     private _getButton;

package/lib/bot-service.js

@@ -54,8 +54,17 @@ exports.CallbackAction = CallbackAction;
 exports.WaitForData = WaitForData;
 var node_telegram_bot_api_1 = __importDefault(require("node-telegram-bot-api"));
 var events_1 = __importDefault(require("events"));
-var crypto_1 = require("crypto");
 var fs_1 = require("fs");
+var hash = require('object-hash');
+function _typed(object) {
+    if ('text' in object && 'action' in object)
+        return 'Button';
+    if ('id' in object && 'text' in object && 'buttons' in object)
+        return 'Dialog';
+    if ('start' in object && 'content' in object && 'commands' in object)
+        return 'Schema';
+    return 'undefined';
+}
 var BotBuilder = /** @class */ (function () {
     function BotBuilder(schema, token, options) {
         var _this = this;
@@ -65,9 +74,14 @@ var BotBuilder = /** @class */ (function () {
         this._schema = schema;
         this._schema.buttons = [];
         for (var x = 0; x < this._schema.content.length; x++) {
+            if (typeof this._schema.content[x].buttons === 'function')
+                continue;
             for (var y = 0; y < this._schema.content[x].buttons.length; y++) {
+                // @ts-ignore
                 for (var b = 0; b < this._schema.content[x].buttons[y].length; b++) {
-                    this._schema.content[x].buttons[y][b]._callback = (0, crypto_1.randomInt)(281474976710655).toFixed(0);
+                    // @ts-ignore
+                    this._schema.content[x].buttons[y][b]._callback = this._hashbtn(this._schema.content[x], this._schema.content[x].buttons[y][b]);
+                    // @ts-ignore
                     this._schema.buttons.push(this._schema.content[x].buttons[y][b]);
                 }
             }
@@ -236,6 +250,9 @@ var BotBuilder = /** @class */ (function () {
             });
         });
     };
+    BotBuilder.prototype._hashbtn = function (dia, btn) {
+        return hash([dia.id, btn]);
+    };
     BotBuilder.prototype._getDialog = function (id) {
         return this._schema.content.find(function (x) { return x.id === id; });
     };
@@ -279,9 +296,9 @@ var BotBuilder = /** @class */ (function () {
     };
     BotBuilder.prototype.ChangeDialog = function (chat, id) {
         return __awaiter(this, void 0, void 0, function () {
-            var dialog, markup, b, _i, _a, btn, text_1, _b, text, _c, _d, msg;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
+            var dialog, btns, _a, markup, b, _i, _b, btn, text_1, _c, text, _d, _e, msg;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0:
                         this._userdialogs[chat].dialog = id;
                         if (this._userdialogs[chat].waiter.statewait) {
@@ -289,65 +306,77 @@ var BotBuilder = /** @class */ (function () {
                             this.ActionSystem.emit("cancel_".concat(this._userdialogs[chat].waiter.descriptor), chat);
                         }
                         dialog = this._getDialog(id);
-                        markup = undefined;
-                        if (!((dialog === null || dialog === void 0 ? void 0 : dialog.buttons.length) > 0)) return [3 /*break*/, 8];
-                        markup = [];
-                        b = 0;
-                        _e.label = 1;
+                        if (!(typeof (dialog === null || dialog === void 0 ? void 0 : dialog.buttons) === 'function')) return [3 /*break*/, 2];
+                        return [4 /*yield*/, (dialog === null || dialog === void 0 ? void 0 : dialog.buttons(chat))];
                     case 1:
-                        if (!(b < (dialog === null || dialog === void 0 ? void 0 : dialog.buttons.length))) return [3 /*break*/, 8];
-                        markup[b] = [];
-                        _i = 0, _a = dialog === null || dialog === void 0 ? void 0 : dialog.buttons[b];
-                        _e.label = 2;
+                        _a = _f.sent();
+                        return [3 /*break*/, 3];
                     case 2:
-                        if (!(_i < _a.length)) return [3 /*break*/, 7];
-                        btn = _a[_i];
-                        if (!(typeof btn.text === 'function')) return [3 /*break*/, 4];
-                        return [4 /*yield*/, btn.text(chat)];
+                        _a = dialog === null || dialog === void 0 ? void 0 : dialog.buttons;
+                        _f.label = 3;
                     case 3:
-                        _b = _e.sent();
-                        return [3 /*break*/, 5];
+                        btns = (_a) || [];
+                        markup = undefined;
+                        if (!(btns.length > 0)) return [3 /*break*/, 11];
+                        markup = [];
+                        b = 0;
+                        _f.label = 4;
                     case 4:
-                        _b = btn.text;
-                        _e.label = 5;
+                        if (!(b < btns.length)) return [3 /*break*/, 11];
+                        markup[b] = [];
+                        _i = 0, _b = btns[b];
+                        _f.label = 5;
                     case 5:
-                        text_1 = _b;
-                        markup[b].push({ text: text_1, callback_data: btn._callback });
-                        _e.label = 6;
+                        if (!(_i < _b.length)) return [3 /*break*/, 10];
+                        btn = _b[_i];
+                        if (!(typeof btn.text === 'function')) return [3 /*break*/, 7];
+                        return [4 /*yield*/, btn.text(chat)];
                     case 6:
-                        _i++;
-                        return [3 /*break*/, 2];
+                        _c = _f.sent();
+                        return [3 /*break*/, 8];
                     case 7:
-                        b++;
-                        return [3 /*break*/, 1];
+                        _c = btn.text;
+                        _f.label = 8;
                     case 8:
-                        if (dialog == undefined)
-                            markup = [[{ text: "Меню", callback_data: this._schema.start }]]; // FIX RAND BTN
-                        if (!(typeof (dialog === null || dialog === void 0 ? void 0 : dialog.text) === 'function')) return [3 /*break*/, 10];
-                        return [4 /*yield*/, (dialog === null || dialog === void 0 ? void 0 : dialog.text(chat))];
+                        text_1 = _c;
+                        btn._callback = this._hashbtn(dialog, btn);
+                        this._schema.buttons.push(btn);
+                        markup[b].push({ text: text_1, callback_data: btn._callback });
+                        _f.label = 9;
                     case 9:
-                        _c = _e.sent();
-                        return [3 /*break*/, 11];
+                        _i++;
+                        return [3 /*break*/, 5];
                     case 10:
-                        _c = dialog === null || dialog === void 0 ? void 0 : dialog.text;
-                        _e.label = 11;
+                        b++;
+                        return [3 /*break*/, 4];
                     case 11:
-                        text = _c;
-                        _e.label = 12;
+                        if (dialog == undefined)
+                            markup = [[{ text: "Меню", callback_data: this._schema.start }]]; // FIX RAND BTN
+                        if (!(typeof (dialog === null || dialog === void 0 ? void 0 : dialog.text) === 'function')) return [3 /*break*/, 13];
+                        return [4 /*yield*/, (dialog === null || dialog === void 0 ? void 0 : dialog.text(chat))];
                     case 12:
-                        _e.trys.push([12, 14, , 16]);
-                        return [4 /*yield*/, this._bot.editMessageText(text || "404", { chat_id: chat, message_id: this._userdialogs[chat].lastid, reply_markup: { inline_keyboard: markup || [] }, parse_mode: 'MarkdownV2' })];
+                        _d = _f.sent();
+                        return [3 /*break*/, 14];
                     case 13:
-                        _e.sent();
-                        return [3 /*break*/, 16];
+                        _d = dialog === null || dialog === void 0 ? void 0 : dialog.text;
+                        _f.label = 14;
                     case 14:
-                        _d = _e.sent();
-                        return [4 /*yield*/, this._bot.sendMessage(chat, text || "404", { reply_markup: { inline_keyboard: markup || [] }, parse_mode: 'MarkdownV2' })];
+                        text = _d;
+                        _f.label = 15;
                     case 15:
-                        msg = _e.sent();
+                        _f.trys.push([15, 17, , 19]);
+                        return [4 /*yield*/, this._bot.editMessageText(text || "404", { chat_id: chat, message_id: this._userdialogs[chat].lastid, reply_markup: { inline_keyboard: markup || [] }, parse_mode: 'HTML' })];
+                    case 16:
+                        _f.sent();
+                        return [3 /*break*/, 19];
+                    case 17:
+                        _e = _f.sent();
+                        return [4 /*yield*/, this._bot.sendMessage(chat, text || "404", { reply_markup: { inline_keyboard: markup || [] }, parse_mode: 'HTML' })];
+                    case 18:
+                        msg = _f.sent();
                         this._userdialogs[chat].lastid = msg.message_id;
-                        return [3 /*break*/, 16];
-                    case 16: return [2 /*return*/];
+                        return [3 /*break*/, 19];
+                    case 19: return [2 /*return*/];
                 }
             });
         });
@@ -357,7 +386,7 @@ var BotBuilder = /** @class */ (function () {
         this._userdialogs[chat].waiter.statewait = true;
     };
     BotBuilder.prototype.Message = function (chat, content) {
-        return this._bot.sendMessage(chat, content, { parse_mode: 'MarkdownV2' });
+        return this._bot.sendMessage(chat, content, { parse_mode: 'HTML' });
     };
     return BotBuilder;
 }());

package/lib/bot-struct.d.ts

@@ -3,10 +3,10 @@ export type Action = (chat: number, _bot: BotBuilder, ...args: any[]) => (Promis
 export interface Dialog {
     id: string;
     text: string | ((chat: number) => Promise<string>) | ((chat: number) => string);
-    buttons: Button[][];
+    buttons: Button[][] | ((chat: number) => Promise<Button[][]>) | ((chat: number) => Button[][]);
 }
 export interface BotDialog extends Dialog {
-    buttons: BotButton[][];
+    buttons: BotButton[][] | ((chat: number) => Promise<BotButton[][]>) | ((chat: number) => BotButton[][]);
 }
 export interface Button {
     text: string | ((chat: number) => Promise<string>) | ((chat: number) => string);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telegram-botbuilder",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "main": "lib/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -10,7 +10,9 @@
   "license": "ISC",
   "description": "",
   "dependencies": {
+    "@types/object-hash": "^3.0.6",
     "node-telegram-bot-api": "^0.66.0",
+    "object-hash": "^3.0.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.3"
   },

package/src/bot-service.ts

@@ -1,8 +1,9 @@
 import TelegramBot, { InlineKeyboardButton }  from 'node-telegram-bot-api';
-import { Schema, Action, BotSchema, Button, BotButton } from './bot-struct';
+import { Schema, Action, BotSchema, Button, BotButton, BotDialog, Dialog } from './bot-struct';
 import EventEmitter from 'events';
 import { randomInt } from 'crypto';
 import { readFileSync, rmSync } from 'fs';
+var hash = require('object-hash');
 
 
 interface UserDialog {
@@ -17,6 +18,13 @@ export interface ActionCallback {
   chatid: number;
 }
 
+function _typed(object: any): 'Button' | 'Dialog' | 'Schema' | 'undefined' {
+  if ('text' in object && 'action' in object) return 'Button';
+  if ('id' in object && 'text' in object && 'buttons' in object) return 'Dialog';
+  if ('start' in object && 'content' in object && 'commands' in object) return 'Schema';
+  return 'undefined';
+}
+
 export class BotBuilder {
   public _bot: TelegramBot;
   private _schema: BotSchema;
@@ -28,7 +36,6 @@ export class BotBuilder {
   public use(func: BotBuilderMiddleware) {
     this._middleware.push(func);
   }
-
   private _mwba(desc: string): Promise<boolean> {
     return new Promise(r => {
       this.ActionSystem.once(`mwb_${desc}`, r)
@@ -50,15 +57,23 @@ export class BotBuilder {
     return res;
   }
 
+  private _hashbtn(dia: BotDialog, btn: Button) {
+    return hash([dia.id, btn]);
+  }
+
   constructor (schema: Schema, token: string, options?: TelegramBot.ConstructorOptions) {
     this._bot = new TelegramBot(token, options);
     this._schema = schema as BotSchema;
     this._schema.buttons = [];
 
     for (let x = 0; x < this._schema.content.length; x++) {
+      if (typeof this._schema.content[x].buttons === 'function') continue;
       for (let y = 0; y < this._schema.content[x].buttons.length; y++) {
+        // @ts-ignore
         for (let b = 0; b < this._schema.content[x].buttons[y].length; b++) {
-          this._schema.content[x].buttons[y][b]._callback = randomInt(281474976710655).toFixed(0);
+          // @ts-ignore
+          this._schema.content[x].buttons[y][b]._callback = this._hashbtn(this._schema.content[x], this._schema.content[x].buttons[y][b]);
+          // @ts-ignore
           this._schema.buttons.push(this._schema.content[x].buttons[y][b]);
         }
       }
@@ -155,13 +170,17 @@ export class BotBuilder {
     }
 
     let dialog = this._getDialog(id);
+    let btns: BotButton[][] = (typeof dialog?.buttons === 'function' ? await dialog?.buttons(chat) : dialog?.buttons) || [];
+
     let markup: InlineKeyboardButton[][] | undefined = undefined;
-    if (dialog?.buttons.length! > 0) {
+    if (btns.length > 0) {
       markup = [];
-      for (let b = 0; b < dialog?.buttons.length!; b++) {
+      for (let b = 0; b < btns.length; b++) {
         markup[b] = [];
-        for (let btn of dialog?.buttons[b]!) {
+        for (let btn of btns[b]) {
           let text = typeof btn.text === 'function' ? await btn.text(chat) : btn.text;
+          btn._callback = this._hashbtn(dialog!, btn);
+          this._schema.buttons.push(btn);
           markup[b].push({ text, callback_data: btn._callback});
         }
       }
@@ -170,9 +189,9 @@ export class BotBuilder {
     if (dialog == undefined) markup = [[{text: "Меню", callback_data: this._schema.start}]]; // FIX RAND BTN
     let text = typeof dialog?.text === 'function' ? await dialog?.text(chat) : dialog?.text;
     try {
-      await this._bot.editMessageText(text || "404", {chat_id: chat, message_id: this._userdialogs[chat].lastid, reply_markup: { inline_keyboard: markup || [] }, parse_mode: 'MarkdownV2'})
+      await this._bot.editMessageText(text || "404", {chat_id: chat, message_id: this._userdialogs[chat].lastid, reply_markup: { inline_keyboard: markup || [] }, parse_mode: 'HTML'})
     } catch {
-      let msg = await this._bot.sendMessage(chat, text || "404", {reply_markup: { inline_keyboard: markup || [] }, parse_mode: 'MarkdownV2'});
+      let msg = await this._bot.sendMessage(chat, text || "404", {reply_markup: { inline_keyboard: markup || [] }, parse_mode: 'HTML'});
       this._userdialogs[chat].lastid = msg.message_id;
     }
   }
@@ -181,7 +200,7 @@ export class BotBuilder {
     this._userdialogs[chat].waiter.statewait = true;
   }
   public Message(chat: number, content: string) {
-    return this._bot.sendMessage(chat, content, {parse_mode: 'MarkdownV2'});
+    return this._bot.sendMessage(chat, content, {parse_mode: 'HTML'});
   }
 }
 

package/src/bot-struct.ts

@@ -6,10 +6,10 @@ export type Action = (chat: number, _bot: BotBuilder, ...args: any[]) => (Promis
 export interface Dialog {
   id: string;
   text: string | ((chat: number) => Promise<string>) | ((chat: number) => string);
-  buttons: Button[][]
+  buttons: Button[][] | ((chat: number) => Promise<Button[][]>) | ((chat: number) => Button[][]);
 }
 export interface BotDialog extends Dialog {
-  buttons: BotButton[][]
+  buttons: BotButton[][] | ((chat: number) => Promise<BotButton[][]>) | ((chat: number) => BotButton[][]);
 }
 
 export interface Button {

package/tsconfig.json

@@ -86,7 +86,7 @@
     // "strictNullChecks": true,                         /* When type checking, take into account 'null' and 'undefined'. */
     // "strictFunctionTypes": true,                      /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
     // "strictBindCallApply": true,                      /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
-    // "strictPropertyInitialization": true,             /* Check for class properties that are declared but not set in the constructor. */
+    "strictPropertyInitialization": false,             /* Check for class properties that are declared but not set in the constructor. */
     // "noImplicitThis": true,                           /* Enable error reporting when 'this' is given the type 'any'. */
     // "useUnknownInCatchVariables": true,               /* Default catch clause variables as 'unknown' instead of 'any'. */
     // "alwaysStrict": true,                             /* Ensure 'use strict' is always emitted. */