@queenanya/baileys 8.3.1 → 8.3.3

package/lib/Signal/libsignal.js

@@ -35,24 +35,30 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeLibSignalRepository = makeLibSignalRepository;
 const libsignal = __importStar(require("libsignal"));
-const WASignalGroup_1 = require("../../WASignalGroup");
 const Utils_1 = require("../Utils");
 const WABinary_1 = require("../WABinary");
+const sender_key_name_1 = require("./Group/sender-key-name");
+const sender_key_record_1 = require("./Group/sender-key-record");
+const Group_1 = require("./Group");
 function makeLibSignalRepository(auth) {
     const storage = signalStorage(auth);
     return {
         decryptGroupMessage({ group, authorJid, msg }) {
             const senderName = jidToSignalSenderKeyName(group, authorJid);
-            const cipher = new WASignalGroup_1.GroupCipher(storage, senderName);
+            const cipher = new Group_1.GroupCipher(storage, senderName);
             return cipher.decrypt(msg);
         },
         async processSenderKeyDistributionMessage({ item, authorJid }) {
-            const builder = new WASignalGroup_1.GroupSessionBuilder(storage);
+            const builder = new Group_1.GroupSessionBuilder(storage);
+            if (!item.groupId) {
+                throw new Error('Group ID is required for sender key distribution message');
+            }
             const senderName = jidToSignalSenderKeyName(item.groupId, authorJid);
-            const senderMsg = new WASignalGroup_1.SenderKeyDistributionMessage(null, null, null, null, item.axolotlSenderKeyDistributionMessage);
-            const { [senderName]: senderKey } = await auth.keys.get('sender-key', [senderName]);
+            const senderMsg = new Group_1.SenderKeyDistributionMessage(null, null, null, null, item.axolotlSenderKeyDistributionMessage);
+            const senderNameStr = senderName.toString();
+            const { [senderNameStr]: senderKey } = await auth.keys.get('sender-key', [senderNameStr]);
             if (!senderKey) {
-                await storage.storeSenderKey(senderName, new WASignalGroup_1.SenderKeyRecord());
+                await storage.storeSenderKey(senderName, new sender_key_record_1.SenderKeyRecord());
             }
             await builder.process(senderName, senderMsg);
         },
@@ -67,6 +73,8 @@ function makeLibSignalRepository(auth) {
                 case 'msg':
                     result = await session.decryptWhisperMessage(ciphertext);
                     break;
+                default:
+                    throw new Error(`Unknown message type: ${type}`);
             }
             return result;
         },
@@ -79,17 +87,18 @@ function makeLibSignalRepository(auth) {
         },
         async encryptGroupMessage({ group, meId, data }) {
             const senderName = jidToSignalSenderKeyName(group, meId);
-            const builder = new WASignalGroup_1.GroupSessionBuilder(storage);
-            const { [senderName]: senderKey } = await auth.keys.get('sender-key', [senderName]);
+            const builder = new Group_1.GroupSessionBuilder(storage);
+            const senderNameStr = senderName.toString();
+            const { [senderNameStr]: senderKey } = await auth.keys.get('sender-key', [senderNameStr]);
             if (!senderKey) {
-                await storage.storeSenderKey(senderName, new WASignalGroup_1.SenderKeyRecord());
+                await storage.storeSenderKey(senderName, new sender_key_record_1.SenderKeyRecord());
             }
             const senderKeyDistributionMessage = await builder.create(senderName);
-            const session = new WASignalGroup_1.GroupCipher(storage, senderName);
+            const session = new Group_1.GroupCipher(storage, senderName);
             const ciphertext = await session.encrypt(data);
             return {
                 ciphertext,
-                senderKeyDistributionMessage: senderKeyDistributionMessage.serialize(),
+                senderKeyDistributionMessage: senderKeyDistributionMessage.serialize()
             };
         },
         async injectE2ESession({ jid, session }) {
@@ -98,7 +107,7 @@ function makeLibSignalRepository(auth) {
         },
         jidToSignalProtocolAddress(jid) {
             return jidToSignalProtocolAddress(jid).toString();
-        },
+        }
     };
 }
 const jidToSignalProtocolAddress = (jid) => {
@@ -106,7 +115,7 @@ const jidToSignalProtocolAddress = (jid) => {
     return new libsignal.ProtocolAddress(user, device || 0);
 };
 const jidToSignalSenderKeyName = (group, user) => {
-    return new WASignalGroup_1.SenderKeyName(group, jidToSignalProtocolAddress(user)).toString();
+    return new sender_key_name_1.SenderKeyName(group, jidToSignalProtocolAddress(user));
 };
 function signalStorage({ creds, keys }) {
     return {
@@ -117,7 +126,7 @@ function signalStorage({ creds, keys }) {
             }
         },
         storeSession: async (id, session) => {
-            await keys.set({ 'session': { [id]: session.serialize() } });
+            await keys.set({ session: { [id]: session.serialize() } });
         },
         isTrustedIdentity: () => {
             return true;
@@ -140,21 +149,25 @@ function signalStorage({ creds, keys }) {
                 pubKey: Buffer.from(key.keyPair.public)
             };
         },
-        loadSenderKey: async (keyId) => {
+        loadSenderKey: async (senderKeyName) => {
+            const keyId = senderKeyName.toString();
             const { [keyId]: key } = await keys.get('sender-key', [keyId]);
             if (key) {
-                return new WASignalGroup_1.SenderKeyRecord(key);
+                return sender_key_record_1.SenderKeyRecord.deserialize(key);
             }
+            return new sender_key_record_1.SenderKeyRecord();
         },
-        storeSenderKey: async (keyId, key) => {
-            await keys.set({ 'sender-key': { [keyId]: key.serialize() } });
+        storeSenderKey: async (senderKeyName, key) => {
+            const keyId = senderKeyName.toString();
+            const serialized = JSON.stringify(key.serialize());
+            await keys.set({ 'sender-key': { [keyId]: Buffer.from(serialized, 'utf-8') } });
         },
-        getOurRegistrationId: () => (creds.registrationId),
+        getOurRegistrationId: () => creds.registrationId,
         getOurIdentity: () => {
             const { signedIdentityKey } = creds;
             return {
                 privKey: Buffer.from(signedIdentityKey.private),
-                pubKey: (0, Utils_1.generateSignalPubKey)(signedIdentityKey.public),
+                pubKey: (0, Utils_1.generateSignalPubKey)(signedIdentityKey.public)
             };
         }
     };

package/lib/Socket/Client/index.d.ts

@@ -1,3 +1,2 @@
-export * from './abstract-socket-client';
-export * from './mobile-socket-client';
-export * from './web-socket-client';
+export * from './types';
+export * from './websocket';

package/lib/Socket/Client/index.js

@@ -14,6 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./abstract-socket-client"), exports);
-__exportStar(require("./mobile-socket-client"), exports);
-__exportStar(require("./web-socket-client"), exports);
+__exportStar(require("./types"), exports);
+__exportStar(require("./websocket"), exports);

package/lib/Socket/Client/{abstract-socket-client.d.ts → types.d.ts}

@@ -11,5 +11,6 @@ export declare abstract class AbstractSocketClient extends EventEmitter {
     constructor(url: URL, config: SocketConfig);
     abstract connect(): Promise<void>;
     abstract close(): Promise<void>;
+    abstract restart(): Promise<void>;
     abstract send(str: Uint8Array | string, cb?: (err?: Error) => void): boolean;
 }

package/lib/Socket/Client/{web-socket-client.d.ts → websocket.d.ts}

@@ -1,5 +1,5 @@
 import WebSocket from 'ws';
-import { AbstractSocketClient } from './abstract-socket-client';
+import { AbstractSocketClient } from './types';
 export declare class WebSocketClient extends AbstractSocketClient {
     protected socket: WebSocket | null;
     get isOpen(): boolean;
@@ -8,5 +8,6 @@ export declare class WebSocketClient extends AbstractSocketClient {
     get isConnecting(): boolean;
     connect(): Promise<void>;
     close(): Promise<void>;
+    restart(): Promise<void>;
     send(str: string | Uint8Array, cb?: (err?: Error) => void): boolean;
 }

package/lib/Socket/Client/{web-socket-client.js → websocket.js}

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebSocketClient = void 0;
 const ws_1 = __importDefault(require("ws"));
 const Defaults_1 = require("../../Defaults");
-const abstract_socket_client_1 = require("./abstract-socket-client");
-class WebSocketClient extends abstract_socket_client_1.AbstractSocketClient {
+const types_1 = require("./types");
+class WebSocketClient extends types_1.AbstractSocketClient {
     constructor() {
         super(...arguments);
         this.socket = null;
@@ -53,6 +53,16 @@ class WebSocketClient extends abstract_socket_client_1.AbstractSocketClient {
         this.socket.close();
         this.socket = null;
     }
+    async restart() {
+        if (this.socket) {
+            await new Promise(resolve => {
+                this.socket.once('close', resolve);
+                this.socket.terminate();
+            });
+            this.socket = null;
+        }
+        await this.connect();
+    }
     send(str, cb) {
         var _a;
         (_a = this.socket) === null || _a === void 0 ? void 0 : _a.send(str, cb);

package/lib/Socket/business.d.ts

@@ -24,7 +24,7 @@ export declare const makeBusinessSocket: (config: SocketConfig) => {
         isVideo: boolean;
     }>;
     fetchMessageHistory: (count: number, oldestMsgKey: import("../Types").WAMessageKey, oldestMsgTimestamp: number | Long) => Promise<string>;
-    requestPlaceholderResend: (messageKey: import("../Types").WAMessageKey) => Promise<"RESOLVED" | string | undefined>;
+    requestPlaceholderResend: (messageKey: import("../Types").WAMessageKey) => Promise<string | undefined>;
     getPrivacyTokens: (jids: string[]) => Promise<any>;
     assertSessions: (jids: string[], force: boolean) => Promise<boolean>;
     relayMessage: (jid: string, message: import("../Types").WAProto.IMessage, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }: import("../Types").MessageRelayOptions) => Promise<string>;
@@ -43,7 +43,7 @@ export declare const makeBusinessSocket: (config: SocketConfig) => {
     }>;
     sendPeerDataOperationMessage: (pdoMessage: import("../Types").WAProto.Message.IPeerDataOperationRequestMessage) => Promise<string>;
     updateMediaMessage: (message: import("../Types").WAProto.IWebMessageInfo) => Promise<import("../Types").WAProto.IWebMessageInfo>;
-    sendMessage: (jid: string, content: import("../Types").AnyMessageContent, options?: import("../Types").MiscMessageGenerationOptions) => Promise<import("../Types").WAProto.WebMessageInfo | undefined>;
+    sendMessage: (jid: string, content: import("../Types").AnyMessageContent, options?: import("../Types").MiscMessageGenerationOptions) => Promise<import("../Types").WAProto.WebMessageInfo>;
     subscribeNewsletterUpdates: (jid: string) => Promise<{
         duration: string;
     }>;
@@ -141,7 +141,7 @@ export declare const makeBusinessSocket: (config: SocketConfig) => {
     }[], star: boolean) => Promise<void>;
     executeUSyncQuery: (usyncQuery: import("..").USyncQuery) => Promise<import("..").USyncQueryResult | undefined>;
     type: "md";
-    ws: any;
+    ws: import("./Client").WebSocketClient;
     ev: import("../Types").BaileysEventEmitter & {
         process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): (() => void);
         buffer(): void;

package/lib/Socket/chat-set.d.ts

@@ -0,0 +1,3 @@
+/** update the profile picture for yourself or a group as Full */
+export declare const updateProfilePictureFull: (jid: any, content: any, sock: any) => Promise<void>;
+export declare const updateProfilePictureFull2: (jid: any, content: any, sock: any) => Promise<void>;

package/lib/Socket/chat-set.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateProfilePictureFull2 = exports.updateProfilePictureFull = void 0;
+const boom_1 = require("@hapi/boom");
+const WABinary_1 = require("../WABinary");
+const Utils_1 = require("../Utils");
+/** update the profile picture for yourself or a group as Full */
+const updateProfilePictureFull = async (jid, content, sock) => {
+    const { authState, query } = sock;
+    let targetJid;
+    if (!jid) {
+        throw new boom_1.Boom('Illegal no-jid profile update. Please specify either your ID or the ID of the chat you wish to update');
+    }
+    if ((0, WABinary_1.jidNormalizedUser)(jid) !== (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id)) {
+        targetJid = (0, WABinary_1.jidNormalizedUser)(jid); // in case it is someone other than us
+    }
+    const { img } = await (0, Utils_1.generateProfilePictureFull)(content);
+    await query({
+        tag: 'iq',
+        attrs: {
+            target: targetJid,
+            to: WABinary_1.S_WHATSAPP_NET,
+            type: 'set',
+            xmlns: 'w:profile:picture'
+        },
+        content: [
+            {
+                tag: 'picture',
+                attrs: { type: 'image' },
+                content: img
+            }
+        ]
+    });
+};
+exports.updateProfilePictureFull = updateProfilePictureFull;
+const updateProfilePictureFull2 = async (jid, content, sock) => {
+    const { authState, query } = sock;
+    let targetJid;
+    if (!jid) {
+        throw new boom_1.Boom('Illegal no-jid profile update. Please specify either your ID or the ID of the chat you wish to update');
+    }
+    if ((0, WABinary_1.jidNormalizedUser)(jid) !== (0, WABinary_1.jidNormalizedUser)(authState.creds.me.id)) {
+        targetJid = (0, WABinary_1.jidNormalizedUser)(jid); // in case it is someone other than us
+    }
+    const { preview } = await (0, Utils_1.generateProfilePictureFP)(content);
+    await query({
+        tag: 'iq',
+        attrs: {
+            target: targetJid,
+            to: WABinary_1.S_WHATSAPP_NET,
+            type: 'set',
+            xmlns: 'w:profile:picture'
+        },
+        content: [
+            {
+                tag: 'picture',
+                attrs: { type: 'image' },
+                content: preview
+            }
+        ]
+    });
+};
+exports.updateProfilePictureFull2 = updateProfilePictureFull2;

package/lib/Socket/chats.d.ts

@@ -52,7 +52,7 @@ export declare const makeChatsSocket: (config: SocketConfig) => {
     }[], star: boolean) => Promise<void>;
     executeUSyncQuery: (usyncQuery: USyncQuery) => Promise<import("../WAUSync").USyncQueryResult | undefined>;
     type: "md";
-    ws: any;
+    ws: import("./Client").WebSocketClient;
     ev: import("../Types").BaileysEventEmitter & {
         process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): (() => void);
         buffer(): void;

package/lib/Socket/chats.js

@@ -10,6 +10,7 @@ const WAProto_1 = require("../../WAProto");
 const Defaults_1 = require("../Defaults");
 const Types_1 = require("../Types");
 const Utils_1 = require("../Utils");
+// import { updateProfilePictureFull, updateProfilePictureFull2 } from './chat-set'
 const make_mutex_1 = require("../Utils/make-mutex");
 const process_message_1 = __importDefault(require("../Utils/process-message"));
 const WABinary_1 = require("../WABinary");
@@ -490,16 +491,18 @@ const makeChatsSocket = (config) => {
             await sendNode({
                 tag: 'presence',
                 attrs: {
-                    name: me.name,
+                    name: me.name.replace(/@/g, ''),
                     type
                 }
             });
         }
         else {
+            const { server } = (0, WABinary_1.jidDecode)(toJid);
+            const isLid = server === 'lid';
             await sendNode({
                 tag: 'chatstate',
                 attrs: {
-                    from: me.id,
+                    from: isLid ? me.lid : me.id,
                     to: toJid,
                 },
                 content: [
@@ -819,14 +822,12 @@ const makeChatsSocket = (config) => {
             sendPresenceUpdate(markOnlineOnConnect ? 'available' : 'unavailable')
                 .catch(error => onUnexpectedError(error, 'presence update requests'));
         }
-        if (receivedPendingNotifications) {
-            // if we don't have the app state key
+        if (receivedPendingNotifications && // if we don't have the app state key
             // we keep buffering events until we finally have
             // the key and can sync the messages
-            if (!((_a = authState.creds) === null || _a === void 0 ? void 0 : _a.myAppStateKeyId) && !config.mobile) {
-                ev.buffer();
-                needToFlushWithAppStateSync = true;
-            }
+            !((_a = authState.creds) === null || _a === void 0 ? void 0 : _a.myAppStateKeyId)) {
+            ev.buffer();
+            needToFlushWithAppStateSync = true;
         }
     });
     return {
@@ -844,6 +845,8 @@ const makeChatsSocket = (config) => {
         fetchDisappearingDuration,
         fetchStatus,
         updateProfilePicture,
+        //updateProfilePictureFull,
+        //updateProfilePictureFull2,
         removeProfilePicture,
         updateProfileStatus,
         updateProfileName,

package/lib/Socket/groups.d.ts

@@ -92,7 +92,7 @@ export declare const makeGroupsSocket: (config: SocketConfig) => {
     }[], star: boolean) => Promise<void>;
     executeUSyncQuery: (usyncQuery: import("..").USyncQuery) => Promise<import("..").USyncQueryResult | undefined>;
     type: "md";
-    ws: any;
+    ws: import("./Client").WebSocketClient;
     ev: import("../Types").BaileysEventEmitter & {
         process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): (() => void);
         buffer(): void;

package/lib/Socket/index.d.ts

@@ -1,7 +1,5 @@
 import { UserFacingSocketConfig } from '../Types';
 declare const makeWASocket: (config: UserFacingSocketConfig) => {
-    register: (code: string) => Promise<import("./registration").ExistsResponse>;
-    requestRegistrationCode: (registrationOptions?: import("./registration").RegistrationOptions) => Promise<import("./registration").ExistsResponse>;
     logger: import("../Utils/logger").ILogger;
     getOrderDetails: (orderId: string, tokenBase64: string) => Promise<import("../Types").OrderDetails>;
     getCatalog: ({ jid, limit, cursor }: import("../Types").GetCatalogOptions) => Promise<{
@@ -25,7 +23,7 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
         isVideo: boolean;
     }>;
     fetchMessageHistory: (count: number, oldestMsgKey: import("../Types").WAMessageKey, oldestMsgTimestamp: number | Long) => Promise<string>;
-    requestPlaceholderResend: (messageKey: import("../Types").WAMessageKey) => Promise<"RESOLVED" | string | undefined>;
+    requestPlaceholderResend: (messageKey: import("../Types").WAMessageKey) => Promise<string | undefined>;
     getPrivacyTokens: (jids: string[]) => Promise<any>;
     assertSessions: (jids: string[], force: boolean) => Promise<boolean>;
     relayMessage: (jid: string, message: import("../Types").WAProto.IMessage, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }: import("../Types").MessageRelayOptions) => Promise<string>;
@@ -44,7 +42,7 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
     }>;
     sendPeerDataOperationMessage: (pdoMessage: import("../Types").WAProto.Message.IPeerDataOperationRequestMessage) => Promise<string>;
     updateMediaMessage: (message: import("../Types").WAProto.IWebMessageInfo) => Promise<import("../Types").WAProto.IWebMessageInfo>;
-    sendMessage: (jid: string, content: import("../Types").AnyMessageContent, options?: import("../Types").MiscMessageGenerationOptions) => Promise<import("../Types").WAProto.WebMessageInfo | undefined>;
+    sendMessage: (jid: string, content: import("../Types").AnyMessageContent, options?: import("../Types").MiscMessageGenerationOptions) => Promise<import("../Types").WAProto.WebMessageInfo>;
     subscribeNewsletterUpdates: (jid: string) => Promise<{
         duration: string;
     }>;
@@ -142,7 +140,7 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
     }[], star: boolean) => Promise<void>;
     executeUSyncQuery: (usyncQuery: import("..").USyncQuery) => Promise<import("..").USyncQueryResult | undefined>;
     type: "md";
-    ws: any;
+    ws: import("./Client").WebSocketClient;
     ev: import("../Types").BaileysEventEmitter & {
         process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): (() => void);
         buffer(): void;

package/lib/Socket/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const Defaults_1 = require("../Defaults");
-const registration_1 = require("./registration");
+const business_1 = require("./business");
 // export the last socket layer
-const makeWASocket = (config) => ((0, registration_1.makeRegistrationSocket)({
+const makeWASocket = (config) => ((0, business_1.makeBusinessSocket)({
     ...Defaults_1.DEFAULT_CONNECTION_CONFIG,
     ...config
 }));

package/lib/Socket/messages-recv.d.ts

@@ -13,7 +13,7 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
         isVideo: boolean;
     }>;
     fetchMessageHistory: (count: number, oldestMsgKey: WAMessageKey, oldestMsgTimestamp: number | Long) => Promise<string>;
-    requestPlaceholderResend: (messageKey: WAMessageKey) => Promise<"RESOLVED" | string | undefined>;
+    requestPlaceholderResend: (messageKey: WAMessageKey) => Promise<string | undefined>;
     getPrivacyTokens: (jids: string[]) => Promise<any>;
     assertSessions: (jids: string[], force: boolean) => Promise<boolean>;
     relayMessage: (jid: string, message: proto.IMessage, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }: MessageRelayOptions) => Promise<string>;
@@ -32,7 +32,7 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
     }>;
     sendPeerDataOperationMessage: (pdoMessage: proto.Message.IPeerDataOperationRequestMessage) => Promise<string>;
     updateMediaMessage: (message: proto.IWebMessageInfo) => Promise<proto.IWebMessageInfo>;
-    sendMessage: (jid: string, content: import("../Types").AnyMessageContent, options?: import("../Types").MiscMessageGenerationOptions) => Promise<proto.WebMessageInfo | undefined>;
+    sendMessage: (jid: string, content: import("../Types").AnyMessageContent, options?: import("../Types").MiscMessageGenerationOptions) => Promise<proto.WebMessageInfo>;
     subscribeNewsletterUpdates: (jid: string) => Promise<{
         duration: string;
     }>;
@@ -130,7 +130,7 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
     }[], star: boolean) => Promise<void>;
     executeUSyncQuery: (usyncQuery: import("..").USyncQuery) => Promise<import("..").USyncQueryResult | undefined>;
     type: "md";
-    ws: any;
+    ws: import("./Client").WebSocketClient;
     ev: import("../Types").BaileysEventEmitter & {
         process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): (() => void);
         buffer(): void;

package/lib/Socket/messages-recv.js

@@ -18,7 +18,7 @@ const messages_send_1 = require("./messages-send");
 const makeMessagesRecvSocket = (config) => {
     const { logger, retryRequestDelayMs, maxMsgRetryCount, getMessage, shouldIgnoreJid } = config;
     const sock = (0, messages_send_1.makeMessagesSocket)(config);
-    const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, createParticipantNodes, getUSyncDevices, sendPeerDataOperationMessage, } = sock;
+    const { ev, authState, ws, processingMutex, signalRepository, query, upsertMessage, resyncAppState, groupMetadata, onUnexpectedError, assertSessions, sendNode, relayMessage, sendReceipt, uploadPreKeys, createParticipantNodes, getUSyncDevices, sendPeerDataOperationMessage, } = sock;
     /** this mutex ensures that each retryRequest will wait for the previous one to finish */
     const retryMutex = (0, make_mutex_1.makeMutex)();
     const msgRetryCache = config.msgRetryCounterCache || new node_cache_1.default({
@@ -574,8 +574,7 @@ const makeMessagesRecvSocket = (config) => {
             await authState.keys.set({ 'sender-key-memory': { [remoteJid]: null } });
         }
         logger.debug({ participant, sendToAll }, 'forced new session for retry recp');
-        for (let i = 0; i < msgs.length; i++) {
-            const msg = msgs[i];
+        for (const [i, msg] of msgs.entries()) {
             if (msg) {
                 updateSendMessageAgainCount(ids[i], participant);
                 const msgRelayOpts = { messageId: ids[i] };
@@ -742,15 +741,13 @@ const makeMessagesRecvSocket = (config) => {
         if (response && ((_a = msg === null || msg === void 0 ? void 0 : msg.messageStubParameters) === null || _a === void 0 ? void 0 : _a[0]) === Utils_1.NO_MESSAGE_FOUND_ERROR_TEXT) {
             msg.messageStubParameters = [Utils_1.NO_MESSAGE_FOUND_ERROR_TEXT, response];
         }
-        if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.type) === WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER) {
-            if (node.attrs.sender_pn) {
-                ev.emit('chats.phoneNumberShare', { lid: node.attrs.from, jid: node.attrs.sender_pn });
-            }
+        if (((_c = (_b = msg.message) === null || _b === void 0 ? void 0 : _b.protocolMessage) === null || _c === void 0 ? void 0 : _c.type) === WAProto_1.proto.Message.ProtocolMessage.Type.SHARE_PHONE_NUMBER && node.attrs.sender_pn) {
+            ev.emit('chats.phoneNumberShare', { lid: node.attrs.from, jid: node.attrs.sender_pn });
         }
         try {
             await Promise.all([
                 processingMutex.mutex(async () => {
-                    var _a, _b;
+                    var _a, _b, _c, _d, _e, _f;
                     await decrypt();
                     // message failed to decrypt
                     if (msg.messageStubType === WAProto_1.proto.WebMessageInfo.StubType.CIPHERTEXT) {
@@ -779,6 +776,17 @@ const makeMessagesRecvSocket = (config) => {
                         if ((_b = msg.key.participant) === null || _b === void 0 ? void 0 : _b.endsWith('@lid')) {
                             msg.key.participant = node.attrs.participant_pn || authState.creds.me.id;
                         }
+                        if ((0, WABinary_1.isJidGroup)(msg.key.remoteJid) && ((_f = (_e = (_d = (_c = msg.message) === null || _c === void 0 ? void 0 : _c.extendedTextMessage) === null || _d === void 0 ? void 0 : _d.contextInfo) === null || _e === void 0 ? void 0 : _e.participant) === null || _f === void 0 ? void 0 : _f.endsWith('@lid'))) {
+                            if (msg.message.extendedTextMessage.contextInfo) {
+                                const metadata = await groupMetadata(msg.key.remoteJid);
+                                const sender = msg.message.extendedTextMessage.contextInfo.participant;
+                                const found = metadata.participants.find(p => p.id === sender);
+                                msg.message.extendedTextMessage.contextInfo.participant = (found === null || found === void 0 ? void 0 : found.jid) || sender;
+                            }
+                        }
+                        if (!(0, WABinary_1.isJidGroup)(msg.key.remoteJid) && (0, WABinary_1.isLidUser)(msg.key.remoteJid)) {
+                            msg.key.remoteJid = node.attrs.sender_pn || node.attrs.peer_recipient_pn;
+                        }
                         let participant = msg.key.participant;
                         if (category === 'peer') { // special peer message
                             type = 'peer_msg';

package/lib/Socket/messages-send.d.ts

@@ -22,7 +22,7 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     }>;
     sendPeerDataOperationMessage: (pdoMessage: proto.Message.IPeerDataOperationRequestMessage) => Promise<string>;
     updateMediaMessage: (message: proto.IWebMessageInfo) => Promise<proto.IWebMessageInfo>;
-    sendMessage: (jid: string, content: AnyMessageContent, options?: MiscMessageGenerationOptions) => Promise<proto.WebMessageInfo | undefined>;
+    sendMessage: (jid: string, content: AnyMessageContent, options?: MiscMessageGenerationOptions) => Promise<proto.WebMessageInfo>;
     subscribeNewsletterUpdates: (jid: string) => Promise<{
         duration: string;
     }>;
@@ -120,7 +120,7 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     }[], star: boolean) => Promise<void>;
     executeUSyncQuery: (usyncQuery: USyncQuery) => Promise<import("../WAUSync").USyncQueryResult | undefined>;
     type: "md";
-    ws: any;
+    ws: import("./Client").WebSocketClient;
     ev: import("../Types").BaileysEventEmitter & {
         process(handler: (events: Partial<import("../Types").BaileysEventMap>) => void | Promise<void>): (() => void);
         buffer(): void;