npm - @skroz/telegram-bot - Versions diffs - 1.0.3 → 1.0.5 - Mend

@skroz/telegram-bot 1.0.3 → 1.0.5

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

@@ -1,11 +1,16 @@
-import { TG_CallbackQuery, TG_Message, TG_Update } from '@skroz/telegram-api/dist/TelegramTypes';
+import { TG_CallbackQuery, TG_Message, TG_SendMessageResponse, TG_SendPhotoInput, TG_Update } from '@skroz/telegram-api/dist/TelegramTypes';
 export declare const createCallbackData: (telegramId: number | string, data: string[]) => string;
 export declare const getCallbackData: (data: string) => string[];
+type ExpiresInput = {
+    seconds?: number;
+    onExpire: () => void;
+};
 declare class TelegramBot {
     private readonly botToken;
     constructor(botToken: string);
     setWebhook(webhookUrl: string): Promise<import("@skroz/telegram-api/dist/ResultAndDescription").default>;
     handleUpdate(update: TG_Update, handleCallback: (callbackQuery: TG_CallbackQuery, callbackDataParams: string[]) => Promise<void>, handleMessage: (message: TG_Message) => void): Promise<void>;
+    sendPhoto(input: TG_SendPhotoInput, message?: TG_Message, expires?: ExpiresInput): Promise<TG_SendMessageResponse>;
     deleteWebhook(): Promise<void>;
 }
 export default TelegramBot;

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,gBAAgB,EAChB,UAAU,EACV,SAAS,EACV,MAAM,wCAAwC,CAAC;~~AAQhD~~,eAAO,MAAM,kBAAkB,eACjB,MAAM,GAAG,MAAM,QACrB,MAAM,EAAE,KACb,MAC0E,CAAC;AAG9E,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAAM,EACxB,CAAC;~~AAE9B~~,cAAM,WAAW;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,MAAM;IAEvC,UAAU,CAAC,UAAU,EAAE,MAAM;IAI7B,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,GAC3C,OAAO,CAAC,IAAI,CAAC;IAmCV,aAAa;CAGpB;AAED,eAAe,WAAW,CAAC"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,sBAAsB,EACtB,iBAAiB,EACjB,SAAS,EACV,MAAM,wCAAwC,CAAC;AAYhD,eAAO,MAAM,kBAAkB,eACjB,MAAM,GAAG,MAAM,QACrB,MAAM,EAAE,KACb,MAC0E,CAAC;AAG9E,eAAO,MAAM,eAAe,SAAU,MAAM,KAAG,MAAM,EACxB,CAAC;AA0D9B,KAAK,YAAY,GAAG;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB,CAAC;AAEF,cAAM,WAAW;IACH,OAAO,CAAC,QAAQ,CAAC,QAAQ;gBAAR,QAAQ,EAAE,MAAM;IAEvC,UAAU,CAAC,UAAU,EAAE,MAAM;IAI7B,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,GAC3C,OAAO,CAAC,IAAI,CAAC;IAmCV,SAAS,CACb,KAAK,EAAE,iBAAiB,EACxB,OAAO,CAAC,EAAE,UAAU,EACpB,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,sBAAsB,CAAC;IAwD5B,aAAa;CAGpB;AAED,eAAe,WAAW,CAAC"}

package/dist/index.js CHANGED Viewed

@@ -5,16 +5,53 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCallbackData = exports.createCallbackData = void 0;
 const telegram_api_1 = __importDefault(require("@skroz/telegram-api"));
+/* eslint-disable @typescript-eslint/naming-convention */
 /* хранит уникальные колбэки, чтобы исключить повторное нажатие */
 const processedCallbacks = new Set();
 /* разделитель для параметров колбэка */
 const callbackDivider = '^:^:^';
+/* по умолчанию истекающее сообщение */
+const expiresSecondsDefault = 5 * 60; // 5 минут
 /* не больше 64 символов по документации, внутри защита от повторных кликов */
 const createCallbackData = (telegramId, data) => [`${Date.now()}_${telegramId}`, ...data].join(callbackDivider).slice(0, 64);
 exports.createCallbackData = createCallbackData;
 /* не больше 64 символов по документации, внутри защита от повторных кликов */
 const getCallbackData = (data) => data.split(callbackDivider);
 exports.getCallbackData = getCallbackData;
