rubika 1.2.0 → 1.2.3

package/client/methods/messages/sendMessage.ts

@@ -48,7 +48,7 @@ async function sendMessage(
       }
       file_inline = await fs.promises.readFile(fileName);
     } else if (!Buffer.isBuffer(file_inline)) {
-      throw this.logger.error(
+      return this.logger.error(
         "File argument must be a file path or bytes",
         "warn",
       );
@@ -70,7 +70,7 @@ async function sendMessage(
       thumb = false;
       if (audio_info) {
         if (!optionalMusicMetadata) {
-          throw new Error(
+          return new Error(
             "music-metadata module is not installed. Some features may be disabled.",
           );
         }

package/client/methods/utilities/start.ts

@@ -16,7 +16,7 @@ async function start(this: Client): Promise<void> {
   }
 
   try {
-    if (!this.auth) throw Error("[start] Error auth is not set");
+    if (!this.auth) return Error("[start] Error auth is not set");
     this.key = Buffer.from(Crypto.passphrase(this.auth), "utf8");
     this.decode_auth = Crypto.decode_auth(this.auth);
     const result = await this.getUserInfo();

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) {
-      throw new Error(
+      return 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) {
-      throw new Error(
+      return 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);
-      throw error;
+      return error;
     }
   }
 
@@ -66,7 +66,7 @@ class ThumbnailGenerator {
     width: number = 320,
   ): Promise<string> {
     if (!sharp) {
-      throw new Error(
+      return 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);
-      throw error;
+      return error;
     }
   }
 }

package/client/network/api.ts

@@ -20,7 +20,7 @@ interface SendPayloadInputs {
  * Retrieves API and WSS server URLs
  */
 export async function getDcs(network: Network): Promise<boolean> {
-  const url = "https://getdcmess.iranlms.ir/";
+  const url = `https://${network.client.application === "Shad" ? "sh" : ""}getdcmess.iranlms.ir/`;
   const RETRY_DELAY = 3000;
 
   while (true) {
@@ -86,7 +86,7 @@ export async function sendRequest(network: Network, url: string, data: any) {
 
     await network.delay(1000);
   }
-  throw network.client.logger.error(
+  return network.client.logger.error(
     `[request] Failed after ${MAX_ATTEMPTS} attempts: ${url}`,
     "warn",
   );

package/client/network/file.ts

@@ -8,7 +8,7 @@ export async function uploadFile(
   chunkSize: number = 1048576,
 ): Promise<any> {
   if (!fs.existsSync(filePath))
-    throw new Error("File not found in the given path");
+    return new Error("File not found in the given path");
 
   const stat = await fs.promises.stat(filePath);
   const fileSize = stat.size;
@@ -81,7 +81,7 @@ export async function uploadFile(
     }
   }
 
-  throw new Error("Upload failed completely.");
+  return new Error("Upload failed completely.");
 }
 
 export async function download(

package/client/network/index.ts

@@ -20,8 +20,9 @@ export default class Network {
 	public reconnecting: boolean = false;
 
 	constructor(public client: Client) {
-		this.defaultPlatform = resolvePlatform(client.platform);
-		this.headers = buildHeaders(client.platform);
+		const isShad = client.application === "Shad";
+		this.defaultPlatform = resolvePlatform(client.platform , isShad);
+		this.headers = buildHeaders(client.platform , isShad);
 	}
 
 	getDcs = () => getDcs(this);

package/client/network/utils.ts

@@ -1,30 +1,32 @@
-import UserAgent from 'user-agents';
+import UserAgent from "user-agents";
 
 export function delay(ms: number) {
-	return new Promise((resolve) => setTimeout(resolve, ms));
+  return new Promise((resolve) => setTimeout(resolve, ms));
 }
 
-export function resolvePlatform(platform: string) {
-	const isAndroid = platform?.toLowerCase() === 'android';
-	return {
-		app_name: 'Main',
-		app_version: isAndroid ? '3.6.4' : '4.4.9',
-		platform: isAndroid ? 'Android' : 'Web',
-		package: isAndroid ? 'app.rbmain.a' : 'web.rubika.ir',
-		lang_code: 'fa',
-	};
+export function resolvePlatform(platform: string, isShad: boolean) {
+  const isAndroid = platform?.toLowerCase() === "android";
+  return {
+    app_name: "Main",
+    app_version: isAndroid ? "3.6.4" : "4.4.9",
+    platform: isAndroid ? "Android" : "Web",
+    package: isAndroid
+      ? `app.${isShad ? "sh" : "rb"}main.a`
+      : `web.${isShad ? "shad" : "rubika"}.ir`,
+    lang_code: "fa",
+  };
 }
 
-export function buildHeaders(platform: string) {
-	const headers: Record<string, string> = {
-		'content-type': 'application/json',
-		connection: 'keep-alive',
-		'user-agent': new UserAgent().toString(),
-	};
-	if (platform.toLowerCase() !== 'android') {
-		headers.origin = 'https://web.rubika.ir';
-		headers.referer = 'https://web.rubika.ir/';
-	}
+export function buildHeaders(platform: string, isShad: boolean) {
+  const headers: Record<string, string> = {
+    "content-type": "application/json",
+    connection: "keep-alive",
+    "user-agent": new UserAgent().toString(),
+  };
+  if (platform.toLowerCase() !== "android") {
+    headers.origin = `https://web.${isShad ? "shad" : "rubika"}.ir`;
+    headers.referer = `https://web.${isShad ? "shad" : "rubika"}.ir/`;
+  }
 
-	return headers;
+  return headers;
 }

package/client/network/websocket.ts

@@ -1,6 +1,6 @@
 import Network from ".";
 import Crypto from "../crypto";
-import { ContextMap, Handler } from "../types/client.type";
+import { ContextMapCon, Handler } from "../types/client.type";
 import { ContextConstructors } from "../contexts/contextConstructors";
 import Message from "../contexts/message.type";
 import { checkFilters } from "../../utils";
@@ -143,9 +143,9 @@ async function getMessage(message: string, network: Network) {
   }
 }
 
-async function handleCategory<T extends keyof ContextMap>(
+async function handleCategory<T extends keyof ContextMapCon>(
   type: T,
-  handlers: Handler<ContextMap[T]>[],
+  handlers: Handler<ContextMapCon[T]>[],
   updates: any[],
   network: Network,
   author_title: string,
@@ -161,7 +161,7 @@ async function handleCategory<T extends keyof ContextMap>(
     update.client_guid = network.client.userGuid;
     update.message.author_title = author_title;
 
-    const ctx = new CtxClass(network.client, update) as ContextMap[T];
+    const ctx = new CtxClass(network.client, update) as ContextMapCon[T];
 
     for (const { filters, handler, prefix } of handlers) {
       const passed = await checkFilters(ctx, filters);

package/client/types/client.type.ts

@@ -17,12 +17,6 @@ export type TypeUpdate = "activities" | "chat" | "message" | "notifications";
 export type SessionType = string | Session;
 export type PlatformType = "Android" | "Web";
 
-export type ErrorMiddleware = (
-  error: any,
-  ctx: Message,
-  next: () => Promise<void>,
-) => Promise<void>;
-
 // پلاگین
 type PluginFunction = (client: Client) => Promise<void>;
 
@@ -43,6 +37,13 @@ export interface ContextMap {
   };
 }
 
+export interface ContextMapCon {
+  chat: Chat;
+  message: Message;
+  activities: Activities;
+  notifications: Notifications;
+}
+
 export type Handler<T> = {
   filters: Array<(ctx: T) => boolean | Promise<boolean>>;
   handler: (ctx: T) => Promise<void>;

package/client/types/methods.ts

@@ -0,0 +1,224 @@
+import { Message } from "./decorators.type";
+
+type OnlineTimeType =
+  | "Exact"
+  | "Recently"
+  | "LastWeek"
+  | "LastMonth"
+  | "Offline";
+type FileId = string | number;
+
+interface AvatarThumbnail {
+  file_id: FileId;
+  mime: string;
+  dc_id: string;
+  access_hash_rec: string;
+}
+
+interface MusicTrack {
+  file_id: FileId;
+  mime: string;
+  dc_id: string;
+  access_hash_rec: string;
+  file_name: string;
+  width: number;
+  height: number;
+  time: number;
+  size: number;
+  type: string;
+  music_performer: string;
+}
+
+interface BaseUser {
+  user_guid: string;
+  first_name: string;
+  last_name: string;
+  phone: string;
+  username?: string;
+  avatar_thumbnail?: AvatarThumbnail;
+  last_online: number;
+  bio: string;
+  is_deleted: boolean;
+  is_verified: boolean;
+  online_time: { type: OnlineTimeType | string; exact_time?: number };
+  birth_date?: string;
+  saved_music_last_track?: MusicTrack;
+}
+
+export interface GetUserInfoResponse {
+  user: BaseUser;
+  chat: {
+    object_guid: string;
+    access: string[];
+    count_unseen: number;
+    is_mute: boolean;
+    is_pinned: boolean;
+    time_string: string;
+    last_message?: {
+      message_id: string;
+      type: string;
+      text?: string;
+      author_object_guid: string;
+      is_mine: boolean;
+      author_title: string;
+      author_type: string;
+    };
+    last_seen_my_mid: string;
+    last_seen_peer_mid: string;
+    status: string;
+    time: number;
+    abs_object: {
+      object_guid: string;
+      type: string;
+      first_name?: string;
+      last_name?: string;
+      avatar_thumbnail?: AvatarThumbnail;
+      is_verified: boolean;
+      is_deleted: boolean;
+    };
+    is_blocked: boolean;
+    last_message_id: string;
+    last_deleted_mid?: string;
+    has_schedule: boolean;
+    auto_delete: string;
+  };
+  timestamp: string;
+  can_receive_call: boolean;
+  can_video_call: boolean;
+  user_additional_info: {
+    is_in_contact: boolean;
+    can_receive_call: boolean;
+    can_video_call: boolean;
+    photo_changed_time?: number;
+  };
+}
+
+export interface SendCodeResponse {
+  phone_code_hash: string;
+  status: "OK" | string;
+  code_digits_count: number;
+  has_confirmed_recovery_email: boolean;
+  no_recovery_alert?: string;
+  send_type: "SMS" | string;
+  hint_pass_key: string
+}
+
+export interface SignInResponse {
+  status: "OK" | string;
+  auth: string;
+  user: BaseUser;
+  timestamp: string;
+  two_step_enabled?: boolean;
+}
+
+export interface AddChannelResponse {
+  channel: {
+    channel_guid: string;
+    channel_title: string;
+    count_members: number;
+    description: string;
+    is_deleted: boolean;
+    is_verified: boolean;
+    channel_type: string;
+    sign_messages: boolean;
+    chat_reaction_setting: {
+      reaction_type: string;
+    };
+    is_restricted_content: boolean;
+  };
+  chat_update: {
+    object_guid: string;
+    action: string;
+    chat: {
+      object_guid: string;
+      access: string[];
+      count_unseen: number;
+      is_mute: boolean;
+      is_pinned: boolean;
+      time_string: string;
+      last_message?: {
+        message_id: string;
+        type: string;
+        text: string;
+        is_mine: boolean;
+      };
+      last_seen_my_mid: string;
+      last_seen_peer_mid: string;
+      status: string;
+      time: number;
+      abs_object: {
+        object_guid: string;
+        type: string;
+        title: string;
+        is_verified: boolean;
+        is_deleted: boolean;
+      };
+      is_blocked: boolean;
+      last_message_id: string;
+      last_deleted_mid?: string;
+      show_ask_spam?: boolean;
+      auto_delete: string;
+    };
+    updated_parameters: any[];
+    timestamp: string;
+    type: string;
+  };
+  message_update?: Message;
+  timestamp: string;
+}
+
+export interface GetChannelInfoResponse {
+  channel: {
+    channel_guid: string;
+    channel_title: string;
+    avatar_thumbnail?: AvatarThumbnail;
+    count_members: number;
+    description: string;
+    username?: string;
+    is_deleted: boolean;
+    is_verified: boolean;
+    share_url?: string;
+    channel_type: string;
+    sign_messages: boolean;
+    chat_reaction_setting: {
+      reaction_type: string;
+      selected_reactions: string[];
+    };
+    is_restricted_content: boolean;
+  };
+  chat: {
+    object_guid: string;
+    access: string[];
+    count_unseen: number;
+    is_mute: boolean;
+    is_pinned: boolean;
+    time_string: string;
+    last_message?: {
+      message_id: string;
+      type: string;
+      text: string;
+      is_mine: boolean;
+    };
+    last_seen_my_mid: string;
+    last_seen_peer_mid: string;
+    status: string;
+    time: number;
+    abs_object: {
+      object_guid: string;
+      type: string;
+      title?: string;
+      avatar_thumbnail?: AvatarThumbnail;
+      is_verified: boolean;
+      is_deleted: boolean;
+    };
+    is_blocked: boolean;
+    last_message_id: string;
+    last_deleted_mid?: string;
+    show_ask_spam?: boolean;
+    is_archived?: boolean;
+    auto_delete: string;
+  };
+  timestamp: string;
+}
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rubika",
-  "version": "1.2.0",
+  "version": "1.2.3",
   "author": "Hadi Rostami",
   "main": "index.ts",
   "description": "A modern library for Rubika built with Bun.",