@prototypevip/baileys 0.0.1 → 0.0.3

package/lib/Socket/chats.js

@@ -1112,6 +1112,7 @@ export const makeChatsSocket = (config) => {
     cleanDirtyBits: cleanDirtyBits,
     addOrEditContact: addOrEditContact,
     removeContact: removeContact,
+    placeholderResendCache: placeholderResendCache,
     addLabel: addLabel,
     addChatLabel: addChatLabel,
     removeChatLabel: removeChatLabel,

package/lib/Socket/messages-send.js

@@ -39,10 +39,11 @@ import {
   buildMergedTcTokenIndexWrite,
   generateCsToken,
   unixTimestampSeconds,
+  DEF_MEDIA_HOST,
 } from "../Utils/index.js";
 import { AssociationType } from "../Types/index.js";
 import { getUrlInfo } from "../Utils/link-preview.js";
-import { makeKeyedMutex } from "../Utils/make-mutex.js";
+import { makeKeyedMutex, makeMutex } from "../Utils/make-mutex.js";
 import {
   getMessageReportingToken,
   shouldIncludeReportingToken,
@@ -105,8 +106,12 @@ export const makeMessagesSocket = (config) => {
     ? new MessageRetryManager(logger, maxMsgRetryCount)
     : null;
   const encryptionMutex = makeKeyedMutex();
+  /** Serializes writes to userDevicesCache across USync refresh and device-notification handling. */
+  const devicesMutex = makeMutex();
   const inFlightTcTokenIssuance = new Set();
   let mediaConn;
+  /** Per-socket media host; updated whenever media_conn is fetched. Defaults to the public WhatsApp host. */
+  let mediaHost = DEF_MEDIA_HOST;
   const issuePrivacyTokens = async (jids, timestamp) => {
     const t = (timestamp ?? unixTimestampSeconds()).toString();
     const result = await query({
@@ -161,6 +166,9 @@ export const makeMessagesSocket = (config) => {
           fetchDate: new Date(),
         };
         logger.debug("fetched media conn");
+        if (node.hosts[0]) {
+          mediaHost = node.hosts[0].hostname;
+        }
         return node;
       })();
     }
@@ -363,18 +371,21 @@ export const makeMessagesSocket = (config) => {
             );
           }
         }
-        if (userDevicesCache.mset) {
-          await userDevicesCache.mset(
-            Object.entries(deviceMap).map(([key, value]) => ({
-              key: key,
-              value: value,
-            })),
-          );
-        } else {
-          for (const key in deviceMap) {
-            if (deviceMap[key]) await userDevicesCache.set(key, deviceMap[key]);
+        await devicesMutex.mutex(async () => {
+          if (userDevicesCache.mset) {
+            await userDevicesCache.mset(
+              Object.entries(deviceMap).map(([key, value]) => ({
+                key: key,
+                value: value,
+              })),
+            );
+          } else {
+            for (const key in deviceMap) {
+              if (deviceMap[key])
+                await userDevicesCache.set(key, deviceMap[key]);
+            }
           }
-        }
+        });
         const userDeviceUpdates = {};
         for (const [userId, devices] of Object.entries(deviceMap)) {
           if (devices && devices.length > 0) {
@@ -1316,6 +1327,8 @@ export const makeMessagesSocket = (config) => {
   const waitForMsgMediaUpdate = bindWaitForEvent(ev, "messages.media-update");
   return {
     ...sock,
+    userDevicesCache: userDevicesCache,
+    devicesMutex: devicesMutex,
     getPrivacyTokens: getPrivacyTokens,
     issuePrivacyTokens: issuePrivacyTokens,
     assertSessions: assertSessions,
@@ -1324,6 +1337,8 @@ export const makeMessagesSocket = (config) => {
     sendReceipts: sendReceipts,
     readMessages: readMessages,
     refreshMediaConn: refreshMediaConn,
+    // Function (not getter) so the spread in chats.js preserves the live closure binding.
+    getMediaHost: () => mediaHost,
     waUploadToServer: waUploadToServer,
     fetchPrivacySettings: fetchPrivacySettings,
     sendPeerMessage: sendPeerMessage,
@@ -1368,7 +1383,7 @@ export const makeMessagesSocket = (config) => {
                   );
                 }
                 content.directPath = media.directPath;
-                content.url = getUrlFromDirectPath(content.directPath);
+                content.url = getUrlFromDirectPath(content.directPath, mediaHost);
                 logger.debug(
                   { directPath: media.directPath, key: result.key },
                   "media update successful",

package/lib/Store/prototype-store.js

@@ -380,6 +380,33 @@ export const makePrototypeStore = (config = {}) => {
 
   const presencesCache = {};
 
+  const makeMessagesStore = () =>
+    new Proxy(
+      makeOrderedDictionary((m) => {
+        const participant = m.key.participant
+          ? resolveJID(m.key.participant, store.signalRepository?.lidMapping)
+          : m.key.fromMe
+            ? "me"
+            : "";
+        return participant ? `${participant}:${m.key.id}` : m.key.id;
+      }),
+      {
+        get(target, prop) {
+          if (prop in target) return target[prop];
+          return target.get(prop);
+        },
+        set(target, prop, value) {
+          target.upsert(value);
+          return true;
+        },
+        deleteProperty(target, prop) {
+          const item = target.get(prop);
+          if (item) return target.remove(item);
+          return false;
+        },
+      },
+    );
+
   const store = {
     signalRepository: config.signalRepository,
     chats: new Proxy(chatsCache, {
@@ -389,34 +416,7 @@ export const makePrototypeStore = (config = {}) => {
         if (!target[jid]) {
           target[jid] = {
             id: jid,
-            messages: new Proxy(
-              makeOrderedDictionary((m) => {
-                const participant = m.key.participant
-                  ? resolveJID(
-                      m.key.participant,
-                      store.signalRepository?.lidMapping,
-                    )
-                  : m.key.fromMe
-                    ? "me"
-                    : "";
-                return participant ? `${participant}:${m.key.id}` : m.key.id;
-              }),
-              {
-                get(target, prop) {
-                  if (prop in target) return target[prop];
-                  return target.get(prop);
-                },
-                set(target, prop, value) {
-                  target.upsert(value);
-                  return true;
-                },
-                deleteProperty(target, prop) {
-                  const item = target.get(prop);
-                  if (item) return target.remove(item);
-                  return false;
-                },
-              },
-            ),
+            messages: makeMessagesStore(),
             get isGroup() {
               return jid.endsWith("@g.us");
             },
@@ -788,7 +788,7 @@ export const makePrototypeStore = (config = {}) => {
             store.signalRepository?.lidMapping,
           );
           if (chatsCache[jid]) {
-            chatsCache[jid].messages = {};
+            chatsCache[jid].messages = makeMessagesStore();
             if (db)
               pendingUpdates.set(`del:m:${jid}`, {
                 type: "delete",
@@ -954,5 +954,22 @@ export const makePrototypeStore = (config = {}) => {
     },
   };
 
+  store.close = () => {
+    if (flushInterval) clearInterval(flushInterval);
+    if (cleanInterval) clearInterval(cleanInterval);
+    try {
+      _flush();
+    } catch {
+      // ignore flush errors on close
+    }
+    if (db) {
+      try {
+        db.close();
+      } catch {
+        // ignore close errors
+      }
+    }
+  };
+
   return store;
 };

package/lib/Utils/event-buffer.js

@@ -580,7 +580,12 @@ const consolidateEvents = (data) => {
     Object.keys(data.historySets.messages).length ||
     Object.keys(data.historySets.contacts).length
   ) {
-    map["messaging-history.set"] = data.historySets;
+    map["messaging-history.set"] = {
+      ...data.historySets,
+      chats: Object.values(data.historySets.chats),
+      contacts: Object.values(data.historySets.contacts),
+      messages: Object.values(data.historySets.messages),
+    };
   }
   if (Object.keys(data.chatUpserts).length)
     map["chats.upsert"] = Object.values(data.chatUpserts);

package/lib/Utils/index.js

@@ -26,4 +26,5 @@ export * from "./cstoken-utils.js";
 export * from "./use-prototype-auth-state.js";
 export * from "./sticker-utils.js";
 export * from "./rich-message-utils.js";
+export * from "./message-builder.js";
 export * from "./constants.js";