@codebam/cf-workers-telegram-bot 7.17.0 → 7.18.0

package/dist/telegram_api.d.ts

@@ -4,28 +4,28 @@ import TelegramInlineQueryResultArticle from './types/TelegramInlineQueryResultA
 import TelegramInlineQueryResultPhoto from './types/TelegramInlineQueryResultPhoto.js';
 import TelegramInlineQueryResultVideo from './types/TelegramInlineQueryResultVideo.js';
 export default class TelegramApi {
-    static getApiUrl(botApi: string, slug: string, data: Record<string, SerializableData>): Request<unknown, CfProperties<unknown>>;
-    static getFile(botApi: string, data: {
+    getApiUrl(botApi: string, slug: string, data: Record<string, SerializableData>): Request<unknown, CfProperties<unknown>>;
+    getFile(botApi: string, data: {
         file_id: string;
     }, token: string): Promise<ArrayBuffer>;
-    static sendMessage(botApi: string, data: {
+    sendMessage(botApi: string, data: {
         reply_to_message_id: number | string;
         chat_id: number | string;
         text: string;
         parse_mode: string;
     }): Promise<Response>;
-    static sendVideo(botApi: string, data: {
+    sendVideo(botApi: string, data: {
         reply_to_message_id: number | string;
         chat_id: number | string;
         video: string;
     }): Promise<Response>;
-    static sendPhoto(botApi: string, data: {
+    sendPhoto(botApi: string, data: {
         reply_to_message_id: number | string;
         chat_id: number | string;
         photo: string;
         caption: string;
     }): Promise<Response>;
-    static answerInline(botApi: string, data: {
+    answerInline(botApi: string, data: {
         inline_query_id: number | string;
         results: TelegramInlineQueryResultArticle[] | TelegramInlineQueryResultPhoto[] | TelegramInlineQueryResultVideo[];
     }): Promise<Response>;

package/dist/telegram_api.js

@@ -1,33 +1,33 @@
 export default class TelegramApi {
-    static getApiUrl(botApi, slug, data) {
+    getApiUrl(botApi, slug, data) {
         const request = new URL(botApi + (slug.startsWith('/') || botApi.endsWith('/') ? '' : '/') + slug);
         const params = new URLSearchParams();
         for (const i in data) {
             params.append(i, data[i].toString());
         }
-        return new Request(`${request}?${params}`);
+        return new Request(`${request.toString()}?${params.toString()}`);
     }
-    static async getFile(botApi, data, token) {
+    async getFile(botApi, data, token) {
         const url = this.getApiUrl(botApi, 'getFile', data);
         const response = await fetch(url);
-        const json = (await response.json());
+        const json = await response.json();
         const file_path = json.result.file_path;
         const file_response = await fetch(`https://api.telegram.org/file/bot${token}/${file_path}`);
         return await file_response.arrayBuffer();
     }
-    static async sendMessage(botApi, data) {
+    async sendMessage(botApi, data) {
         const url = this.getApiUrl(botApi, 'sendMessage', data);
         return await fetch(url);
     }
-    static async sendVideo(botApi, data) {
+    async sendVideo(botApi, data) {
         const url = this.getApiUrl(botApi, 'sendVideo', data);
         return await fetch(url);
     }
-    static async sendPhoto(botApi, data) {
+    async sendPhoto(botApi, data) {
         const url = this.getApiUrl(botApi, 'sendPhoto', data);
         return await fetch(url);
     }
-    static async answerInline(botApi, data) {
+    async answerInline(botApi, data) {
         const url = this.getApiUrl(botApi, 'answerInlineQuery', {
             inline_query_id: data.inline_query_id,
             results: JSON.stringify(data.results),

package/dist/telegram_bot.js

@@ -13,7 +13,7 @@ export default class TelegramBot {
         this.api = new URL('https://api.telegram.org/bot' + token);
     }
     on(event, callback) {
-        if (['on', 'handle'].indexOf(event) === -1) {
+        if (!['on', 'handle'].includes(event)) {
             this.commands[event] = callback;
         }
         return this;
@@ -49,11 +49,10 @@ export default class TelegramBot {
                     if (args.at(0)?.startsWith('/')) {
                         command = args.at(0)?.slice(1) ?? 'default';
                     }
-                    this.commands['any']?.(ctx);
-                    if (!this.commands[command]) {
+                    if (!(command in this.commands)) {
                         command = 'default';
                     }
-                    return await this.commands[command]?.(ctx);
+                    return await this.commands[command](ctx);
                 }
                 case 'GET': {
                     switch (url.searchParams.get('command')) {

package/dist/telegram_execution_context.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="@cloudflare/workers-types" />
+import TelegramApi from './telegram_api.js';
 import TelegramBot from './telegram_bot.js';
 import SerializableData from './types/SerializableData.js';
 import TelegramUpdate from './types/TelegramUpdate.js';
@@ -6,12 +7,12 @@ export default class TelegramExecutionContext {
     bot: TelegramBot;
     update: TelegramUpdate;
     update_type: string;
+    api: TelegramApi;
     private data;
     constructor(bot: TelegramBot, update: TelegramUpdate);
     getText(): string;
     next(): Response;
     setData(key: string, value: SerializableData): this;
-    deleteData(key: string): this;
     getData(key: string): SerializableData;
     replyVideo(video: string, options?: Record<string, SerializableData>): Promise<Response | undefined>;
     getFile(file_id: string): Promise<ArrayBuffer>;

package/dist/telegram_execution_context.js

@@ -6,6 +6,7 @@ export default class TelegramExecutionContext {
     bot;
     update;
     update_type = '';
+    api = new TelegramApi();
     data = {};
     constructor(bot, update) {
         this.bot = bot;
@@ -21,7 +22,7 @@ export default class TelegramExecutionContext {
         }
     }
     getText() {
-        return this.update.message?.text || this.update.inline_query?.query || '';
+        return this.update.message?.text ?? this.update.inline_query?.query ?? '';
     }
     next() {
         return new Response('ok');
@@ -30,24 +31,20 @@ export default class TelegramExecutionContext {
         this.data[key] = value;
         return this;
     }
-    deleteData(key) {
-        delete this.data[key];
-        return this;
-    }
     getData(key) {
         return this.data[key];
     }
     async replyVideo(video, options = {}) {
         switch (this.update_type) {
             case 'message':
-                return await TelegramApi.sendVideo(this.bot.api.toString(), {
+                return await this.api.sendVideo(this.bot.api.toString(), {
                     ...options,
                     chat_id: this.update.message?.chat.id.toString() ?? '',
                     reply_to_message_id: this.update.message?.message_id.toString() ?? '',
                     video,
                 });
             case 'inline':
-                return await TelegramApi.answerInline(this.bot.api.toString(), {
+                return await this.api.answerInline(this.bot.api.toString(), {
                     ...options,
                     inline_query_id: this.update.inline_query?.id.toString() ?? '',
                     results: [new TelegramInlineQueryResultVideo(video)],
@@ -57,12 +54,12 @@ export default class TelegramExecutionContext {
         }
     }
     async getFile(file_id) {
-        return await TelegramApi.getFile(this.bot.api.toString(), { file_id }, this.bot.token);
+        return await this.api.getFile(this.bot.api.toString(), { file_id }, this.bot.token);
     }
     async replyPhoto(photo, caption = '', options = {}) {
         switch (this.update_type) {
             case 'photo':
-                return await TelegramApi.sendPhoto(this.bot.api.toString(), {
+                return await this.api.sendPhoto(this.bot.api.toString(), {
                     ...options,
                     chat_id: this.update.message?.chat.id.toString() ?? '',
                     reply_to_message_id: this.update.message?.message_id.toString() ?? '',
@@ -70,7 +67,7 @@ export default class TelegramExecutionContext {
                     caption,
                 });
             case 'message':
-                return await TelegramApi.sendPhoto(this.bot.api.toString(), {
+                return await this.api.sendPhoto(this.bot.api.toString(), {
                     ...options,
                     chat_id: this.update.message?.chat.id.toString() ?? '',
                     reply_to_message_id: this.update.message?.message_id.toString() ?? '',
@@ -78,7 +75,7 @@ export default class TelegramExecutionContext {
                     caption,
                 });
             case 'inline':
-                return await TelegramApi.answerInline(this.bot.api.toString(), {
+                return await this.api.answerInline(this.bot.api.toString(), {
                     inline_query_id: this.update.inline_query?.id.toString() ?? '',
                     results: [new TelegramInlineQueryResultPhoto(photo)],
                 });
@@ -89,7 +86,7 @@ export default class TelegramExecutionContext {
     async reply(message, parse_mode = '', options = {}) {
         switch (this.update_type) {
             case 'message':
-                return await TelegramApi.sendMessage(this.bot.api.toString(), {
+                return await this.api.sendMessage(this.bot.api.toString(), {
                     ...options,
                     chat_id: this.update.message?.chat.id.toString() ?? '',
                     reply_to_message_id: this.update.message?.message_id.toString() ?? '',
@@ -97,7 +94,7 @@ export default class TelegramExecutionContext {
                     parse_mode,
                 });
             case 'photo':
-                return await TelegramApi.sendMessage(this.bot.api.toString(), {
+                return await this.api.sendMessage(this.bot.api.toString(), {
                     ...options,
                     chat_id: this.update.message?.chat.id.toString() ?? '',
                     reply_to_message_id: this.update.message?.message_id.toString() ?? '',
@@ -105,7 +102,7 @@ export default class TelegramExecutionContext {
                     parse_mode,
                 });
             case 'inline':
-                return await TelegramApi.answerInline(this.bot.api.toString(), {
+                return await this.api.answerInline(this.bot.api.toString(), {
                     inline_query_id: this.update.inline_query?.id.toString() ?? '',
                     results: [new TelegramInlineQueryResultArticle(message)],
                 });

package/dist/types/Bored.d.ts

@@ -1,4 +1,4 @@
-type Bored = {
+interface Bored {
     activity: string;
     type: string;
     participants: number;
@@ -6,5 +6,5 @@ type Bored = {
     link: string;
     key: string;
     accessibility: 0;
-};
+}
 export default Bored;

package/dist/types/ChatPermissions.d.ts

@@ -1,4 +1,4 @@
-type ChatPermissions = {
+interface ChatPermissions {
     can_send_messages?: boolean;
     can_send_audios?: boolean;
     can_send_documents?: boolean;
@@ -13,5 +13,5 @@ type ChatPermissions = {
     can_invite_users?: boolean;
     can_pin_messages?: boolean;
     can_manage_topics?: boolean;
-};
+}
 export default ChatPermissions;

package/dist/types/DDGQueryResponse.d.ts

@@ -1,4 +1,4 @@
-type DDGQueryResponse = {
+interface DDGQueryResponse {
     AbstractSource: string;
     AbstractURL: string;
     Redirect: string;
@@ -8,5 +8,5 @@ type DDGQueryResponse = {
             URL: string;
         };
     }[];
-};
+}
 export default DDGQueryResponse;

package/dist/types/Joke.d.ts

@@ -1,4 +1,4 @@
-type Joke = {
+interface Joke {
     error: boolean;
     category: string;
     type: string;
@@ -16,5 +16,5 @@ type Joke = {
     id: number;
     safe: boolean;
     lang: string;
-};
+}
 export default Joke;

package/dist/types/Kanye.d.ts

@@ -1,4 +1,4 @@
-type Kanye = {
+interface Kanye {
     quote: string;
-};
+}
 export default Kanye;

package/dist/types/PartialTelegramUpdate.d.ts

@@ -1,11 +1,11 @@
 import TelegramInlineQuery from './TelegramInlineQuery.js';
 import TelegramMessage from './TelegramMessage.js';
-type PartialTelegramUpdate = {
+interface PartialTelegramUpdate {
     update_id?: number;
     message?: TelegramMessage;
     edited_message?: TelegramMessage;
     channel_post?: TelegramMessage;
     edited_channel_post?: TelegramMessage;
     inline_query?: TelegramInlineQuery;
-};
+}
 export default PartialTelegramUpdate;

package/dist/types/TelegramChat.d.ts

@@ -1,5 +1,5 @@
 import TelegramMessage from './TelegramMessage.js';
-type TelegramChat = {
+interface TelegramChat {
     id: number;
     type: string;
     title?: string;
@@ -17,5 +17,5 @@ type TelegramChat = {
     sticker_set_name?: string;
     can_set_sticker_set?: boolean;
     linked_chat_id?: number;
-};
+}
 export default TelegramChat;

package/dist/types/TelegramFrom.d.ts

@@ -1,8 +1,8 @@
-type TelegramFrom = {
+interface TelegramFrom {
     first_name: string;
     id: number;
     is_bot: boolean;
     language_code: string;
     username: string;
-};
+}
 export default TelegramFrom;

package/dist/types/TelegramInlineQuery.d.ts

@@ -1,9 +1,9 @@
 import TelegramFrom from './TelegramFrom.js';
-type TelegramInlineQuery = {
+interface TelegramInlineQuery {
     chat_type: 'sender' | 'private' | 'group' | 'supergroup' | 'channel';
     from: TelegramFrom;
     id: number;
     offset: string;
     query: string;
-};
+}
 export default TelegramInlineQuery;

package/dist/types/TelegramInputMessageContent.d.ts

@@ -1,5 +1,5 @@
-type TelegramInputMessageContent = {
+interface TelegramInputMessageContent {
     message_text: string;
     parse_mode: string;
-};
+}
 export default TelegramInputMessageContent;

package/dist/types/TelegramMessage.d.ts

@@ -3,7 +3,7 @@ import TelegramFrom from './TelegramFrom.js';
 import TelegramMessageEntity from './TelegramMessageEntity.js';
 import TelegramPhotoSize from './TelegramPhotoSize.js';
 import TelegramUser from './TelegramUser.js';
-type TelegramMessage = {
+interface TelegramMessage {
     message_id: number;
     from: TelegramFrom;
     sender_chat?: TelegramChat;
@@ -39,5 +39,5 @@ type TelegramMessage = {
     migrate_from_chat_id?: number;
     pinned_message?: TelegramMessage;
     connected_website?: string;
-};
+}
 export default TelegramMessage;

package/dist/types/TelegramMessageEntity.d.ts

@@ -1,10 +1,10 @@
 import TelegramUser from './TelegramUser.js';
-type TelegramMessageEntity = {
+interface TelegramMessageEntity {
     type: string;
     offset: number;
     length: number;
     url?: string;
     user?: TelegramUser;
     language?: string;
-};
+}
 export default TelegramMessageEntity;

package/dist/types/TelegramPhotoSize.d.ts

@@ -1,8 +1,8 @@
-type TelegramPhotoSize = {
+interface TelegramPhotoSize {
     file_id: string;
     file_unique_id: string;
     width: number;
     height: number;
     file_size?: number;
-};
+}
 export default TelegramPhotoSize;

package/dist/types/TelegramUpdate.js

@@ -17,7 +17,7 @@ export default class TelegramUpdate extends Update {
     // chat_join_request: TelegramChatJoinRequest;
     constructor(update) {
         super();
-        this.update_id = update.update_id || 0;
+        this.update_id = update.update_id ?? 0;
         this.message = update.message;
         this.edited_message = update.edited_message;
         this.channel_post = update.channel_post;

package/dist/types/TelegramUser.d.ts

@@ -1,4 +1,4 @@
-type TelegramUser = {
+interface TelegramUser {
     id: number;
     is_bot: boolean;
     first_name: string;
@@ -8,5 +8,5 @@ type TelegramUser = {
     can_join_groups?: boolean;
     can_read_all_group_messages?: boolean;
     supports_inline_queries: boolean;
-};
+}
 export default TelegramUser;

package/dist/webhook.js

@@ -12,6 +12,6 @@ export default class Webhook {
         params.append('max_connections', '100');
         params.append('allowed_updates', JSON.stringify(['message', 'inline_query']));
         params.append('drop_pending_updates', 'true');
-        return await fetch(`${url}?${params}`);
+        return await fetch(`${url.toString()}?${params.toString()}`);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@codebam/cf-workers-telegram-bot",
-	"version": "7.17.0",
+	"version": "7.18.0",
 	"description": "serverless telegram bot on cf workers",
 	"main": "./dist/main.js",
 	"module": "./dist/main.js",
@@ -31,18 +31,18 @@
 		"url": "https://github.com/codebam/cf-workers-telegram-bot.git"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20240502.0",
-		"@eslint/js": "^9.2.0",
-		"@typescript-eslint/eslint-plugin": "^7.8.0",
-		"@typescript-eslint/parser": "^7.8.0",
-		"eslint": "^9.2.0",
+		"@cloudflare/workers-types": "^4.20240512.0",
+		"@eslint/js": "^9.3.0",
+		"@typescript-eslint/eslint-plugin": "^7.10.0",
+		"@typescript-eslint/parser": "^7.10.0",
+		"eslint": "^8.56.0",
 		"eslint-config-prettier": "^9.1.0",
-		"globals": "^15.2.0",
+		"globals": "^15.3.0",
 		"lerna": "^8.1.2",
 		"prettier": "^3.2.5",
 		"typescript": "^5.4.5",
-		"typescript-eslint": "^7.8.0",
+		"typescript-eslint": "^7.10.0",
 		"vitest": "^1.6.0"
 	},
-	"gitHead": "03634bbfeffcfacd0a67ff46fc6ae2a76440eb8e"
+	"gitHead": "9403f38804403328eac9f7249bdeaccee8a4ee25"
 }