+const expiredMessagesList = [];
+const pushMessageToExpireList = (
+// from: TG_User,
+message, expires) => {
+    const expiresAt = Date.now() + (expires.seconds || expiresSecondsDefault) * 1000;
+    expiredMessagesList.push({
+        message,
+        // from,
+        expiresAt,
+        onExpire: expires.onExpire,
+    });
+};
+// забирает и сразу удаляет
+const shiftExpiredMessages = () => {
+    const now = Date.now();
+    const expired = expiredMessagesList.filter((msg) => msg.expiresAt <= now);
+    expiredMessagesList.splice(0, expired.length);
+    return expired;
+};
+// убираем из списка удаленные сообщения
+const deleteMessageFromExpiringList = (message) => {
+    const index = expiredMessagesList.findIndex((msg) => msg.message.message_id === message.message_id);
+    if (index !== -1) {
+        expiredMessagesList.splice(index, 1);
+    }
+};
+setInterval(async () => {
+    const expired = shiftExpiredMessages();
+    if (expired.length > 0) {
+        await Promise.all(expired.map(async (ex) => {
+            await ex.onExpire();
+        }));
+    }
+}, 15000);
 class TelegramBot {
     constructor(botToken) {
         this.botToken = botToken;
@@ -51,6 +88,50 @@ class TelegramBot {
             await handleMessage(message);
         }
     }
+    async sendPhoto(input, message, expires) {
+        const { chat_id, reply_markup, caption, photo } = input;
+        let sendResult;
+        const sendPhotoFunction = () => telegram_api_1.default.sendPhoto({
+            chat_id,
+            caption,
+            photo,
+            parse_mode: 'HTML',
+            reply_markup,
+        }, this.botToken);
+        if (message) {
+            try {
+                sendResult = await telegram_api_1.default.editMessageMedia({
+                    media: {
+                        type: 'photo',
+                        media: photo,
+                        caption,
+                        parse_mode: 'HTML',
+                    },
+                    message_id: message.message_id,
+                    reply_markup,
+                    chat_id,
+                }, this.botToken);
+            }
+            catch (e) {
+                sendResult = await sendPhotoFunction();
+            }
+        }
+        else {
+            sendResult = await sendPhotoFunction();
+        }
+        if (sendResult.ok && sendResult.result) {
+            if (expires) {
+                pushMessageToExpireList(sendResult.result,
+                // sendResult.result,
+                // sendResult.result.from,
+                expires);
+            }
+            else {
+                deleteMessageFromExpiringList(sendResult.result);
+            }
+        }
+        return sendResult;
+    }
     async deleteWebhook() {
         return telegram_api_1.default.deleteWebhook(this.botToken);
     }

package/dist/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,uEAA8C;~~AAO9C~~,kEAAkE;AAClE,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAE,CAAC;AACrC,wCAAwC;AACxC,MAAM,eAAe,GAAG,OAAO,CAAC;~~AAEhC~~,8EAA8E;AACvE,MAAM,kBAAkB,GAAG,CAChC,UAA2B,EAC3B,IAAc,EACN,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;AADjB,QAAA,eAAe,mBACE;AAE9B,MAAM,WAAW;IACf,YAA6B,QAAgB;QAAhB,aAAQ,GAAR,QAAQ,CAAQ;IAAG,CAAC;IAEjD,KAAK,CAAC,UAAU,CAAC,UAAkB;QACjC,OAAO,sBAAW,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAiB,EACjB,cAGkB,EAClB,aAA4C;QAE5C,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,0BAA0B;QAC1B,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC,kGAAkG;QAE9H,IAAI,CAAC,aAAa,IAAI,OAAO,EAAE,CAAC;YAC9B,8BAA8B;YAC9B,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,sBAAW,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAClD,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.3",
+  "version": "1.0.5",
   "license": "MIT",
   "repository": "git@gitlab.com:skroz/libs/utils.git",
   "main": "dist/index.js",
@@ -21,5 +21,5 @@
   "dependencies": {
     "@skroz/telegram-api": "^1.0.10"
   },
-  "gitHead": "f581017d2941a8fc89cee07fb7c39b5e1aae4218"
+  "gitHead": "027ab22a48e487c2c51bb86a0aacabc20109b7e0"
 }

