telegram-botbuilder 1.1.3 → 1.1.4

package/lib/bot-service.d.ts

@@ -26,5 +26,5 @@ export declare class BotBuilder {
 type CallbackActionFunc = ((chatid: number, ...args: any[]) => void) | ((chatid: number, ...args: any[]) => Promise<void>);
 export declare function ChangeDialog(id: string): Action;
 export declare function CallbackAction(descriptor: string | CallbackActionFunc, ...args: any[]): Action;
-export declare function WaitForData(descriptor: string): Action;
+export declare function WaitForData(descriptor: string | CallbackActionFunc): Action;
 export {};

package/lib/bot-service.js

@@ -397,11 +397,28 @@ function CallbackAction(descriptor) {
     };
 }
 function WaitForData(descriptor) {
-    return function (chat, _bot) {
-        _bot.AttachDataWait(chat, descriptor);
-        return new Promise(function (r) {
-            _bot.ActionSystem.once(descriptor, r);
-            _bot.ActionSystem.once("cancel_".concat(descriptor), r);
+    var _this = this;
+    return function (chat, _bot) { return __awaiter(_this, void 0, void 0, function () {
+        var desc_1;
+        return __generator(this, function (_a) {
+            if (typeof descriptor == 'string') {
+                _bot.AttachDataWait(chat, descriptor);
+                return [2 /*return*/, new Promise(function (r) {
+                        _bot.ActionSystem.once(descriptor, r);
+                        _bot.ActionSystem.once("cancel_".concat(descriptor), r);
+                    })];
+            }
+            else {
+                desc_1 = crypto.randomUUID();
+                _bot.AttachDataWait(chat, desc_1);
+                return [2 /*return*/, new Promise(function (r) {
+                        _bot.ActionSystem.once(desc_1, descriptor);
+                        _bot.ActionSystem.once("cancel_".concat(desc_1), descriptor);
+                        _bot.ActionSystem.once(desc_1, r);
+                        _bot.ActionSystem.once("cancel_".concat(desc_1), r);
+                    })];
+            }
+            return [2 /*return*/];
         });
-    };
+    }); };
 }

package/package.json

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

package/src/bot-service.ts

@@ -193,12 +193,23 @@ export function ChangeDialog(id: string): Action {
 export function CallbackAction(descriptor: string | CallbackActionFunc, ...args: any[]): Action {
   return async (chat: number, _bot: BotBuilder, ..._args: any[]) => { return typeof descriptor == 'function' ? await descriptor(chat, ...args, ..._args) : _bot.ActionSystem.emit(descriptor, chat, ...args, ..._args); };
 }
-export function WaitForData(descriptor: string): Action {
-  return (chat: number, _bot: BotBuilder) => { 
-    _bot.AttachDataWait(chat, descriptor);
-    return new Promise(r => {
-      _bot.ActionSystem.once(descriptor, r);
-      _bot.ActionSystem.once(`cancel_${descriptor}`, r); 
-    });
+export function WaitForData(descriptor: string | CallbackActionFunc): Action {
+  return async (chat: number, _bot: BotBuilder) => { 
+    if (typeof descriptor == 'string') {
+      _bot.AttachDataWait(chat, descriptor);
+      return new Promise(r => {
+        _bot.ActionSystem.once(descriptor, r);
+        _bot.ActionSystem.once(`cancel_${descriptor}`, r); 
+      });
+    } else {
+      let desc = crypto.randomUUID();
+      _bot.AttachDataWait(chat, desc);
+      return new Promise(r => {
+        _bot.ActionSystem.once(desc, descriptor);
+        _bot.ActionSystem.once(`cancel_${desc}`, descriptor);
+        _bot.ActionSystem.once(desc, r);
+        _bot.ActionSystem.once(`cancel_${desc}`, r);
+      });
+    }
   };
 }