@pney/whatsapp-web 1.34.4-node20 → 1.34.6

package/src/authStrategies/RemoteAuth.js

@@ -102,24 +102,34 @@ class RemoteAuth extends BaseAuthStrategy {
     }
 
     async storeRemoteSession(options) {
-        /* Compress & Store Session */
         const pathExists = await this.isValidPath(this.userDataDir);
-        if (pathExists) {
-            await this.compressSession();
-            await this.store.save({session: this.sessionName});
-            await fs.promises.unlink(`${this.sessionName}.zip`);
-            await fs.promises.rm(`${this.tempDir}`, {
-                recursive: true,
-                force: true,
-                maxRetries: this.rmMaxRetries,
-            }).catch(() => {});
+        if (!pathExists) return;
+
+        let compressedSessionPath;
+        try {
+            compressedSessionPath = await this.compressSession();
+            await this.store.save({ session: path.join(this.dataPath, this.sessionName) });
             if(options && options.emit) this.client.emit(Events.REMOTE_SESSION_SAVED);
+        } finally {
+            const paths = [
+                this.tempDir,
+                ...(compressedSessionPath ? [compressedSessionPath] : [])
+            ];
+            await Promise.allSettled(
+                paths.map((p) =>
+                    fs.promises.rm(p, {
+                        recursive: true,
+                        force: true,
+                        maxRetries: this.rmMaxRetries,
+                    })
+                )
+            );
         }
     }
 
     async extractRemoteSession() {
         const pathExists = await this.isValidPath(this.userDataDir);
-        const compressedSessionPath = `${this.sessionName}.zip`;
+        const compressedSessionPath = path.join(this.dataPath, `${this.sessionName}.zip`);
         const sessionExists = await this.store.sessionExists({session: this.sessionName});
         if (pathExists) {
             await fs.promises.rm(this.userDataDir, {
@@ -142,27 +152,34 @@ class RemoteAuth extends BaseAuthStrategy {
     }
 
     async compressSession() {
-        const archive = archiver('zip');
-        const stream = fs.createWriteStream(`${this.sessionName}.zip`);
+        const stageDefaultPath = path.join(this.tempDir, 'Default');
+        const userDataDefaultPath = path.join(this.userDataDir, 'Default');
 
-        await fs.copy(this.userDataDir, this.tempDir).catch(() => {});
-        await this.deleteMetadata();
-        return new Promise((resolve, reject) => {
-            archive
-                .directory(this.tempDir, false)
-                .on('error', err => reject(err))
-                .pipe(stream);
+        await fs.emptyDir(stageDefaultPath);
+        await this.copyByRequiredDirs(userDataDefaultPath, stageDefaultPath);
 
-            stream.on('close', () => resolve());
+        const archive = archiver('zip');
+        const outPath = path.join(this.dataPath, `${this.sessionName}.zip`);
+        const out = fs.createWriteStream(outPath);
+
+        await new Promise((resolve, reject) => {
+            out.once('close', resolve);
+            out.once('error', reject);
+            archive.once('error', reject);
+        
+            archive.pipe(out);
+            archive.directory(this.tempDir, false);
             archive.finalize();
         });
+        return outPath;
     }
 
     async unCompressSession(compressedSessionPath) {
         var stream = fs.createReadStream(compressedSessionPath);
         await new Promise((resolve, reject) => {
             stream.pipe(unzipper.Extract({
-                path: this.userDataDir
+                path: this.userDataDir,
+                concurrency: 10
             }))
                 .on('error', err => reject(err))
                 .on('finish', () => resolve());
@@ -170,25 +187,16 @@ class RemoteAuth extends BaseAuthStrategy {
         await fs.promises.unlink(compressedSessionPath);
     }
 
-    async deleteMetadata() {
-        const sessionDirs = [this.tempDir, path.join(this.tempDir, 'Default')];
-        for (const dir of sessionDirs) {
-            const sessionFiles = await fs.promises.readdir(dir);
-            for (const element of sessionFiles) {
-                if (!this.requiredDirs.includes(element)) {
-                    const dirElement = path.join(dir, element);
-                    const stats = await fs.promises.lstat(dirElement);
-    
-                    if (stats.isDirectory()) {
-                        await fs.promises.rm(dirElement, {
-                            recursive: true,
-                            force: true,
-                            maxRetries: this.rmMaxRetries,
-                        }).catch(() => {});
-                    } else {
-                        await fs.promises.unlink(dirElement).catch(() => {});
-                    }
-                }
+    async copyByRequiredDirs(from, to) {
+        for (const d of this.requiredDirs) {
+            const src = path.join(from, d);
+            if (await this.isValidPath(src)) {
+                const dest = path.join(to, path.basename(src));
+                await fs.promises.cp(src, dest, {
+                    recursive: true,
+                    force: true,
+                    errorOnExist: false
+                });
             }
         }
     }

package/src/structures/Channel.js

@@ -97,15 +97,15 @@ class Channel extends Base {
     /**
      * Gets the subscribers of the channel (only those who are in your contact list)
      * @param {?number} limit Optional parameter to specify the limit of subscribers to retrieve
-     * @returns {Promise<{contact: Contact, role: string}[]>} Returns an array of objects that handle the subscribed contacts and their roles in the channel
+     * @returns {Promise<Array<{contact: Contact, role: string}>>} Returns an array of objects that handle the subscribed contacts and their roles in the channel
      */
     async getSubscribers(limit) {
         return await this.client.pupPage.evaluate(async (channelId, limit) => {
             const channel = await window.WWebJS.getChat(channelId, { getAsModel: false });
             if (!channel) return [];
-            !limit && (limit = window.Store.ChannelUtils.getMaxSubscriberNumber());
-            const response = await window.Store.ChannelSubscribers.mexFetchNewsletterSubscribers(channelId, limit);
-            const contacts = window.Store.ChannelSubscribers.getSubscribersInContacts(response.subscribers);
+            !limit && (limit = window.require('WAWebNewsletterGatingUtils').getMaxSubscriberNumber());
+            const response = await (window.require('WAWebMexFetchNewsletterSubscribersJob')).mexFetchNewsletterSubscribers(channelId, limit);
+            const contacts = (window.require('WAWebNewsletterSubscriberListAction')).getSubscribersInContacts(response.subscribers);
             return Promise.all(contacts.map((obj) => ({
                 ...obj,
                 contact: window.WWebJS.getContactModel(obj.contact)
@@ -303,7 +303,7 @@ class Channel extends Base {
 
             if (searchOptions && searchOptions.limit > 0) {
                 while (msgs.length < searchOptions.limit) {
-                    const loadedMessages = await window.Store.ConversationMsgs.loadEarlierMsgs(channel);
+                    const loadedMessages = await (window.require('WAWebChatLoadMessages')).loadEarlierMsgs(channel);
                     if (!loadedMessages || !loadedMessages.length) break;
                     msgs = [...loadedMessages.filter(msgFilter), ...msgs];
                 }
@@ -350,7 +350,7 @@ class Channel extends Base {
                     : null;
             }
             try {
-                await window.Store.ChannelUtils.editNewsletterMetadataAction(channel, property, value);
+                await (window.require('WAWebEditNewsletterMetadataAction')).editNewsletterMetadataAction(channel, property, value);
                 return true;
             } catch (err) {
                 if (err.name === 'ServerStatusCodeError') return false;
@@ -367,9 +367,11 @@ class Channel extends Base {
     async _muteUnmuteChannel(action) {
         return await this.client.pupPage.evaluate(async (channelId, action) => {
             try {
-                action === 'MUTE'
-                    ? await window.Store.ChannelUtils.muteNewsletter([channelId])
-                    : await window.Store.ChannelUtils.unmuteNewsletter([channelId]);
+                await (window.require('WAWebNewsletterUpdateUserSettingJob')).updateNewsletterUserSetting({
+                    newsletterJid: window.require('WAJids').toNewsletterJid(channelId),
+                    type: window.require('WAWebNewsletterModelUtils').ADMIN_NOTIFICATIONS,
+                    muteExpirationValue: action === 'MUTE' ? window.require('WAWebNewsletterModelUtils').MUTED_STATE : window.require('WAWebNewsletterModelUtils').UNMUTED_STATE
+                });
                 return true;
             } catch (err) {
                 if (err.name === 'ServerStatusCodeError') return false;

package/src/structures/Chat.js

@@ -63,6 +63,12 @@ class Chat extends Base {
          */
         this.pinned = !!data.pin;
 
+        /**
+         * Indicates if the Chat is locked
+         * @type {boolean}
+         */
+        this.isLocked = data.isLocked;
+
         /**
          * Indicates if the chat is muted or not
          * @type {boolean}
@@ -206,7 +212,7 @@ class Chat extends Base {
 
             if (searchOptions && searchOptions.limit > 0) {
                 while (msgs.length < searchOptions.limit) {
-                    const loadedMessages = await window.Store.ConversationMsgs.loadEarlierMsgs(chat);
+                    const loadedMessages = await (window.require('WAWebChatLoadMessages')).loadEarlierMsgs(chat,chat.msgs);
                     if (!loadedMessages || !loadedMessages.length) break;
                     msgs = [...loadedMessages.filter(msgFilter), ...msgs];
                 }
@@ -281,7 +287,7 @@ class Chat extends Base {
 
     /**
      * Gets instances of all pinned messages in a chat
-     * @returns {Promise<[Message]|[]>}
+     * @returns {Promise<Array<Message>>}
      */
     async getPinnedMessages() {
         return this.client.getPinnedMessages(this.id._serialized);

package/src/structures/ClientInfo.js

@@ -62,7 +62,7 @@ class ClientInfo extends Base {
      */
     async getBatteryStatus() {
         return await this.client.pupPage.evaluate(() => {
-            const { battery, plugged } = window.Store.Conn;
+            const { battery, plugged } = window.require('WAWebConnModel').Conn;
             return { battery, plugged };
         });
     }

package/src/structures/Contact.js

@@ -155,8 +155,8 @@ class Contact extends Base {
         if(this.isGroup) return false;
 
         await this.client.pupPage.evaluate(async (contactId) => {
-            const contact = window.Store.Contact.get(contactId);
-            await window.Store.BlockContact.blockContact({contact});
+            const contact = (window.require('WAWebCollections')).Contact.get(contactId);
+            await (window.require('WAWebBlockContactAction')).blockContact({contact});
         }, this.id._serialized);
 
         this.isBlocked = true;
@@ -171,8 +171,8 @@ class Contact extends Base {
         if(this.isGroup) return false;
 
         await this.client.pupPage.evaluate(async (contactId) => {
-            const contact = window.Store.Contact.get(contactId);
-            await window.Store.BlockContact.unblockContact(contact);
+            const contact = (window.require('WAWebCollections')).Contact.get(contactId);
+            await (window.require('WAWebBlockContactAction')).unblockContact(contact);
         }, this.id._serialized);
 
         this.isBlocked = false;
@@ -185,8 +185,8 @@ class Contact extends Base {
      */
     async getAbout() {
         const about = await this.client.pupPage.evaluate(async (contactId) => {
-            const wid = window.Store.WidFactory.createWid(contactId);
-            return window.Store.StatusUtils.getStatus({'token':'', 'wid': wid});
+            const wid = window.require('WAWebWidFactory').createWid(contactId);
+            return (window.require('WAWebContactStatusBridge')).getStatus({'token':'', 'wid': wid});
         }, this.id._serialized);
 
         if (typeof about.status !== 'string')
@@ -202,7 +202,14 @@ class Contact extends Base {
     async getCommonGroups() {
         return await this.client.getCommonGroups(this.id._serialized);
     }
-    
+
+    /**
+     * Gets the Contact's current status broadcast.
+     * @returns {Promise<Broadcast>}
+    */
+    async getBroadcast() {
+        return await this.client.getBroadcastById(this.id._serialized);
+    }
 }
 
 module.exports = Contact;

package/src/structures/GroupChat.js

@@ -81,9 +81,9 @@ class GroupChat extends Chat {
             const participantData = {};
 
             !Array.isArray(participantIds) && (participantIds = [participantIds]);
-            const groupWid = window.Store.WidFactory.createWid(groupId);
-            const group = window.Store.Chat.get(groupWid) || (await window.Store.Chat.find(groupWid));
-            const participantWids = participantIds.map((p) => window.Store.WidFactory.createWid(p));
+            const groupWid = window.require('WAWebWidFactory').createWid(groupId);
+            const group = (window.require('WAWebCollections')).Chat.get(groupWid) || (await (window.require('WAWebCollections')).Chat.find(groupWid));
+            const participantWids = participantIds.map((p) => window.require('WAWebWidFactory').createWid(p));
 
             const errorCodes = {
                 default: 'An unknown error occupied while adding a participant',
@@ -98,7 +98,7 @@ class GroupChat extends Chat {
                 419: 'The participant can\'t be added because the group is full'
             };
 
-            await window.Store.GroupQueryAndUpdate({ id: groupId });
+            await (window.require('WAWebGroupQueryJob')).queryAndUpdateGroupMetadataById({ id: groupId });
 
             let groupParticipants = group.groupMetadata?.participants.serialize();
 
@@ -111,7 +111,7 @@ class GroupChat extends Chat {
             }
 
             groupParticipants.map(({ id }) => {
-                return id.server === 'lid' ? window.Store.LidUtils.getPhoneNumber(id) : id;
+                return id.server === 'lid' ? window.require('WAWebApiContact').getPhoneNumber(id) : id;
             });
 
             const _getSleepTime = (sleep) => {
@@ -127,7 +127,7 @@ class GroupChat extends Chat {
 
             for (let pWid of participantWids) {
                 const pId = pWid._serialized;
-                pWid = pWid.server === 'lid' ? window.Store.LidUtils.getPhoneNumber(pWid) : pWid;
+                pWid = pWid.server === 'lid' ? window.require('WAWebApiContact').getPhoneNumber(pWid) : pWid;
                 
                 participantData[pId] = {
                     code: undefined,
@@ -141,7 +141,7 @@ class GroupChat extends Chat {
                     continue;
                 }
 
-                if (!(await window.Store.QueryExist(pWid))?.wid) {
+                if (!(await (window.require('WAWebQueryExistsJob').queryWidExists)(pWid))?.wid) {
                     participantData[pId].code = 404;
                     participantData[pId].message = errorCodes[404];
                     continue;
@@ -157,12 +157,12 @@ class GroupChat extends Chat {
 
                 if (autoSendInviteV4 && rpcResultCode === 403) {
                     let userChat, isInviteV4Sent = false;
-                    window.Store.Contact.gadd(pWid, { silent: true });
+                    (window.require('WAWebCollections')).Contact.gadd(pWid, { silent: true });
 
                     if (rpcResult.name === 'ParticipantRequestCodeCanBeSent' &&
-                        (userChat = window.Store.Chat.get(pWid) || (await window.Store.Chat.find(pWid)))) {
+                        (userChat = (window.require('WAWebCollections')).Chat.get(pWid) || (await (window.require('WAWebCollections')).Chat.find(pWid)))) {
                         const groupName = group.formattedTitle || group.name;
-                        const res = await window.Store.GroupInviteV4.sendGroupInviteMessage(
+                        const res = await (window.require('WAWebChatSendMessages')).sendGroupInviteMessage(
                             userChat,
                             group.id._serialized,
                             groupName,
@@ -201,7 +201,7 @@ class GroupChat extends Chat {
                 return chat.groupMetadata.participants.get(lid?._serialized) ||
                     chat.groupMetadata.participants.get(phone?._serialized);
             }))).filter(Boolean);
-            await window.Store.GroupParticipants.removeParticipants(chat, participants);
+            await (window.require('WAWebModifyParticipantsGroupAction')).removeParticipants(chat, participants);
             return { status: 200 };
         }, this.id._serialized, participantIds);
     }
@@ -220,7 +220,7 @@ class GroupChat extends Chat {
                 return chat.groupMetadata.participants.get(lid?._serialized) ||
                     chat.groupMetadata.participants.get(phone?._serialized);
             }))).filter(Boolean);
-            await window.Store.GroupParticipants.promoteParticipants(chat, participants);
+            await (window.require('WAWebModifyParticipantsGroupAction')).promoteParticipants(chat, participants);
             return { status: 200 };
         }, this.id._serialized, participantIds);
     }
@@ -239,7 +239,7 @@ class GroupChat extends Chat {
                 return chat.groupMetadata.participants.get(lid?._serialized) ||
                     chat.groupMetadata.participants.get(phone?._serialized);
             }))).filter(Boolean);
-            await window.Store.GroupParticipants.demoteParticipants(chat, participants);
+            await (window.require('WAWebModifyParticipantsGroupAction')).demoteParticipants(chat, participants);
             return { status: 200 };
         }, this.id._serialized, participantIds);
     }
@@ -251,9 +251,9 @@ class GroupChat extends Chat {
      */
     async setSubject(subject) {
         const success = await this.client.pupPage.evaluate(async (chatId, subject) => {
-            const chatWid = window.Store.WidFactory.createWid(chatId);
+            const chatWid = window.require('WAWebWidFactory').createWid(chatId);
             try {
-                await window.Store.GroupUtils.setGroupSubject(chatWid, subject);
+                await (window.require('WAWebGroupModifyInfoJob')).setGroupSubject(chatWid, subject);
                 return true;
             } catch (err) {
                 if(err.name === 'ServerStatusCodeError') return false;
@@ -273,11 +273,12 @@ class GroupChat extends Chat {
      */
     async setDescription(description) {
         const success = await this.client.pupPage.evaluate(async (chatId, description) => {
-            const chatWid = window.Store.WidFactory.createWid(chatId);
-            let descId = window.Store.GroupMetadata.get(chatWid).descId;
-            let newId = await window.Store.MsgKey.newId();
+            const chatWid = window.require('WAWebWidFactory').createWid(chatId);
+            const chat = await window.WWebJS.getChat(chatId, { getAsModel: false });
+            let descId = chat.groupMetadata.descId;
+            let newId = await (window.require('WAWebMsgKey')).newId();
             try {
-                await window.Store.GroupUtils.setGroupDescription(chatWid, description, newId, descId);
+                await (window.require('WAWebGroupModifyInfoJob')).setGroupDescription(chatWid, description, newId, descId);
                 return true;
             } catch (err) {
                 if(err.name === 'ServerStatusCodeError') return false;
@@ -299,7 +300,7 @@ class GroupChat extends Chat {
         const success = await this.client.pupPage.evaluate(async (groupId, adminsOnly) => {
             const chat = await window.WWebJS.getChat(groupId, { getAsModel: false });
             try {
-                await window.Store.GroupUtils.setGroupProperty(chat, 'member_add_mode', adminsOnly ? 0 : 1);
+                await (window.require('WAWebSetPropertyGroupAction')).setGroupProperty(chat, 'member_add_mode', adminsOnly ? 0 : 1);
                 return true;
             } catch (err) {
                 if(err.name === 'ServerStatusCodeError') return false;
@@ -320,7 +321,7 @@ class GroupChat extends Chat {
         const success = await this.client.pupPage.evaluate(async (chatId, adminsOnly) => {
             const chat = await window.WWebJS.getChat(chatId, { getAsModel: false });
             try {
-                await window.Store.GroupUtils.setGroupProperty(chat, 'announcement', adminsOnly ? 1 : 0);
+                await (window.require('WAWebSetPropertyGroupAction')).setGroupProperty(chat, 'announcement', adminsOnly ? 1 : 0);
                 return true;
             } catch (err) {
                 if(err.name === 'ServerStatusCodeError') return false;
@@ -343,7 +344,7 @@ class GroupChat extends Chat {
         const success = await this.client.pupPage.evaluate(async (chatId, adminsOnly) => {
             const chat = await window.WWebJS.getChat(chatId, { getAsModel: false });
             try {
-                await window.Store.GroupUtils.setGroupProperty(chat, 'restrict', adminsOnly ? 1 : 0);
+                await (window.require('WAWebSetPropertyGroupAction')).setGroupProperty(chat, 'restrict', adminsOnly ? 1 : 0);
                 return true;
             } catch (err) {
                 if(err.name === 'ServerStatusCodeError') return false;
@@ -388,11 +389,8 @@ class GroupChat extends Chat {
      */
     async getInviteCode() {
         const codeRes = await this.client.pupPage.evaluate(async chatId => {
-            const chatWid = window.Store.WidFactory.createWid(chatId);
             try {
-                return window.compareWwebVersions(window.Debug.VERSION, '>=', '2.3000.1020730154')
-                    ? await window.Store.GroupInvite.fetchMexGroupInviteCode(chatId)
-                    : await window.Store.GroupInvite.queryGroupInviteCode(chatWid, true);
+                return await (window.require('WAWebMexFetchGroupInviteCodeJob')).fetchMexGroupInviteCode(chatId);
             }
             catch (err) {
                 if(err.name === 'ServerStatusCodeError') return undefined;
@@ -411,8 +409,8 @@ class GroupChat extends Chat {
      */
     async revokeInvite() {
         const codeRes = await this.client.pupPage.evaluate(chatId => {
-            const chatWid = window.Store.WidFactory.createWid(chatId);
-            return window.Store.GroupInvite.resetGroupInviteCode(chatWid);
+            const chatWid = window.require('WAWebWidFactory').createWid(chatId);
+            return (window.require('WAWebGroupQueryJob')).resetGroupInviteCode(chatWid);
         }, this.id._serialized);
 
         return codeRes.code;
@@ -476,7 +474,7 @@ class GroupChat extends Chat {
     async leave() {
         await this.client.pupPage.evaluate(async chatId => {
             const chat = await window.WWebJS.getChat(chatId, { getAsModel: false });
-            return window.Store.GroupUtils.sendExitGroup(chat);
+            return (window.require('WAWebExitGroupAction')).sendExitGroup(chat);
         }, this.id._serialized);
     }