@prototypevip/baileys 0.0.3 → 0.0.5

package/lib/Socket/chats.js

@@ -199,6 +199,15 @@ export const makeChatsSocket = (config) => {
     }
   };
 
+  const getUsername = async (jid) => {
+    const usyncQuery = new USyncQuery()
+      .withUsernameProtocol()
+      .withContext("background");
+    usyncQuery.withUser(new USyncUser().withId(jid));
+    const result = await sock.executeUSyncQuery(usyncQuery);
+    return result?.list?.[0]?.username || null;
+  };
+
   const findUserId = async (pnLid) => {
     const cachedId = USER_ID_CACHE.get(pnLid);
     if (cachedId) {
@@ -212,6 +221,7 @@ export const makeChatsSocket = (config) => {
       )?.[0]?.lid;
       if (!userId.lid) {
         userId.lid = "id-not-found";
+        USER_ID_CACHE.set(pnLid, userId);
         return userId;
       }
     } else if (isLidUser(pnLid)) {
@@ -220,7 +230,18 @@ export const makeChatsSocket = (config) => {
         await signalRepository.lidMapping.getPNsForLIDs([pnLid])
       )?.[0]?.pn;
       if (!userId.phoneNumber) {
+        // ملحوظه: ده بيحصل عادي دلوقتي مع أي حساب حاطط "username" جديد بتاع
+        // واتساب، لأن رقمه بيبقى مش قابل للاكتشاف. من غير الكاش ده، كل رساله
+        // جايه من الحساب ده كانت بتعمل استعلام شبكه كامل تاني من الأول، وده
+        // اللي كان بيسبب التأخير/التعليق الملحوظ مع أي حد شايل يوزرنيم.
+        // كمان بنحاول نجيب اليوزرنيم نفسه عشان يتعرض بدل الرقم/الليد الخام.
         userId.phoneNumber = "id-not-found";
+        try {
+          userId.username = await getUsername(pnLid);
+        } catch {
+          userId.username = null;
+        }
+        USER_ID_CACHE.set(pnLid, userId);
         return userId;
       }
     } else {
@@ -1091,6 +1112,7 @@ export const makeChatsSocket = (config) => {
     fetchStatus: fetchStatus,
     fetchDisappearingDuration: fetchDisappearingDuration,
     findUserId: findUserId,
+    getUsername: getUsername,
     updateProfilePicture: updateProfilePicture,
     removeProfilePicture: removeProfilePicture,
     updateProfileStatus: updateProfileStatus,

package/lib/Store/prototype-store.js

@@ -285,7 +285,12 @@ export const makePrototypeStore = (config = {}) => {
               }
             }
           } catch (err) {
-            console.error("PrototypeStore Transaction Step Error:", err);
+            const code = err?.code || err?.message || "";
+            if (String(code).includes("READONLY") || String(code).includes("SQLITE_READONLY")) {
+              console.error("PrototypeStore Transaction Step Error (readonly DB - check file path/permissions/volume):", err.message || err);
+            } else {
+              console.error("PrototypeStore Transaction Step Error:", err);
+            }
           }
         }
       })();
