telegram-botbuilder 1.0.0 → 1.0.2

package/package.json

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

package/src/bot-service.ts

@@ -8,16 +8,30 @@ import { readFileSync, rmSync } from 'fs';
 interface UserDialog {
   [key: number]: {dialog: string, lastid: number, waiter: { statewait: boolean, descriptor: string }};
 }
+type BotBuilderMiddleware = (chat: number, msg: TelegramBot.Message | TelegramBot.CallbackQuery) => Promise<boolean> | boolean;
 
 export interface ActionCallback {
   chatid: number;
 }
 
-export class EasyBot {
+export class BotBuilder {
   private _bot: TelegramBot;
   private _schema: BotSchema;
   public ActionSystem: EventEmitter;
   private _userdialogs: UserDialog;
+  private _middleware: BotBuilderMiddleware[] = [];
+
+  public use(func: BotBuilderMiddleware) {
+    this._middleware.push(func);
+  }
+
+  private async _runmw(chat: number, msg: TelegramBot.Message | TelegramBot.CallbackQuery) {
+    let res = false;
+    for (let mw of this._middleware) {
+      res = res || await mw(chat, msg);
+    }
+    return res;
+  }
 
   constructor (schema: Schema, token: string, options?: TelegramBot.ConstructorOptions) {
     this._bot = new TelegramBot(token, options);
@@ -36,18 +50,24 @@ export class EasyBot {
     this.ActionSystem = new EventEmitter();
     this._userdialogs = {};
 
-    this._bot.onText(/\/start/, (msg) => {
+    this._bot.onText(/\/start/, 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);
     });
 
-    this._bot.on('callback_query', (query) => {
+    this._bot.on('callback_query', async (query) => {
+      if (await this._runmw(query.message!.chat.id, query)) return;
+
       if (!this._userdialogs[query.message!.chat.id]) this._userdialogs[query.message!.chat.id] = {dialog: this._schema.start, lastid: -1, waiter: { statewait: false, descriptor: '' }}
       this._activateButton(query.message!.chat.id, query.data!)
     });
 
-    this._bot.onText(/.+/g, (msg) => {
+    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;
@@ -56,7 +76,9 @@ export class EasyBot {
       }
     })
 
-    this._bot.on('document', (msg) => {
+    this._bot.on('document', async (msg) => {
+      if (await this._runmw(msg.chat.id, msg)) return;
+
       if (!msg.document) return;
       let chat = msg.chat.id;
       if (!this._userdialogs[chat].waiter.statewait) return;
@@ -128,13 +150,13 @@ export class EasyBot {
 }
 
 export function ChangeDialog(id: string): Action {
-  return async (chat: number, _bot: EasyBot) => { await _bot.ChangeDialog(chat, id); };
+  return async (chat: number, _bot: BotBuilder) => { await _bot.ChangeDialog(chat, id); };
 }
 export function CallbackAction(descriptor: string): Action {
-  return async (chat: number, _bot: EasyBot) => { _bot.ActionSystem.emit(descriptor, {chatid: chat}); };
+  return async (chat: number, _bot: BotBuilder) => { _bot.ActionSystem.emit(descriptor, {chatid: chat}); };
 }
 export function WaitForData(descriptor: string): Action {
-  return (chat: number, _bot: EasyBot) => { 
+  return (chat: number, _bot: BotBuilder) => { 
     _bot.AttachDataWait(chat, descriptor);
     return new Promise(r => {
       _bot.ActionSystem.once(descriptor, r);

package/lib/index.js

@@ -1 +0,0 @@
-"use strict";