rubika 1.2.1 → 1.2.4

package/bot/bot.ts

@@ -1,9 +1,10 @@
 import Network from "./network";
 import Methods from "./methods";
+import { Logger } from "../utils";
+import Update from "./contexts/update";
 import type { BotInfo } from "./types/interfaces";
 import type { ContextMap, Handler, NestedFilter } from "./types/handlers";
-import Update from "./contexts/update";
-import { Logger } from "../utils";
+import { BotConfig } from "./types/utils";
 
 class Bot extends Methods {
   protected initialize: boolean = false;
@@ -12,7 +13,7 @@ class Bot extends Methods {
   public bot?: BotInfo;
 
   public handlers: {
-    [K in keyof ContextMap]: Handler<ContextMap[K]>[];
+    [K in keyof ContextMap<unknown>]: Handler<ContextMap<unknown>[K]>[];
   } = { inline: [], update: [], error: [] };
 
   public logger = new Logger<Bot>(this.handlers.error, this);
@@ -33,11 +34,16 @@ class Bot extends Methods {
    */
   constructor(
     public token: string,
-    timeout: number = 10000,
+    config: BotConfig = { retryCount: 3, timeout: 10000 },
   ) {
     super();
     this.BASE_URL = `https://botapi.rubika.ir/v3/${token}`;
-    this.network = new Network(this.BASE_URL, timeout);
+    this.network = new Network(
+      this.BASE_URL,
+      this.logger,
+      config.timeout,
+      config.retryCount,
+    );
 
     this.start();
   }
@@ -66,9 +72,9 @@ class Bot extends Methods {
    * });
    * ```
    */
-  on<T extends keyof typeof this.handlers>(
-    type: T,
-    handler: (ctx: ContextMap[T]) => Promise<void>,
+  on<T, K extends keyof ContextMap<T>>(
+    type: K,
+    handler: (ctx: ContextMap<T>[K]) => Promise<void>,
   ): void;
 
   /**
@@ -96,18 +102,18 @@ class Bot extends Methods {
    * });
    * ```
    */
-  on<T extends keyof typeof this.handlers>(
-    type: T,
-    filters: NestedFilter<ContextMap[T]>,
-    handler: (ctx: ContextMap[T]) => Promise<void>,
+  on<T, K extends keyof ContextMap<T>>(
+    type: K,
+    filters: NestedFilter<ContextMap<T>[K]>,
+    handler: (ctx: ContextMap<T>[K]) => Promise<void>,
   ): void;
 
-  on<T extends keyof typeof this.handlers>(
-    type: T,
-    filtersOrHandler:
-      | NestedFilter<ContextMap[T]>
-      | ((ctx: ContextMap[T]) => Promise<void>),
-    maybeHandler?: (ctx: ContextMap[T]) => Promise<void>,
+  on<T, K extends keyof ContextMap<T>>(
+    type: K,
+    filtersOrHandler?:
+      | NestedFilter<ContextMap<T>[K]>
+      | ((ctx: ContextMap<T>[K]) => Promise<void>),
+    maybeHandler?: (ctx: ContextMap<T>[K]) => Promise<void>,
   ): void {
     if (typeof filtersOrHandler === "function") {
       this.handlers[type].push({
@@ -147,9 +153,9 @@ class Bot extends Methods {
    * });
    * ```
    */
-  command(
+  command<T>(
     prefix: string | RegExp,
-    handler: (ctx: Update) => Promise<void>,
+    handler: (ctx: Update<T>) => Promise<void>,
   ): void;
 
   /**
@@ -178,18 +184,18 @@ class Bot extends Methods {
    * });
    * ```
    */
-  command(
+  command<T>(
     prefix: string | RegExp,
-    filters: NestedFilter<ContextMap["update"]>,
-    handler: (ctx: Update) => Promise<void>,
+    filters: NestedFilter<ContextMap<T>["update"]>,
+    handler: (ctx: Update<T>) => Promise<void>,
   ): void;
 
-  command(
+  command<T>(
     prefix: string | RegExp,
     filtersOrHandler:
-      | NestedFilter<ContextMap["update"]>
-      | ((ctx: Update) => Promise<void>),
-    maybeHandler?: (ctx: Update) => Promise<void>,
+      | NestedFilter<ContextMap<T>["update"]>
+      | ((ctx: Update<T>) => Promise<void>),
+    maybeHandler?: (ctx: Update<T>) => Promise<void>,
   ) {
     if (typeof filtersOrHandler === "function") {
       this.handlers.update.push({
@@ -204,7 +210,7 @@ class Bot extends Methods {
         prefix,
       });
     } else {
-      throw this.logger.error("Invalid arguments for command()", "warn");
+      this.logger.error("Invalid arguments for command()", "warn");
     }
   }
 }

package/bot/contexts/inline.ts

@@ -4,13 +4,14 @@ import {
   AuxData,
   File,
   InlineKeypad,
+  InlineMessage,
   Keypad,
   Location,
 } from "../types/interfaces";
 import { ChatKeypadTypeEnum } from "../types/enums";
 import { FileSource } from "../types/methods";
 
-class Inline {
+class Inline<T> {
   sender_id: string;
   text: string;
   file?: File;
@@ -18,12 +19,12 @@ class Inline {
   aux_data?: AuxData;
   message_id: string;
   chat_id: string;
-  store: Record<string, any> = {};
+  store: Partial<T> = {};
 
   declare bot: Bot;
 
   constructor(
-    private ctx: any,
+    private ctx: InlineMessage,
     bot: Bot,
   ) {
     this.sender_id = ctx.sender_id;
@@ -41,7 +42,7 @@ class Inline {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     return await this.bot.sendMessage(
@@ -62,7 +63,7 @@ class Inline {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     return await this.bot.sendImage(
@@ -84,7 +85,7 @@ class Inline {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     return await this.bot.sendVideo(
@@ -106,7 +107,7 @@ class Inline {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     return await this.bot.sendGif(
@@ -127,7 +128,7 @@ class Inline {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     return await this.bot.sendSticker(
@@ -148,7 +149,7 @@ class Inline {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     return await this.bot.sendMusic(
@@ -170,7 +171,7 @@ class Inline {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     return await this.bot.sendVoice(
@@ -192,7 +193,7 @@ class Inline {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     return await this.bot.sendFile(
@@ -214,7 +215,7 @@ class Inline {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     return await this.bot.sendLocation(
@@ -237,7 +238,7 @@ class Inline {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     return await this.bot.sendContact(
@@ -257,7 +258,7 @@ class Inline {
   replyPoll = async (
     question: string,
     options: string[],
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
   ) => {
     return await this.bot.sendPoll(
       this.chat_id,

package/bot/contexts/update.ts

@@ -7,20 +7,22 @@ import {
   Keypad,
   Message,
   PaymentStatus,
+  UpdateMessage,
 } from "../types/interfaces";
 
-class Update {
+class Update<T> {
   type: UpdateTypeEnum;
   chat_id: string;
+  update_time: number;
   removed_message_id?: string;
   new_message?: Message;
   updated_message?: Message;
   updated_payment?: PaymentStatus;
-  store: Record<string, any> = {};
+  store: Partial<T> = {};
   declare bot: Bot;
 
   constructor(
-    private ctx: any,
+    private ctx: UpdateMessage,
     bot: Bot,
   ) {
     this.type = ctx.type;
@@ -29,6 +31,7 @@ class Update {
     this.new_message = ctx.new_message;
     this.updated_message = ctx.updated_message;
     this.updated_payment = ctx.updated_payment;
+    this.update_time = ctx.update_time;
     this.bot = bot;
   }
 
@@ -37,7 +40,7 @@ class Update {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     const replyId = this.ensureReply();
@@ -60,7 +63,7 @@ class Update {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     const replyId = this.ensureReply();
@@ -84,7 +87,7 @@ class Update {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     const replyId = this.ensureReply();
@@ -108,7 +111,7 @@ class Update {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     const replyId = this.ensureReply();
@@ -131,7 +134,7 @@ class Update {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     const replyId = this.ensureReply();
@@ -154,7 +157,7 @@ class Update {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     const replyId = this.ensureReply();
@@ -178,7 +181,7 @@ class Update {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     const replyId = this.ensureReply();
@@ -202,7 +205,7 @@ class Update {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     const replyId = this.ensureReply();
@@ -226,7 +229,7 @@ class Update {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     const replyId = this.ensureReply();
@@ -251,7 +254,7 @@ class Update {
     chat_keypad?: Keypad,
     inline_keypad?: InlineKeypad,
     disable_notification?: boolean,
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
     chat_keypad_type?: ChatKeypadTypeEnum | undefined,
   ) => {
     const replyId = this.ensureReply();
@@ -273,7 +276,7 @@ class Update {
   replyPoll = async (
     question: string,
     options: string[],
-    auto_delete: number | boolean = false,
+    auto_delete: number | false = false,
   ) => {
     return await this.bot.sendPoll(
       this.chat_id,
@@ -304,8 +307,6 @@ class Update {
 
     if (!user && !userId)
       throw this.bot.logger.error("No data to ban user", "warn");
-
-    //@ts-ignore
     return await this.bot.banChatMember(this.chat_id, userId || user);
   };
 
@@ -313,8 +314,6 @@ class Update {
     const user = this.ensureReply(true);
     if (!user && !userId)
       throw this.bot.logger.error("No data to unban user", "warn");
-
-    //@ts-ignore
     return await this.bot.banChatMember(this.chat_id, userId || user);
   };
 
@@ -322,12 +321,12 @@ class Update {
     const message_id = this.ensureReply();
     if (!text && !inline_keypad && !message_id)
       throw this.bot.logger.error("No data to edit message", "warn");
-    //@ts-ignore
-    if (text) await this.bot.editMessageText(this.chat_id, text, message_id);
+
     if (inline_keypad) {
-      //@ts-ignore
       await this.bot.editMessageKeypad(this.chat_id, message_id, inline_keypad);
     }
+
+    if (text) await this.bot.editMessageText(this.chat_id, text, message_id);
   };
 
   private ensureReply(isId = false) {

package/bot/filters.ts

@@ -11,7 +11,7 @@ export default class Filters {
 
   static USERNAME_PATTERN = /@([a-zA-Z0-9_]{3,32})/;
 
-  static findKey(message: any, key: string): any {
+  static findKey(message: Record<string, any>, key: string){
     if (!message || typeof message !== "object") {
       return undefined;
     }
@@ -42,11 +42,11 @@ export default class Filters {
     return undefined;
   }
 
-  static isText(message: Update): boolean {
+  static isText(message: Update<unknown>): boolean {
     return !!Filters.findKey(message, "text");
   }
 
-  static isPersian(message: Update): boolean {
+  static isPersian(message: Update<unknown>): boolean {
     const text = Filters.findKey(message, "text");
     if (!text) return false;
 
@@ -66,115 +66,117 @@ export default class Filters {
     return false;
   }
 
-  static isLocation(message: Update): boolean {
+  static isLocation(message: Update<unknown>): boolean {
     return !!Filters.findKey(message, "location");
   }
 
-  static isTag(message: Update): boolean {
+  static isTag(message: Update<unknown>): boolean {
     const text = Filters.findKey(message, "text");
     return text ? text.includes("#") : false;
   }
 
-  static isSpam(message: Update): boolean {
+  static isSpam(message: Update<unknown>): boolean {
     const text = Filters.findKey(message, "text");
     return text ? text.length > 1000 : false;
   }
 
-  static isSticker(message: Update): boolean {
+  static isSticker(message: Update<unknown>): boolean {
     return !!Filters.findKey(message, "sticker");
   }
 
-  static isLink(message: Update): boolean {
+  static isLink(message: Update<unknown>): boolean {
     const text = Filters.findKey(message, "text");
     return text ? Filters.linkify.test(text) : false;
   }
 
-  static isUsername(message: Update): boolean {
+  static isUsername(message: Update<unknown>): boolean {
     const text = Filters.findKey(message, "text");
     return text ? Filters.USERNAME_PATTERN.test(text) : false;
   }
 
-  static isForward(message: Update): boolean {
+  static isForward(message: Update<unknown>): boolean {
     return !!Filters.findKey(message, "forwarded_from");
   }
 
-  static isReply(message: Update): boolean {
+  static isReply(message: Update<unknown>): boolean {
     return !!Filters.findKey(message, "reply_to_message_id");
   }
 
-  static isContact(message: Update): boolean {
+  static isContact(message: Update<unknown>): boolean {
     return !!Filters.findKey(message, "contact_message");
   }
 
-  static isPoll(message: Update): boolean {
+  static isPoll(message: Update<unknown>): boolean {
     return !!Filters.findKey(message, "poll");
   }
 
-  static isLiveLocation(message: Update): boolean {
+  static isLiveLocation(message: Update<unknown>): boolean {
     return !!Filters.findKey(message, "live_location");
   }
 
-  static isFile(message: Update): boolean {
+  static isFile(message: Update<unknown>): boolean {
     return !!Filters.findKey(message, "file");
   }
 
-  static isMention(message: Update): boolean {
+  static isMention(message: Update<unknown>): boolean {
     return !!Filters.findKey(
       Filters.findKey(message, "meta_data_parts") || {},
       "link",
     );
   }
 
-  static isMarkdown(message: Update): boolean {
+  static isMarkdown(message: Update<unknown>): boolean {
     return !!Filters.findKey(message, "metadata");
   }
 
-  static isDelete(message: Update): boolean {
+  static isDelete(message: Update<unknown>): boolean {
     return !!Filters.findKey(message, "removed_message_id");
   }
 
-  static isPayment(message: Update): boolean {
+  static isPayment(message: Update<unknown>): boolean {
     return !!Filters.findKey(message, "updated_payment");
   }
 
-  static isPrivate(message: Update | Inline): boolean {
+  static isPrivate(message: Update<unknown> | Inline<unknown>): boolean {
     return message.chat_id.startsWith("b0");
   }
 
-  static isGroup(message: Update | Inline): boolean {
+  static isGroup(message: Update<unknown> | Inline<unknown>): boolean {
     return message.chat_id.startsWith("g0");
   }
 
-  static isChannel(message: Update | Inline): boolean {
+  static isChannel(message: Update<unknown> | Inline<unknown>): boolean {
     return message.chat_id.startsWith("c0");
   }
 
-  static isNewMessage(message: Update): boolean {
+  static isNewMessage(message: Update<unknown>): boolean {
     return message.type === "NewMessage";
   }
 
-  static isUpdatedMessage(message: Update): boolean {
+  static isUpdatedMessage(message: Update<unknown>): boolean {
     return message.type === "UpdatedMessage";
   }
 
-  static isRemovedMessage(message: Update): boolean {
+  static isRemovedMessage(message: Update<unknown>): boolean {
     return message.type === "RemovedMessage";
   }
 
-  static isStartedBot(message: Update): boolean {
+  static isStartedBot(message: Update<unknown>): boolean {
     return message.type === "StartedBot";
   }
 
-  static isStoppedBot(message: Update): boolean {
+  static isStoppedBot(message: Update<unknown>): boolean {
     return message.type === "StoppedBot";
   }
 
-  static isUpdatedPayment(message: Update): boolean {
+  static isUpdatedPayment(message: Update<unknown>): boolean {
     return message.type === "UpdatedPayment";
   }
 
-  static kypadID(button_id: string): (message: Update | Inline) => boolean {
-    return (message: Update | Inline) => {
+  static kypadID(
+    button_id: string,
+  ): (message: Update<unknown> | Inline<unknown>) => boolean {
+    return (message: Update<unknown> | Inline<unknown>) => {
       const res = Filters.findKey(message, "button_id");
       return res === button_id;
     };

package/bot/index.ts

@@ -3,8 +3,10 @@ import { AntiSpam } from "./utils";
 import Filters from "./filters";
 import Utils from "../utils/formater";
 import type * as Enums from "./types/enums";
-import { Update, Inline } from "./contexts/index";
+export * as Contexts from "./contexts";
+export * from "../utils";
+
 
 export default Bot;
 export { Bot, Filters, Utils, AntiSpam };
-export type { Enums, Update, Inline };
+export type { Enums };

package/bot/methods/advanced/builder.ts

@@ -5,23 +5,18 @@ async function builder(
   method: string,
   input: object = {},
 ): Promise<any> {
-  if (!this.token) {
-    throw this.logger.error(
-      "[builder] Bot token is not set. Please provide a valid token.",
-      "error",
-    );
-  }
-
   const response: any = await this.network.request(method, input);
+  if (response === false) return { status_message: "NETWORK_ERROR" };
+
+  if (response?.status === "OK") {
+    return { ...response.data, status_message: "OK" };
+  }
 
-  if (response?.status !== "OK") {
-    throw this.logger.error(
-      `[builder] error in request ${method}:\n ${JSON.stringify(response, null, 2)}`,
-      "error",
-    );
+  if (method === "getMe" && response.status === "INVALID_ACCESS") {
+    return { status_message: "INVALID_TOKEN" };
   }
 
-  return response.data;
+  return { status_message: response.status };
 }
 
 export default builder;

package/bot/methods/files/_sendFile.ts

@@ -15,7 +15,7 @@ async function _sendFile(
   disable_notification = false,
   reply_to_message_id?: string,
   chat_keypad_type?: ChatKeypadTypeEnum,
-  auto_delete: number | boolean = false,
+  auto_delete: number | false = false,
 ) {
   const { upload_url } = await this.requestSendFile(type);
   const {
@@ -44,7 +44,10 @@ async function _sendFile(
 
   const res = await this.builder("sendFile", data);
 
-  if (auto_delete !== false) await this.deleteMessage(chat_id, res.message_id);
+  if (auto_delete !== false)
+    setTimeout(async () => {
+      await this.deleteMessage(chat_id, res.message_id);
+    }, auto_delete);
 
   return res;
 }

package/bot/methods/files/uploadFile.ts

@@ -15,7 +15,10 @@ async function uploadFile(
   if (typeof source === "string") {
     if (source.startsWith("http://") || source.startsWith("https://")) {
       // download file
-      console.log(`[ uploadFile ] Downloading from URL: ${source}`);
+      this.logger.error(
+        `[ uploadFile ] Downloading from URL: ${source}`,
+        "warn",
+      );
       const res = await fetch(source);
       if (!res.ok) {
         throw this.logger.error(
@@ -67,7 +70,7 @@ async function uploadFile(
     throw this.logger.error(`HTTP ${res.status}: ${text}`, "warn");
   }
 
-  const response = await res.json();
+  const response: any = await res.json();
 
   if (response.status !== "OK") {
     throw this.logger.error(