telegram-botbuilder 1.0.4 → 1.0.6

package/lib/bot-service.js

@@ -64,17 +64,20 @@ var BotBuilder = /** @class */ (function () {
         }
         this.ActionSystem = new events_1.default();
         this._userdialogs = {};
-        this._bot.onText(/\/start/, function (msg) { return __awaiter(_this, void 0, void 0, function () {
+        this._bot.onText(/.+/g, function (msg) { return __awaiter(_this, void 0, void 0, function () {
+            var chat;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._runmw(msg.chat.id, msg)];
                     case 1:
                         if (_a.sent())
                             return [2 /*return*/];
-                        if (!this._userdialogs[msg.chat.id])
-                            this._userdialogs[msg.chat.id] = { dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' } };
-                        this._bot.deleteMessage(msg.chat.id, msg.message_id).catch(function () { return undefined; });
-                        this.ChangeDialog(msg.chat.id, this._schema.start);
+                        chat = msg.chat.id;
+                        if (this._userdialogs[chat].waiter.statewait) {
+                            this._userdialogs[chat].waiter.statewait = false;
+                            this._bot.deleteMessage(chat, msg.message_id).catch(function () { return undefined; });
+                            this.ActionSystem.emit(this._userdialogs[chat].waiter.descriptor, chat, msg.text);
+                        }
                         return [2 /*return*/];
                 }
             });
@@ -93,24 +96,6 @@ var BotBuilder = /** @class */ (function () {
                 }
             });
         }); });
-        this._bot.onText(/.+/g, function (msg) { return __awaiter(_this, void 0, void 0, function () {
-            var chat;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._runmw(msg.chat.id, msg)];
-                    case 1:
-                        if (_a.sent())
-                            return [2 /*return*/];
-                        chat = msg.chat.id;
-                        if (this._userdialogs[chat].waiter.statewait) {
-                            this._userdialogs[chat].waiter.statewait = false;
-                            this._bot.deleteMessage(chat, msg.message_id).catch(function () { return undefined; });
-                            this.ActionSystem.emit(this._userdialogs[chat].waiter.descriptor, chat, msg.text);
-                        }
-                        return [2 /*return*/];
-                }
-            });
-        }); });
         this._bot.on('document', function (msg) { return __awaiter(_this, void 0, void 0, function () {
             var chat;
             var _this = this;
@@ -136,6 +121,52 @@ var BotBuilder = /** @class */ (function () {
                 }
             });
         }); });
