rubika 1.2.3 → 1.2.5

package/client/methods/messages/sendVideo.ts

@@ -8,18 +8,19 @@ async function sendVideo(
   reply_to_message_id?: string,
   is_spoil?: boolean,
   thumb?: string | boolean,
-  auto_delete?: number
+  auto_delete?: number,
 ) {
   return await this.sendMessage(
     object_guid,
     caption,
     reply_to_message_id,
     video,
+    undefined,
     "Video",
     is_spoil,
     thumb,
     undefined,
-    auto_delete
+    auto_delete,
   );
 }
 

package/client/methods/messages/sendVideoMessage.ts

@@ -7,18 +7,19 @@ async function sendVideoMessage(
   reply_to_message_id?: string,
   is_spoil?: boolean,
   thumb?: string | boolean,
-  auto_delete?: number
+  auto_delete?: number,
 ) {
   return await this.sendMessage(
     object_guid,
     null,
     reply_to_message_id,
     video,
+    undefined,
     "VideoMessage",
     is_spoil,
     thumb,
     undefined,
-    auto_delete
+    auto_delete,
   );
 }
 

package/client/methods/messages/sendVoice.ts

@@ -6,18 +6,19 @@ async function sendVoice(
   voice: string | Buffer<ArrayBufferLike>,
   caption?: string,
   reply_to_message_id?: string,
-  auto_delete?: number
+  auto_delete?: number,
 ) {
   return await this.sendMessage(
     object_guid,
     caption,
     reply_to_message_id,
     voice,
+    undefined,
     "Voice",
     undefined,
     undefined,
     undefined,
-    auto_delete
+    auto_delete,
   );
 }
 

package/client/methods/settings/updateProfile.ts