@@ -380,6 +385,22 @@ export const makePrototypeStore = (config = {}) => {
 
   const presencesCache = {};
 
+
+  const safeAssignChat = (existing, incoming) => {
+    if (!existing || !incoming) return existing;
+    const savedMessages = existing.messages;
+    Object.assign(existing, incoming, { isChats: true });
+    // Never let chat events wipe the ordered messages store
+    if (
+      !existing.messages ||
+      typeof existing.messages.upsert !== "function"
+    ) {
+      existing.messages = savedMessages || makeMessagesStore();
+    }
+    if (!existing.id) existing.id = incoming.id || existing.id;
+    return existing;
+  };
+
   const makeMessagesStore = () =>
     new Proxy(
       makeOrderedDictionary((m) => {
@@ -421,6 +442,12 @@ export const makePrototypeStore = (config = {}) => {
               return jid.endsWith("@g.us");
             },
           };
+        } else if (
+          !target[jid].messages ||
+          typeof target[jid].messages.upsert !== "function"
+        ) {
+          // Recover if messages was overwritten by Object.assign / chat updates
+          target[jid].messages = makeMessagesStore();
         }
         return target[jid];
       },
@@ -606,7 +633,7 @@ export const makePrototypeStore = (config = {}) => {
           if (!id || id === "status@broadcast") continue;
 
           const existingChat = store.chats[id];
-          Object.assign(existingChat, chat, { isChats: true });
+          safeAssignChat(existingChat, chat);
 
           if (id.endsWith("@g.us")) {
             const current = groupsCache[id] || {};
@@ -731,16 +758,26 @@ export const makePrototypeStore = (config = {}) => {
               store.signalRepository?.lidMapping,
             );
             const existingChat = store.chats[id];
-            Object.assign(existingChat, chat, { isChats: true });
+            safeAssignChat(existingChat, chat);
           }
         },
       );
 
       listen("messages.upsert", async ({ messages }) => {
         for (let msg of messages) {
-          const chatId = msg.key.remoteJid;
+          const rawChatId = msg?.key?.remoteJid;
+          if (!rawChatId) continue;
+          const chatId = await resolveJIDAsync(
+            rawChatId,
+            store.signalRepository?.lidMapping,
+          );
           if (!chatId) continue;
-          store.chats[chatId].messages.upsert(cloneM(msg));
+          const chat = store.chats[chatId];
+          if (!chat) continue;
+          if (!chat.messages || typeof chat.messages.upsert !== "function") {
+            chat.messages = makeMessagesStore();
+          }
+          chat.messages.upsert(cloneM(msg));
 
           if (db) {
             const msgKey = getMessageKey(

package/lib/Utils/message-builder.js

@@ -29,11 +29,28 @@
  */
 
 import crypto from 'crypto';
-import sharp from 'sharp';
 import ffmpeg from 'fluent-ffmpeg';
 import { PassThrough, Readable } from 'stream';
 import { generateWAMessageFromContent, prepareWAMessageMedia } from './messages.js';
 
+// sharp اختيارية (peerDependency) — نحمّلها ديناميكيًا وقت الاستخدام فعليًا
+// بدل static import، عشان لو حد ركّب المكتبة من غير ما يثبتها، المكتبة كلها
+// (makeWASocket وكل حاجة تانية) متتأثرش، وميزة الـ builder بس اللي هترمي
+// error واضح لو حد استخدمها فعلاً من غير sharp.
+let _sharpPromise;
+async function loadSharp() {
+	if (!_sharpPromise) {
+		_sharpPromise = import('sharp')
+			.then((mod) => mod.default || mod)
+			.catch(() => {
+				throw new Error(
+					"Toolkit.resize يحتاج مكتبة 'sharp' وهي مش متثبتة. ثبّتها بـ: npm install sharp"
+				);
+			});
+	}
+	return _sharpPromise;
+}
+
 const VERSION = '4.6';
 
 function extractIE(text, { extract = true, hyperlink = true, citation = true, latex = true } = {}) {
@@ -235,6 +252,7 @@ export class Toolkit {
 	}
 
 	static async resize(buffer, x, y, fit = 'cover') {
+		const sharp = await loadSharp();
 		return await sharp(buffer)
 			.resize(x, y, {
 				fit,

package/lib/Utils/messages.js

@@ -938,6 +938,51 @@ export const generateWAMessageContent = async (message, options) => {
       options,
     );
     m.stickerPackMessage = stickerPackMessage;
+  } else if (
+    hasNonNullishProperty(message, "buttons") &&
+    Array.isArray(message.buttons) &&
+    message.buttons.length > 0
+  ) {
+    // === دعم الصيغة القديمة للأزرار (buttonId/buttonText/type + headerType) ===
+    // واتساب وقف عرض buttonsMessage/templateMessage القديمة، فبنحوّلها هنا
+    // تلقائيًا لنفس آلية nativeFlow الحديثة (المُثبتة إنها بترسم فعليًا)
+    // عشان أي بلجن قديم يفضل شغال من غير ما يتعدل.
+    const legacyNativeFlow = message.buttons.map((b) => ({
+      id: b.buttonId,
+      text:
+        (typeof b.buttonText === "string"
+          ? b.buttonText
+          : b.buttonText?.displayText) || "👉🏻 اضغط",
+    }));
+    const interactiveMessage = {
+      nativeFlowMessage: prepareNativeFlowButtons({
+        nativeFlow: legacyNativeFlow,
+      }),
+    };
+    if (hasOptionalProperty(message, "caption")) {
+      let mediaHeader = {};
+      if (
+        hasOptionalProperty(message, "image") ||
+        hasOptionalProperty(message, "video") ||
+        hasOptionalProperty(message, "document")
+      ) {
+        mediaHeader = await prepareWAMessageMedia(message, options);
+      }
+      const isValidHeader = hasValidInteractiveHeader(mediaHeader);
+      interactiveMessage.header = {
+        title: message.title || "",
+        subtitle: message.subtitle || "",
+        hasMediaAttachment: !!isValidHeader,
+        ...mediaHeader,
+      };
+      interactiveMessage.body = { text: message.caption };
+    } else if (hasOptionalProperty(message, "text")) {
+      interactiveMessage.body = { text: message.text };
+    }
+    if (hasOptionalProperty(message, "footer")) {
+      interactiveMessage.footer = { text: message.footer };
+    }
+    m = { interactiveMessage };
   } else if (hasNonNullishProperty(message, "nativeFlow")) {
     const interactiveMessage = {
       nativeFlowMessage: prepareNativeFlowButtons(message),

package/lib/WAUSync/Protocols/index.js

@@ -2,3 +2,4 @@ export * from "./USyncDeviceProtocol.js";
 export * from "./USyncContactProtocol.js";
 export * from "./USyncStatusProtocol.js";
 export * from "./USyncDisappearingModeProtocol.js";
+export * from "./USyncUsernameProtocol.js";

package/lib/WAUSync/USyncQuery.js

@@ -6,6 +6,7 @@ import {
   USyncDeviceProtocol,
   USyncDisappearingModeProtocol,
   USyncStatusProtocol,
+  USyncUsernameProtocol,
 } from "./Protocols/index.js";
 import { USyncUser } from "./USyncUser.js";
 export class USyncQuery {
@@ -130,4 +131,8 @@ export class USyncQuery {
     this.protocols.push(new USyncLIDProtocol());
     return this;
   }
+  withUsernameProtocol() {
+    this.protocols.push(new USyncUsernameProtocol());
+    return this;
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prototypevip/baileys",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "A simple fork of Baileys for WhatsApp automation",
   "main": "lib/index.js",
   "type": "module",
@@ -74,6 +74,9 @@
     },
     "link-preview-js": {
       "optional": true
+    },
+    "sharp": {
+      "optional": true
     }
   }
 }