+        this._bot.onText(/\/start/, function (msg) { return __awaiter(_this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                if (!this._userdialogs[msg.chat.id])
+                    this._userdialogs[msg.chat.id] = { dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' } };
+                this._bot.deleteMessage(msg.chat.id, msg.message_id).catch(function () { return undefined; });
+                this.ChangeDialog(msg.chat.id, this._schema.start);
+                return [2 /*return*/];
+            });
+        }); });
+        var _loop_1 = function (cmd) {
+            this_1._bot.onText(new RegExp('\\/${cmd.text}(?:\\s+(.*))?$'), function (msg, match) { return __awaiter(_this, void 0, void 0, function () {
+                var chat, _i, _a, act;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            chat = msg.chat.id;
+                            if (!Array.isArray(cmd === null || cmd === void 0 ? void 0 : cmd.action)) return [3 /*break*/, 5];
+                            _i = 0, _a = cmd === null || cmd === void 0 ? void 0 : cmd.action;
+                            _b.label = 1;
+                        case 1:
+                            if (!(_i < _a.length)) return [3 /*break*/, 4];
+                            act = _a[_i];
+                            return [4 /*yield*/, act(chat, this, match[1])];
+                        case 2:
+                            _b.sent();
+                            _b.label = 3;
+                        case 3:
+                            _i++;
+                            return [3 /*break*/, 1];
+                        case 4: return [3 /*break*/, 7];
+                        case 5:
+                            if (!(cmd === null || cmd === void 0 ? void 0 : cmd.action)) return [3 /*break*/, 7];
+                            return [4 /*yield*/, (cmd === null || cmd === void 0 ? void 0 : cmd.action)(chat, this, match[1])];
+                        case 6:
+                            _b.sent();
+                            _b.label = 7;
+                        case 7: return [2 /*return*/];
+                    }
+                });
+            }); });
+        };
+        var this_1 = this;
+        for (var _i = 0, _a = this._schema.commands; _i < _a.length; _i++) {
+            var cmd = _a[_i];
+            _loop_1(cmd);
+        }
     }
     BotBuilder.prototype.use = function (func) {
         this._middleware.push(func);

package/lib/bot-struct.d.ts

@@ -1,5 +1,5 @@
 import { BotBuilder } from "./bot-service";
-export type Action = (chat: number, _bot: BotBuilder) => Promise<void>;
+export type Action = (chat: number, _bot: BotBuilder, ...args: any[]) => Promise<void>;
 export interface Dialog {
     id: string;
     text: string | ((chat: number) => Promise<string>);
@@ -18,8 +18,13 @@ export interface BotButton extends Button {
 export interface Schema {
     start: string;
     content: Dialog[];
+    commands: Command[];
 }
 export interface BotSchema extends Schema {
     content: BotDialog[];
     buttons: BotButton[];
 }
+export interface Command {
+    text: string;
+    action: Action[] | Action;
+}

package/lib/index.d.ts

@@ -1,7 +1,2 @@
-import * as BotBuilder from "./bot-service";
-import * as BotStruct from "./bot-struct";
-declare const _default: {
-    BotBuilder: typeof BotBuilder;
-    BotStruct: typeof BotStruct;
-};
-export = _default;
+export * from './bot-service';
+export * from './bot-struct';

package/lib/index.js

@@ -10,18 +10,9 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-var BotBuilder = __importStar(require("./bot-service"));
-var BotStruct = __importStar(require("./bot-struct"));
-module.exports = { BotBuilder: BotBuilder, BotStruct: BotStruct };
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./bot-service"), exports);
+__exportStar(require("./bot-struct"), exports);

package/package.json

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

package/src/bot-service.ts

@@ -50,12 +50,15 @@ export class BotBuilder {
     this.ActionSystem = new EventEmitter();
     this._userdialogs = {};
 
-    this._bot.onText(/\/start/, async (msg) => {
+    this._bot.onText(/.+/g, async (msg) => {
       if (await this._runmw(msg.chat.id, msg)) return;
 
-      if (!this._userdialogs[msg.chat.id]) this._userdialogs[msg.chat.id] = {dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' }}
-      this._bot.deleteMessage(msg.chat.id, msg.message_id).catch(() => undefined);
-      this.ChangeDialog(msg.chat.id, this._schema.start);
+      let chat = msg.chat.id;
+      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);
+      }
     });
 
     this._bot.on('callback_query', async (query) => {
@@ -65,17 +68,6 @@ export class BotBuilder {
       this._activateButton(query.message!.chat.id, query.data!)
     });
 
-    this._bot.onText(/.+/g, async (msg) => {
-      if (await this._runmw(msg.chat.id, msg)) return;
-
-      let chat = msg.chat.id;
-      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);
-      }
-    })
-
     this._bot.on('document', async (msg) => {
       if (await this._runmw(msg.chat.id, msg)) return;
 
@@ -88,8 +80,27 @@ export class BotBuilder {
         let content = readFileSync(x, 'utf8');
         rmSync(x);
         this.ActionSystem.emit(this._userdialogs[chat].waiter.descriptor, chat, content);
-      })
-    })
+      });
+    });
+
+    this._bot.onText(/\/start/, async (msg) => {
+      if (!this._userdialogs[msg.chat.id]) this._userdialogs[msg.chat.id] = {dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' }}
+      this._bot.deleteMessage(msg.chat.id, msg.message_id).catch(() => undefined);
+      this.ChangeDialog(msg.chat.id, this._schema.start);
+    });
+
+    for (let cmd of this._schema.commands) {
+      this._bot.onText(new RegExp('\\/${cmd.text}(?:\\s+(.*))?$'), async (msg, match) => {
+        let chat = msg.chat.id;
+        if (Array.isArray(cmd?.action)) {
+          for (let act of (cmd?.action as Action[])) {
+            await act(chat, this, match![1]);
+          }
+        } else if (cmd?.action as Action) {
+          await (cmd?.action as Action)(chat, this, match![1]);
+        }
+      });
+    }
   }
 
   private _getDialog(id: string) {

package/src/bot-struct.ts

@@ -1,7 +1,7 @@
 import { BotBuilder } from "./bot-service";
 
 
-export type Action = (chat: number, _bot: BotBuilder) => Promise<void>;
+export type Action = (chat: number, _bot: BotBuilder, ...args: any[]) => Promise<void>;
 
 export interface Dialog {
   id: string;
@@ -23,9 +23,15 @@ export interface BotButton extends Button {
 export interface Schema {
   start: string;
   content: Dialog[];
+  commands: Command[];
 }
 
 export interface BotSchema extends Schema {
   content: BotDialog[];
   buttons: BotButton[];
+}
+
+export interface Command {
+  text: string;
+  action: Action[] | Action;
 }

package/src/index.ts

@@ -1,4 +1,2 @@
-import * as BotBuilder from "./bot-service";
-import * as BotStruct from "./bot-struct";
-
-export = { BotBuilder, BotStruct };
+export * from './bot-service';
+export * from './bot-struct';