npm - @skroz/telegram-bot - Versions diffs - 1.0.25 → 1.0.27 - Mend

@skroz/telegram-bot 1.0.25 → 1.0.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/index.d.ts CHANGED Viewed

@@ -5,7 +5,18 @@ declare class TelegramBot {
     private readonly botToken;
     private readonly expiresMessageSeconds?;
     private readonly protect_content?;
-    constructor(botToken: string, expiresMessageSeconds?: number | undefined, protect_content?: boolean | undefined);
+    constructor(botToken: string, messages: {
+        text?: Record<string, (input: TG_SendMessageInput) => TG_SendMessageInput>;
+        photo?: Record<string, (input: TG_SendPhotoInput) => TG_SendPhotoInput>;
+    }, expiresMessageSeconds?: number | undefined, protect_content?: boolean | undefined);
+    readonly messages: {
+        text: Record<string, {
+            send: (input?: TG_SendMessageInput, message?: TG_Message, onExpire?: (resultMessage: TG_Message) => void) => Promise<TG_SendMessageResponse>;
+        }>;
+        photo: Record<string, {
+            send: (input?: TG_SendPhotoInput, message?: TG_Message, onExpire?: (resultMessage: TG_Message) => void) => Promise<TG_SendMessageResponse>;
+        }>;
+    };
     handleUpdate(update: TG_Update, handleCallback: (callbackQuery: TG_CallbackQuery, callbackDataParams: string[]) => Promise<void>, handleMessage: (message: TG_Message) => void, handlePreCheckoutQuery: (preCheckoutQuery: TG_PreCheckoutQuery) => Promise<{
         ok: boolean;
         error_message?: string;
@@ -19,6 +30,8 @@ declare class TelegramBot {
     getChatInfo(telegramId: string | number): Promise<TG_ChatResponse>;
     sendChatAction(input: TG_SendActionInput): Promise<boolean>;
     deleteMessage(input: TG_DeleteMessageInput): Promise<boolean>;
+    private wrapTextMessages;
+    private wrapPhotoMessages;
 }
 export default TelegramBot;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACrB,UAAU,EACV,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,wBAAwB,EACxB,oBAAoB,EACpB,SAAS,EACV,MAAM,wCAAwC,CAAC;AAYhD,eAAO,MAAM,kBAAkB,eACjB,MAAM,GAAG,MAAM,QACrB,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,KACxB,MAC0E,CAAC;AAG9E,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAAM,EACf,CAAC;~~AAoEvC~~,cAAM,WAAW;IAEb,OAAO,CAAC,QAAQ,CAAC,QAAQ;~~IACzB~~,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC;IACvC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;~~gBAFhB~~,QAAQ,EAAE,MAAM,~~EAChB~~,qBAAqB,CAAC,oBAAQ,EAC9B,eAAe,CAAC,qBAAS;~~IAGtC~~,YAAY,CAChB,MAAM,EAAE,SAAS,EACjB,cAAc,EAAE,CACd,aAAa,EAAE,gBAAgB,EAC/B,kBAAkB,EAAE,MAAM,EAAE,KACzB,OAAO,CAAC,IAAI,CAAC,EAClB,aAAa,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,EAC5C,sBAAsB,EAAE,CACtB,gBAAgB,EAAE,mBAAmB,KAClC,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EACrD,uBAAuB,EAAE,CACvB,iBAAiB,EAAE,oBAAoB,EACvC,OAAO,EAAE,UAAU,KAChB,OAAO,CAAC,IAAI,CAAC,GACjB,OAAO,CAAC,IAAI,CAAC;~~IA8DV~~,SAAS,CACb,KAAK,EAAE,iBAAiB,EACxB,OAAO,CAAC,EAAE,UAAU,EACpB,QAAQ,CAAC,EAAE,CAAC,aAAa,EAAE,UAAU,KAAK,IAAI,GAC7C,OAAO,CAAC,sBAAsB,CAAC;~~IAyD5B~~,WAAW,CACf,KAAK,EAAE,mBAAmB,EAC1B,OAAO,CAAC,EAAE,UAAU,EACpB,QAAQ,CAAC,EAAE,CAAC,aAAa,EAAE,UAAU,KAAK,IAAI,GAC7C,OAAO,CAAC,sBAAsB,CAAC;~~IAmD5B~~,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM;IAI1B,UAAU,CAAC,UAAU,EAAE,MAAM;IAI7B,aAAa;IAIb,aAAa,CACjB,QAAQ,EAAE,aAAa,EAAE,GACxB,OAAO,CAAC,wBAAwB,CAAC;IAI9B,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAIlE,cAAc,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IAI3D,aAAa,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC;~~CAGpE~~;AAED,eAAe,WAAW,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACrB,UAAU,EACV,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,wBAAwB,EACxB,oBAAoB,EACpB,SAAS,EACV,MAAM,wCAAwC,CAAC;AAYhD,eAAO,MAAM,kBAAkB,eACjB,MAAM,GAAG,MAAM,QACrB,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,KACxB,MAC0E,CAAC;AAG9E,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAAM,EACf,CAAC;AAoFvC,cAAM,WAAW;IAEb,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAQzB,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAC;IACvC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAC;gBAThB,QAAQ,EAAE,MAAM,EACjC,QAAQ,EAAE;QACR,IAAI,CAAC,EAAE,MAAM,CACX,MAAM,EACN,CAAC,KAAK,EAAE,mBAAmB,KAAK,mBAAmB,CACpD,CAAC;QACF,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,iBAAiB,CAAC,CAAC;KACzE,EACgB,qBAAqB,CAAC,oBAAQ,EAC9B,eAAe,CAAC,qBAAS;IAS5C,QAAQ,CAAC,QAAQ,EAAE;QACjB,IAAI,EAAE,MAAM,CACV,MAAM,EACN;YACE,IAAI,EAAE,CACJ,KAAK,CAAC,EAAE,mBAAmB,EAC3B,OAAO,CAAC,EAAE,UAAU,EACpB,QAAQ,CAAC,EAAE,CAAC,aAAa,EAAE,UAAU,KAAK,IAAI,KAC3C,OAAO,CAAC,sBAAsB,CAAC,CAAC;SACtC,CACF,CAAC;QACF,KAAK,EAAE,MAAM,CACX,MAAM,EACN;YACE,IAAI,EAAE,CACJ,KAAK,CAAC,EAAE,iBAAiB,EACzB,OAAO,CAAC,EAAE,UAAU,EACpB,QAAQ,CAAC,EAAE,CAAC,aAAa,EAAE,UAAU,KAAK,IAAI,KAC3C,OAAO,CAAC,sBAAsB,CAAC,CAAC;SACtC,CACF,CAAC;KACH,CAAC;IAEI,YAAY,CAChB,MAAM,EAAE,SAAS,EACjB,cAAc,EAAE,CACd,aAAa,EAAE,gBAAgB,EAC/B,kBAAkB,EAAE,MAAM,EAAE,KACzB,OAAO,CAAC,IAAI,CAAC,EAClB,aAAa,EAAE,CAAC,OAAO,EAAE,UAAU,KAAK,IAAI,EAC5C,sBAAsB,EAAE,CACtB,gBAAgB,EAAE,mBAAmB,KAClC,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,EACrD,uBAAuB,EAAE,CACvB,iBAAiB,EAAE,oBAAoB,EACvC,OAAO,EAAE,UAAU,KAChB,OAAO,CAAC,IAAI,CAAC,GACjB,OAAO,CAAC,IAAI,CAAC;IA+DV,SAAS,CACb,KAAK,EAAE,iBAAiB,EACxB,OAAO,CAAC,EAAE,UAAU,EACpB,QAAQ,CAAC,EAAE,CAAC,aAAa,EAAE,UAAU,KAAK,IAAI,GAC7C,OAAO,CAAC,sBAAsB,CAAC;IAiD5B,WAAW,CACf,KAAK,EAAE,mBAAmB,EAC1B,OAAO,CAAC,EAAE,UAAU,EACpB,QAAQ,CAAC,EAAE,CAAC,aAAa,EAAE,UAAU,KAAK,IAAI,GAC7C,OAAO,CAAC,sBAAsB,CAAC;IA2C5B,UAAU,CAAC,MAAM,CAAC,EAAE,MAAM;IAI1B,UAAU,CAAC,UAAU,EAAE,MAAM;IAI7B,aAAa;IAIb,aAAa,CACjB,QAAQ,EAAE,aAAa,EAAE,GACxB,OAAO,CAAC,wBAAwB,CAAC;IAI9B,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAIlE,cAAc,CAAC,KAAK,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC;IAI3D,aAAa,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,OAAO,CAAC;IAKnE,OAAO,CAAC,gBAAgB;IA2BxB,OAAO,CAAC,iBAAiB;CA0B1B;AAED,eAAe,WAAW,CAAC"}

package/dist/index.js CHANGED Viewed

@@ -53,11 +53,28 @@ setInterval(async () => {
         }));
     }
 }, 15000);