@@ -13,7 +13,7 @@ async function updateProfile(
 	last_name: string | null = null,
 	bio: string | null = null,
 ) {
-	let input: InputType = {
+	const input: InputType = {
 		updated_parameters: [],
 	};
 

package/client/methods/utilities/start.ts

@@ -16,14 +16,19 @@ async function start(this: Client): Promise<void> {
   }
 
   try {
-    if (!this.auth) return Error("[start] Error auth is not set");
+    if (!this.auth)
+      throw this.logger.error("[start] Error auth is not set", "error");
     this.key = Buffer.from(Crypto.passphrase(this.auth), "utf8");
     this.decode_auth = Crypto.decode_auth(this.auth);
     const result = await this.getUserInfo();
+    console.log(result);
+    
     this.userGuid = result.user.user_guid;
     this.initialize = true;
-  } catch (error) {
-    let phone_number: string = await prompt("Phone Number: ");
+  } catch {
+    let phone_number: string = await prompt(
+      "Phone Number ex -> (989123456789): ",
+    );
     let is_phone_number_true = true;
 
     while (is_phone_number_true) {
@@ -31,7 +36,7 @@ async function start(this: Client): Promise<void> {
       if (answer.toLowerCase() === "y") {
         is_phone_number_true = false;
       } else {
-        phone_number = await prompt("Phone Number ex -> (09123456789) : ");
+        phone_number = await prompt("Phone Number ex -> (989123456789): ");
       }
     }
 
@@ -54,7 +59,7 @@ async function start(this: Client): Promise<void> {
     this.privateKey = privateKey;
 
     while (true) {
-      let phone_code = await prompt("Code: ");
+      let phone_code = await prompt(`Code [ ${result.send_type} ]: `);
 
       let response = await this.signIn(
         phone_code,
@@ -77,7 +82,10 @@ async function start(this: Client): Promise<void> {
           private_key: this.privateKey,
         });
 
-        await this.registerDevice();
+        const res = await this.registerDevice();
+
+        console.log(res);
+
         break;
       }
     }

package/client/methods/utilities/thumbnail.ts

@@ -8,7 +8,7 @@ const ffmpeg = optionalImport<typeof import("fluent-ffmpeg")>("fluent-ffmpeg");
 class ThumbnailGenerator {
   static async getTime(videoPath: string): Promise<number> {
     if (!ffmpeg) {
-      return new Error(
+      throw new Error(
         "fluent-ffmpeg module is not installed. Some features may be disabled.",
       );
     }
@@ -28,7 +28,7 @@ class ThumbnailGenerator {
 
   static async fromVideo(videoPath: string): Promise<string> {
     if (!ffmpeg) {
-      return new Error(
+      throw new Error(
         "fluent-ffmpeg module is not installed. Some features may be disabled.",
       );
     }
@@ -57,7 +57,7 @@ class ThumbnailGenerator {
       return base64Thumbnail;
     } catch (error) {
       console.error("Error generating video thumbnail:", error);
-      return error;
+      throw error;
     }
   }
 
@@ -66,7 +66,7 @@ class ThumbnailGenerator {
     width: number = 320,
   ): Promise<string> {
     if (!sharp) {
-      return new Error(
+      throw new Error(
         "sharp module is not installed. Some features may be disabled.",
       );
     }
@@ -76,7 +76,7 @@ class ThumbnailGenerator {
       return buffer.toString("base64");
     } catch (error) {
       console.error("Error generating image thumbnail:", error);
-      return error;
+      throw error;
     }
   }
 }

package/client/network/file.ts

@@ -8,7 +8,10 @@ export async function uploadFile(
   chunkSize: number = 1048576,
 ): Promise<any> {
   if (!fs.existsSync(filePath))
-    return new Error("File not found in the given path");
+    throw network.client.logger.error(
+      "File not found in the given path",
+      "error",
+    );
 
   const stat = await fs.promises.stat(filePath);
   const fileSize = stat.size;
@@ -21,7 +24,7 @@ export async function uploadFile(
   let dc_id: string = result.dc_id;
   let upload_url: string = result.upload_url;
   let access_hash_send: string = result.access_hash_send;
-  let totalParts: number = Math.ceil(fileSize / chunkSize);
+  const totalParts: number = Math.ceil(fileSize / chunkSize);
 
   const stream = fs.createReadStream(filePath, { highWaterMark: chunkSize });
 
@@ -76,12 +79,12 @@ export async function uploadFile(
         };
       }
     } catch (error) {
-      console.error("Upload error:", error);
+      network.client.logger.error("Upload error:" + error, "error");
       await new Promise((resolve) => setTimeout(resolve, 5000));
     }
   }
 
-  return new Error("Upload failed completely.");
+  throw network.client.logger.error("Upload failed completely.", "error");
 }
 
 export async function download(
@@ -99,7 +102,7 @@ export async function download(
     "user-agent": network.userAgent,
   };
 
-  const base_url = `https://messenger${dc_id}.iranlms.ir`;
+  const base_url = `https://${network.client.application === "Rubika" ? "messenger" : "shstorage" + dc_id}.iranlms.ir`;
 
   const fetchChunk = async (
     start_index: number,
@@ -117,12 +120,15 @@ export async function download(
         headers,
       });
 
-      if (res.status !== 200) return Buffer.alloc(0);
+      if (res.status !== 200) return await fetchChunk(start_index, last_index);
 
       const arrayBuffer = await res.arrayBuffer();
       return Buffer.from(arrayBuffer);
     } catch (err) {
-      console.error(`[fetchChunk] Failed at ${start_index}-${last_index}`, err);
+      network.client.logger.error(
+        `[fetchChunk] Failed at ${start_index}-${last_index}` + err,
+        "error",
+      );
       return Buffer.alloc(0);
     }
   };

package/client/network/websocket.ts

@@ -27,7 +27,7 @@ export async function setupWebSocket(network: Network) {
 
   network.ws.addEventListener("error", async () => {
     if (!network.reconnecting) {
-      console.error("WebSocket error, reconnecting...");
+      network.client.logger.error("WebSocket error, reconnecting...", "error");
       network.reconnecting = true;
       await resetConnection(network);
     }
@@ -35,7 +35,7 @@ export async function setupWebSocket(network: Network) {
 
   network.ws.addEventListener("close", async () => {
     if (!network.reconnecting) {
-      console.warn("WebSocket closed, reconnecting...");
+      network.client.logger.error("WebSocket closed, reconnecting...", "warn");
       network.reconnecting = true;
       await resetConnection(network);
     }
@@ -64,14 +64,20 @@ export async function openSocket(network: Network) {
             network.ws.send(JSON.stringify({}));
           }
         } catch (err) {
-          console.error("Error sending heartbeat", err);
+          network.client.logger.error("Error sending heartbeat" + err, "error");
         }
       }, 30000);
     } else {
-      console.warn("WebSocket is not open; cannot send handshake");
+      network.client.logger.error(
+        "WebSocket is not open; cannot send handshake",
+        "warn",
+      );
     }
   } catch (err) {
-    console.error("Error during openSocket execution", err);
+    network.client.logger.error(
+      "Error during openSocket execution" + err,
+      "error",
+    );
   }
 }
 
@@ -83,7 +89,7 @@ async function resetConnection(network: Network) {
     try {
       await network.getUpdates();
     } catch (e) {
-      console.error("Failed to reconnect:", e);
+      network.client.logger.error("Failed to reconnect:" + e, "error");
     } finally {
       network.reconnecting = false;
     }
@@ -95,11 +101,15 @@ function resetInactivityTimer(network: Network) {
 
   network.inactivityTimeout = setTimeout(
     () => {
-      console.warn(
+      network.client.logger.error(
         "No updates received for 10 minutes. Reconnecting WebSocket...",
+        "warn",
       );
       void resetConnection(network).catch((err) => {
-        console.error("Error during inactivity reset:", err);
+        network.client.logger.error(
+          "Error during inactivity reset:" + err,
+          "error",
+        );
       });
     },
     10 * 60 * 1000,
@@ -139,20 +149,27 @@ async function getMessage(message: string, network: Network) {
       await Promise.all(tasks);
     }
   } catch (err) {
-    console.error("[getMessage] Failed to decrypt or process message:", err);
+    network.client.logger.error(
+      "[getMessage] Failed to decrypt or process message:" + err,
+      "error",
+    );
   }
 }
 
-async function handleCategory<T extends keyof ContextMapCon>(
+async function handleCategory<T, K extends keyof ContextMapCon<T>>(
   type: T,
-  handlers: Handler<ContextMapCon[T]>[],
+  handlers: Handler<ContextMapCon<T>[K]>[],
   updates: any[],
   network: Network,
   author_title: string,
 ) {
-  const CtxClass = ContextConstructors[type];
+  // @ts-ignore
+  const CtxClass = ContextConstructors[type]<T>;
   if (!CtxClass) {
-    console.warn(`[handleCategory] No constructor found for type: ${type}`);
+    network.client.logger.error(
+      `[handleCategory] No constructor found for type: ${type}`,
+      "warn",
+    );
     return;
   }
 
@@ -161,14 +178,14 @@ async function handleCategory<T extends keyof ContextMapCon>(
     update.client_guid = network.client.userGuid;
     update.message.author_title = author_title;
 
-    const ctx = new CtxClass(network.client, update) as ContextMapCon[T];
+    const ctx = new CtxClass(network.client, update) as ContextMapCon<T>[K];
 
     for (const { filters, handler, prefix } of handlers) {
       const passed = await checkFilters(ctx, filters);
 
       if (passed) {
         if (type === "message" && prefix) {
-          const text = (ctx as Message).message.text;
+          const text = (ctx as Message<T>).message.text;
           if (!text) continue;
 
           if (typeof prefix === "string" && text !== prefix) continue;

package/client/types/client.type.ts

@@ -26,22 +26,22 @@ export interface RubPlugin {
   run: PluginFunction;
 }
 
-export interface ContextMap {
-  chat: Chat;
-  message: Message;
-  activities: Activities;
-  notifications: Notifications;
+export interface ContextMap<T> {
+  chat: Chat<T>;
+  message: Message<T>;
+  activities: Activities<T>;
+  notifications: Notifications<T>;
   error: {
     message: string;
     client: Client;
   };
 }
 
-export interface ContextMapCon {
-  chat: Chat;
-  message: Message;
-  activities: Activities;
-  notifications: Notifications;
+export interface ContextMapCon<T> {
+  chat: Chat<T>;
+  message: Message<T>;
+  activities: Activities<T>;
+  notifications: Notifications<T>;
 }
 
 export type Handler<T> = {

package/client/utils/session.ts

@@ -10,7 +10,7 @@ class SessionManager {
 
     this.filename = isStringInput
       ? `${input}.json`
-      : `${Date.now()}.rubjs.json`;
+      : `${Date.now()}.rubika.json`;
 
     if (!isStringInput) {
       this.sessionData = input;

package/index.ts

@@ -1,5 +1,6 @@
 import Bot from "./bot";
 import Client from "./client";
 import { Utils, prompt } from "./utils";
+export * from "./utils";
 
 export { Bot, Client, Utils, prompt };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubika",
-  "version": "1.2.3",
+  "version": "1.2.5",
   "author": "Hadi Rostami",
   "main": "index.ts",
   "description": "A modern library for Rubika built with Bun.",
@@ -12,12 +12,6 @@
   ],
   "license": "MIT",
   "type": "module",
-  "devDependencies": {
-    "@types/bun": "^1.3.9",
-    "@types/linkify-it": "^5.0.0",
-    "@types/node-rsa": "^1.1.4",
-    "@types/user-agents": "^1.0.4"
-  },
   "dependencies": {
     "linkify-it": "^5.0.0",
     "node-rsa": "^1.1.1",

package/utils/formater.ts

@@ -6,7 +6,7 @@ class Utils {
   static Spoiler = (text: string): string => `||${text.trim()}||`;
   static Strike = (text: string): string => `~~${text.trim()}~~`;
   static Underline = (text: string): string => `--${text.trim()}--`;
-  static Quote = (text: string): string => `>${text.trim()}>`;
+  static Quote = (text: string): string => `^^${text.trim()}^^`;
   static HyperLink = (text: string, link: string): string =>
     `[${text.trim()}](${link.trim()})`;
 }

package/utils/index.ts

@@ -1,7 +1,7 @@
 import checkFilters from "./checkFilter";
 import Markdown from "./parser";
 import Utils from "./formater";
-import Logger from "./errors";
+import Logger from "./logger";
 import prompt from "./prompt";
 
 export { checkFilters, Logger, Utils, Markdown, prompt };

package/utils/logger.ts

@@ -0,0 +1,26 @@
+import { ContextMap, Handler } from "../client/types/client.type";
+import checkFilters from "./checkFilter";
+
+class Logger<T> {
+  constructor(
+    private errors: Handler<ContextMap<unknown>["error"]>[],
+    private bot: T,
+  ) {}
+
+  async error(text: string, type: "error" | "warn") {
+    const error = {
+      message: `⟮ ${type} ⟯ ----> ${text}`,
+      bot: this.bot,
+    };
+
+    for (const { filters, handler } of this.errors) {
+      const passed = await checkFilters(text, filters);
+
+      if (passed) {
+        await handler(error as any);
+      }
+    }
+  }
+}
+
+export default Logger;