telegram-botbuilder 1.0.11 → 1.0.13

package/lib/bot-service.d.ts

@@ -11,7 +11,9 @@ export declare class BotBuilder {
     ActionSystem: EventEmitter;
     private _userdialogs;
     private _middleware;
+    private _mwbreak;
     use(func: BotBuilderMiddleware): void;
+    private _mwba;
     private _runmw;
     constructor(schema: Schema, token: string, options?: TelegramBot.ConstructorOptions);
     private _getDialog;

package/lib/bot-service.js

@@ -60,6 +60,7 @@ var BotBuilder = /** @class */ (function () {
     function BotBuilder(schema, token, options) {
         var _this = this;
         this._middleware = [];
+        this._mwbreak = {};
         this._bot = new node_telegram_bot_api_1.default(token, options);
         this._schema = schema;
         this._schema.buttons = [];
@@ -181,31 +182,49 @@ var BotBuilder = /** @class */ (function () {
     BotBuilder.prototype.use = function (func) {
         this._middleware.push(func);
     };
+    BotBuilder.prototype._mwba = function (desc) {
+        var _this = this;
+        return new Promise(function (r) {
+            _this.ActionSystem.once("mwb_".concat(desc), r);
+        });
+    };
     BotBuilder.prototype._runmw = function (chat, msg) {
         return __awaiter(this, void 0, void 0, function () {
-            var res, _i, _a, mw, _b;
+            var desc, mwb, res, _i, _a, mw, _b;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
+                        desc = "".concat(chat, "_").concat(msg.message_id || msg.id);
+                        mwb = this._mwbreak[desc];
+                        if (typeof mwb === 'boolean')
+                            return [2 /*return*/, mwb];
+                        if (!(typeof mwb === 'object')) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this._mwba(desc)];
+                    case 1: return [2 /*return*/, _c.sent()];
+                    case 2:
+                        this._mwbreak[desc] = null;
                         res = false;
                         _i = 0, _a = this._middleware;
-                        _c.label = 1;
-                    case 1:
-                        if (!(_i < _a.length)) return [3 /*break*/, 5];
+                        _c.label = 3;
+                    case 3:
+                        if (!(_i < _a.length)) return [3 /*break*/, 7];
                         mw = _a[_i];
                         _b = res;
-                        if (_b) return [3 /*break*/, 3];
+                        if (_b) return [3 /*break*/, 5];
                         return [4 /*yield*/, mw(chat, msg)];
-                    case 2:
+                    case 4:
                         _b = (_c.sent());
-                        _c.label = 3;
-                    case 3:
+                        _c.label = 5;
+                    case 5:
                         res = _b;
-                        _c.label = 4;
-                    case 4:
+                        _c.label = 6;
+                    case 6:
                         _i++;
-                        return [3 /*break*/, 1];
-                    case 5: return [2 /*return*/, res];
+                        return [3 /*break*/, 3];
+                    case 7:
+                        this._mwbreak[desc] = res;
+                        this.ActionSystem.emit("mwb_".concat(desc));
+                        return [2 /*return*/, res];
                 }
             });
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telegram-botbuilder",
-  "version": "1.0.11",
+  "version": "1.0.13",
   "main": "lib/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/bot-service.ts

@@ -8,6 +8,9 @@ import { readFileSync, rmSync } from 'fs';
 interface UserDialog {
   [key: number]: {dialog: string, lastid: number, waiter: { statewait: boolean, descriptor: string }};
 }
+interface MWBreakDown {
+  [key: string]: boolean | undefined | null;
+}
 type BotBuilderMiddleware = (chat: number, msg: TelegramBot.Message | TelegramBot.CallbackQuery) => Promise<boolean> | boolean;
 
 export interface ActionCallback {
@@ -20,16 +23,30 @@ export class BotBuilder {
   public ActionSystem: EventEmitter;
   private _userdialogs: UserDialog;
   private _middleware: BotBuilderMiddleware[] = [];
+  private _mwbreak: MWBreakDown = {};
 
   public use(func: BotBuilderMiddleware) {
     this._middleware.push(func);
   }
 
+  private _mwba(desc: string): Promise<boolean> {
+    return new Promise(r => {
+      this.ActionSystem.once(`mwb_${desc}`, r)
+    });
+  }
   private async _runmw(chat: number, msg: TelegramBot.Message | TelegramBot.CallbackQuery) {
+    let desc = `${chat}_${(msg as TelegramBot.Message).message_id || (msg as TelegramBot.CallbackQuery).id}`;
+    let mwb = this._mwbreak[desc];
+    if (typeof mwb === 'boolean') return mwb;
+    if (typeof mwb === 'object') return await this._mwba(desc);
+    this._mwbreak[desc] = null;
+
     let res = false;
     for (let mw of this._middleware) {
       res = res || await mw(chat, msg);
     }
+    this._mwbreak[desc] = res;
+    this.ActionSystem.emit(`mwb_${desc}`);
     return res;
   }
 
@@ -54,7 +71,7 @@ export class BotBuilder {
       if (await this._runmw(msg.chat.id, msg)) return;
 
       let chat = msg.chat.id;
-      if (this._userdialogs[chat].waiter.statewait) {
+      if (this._userdialogs[chat]!.waiter!.statewait) {
         this._userdialogs[chat].waiter.statewait = false;
         this._bot.deleteMessage(chat, msg.message_id).catch(() => undefined);
         this.ActionSystem.emit(this._userdialogs[chat].waiter.descriptor, chat, msg.text);