telegram-botbuilder 1.1.4 → 1.1.6

package/lib/bot-service.d.ts

@@ -6,7 +6,7 @@ export interface ActionCallback {
     chatid: number;
 }
 export declare class BotBuilder {
-    private _bot;
+    _bot: TelegramBot;
     private _schema;
     ActionSystem: EventEmitter;
     private _userdialogs;

package/lib/bot-service.js

@@ -399,13 +399,30 @@ function CallbackAction(descriptor) {
 function WaitForData(descriptor) {
     var _this = this;
     return function (chat, _bot) { return __awaiter(_this, void 0, void 0, function () {
-        var desc_1;
+        var _tmpds_1, desc_1;
         return __generator(this, function (_a) {
             if (typeof descriptor == 'string') {
-                _bot.AttachDataWait(chat, descriptor);
+                _tmpds_1 = crypto.randomUUID();
+                _bot.AttachDataWait(chat, _tmpds_1);
                 return [2 /*return*/, new Promise(function (r) {
-                        _bot.ActionSystem.once(descriptor, r);
-                        _bot.ActionSystem.once("cancel_".concat(descriptor), r);
+                        _bot.ActionSystem.once(_tmpds_1, function () {
+                            var _a;
+                            var args = [];
+                            for (var _i = 0; _i < arguments.length; _i++) {
+                                args[_i] = arguments[_i];
+                            }
+                            (_a = _bot.ActionSystem).emit.apply(_a, __spreadArray([descriptor], args, false));
+                            return r(undefined);
+                        });
+                        _bot.ActionSystem.once("cancel_".concat(_tmpds_1), function () {
+                            var _a;
+                            var args = [];
+                            for (var _i = 0; _i < arguments.length; _i++) {
+                                args[_i] = arguments[_i];
+                            }
+                            (_a = _bot.ActionSystem).emit.apply(_a, __spreadArray(["cancel_".concat(descriptor)], args, false));
+                            return r(undefined);
+                        });
                     })];
             }
             else {

package/package.json

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

package/src/bot-service.ts

@@ -18,7 +18,7 @@ export interface ActionCallback {
 }
 
 export class BotBuilder {
-  private _bot: TelegramBot;
+  public _bot: TelegramBot;
   private _schema: BotSchema;
   public ActionSystem: EventEmitter;
   private _userdialogs: UserDialog;
@@ -196,10 +196,11 @@ export function CallbackAction(descriptor: string | CallbackActionFunc, ...args:
 export function WaitForData(descriptor: string | CallbackActionFunc): Action {
   return async (chat: number, _bot: BotBuilder) => { 
     if (typeof descriptor == 'string') {
-      _bot.AttachDataWait(chat, descriptor);
+      let _tmpds = crypto.randomUUID();
+      _bot.AttachDataWait(chat, _tmpds);
       return new Promise(r => {
-        _bot.ActionSystem.once(descriptor, r);
-        _bot.ActionSystem.once(`cancel_${descriptor}`, r); 
+        _bot.ActionSystem.once(_tmpds, (...args: any[]) => {_bot.ActionSystem.emit(descriptor, ...args); return r(undefined)});
+        _bot.ActionSystem.once(`cancel_${_tmpds}`, (...args: any[]) => {_bot.ActionSystem.emit(`cancel_${descriptor}`, ...args); return r(undefined)});
       });
     } else {
       let desc = crypto.randomUUID();