+/* Тип функции отправки в телеграм */
+/* type TelegramSendFunction<TInput, TResponse> = (
+  input: TInput
+) => Promise<TResponse>; */
+/* Тип типов функций отправки */
+/* type TG_SendFunction =
+  | TelegramSendFunction<TG_SendMessageInput, TG_SendMessageResponse>
+  | TelegramSendFunction<TG_SendPhotoInput, TG_SendMessageResponse>; */
+// в будущем:
+// | TelegramSendFunction<TG_SendDocumentInput, TG_SendDocumentResponse>
+// interface TelegramMessageHandler<TInput, TResponse> {
+//   send: (input: TInput) => Promise<TResponse>;
+// }
 class TelegramBot {
-    constructor(botToken, expiresMessageSeconds, protect_content) {
+    constructor(botToken, messages, expiresMessageSeconds, protect_content) {
         this.botToken = botToken;
         this.expiresMessageSeconds = expiresMessageSeconds;
         this.protect_content = protect_content;
+        this.messages = {
+            text: this.wrapTextMessages(messages.text ?? {}),
+            photo: this.wrapPhotoMessages(messages.photo ?? {}),
+        };
     }
     async handleUpdate(update, handleCallback, handleMessage, handlePreCheckoutQuery, handleSuccessfulPayment) {
         const callbackQuery = update.callback_query;
@@ -100,15 +117,15 @@ class TelegramBot {
             if (successful_payment) {
                 /* Успешная оплата */
                 await handleSuccessfulPayment(successful_payment, message);
+                return;
+            }
+            if (!callbackQuery) {
+                /* разбираем входящий текст */
+                await handleMessage(message);
             }
-        }
-        if (!callbackQuery && message) {
-            /* разбираем входящий текст */
-            await handleMessage(message);
         }
     }
     async sendPhoto(input, message, onExpire) {
-        // const { chat_id, reply_markup, caption, photo } = input;
         let sendResult;
         const sendPhotoFunction = () => telegram_api_1.default.sendPhoto({
             protect_content: this.protect_content, // переписывается инпутом
@@ -137,10 +154,7 @@ class TelegramBot {
         }
         if (sendResult.ok && sendResult.result) {
             if (onExpire) {
-                pushMessageToExpireList(sendResult.result,
-                // sendResult.result,
-                // sendResult.result.from,
-                {
+                pushMessageToExpireList(sendResult.result, {
                     seconds: this.expiresMessageSeconds,
                     onExpire,
                 });
@@ -152,23 +166,16 @@ class TelegramBot {
         return sendResult;
     }
     async sendMessage(input, message, onExpire) {
-        // const { chat_id, reply_markup, text, protect_content } = input;
         let sendResult;
         const sendPhotoFunction = () => telegram_api_1.default.sendMessage({
-            // chat_id,
-            // text,
             parse_mode: 'HTML',
             protect_content: this.protect_content, // переписывается инпутом
-            // reply_markup,
             ...input,
         }, this.botToken);
         if (message) {
             try {
                 sendResult = await telegram_api_1.default.editMessageText({
-                    // text,
                     message_id: message.message_id,
-                    // reply_markup,
-                    // chat_id,
                     ...input,
                 }, this.botToken);
             }
@@ -213,6 +220,25 @@ class TelegramBot {
     async deleteMessage(input) {
         return telegram_api_1.default.deleteMessage(input, this.botToken);
     }
+    // генераторы типовых методов
+    wrapTextMessages(defs) {
+        const result = {};
+        Object.entries(defs).forEach(([key, builder]) => {
+            result[key] = {
+                send: (input, message, onExpire) => this.sendMessage(builder(input ?? {}), message, onExpire),
+            };
+        });
+        return result;
+    }
+    wrapPhotoMessages(defs) {
+        const result = {};
+        Object.entries(defs).forEach(([key, builder]) => {
+            result[key] = {
+                send: (input, message, onExpire) => this.sendPhoto(builder(input ?? {}), message, onExpire),
+            };
+        });
+        return result;
+    }
 }
 exports.default = TelegramBot;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,uEAA8C;AAiB9C,yDAAyD;AAEzD,kEAAkE;AAClE,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAE,CAAC;AACrC,wCAAwC;AACxC,MAAM,eAAe,GAAG,OAAO,CAAC;AAChC,uCAAuC;AACvC,MAAM,qBAAqB,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,UAAU;AAEhD,8EAA8E;AACvE,MAAM,kBAAkB,GAAG,CAChC,UAA2B,EAC3B,IAAyB,EACjB,EAAE,CACV,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,IAAI,UAAU,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AAJjE,QAAA,kBAAkB,sBAI+C;AAE9E,8EAA8E;AACvE,MAAM,eAAe,GAAG,CAAC,IAAY,EAAY,EAAE,CACxD,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAD1B,QAAA,eAAe,mBACW;AAEvC,MAAM,mBAAmB,GAKnB,EAAE,CAAC;AAET,MAAM,uBAAuB,GAAG,CAC9B,OAAmB;AACnB,iBAAiB;AACjB,OAAqB,EACrB,EAAE;IACF,MAAM,SAAS,GACb,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,qBAAqB,CAAC,GAAG,IAAI,CAAC;IAEjE,mBAAmB,CAAC,IAAI,CAAC;QACvB,OAAO;QACP,QAAQ;QACR,SAAS;QACT,QAAQ,EAAE,OAAO,CAAC,QAAQ;KAC3B,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,2BAA2B;AAC3B,MAAM,oBAAoB,GAAG,GAQzB,EAAE;IACJ,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,OAAO,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,CAAC;IAC1E,mBAAmB,CAAC,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC9C,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,wCAAwC;AACxC,MAAM,6BAA6B,GAAG,CAAC,OAAmB,EAAE,EAAE;IAC5D,MAAM,KAAK,GAAG,mBAAmB,CAAC,SAAS,CACzC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,OAAO,CAAC,UAAU,CACvD,CAAC;IACF,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;QACjB,mBAAmB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACvC,CAAC;AACH,CAAC,CAAC;AAEF,gDAAgD;AAChD,WAAW,CAAC,KAAK,IAAI,EAAE;IACrB,MAAM,OAAO,GAAG,oBAAoB,EAAE,CAAC;IACvC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YACvB,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;AACH,CAAC,EAAE,KAAK,CAAC,CAAC;AAOV,MAAM,WAAW;IACf,YACmB,QAAgB,~~EAChB~~,qBAA8B,EAC9B,eAAyB;~~QAFzB~~,aAAQ,GAAR,QAAQ,CAAQ;~~QAChB~~,0BAAqB,GAArB,qBAAqB,CAAS;QAC9B,oBAAe,GAAf,eAAe,CAAU;~~IACzC~~,CAAC;~~IAEJ~~,KAAK,CAAC,YAAY,CAChB,MAAiB,EACjB,cAGkB,EAClB,aAA4C,EAC5C,sBAEqD,EACrD,uBAGkB;QAElB,MAAM,aAAa,GAAG,MAAM,CAAC,cAAc,CAAC;QAC5C,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,EAAE,IAAI,EAAE,GAAG,aAAa,CAAC;YAE/B,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,8BAA8B;gBAC9B,oBAAoB;gBACpB,mCAAmC;gBACnC,OAAO,CAAC,iBAAiB;YAC3B,CAAC;YAED,uEAAuE;YACvE,IAAI,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBACjC,gDAAgD;gBAChD,OAAO,CAAC,gBAAgB;YAC1B,CAAC;YACD,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAE7B,oCAAoC;YACpC,UAAU,CAAC,GAAG,EAAE;gBACd,kBAAkB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAClC,CAAC,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;YAEd,MAAM,cAAc,CAAC,aAAa,EAAE,IAAA,uBAAe,EAAC,IAAI,CAAC,CAAC,CAAC;QAC7D,CAAC;QACD,kBAAkB;QAClB,MAAM,gBAAgB,GAAG,MAAM,CAAC,kBAAkB,CAAC;QACnD,IAAI,gBAAgB,EAAE,CAAC;YACrB,yFAAyF;YACzF,MAAM,EAAE,EAAE,EAAE,aAAa,EAAE,GAAG,MAAM,sBAAsB,CACxD,gBAAgB,CACjB,CAAC;YAEF,MAAM,sBAAW,CAAC,sBAAsB,CACtC;gBACE,qBAAqB,EAAE,gBAAgB,CAAC,EAAE;gBAC1C,EAAE;gBACF,aAAa;aACd,EACD,IAAI,CAAC,QAAQ,CACd,CAAC;YACF,OAAO;QACT,CAAC;QAED,0BAA0B;QAC1B,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC,kGAAkG;QAE9H,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC;YACvC,IAAI,kBAAkB,EAAE,CAAC;gBACvB,qBAAqB;gBACrB,MAAM,uBAAuB,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;~~YAC7D~~,~~CAAC~~;~~QACH~~,CAAC;~~QAED~~,IAAI,CAAC,aAAa,~~IAAI,OAAO,~~EAAE,CAAC;~~YAC9B~~,8BAA8B;~~YAC9B~~,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;~~QAC~~/B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,SAAS,CACb,KAAwB,EACxB,OAAoB,EACpB,QAA8C;QAE9C,~~2DAA2D;QAE3D,~~IAAI,UAAkC,CAAC;QAEvC,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAC7B,sBAAW,CAAC,SAAS,CACnB;YACE,eAAe,EAAE,IAAI,CAAC,eAAe,EAAE,yBAAyB;YAChE,UAAU,EAAE,MAAM;YAClB,GAAG,KAAK;SACT,EACD,IAAI,CAAC,QAAQ,CACd,CAAC;QAEJ,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC;gBACH,UAAU,GAAG,MAAM,sBAAW,CAAC,gBAAgB,CAC7C;oBACE,KAAK,EAAE;wBACL,IAAI,EAAE,OAAO;wBACb,KAAK,EAAE,KAAK,CAAC,KAAe;wBAC5B,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,UAAU,EAAE,MAAM;qBACnB;oBACD,GAAG,KAAK;oBACR,UAAU,EAAE,OAAO,CAAC,UAAU;iBAC/B,EACD,IAAI,CAAC,QAAQ,CACd,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,UAAU,GAAG,MAAM,iBAAiB,EAAE,CAAC;YACzC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,MAAM,iBAAiB,EAAE,CAAC;QACzC,CAAC;QAED,IAAI,UAAU,CAAC,EAAE,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YACvC,IAAI,QAAQ,EAAE,CAAC;gBACb,uBAAuB,~~CACrB~~,UAAU,CAAC,MAAM~~;gBAEjB~~,~~qBAAqB~~;~~gBACrB~~,~~0BAA0B;gBAC1B;oBACE,~~OAAO,EAAE,IAAI,CAAC,qBAAqB;oBACnC,QAAQ;iBACT,~~CACF~~,CAAC;~~YACJ~~,CAAC;iBAAM,CAAC;gBACN,6BAA6B,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,WAAW,CACf,KAA0B,EAC1B,OAAoB,EACpB,QAA8C;QAE9C,~~kEAAkE;QAElE,~~IAAI,UAAkC,CAAC;QAEvC,MAAM,iBAAiB,GAAG,GAAG,EAAE,CAC7B,sBAAW,CAAC,WAAW,CACrB;YACE,~~WAAW;YACX,QAAQ;YACR,~~UAAU,EAAE,MAAM;YAClB,eAAe,EAAE,IAAI,CAAC,eAAe,EAAE,yBAAyB;YAChE,~~gBAAgB;YAChB,~~GAAG,KAAK;SACT,EACD,IAAI,CAAC,QAAQ,CACd,CAAC;QAEJ,IAAI,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC;gBACH,UAAU,GAAG,MAAM,sBAAW,CAAC,eAAe,CAC5C;oBACE,~~QAAQ;oBACR,~~UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,~~gBAAgB;oBAChB,WAAW;oBACX,~~GAAG,KAAK;iBACT,EACD,IAAI,CAAC,QAAQ,CACd,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,UAAU,GAAG,MAAM,iBAAiB,EAAE,CAAC;YACzC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,MAAM,iBAAiB,EAAE,CAAC;QACzC,CAAC;QAED,IAAI,UAAU,CAAC,EAAE,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YACvC,IAAI,QAAQ,EAAE,CAAC;gBACb,uBAAuB,CAAC,UAAU,CAAC,MAAM,EAAE;oBACzC,OAAO,EAAE,IAAI,CAAC,qBAAqB;oBACnC,QAAQ;iBACT,CAAC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACN,6BAA6B,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAe;QAC9B,OAAO,sBAAW,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,UAAkB;QACjC,OAAO,sBAAW,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,sBAAW,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,QAAyB;QAEzB,OAAO,sBAAW,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,UAA2B;QAC3C,OAAO,sBAAW,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,KAAyB;QAC5C,OAAO,sBAAW,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAA4B;QAC9C,OAAO,sBAAW,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzD,CAAC;CACF;AAED,kBAAe,WAAW,CAAC"}
1	+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@skroz/telegram-bot",
-  "version": "1.0.25",
+  "version": "1.0.27",
   "license": "MIT",
   "repository": "git@gitlab.com:skroz/libs/utils.git",
   "main": "dist/index.js",
@@ -21,5 +21,5 @@
   "dependencies": {
     "@skroz/telegram-api": "^1.0.14"
   },
-  "gitHead": "8347f084dcc58b19e4d8202f3c6a061a4f1c1c42"
+  "gitHead": "cc51ca25fd82020cb26e2f3a6092d73a0530a690"
 }

package/src/index.ts CHANGED Viewed

@@ -101,12 +101,64 @@ type ExpiresInput = {
   onExpire: (resultMessage: TG_Message) => void;
 };
+/* Тип функции отправки в телеграм */
+/* type TelegramSendFunction<TInput, TResponse> = (
+  input: TInput
+) => Promise<TResponse>; */
+/* Тип типов функций отправки */
+/* type TG_SendFunction =
+  | TelegramSendFunction<TG_SendMessageInput, TG_SendMessageResponse>
+  | TelegramSendFunction<TG_SendPhotoInput, TG_SendMessageResponse>; */
+// в будущем:
+// | TelegramSendFunction<TG_SendDocumentInput, TG_SendDocumentResponse>
+// interface TelegramMessageHandler<TInput, TResponse> {
+//   send: (input: TInput) => Promise<TResponse>;
+// }
 class TelegramBot {
   constructor(
     private readonly botToken: string,
+    messages: {
+      text?: Record<
+        string,
+        (input: TG_SendMessageInput) => TG_SendMessageInput
+      >;
+      photo?: Record<string, (input: TG_SendPhotoInput) => TG_SendPhotoInput>;
+    },
     private readonly expiresMessageSeconds?: number,
     private readonly protect_content?: boolean
-  ) {}
+  ) {
+    this.messages = {
+      text: this.wrapTextMessages(messages.text ?? {}),
+      photo: this.wrapPhotoMessages(messages.photo ?? {}),
+    };
+  }
+  // публичный контейнер
+  readonly messages: {
+    text: Record<
+      string,
+      {
+        send: (
+          input?: TG_SendMessageInput,
+          message?: TG_Message,
+          onExpire?: (resultMessage: TG_Message) => void
+        ) => Promise<TG_SendMessageResponse>;
+      }
+    >;
+    photo: Record<
+      string,
+      {
+        send: (
+          input?: TG_SendPhotoInput,
+          message?: TG_Message,
+          onExpire?: (resultMessage: TG_Message) => void
+        ) => Promise<TG_SendMessageResponse>;
+      }
+    >;
+  };
   async handleUpdate(
     update: TG_Update,
@@ -175,12 +227,13 @@ class TelegramBot {
       if (successful_payment) {
         /* Успешная оплата */
         await handleSuccessfulPayment(successful_payment, message);
+        return;
       }
-    }
-    if (!callbackQuery && message) {
-      /* разбираем входящий текст */
-      await handleMessage(message);
+      if (!callbackQuery) {
+        /* разбираем входящий текст */
+        await handleMessage(message);
+      }
     }
   }
@@ -189,8 +242,6 @@ class TelegramBot {
     message?: TG_Message,
     onExpire?: (resultMessage: TG_Message) => void
   ): Promise<TG_SendMessageResponse> {
-    // const { chat_id, reply_markup, caption, photo } = input;
     let sendResult: TG_SendMessageResponse;
     const sendPhotoFunction = () =>
@@ -227,16 +278,10 @@ class TelegramBot {
     if (sendResult.ok && sendResult.result) {
       if (onExpire) {
-        pushMessageToExpireList(
-          sendResult.result,
-          // sendResult.result,
-          // sendResult.result.from,
-          {
-            seconds: this.expiresMessageSeconds,
-            onExpire,
-          }
-        );
+        pushMessageToExpireList(sendResult.result, {
+          seconds: this.expiresMessageSeconds,
+          onExpire,
+        });
       } else {
         deleteMessageFromExpiringList(sendResult.result);
       }
@@ -250,18 +295,13 @@ class TelegramBot {
     message?: TG_Message,
     onExpire?: (resultMessage: TG_Message) => void
   ): Promise<TG_SendMessageResponse> {
-    // const { chat_id, reply_markup, text, protect_content } = input;
     let sendResult: TG_SendMessageResponse;
     const sendPhotoFunction = () =>
       TelegramApi.sendMessage(
         {
-          // chat_id,
-          // text,
           parse_mode: 'HTML',
           protect_content: this.protect_content, // переписывается инпутом
-          // reply_markup,
           ...input,
         },
         this.botToken
@@ -271,10 +311,7 @@ class TelegramBot {
       try {
         sendResult = await TelegramApi.editMessageText(
           {
-            // text,
             message_id: message.message_id,
-            // reply_markup,
-            // chat_id,
             ...input,
           },
           this.botToken
@@ -329,6 +366,61 @@ class TelegramBot {
   async deleteMessage(input: TG_DeleteMessageInput): Promise<boolean> {
     return TelegramApi.deleteMessage(input, this.botToken);
   }
+  // генераторы типовых методов
+  private wrapTextMessages(
+    defs: Record<string, (input: TG_SendMessageInput) => TG_SendMessageInput>
+  ) {
+    const result: Record<
+      string,
+      {
+        send: (
+          input?: TG_SendMessageInput,
+          message?: TG_Message,
+          onExpire?: (m: TG_Message) => void
+        ) => Promise<TG_SendMessageResponse>;
+      }
+    > = {};
+    Object.entries(defs).forEach(([key, builder]) => {
+      result[key] = {
+        send: (input, message, onExpire) =>
+          this.sendMessage(
+            builder(input ?? ({} as TG_SendMessageInput)),
+            message,
+            onExpire
+          ),
+      };
+    });
+    return result;
+  }
+  private wrapPhotoMessages(
+    defs: Record<string, (input: TG_SendPhotoInput) => TG_SendPhotoInput>
+  ) {
+    const result: Record<
+      string,
+      {
+        send: (
+          input?: TG_SendPhotoInput,
+          message?: TG_Message,
+          onExpire?: (m: TG_Message) => void
+        ) => Promise<TG_SendMessageResponse>;
+      }
+    > = {};
+    Object.entries(defs).forEach(([key, builder]) => {
+      result[key] = {
+        send: (input, message, onExpire) =>
+          this.sendPhoto(
+            builder(input ?? ({} as TG_SendPhotoInput)),
+            message,
+            onExpire
+          ),
+      };
+    });
+    return result;
+  }
 }
 export default TelegramBot;