telegram-botbuilder 1.1.2 → 1.1.4

package/lib/bot-service.d.ts

@@ -23,7 +23,8 @@ export declare class BotBuilder {
     AttachDataWait(chat: number, descriptor: string): void;
     Message(chat: number, content: string): Promise<TelegramBot.Message>;
 }
+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, ...args: any[]): Action;
-export declare function WaitForData(descriptor: string): Action;
+export declare function CallbackAction(descriptor: string | CallbackActionFunc, ...args: any[]): Action;
+export declare function WaitForData(descriptor: string | CallbackActionFunc): Action;
 export {};

package/lib/bot-service.js

@@ -366,25 +366,59 @@ function ChangeDialog(id) {
     return function (chat, _bot) { return _bot.ChangeDialog(chat, id); };
 }
 function CallbackAction(descriptor) {
+    var _this = this;
     var args = [];
     for (var _i = 1; _i < arguments.length; _i++) {
         args[_i - 1] = arguments[_i];
     }
     return function (chat, _bot) {
-        var _a;
         var _args = [];
         for (var _i = 2; _i < arguments.length; _i++) {
             _args[_i - 2] = arguments[_i];
         }
-        (_a = _bot.ActionSystem).emit.apply(_a, __spreadArray(__spreadArray([descriptor, chat], args, false), _args, false));
+        return __awaiter(_this, void 0, void 0, function () {
+            var _a;
+            var _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        if (!(typeof descriptor == 'function')) return [3 /*break*/, 2];
+                        return [4 /*yield*/, descriptor.apply(void 0, __spreadArray(__spreadArray([chat], args, false), _args, false))];
+                    case 1:
+                        _a = _c.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        _a = (_b = _bot.ActionSystem).emit.apply(_b, __spreadArray(__spreadArray([descriptor, chat], args, false), _args, false));
+                        _c.label = 3;
+                    case 3: return [2 /*return*/, _a];
+                }
+            });
+        });
     };
 }
 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/lib/bot-struct.d.ts

@@ -1,5 +1,5 @@
 import { BotBuilder } from "./bot-service";
-export type Action = (chat: number, _bot: BotBuilder, ...args: any[]) => Promise<void> | void;
+export type Action = (chat: number, _bot: BotBuilder, ...args: any[]) => (Promise<any> | any);
 export interface Dialog {
     id: string;
     text: string | ((chat: number) => Promise<string>) | ((chat: number) => string);

package/package.json

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

package/readme.md

@@ -12,7 +12,7 @@ const schema: Schema = {
         [
           {
             text: 'Button 1',
-            action: [CallbackAction('button1_clicked')],
+            action: [CallbackAction('button1_clicked', 'optional arg')],
           },
           {
             text: 'Dialog 2',
@@ -23,7 +23,7 @@ const schema: Schema = {
     },
     {
       id: 'dialog2',
-      text: 'Test dialog 2',
+      text: async (chatid: number) => { return "test dialog 2"; },
       buttons: [
         [
           {

package/src/bot-service.ts

@@ -185,18 +185,31 @@ export class BotBuilder {
   }
 }
 
+type CallbackActionFunc = ((chatid: number, ...args: any[]) => void) | ((chatid: number, ...args: any[]) => Promise<void>)
+
 export function ChangeDialog(id: string): Action {
   return (chat: number, _bot: BotBuilder) => { return _bot.ChangeDialog(chat, id); };
 }
-export function CallbackAction(descriptor: string, ...args: any[]): Action {
-  return (chat: number, _bot: BotBuilder, ..._args: any[]) => { _bot.ActionSystem.emit(descriptor, chat, ...args, ..._args); };
+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);
+      });
+    }
   };
 }

package/src/bot-struct.ts

@@ -1,7 +1,7 @@
 import { BotBuilder } from "./bot-service";
 
 
-export type Action = (chat: number, _bot: BotBuilder, ...args: any[]) => Promise<void> | void;
+export type Action = (chat: number, _bot: BotBuilder, ...args: any[]) => (Promise<any> | any);
 
 export interface Dialog {
   id: string;