package/src/index.ts CHANGED Viewed

@@ -2,13 +2,19 @@ import TelegramApi from '@skroz/telegram-api';
 import {
   TG_CallbackQuery,
   TG_Message,
+  TG_SendMessageResponse,
+  TG_SendPhotoInput,
   TG_Update,
 } from '@skroz/telegram-api/dist/TelegramTypes';
+/* eslint-disable @typescript-eslint/naming-convention */
 /* хранит уникальные колбэки, чтобы исключить повторное нажатие */
 const processedCallbacks = new Set();
 /* разделитель для параметров колбэка */
 const callbackDivider = '^:^:^';
+/* по умолчанию истекающее сообщение */
+const expiresSecondsDefault = 5 * 60; // 5 минут
 /* не больше 64 символов по документации, внутри защита от повторных кликов */
 export const createCallbackData = (
@@ -21,6 +27,67 @@ export const createCallbackData = (
 export const getCallbackData = (data: string): string[] =>
   data.split(callbackDivider);
+const expiredMessagesList: {
+  // from: TG_User;
+  message: TG_Message;
+  expiresAt: number;
+  onExpire: () => void;
+}[] = [];
+const pushMessageToExpireList = (
+  // from: TG_User,
+  message: TG_Message,
+  expires: ExpiresInput
+) => {
+  const expiresAt =
+    Date.now() + (expires.seconds || expiresSecondsDefault) * 1000;
+  expiredMessagesList.push({
+    message,
+    // from,
+    expiresAt,
+    onExpire: expires.onExpire,
+  });
+};
+// забирает и сразу удаляет
+const shiftExpiredMessages = (): {
+  message: TG_Message;
+  // from: TG_User;
+  onExpire: () => void;
+}[] => {
+  const now = Date.now();
+  const expired = expiredMessagesList.filter((msg) => msg.expiresAt <= now);
+  expiredMessagesList.splice(0, expired.length);
+  return expired;
+};
+// убираем из списка удаленные сообщения
+const deleteMessageFromExpiringList = (message: TG_Message) => {
+  const index = expiredMessagesList.findIndex(
+    (msg) => msg.message.message_id === message.message_id
+  );
+  if (index !== -1) {
+    expiredMessagesList.splice(index, 1);
+  }
+};
+setInterval(async () => {
+  const expired = shiftExpiredMessages();
+  if (expired.length > 0) {
+    await Promise.all(
+      expired.map(async (ex) => {
+        await ex.onExpire();
+      })
+    );
+  }
+}, 15000);
+type ExpiresInput = {
+  seconds?: number;
+  onExpire: () => void;
+};
 class TelegramBot {
   constructor(private readonly botToken: string) {}
@@ -70,6 +137,66 @@ class TelegramBot {
     }
   }
+  async sendPhoto(
+    input: TG_SendPhotoInput,
+    message?: TG_Message,
+    expires?: ExpiresInput
+  ): Promise<TG_SendMessageResponse> {
+    const { chat_id, reply_markup, caption, photo } = input;
+    let sendResult: TG_SendMessageResponse;
+    const sendPhotoFunction = () =>
+      TelegramApi.sendPhoto(
+        {
+          chat_id,
+          caption,
+          photo,
+          parse_mode: 'HTML',
+          reply_markup,
+        },
+        this.botToken
+      );
+    if (message) {
+      try {
+        sendResult = await TelegramApi.editMessageMedia(
+          {
+            media: {
+              type: 'photo',
+              media: photo as string,
+              caption,
+              parse_mode: 'HTML',
+            },
+            message_id: message.message_id,
+            reply_markup,
+            chat_id,
+          },
+          this.botToken
+        );
+      } catch (e) {
+        sendResult = await sendPhotoFunction();
+      }
+    } else {
+      sendResult = await sendPhotoFunction();
+    }
+    if (sendResult.ok && sendResult.result) {
+      if (expires) {
+        pushMessageToExpireList(
+          sendResult.result,
+          // sendResult.result,
+          // sendResult.result.from,
+          expires
+        );
+      } else {
+        deleteMessageFromExpiringList(sendResult.result);
+      }
+    }
+    return sendResult;
+  }
   async deleteWebhook() {
     return TelegramApi.deleteWebhook(this.botToken);
   }