whatsapp-web.js 1.21.1-alpha.0 → 2.0.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whatsapp-web.js",
-  "version": "1.21.1-alpha.0",
+  "version": "2.0.0-alpha.0",
   "description": "Library for interacting with the WhatsApp Web API ",
   "main": "./index.js",
   "typings": "./index.d.ts",

package/src/Client.js

@@ -275,6 +275,50 @@ class Client extends EventEmitter {
 
         }
 
+        await page.evaluate(() => {
+            /**
+             * Helper function that compares between two WWeb versions. Its purpose is to help the developer to choose the correct code implementation depending on the comparison value and the WWeb version.
+             * @param {string} lOperand The left operand for the WWeb version string to compare with
+             * @param {string} operator The comparison operator
+             * @param {string} rOperand The right operand for the WWeb version string to compare with
+             * @returns {boolean} Boolean value that indicates the result of the comparison
+             */
+            window.compareWwebVersions = (lOperand, operator, rOperand) => {
+                if (!['>', '>=', '<', '<=', '='].includes(operator)) {
+                    throw class _ extends Error {
+                        constructor(m) { super(m); this.name = 'CompareWwebVersionsError'; }
+                    }('Invalid comparison operator is provided');
+
+                }
+                if (typeof lOperand !== 'string' || typeof rOperand !== 'string') {
+                    throw class _ extends Error {
+                        constructor(m) { super(m); this.name = 'CompareWwebVersionsError'; }
+                    }('A non-string WWeb version type is provided');
+                }
+
+                lOperand = lOperand.replace(/-beta$/, '');
+                rOperand = rOperand.replace(/-beta$/, '');
+
+                while (lOperand.length !== rOperand.length) {
+                    lOperand.length > rOperand.length
+                        ? rOperand = rOperand.concat('0')
+                        : lOperand = lOperand.concat('0');
+                }
+
+                lOperand = Number(lOperand.replace(/\./g, ''));
+                rOperand = Number(rOperand.replace(/\./g, ''));
+
+                return (
+                    operator === '>' ? lOperand > rOperand :
+                        operator === '>=' ? lOperand >= rOperand :
+                            operator === '<' ? lOperand < rOperand :
+                                operator === '<=' ? lOperand <= rOperand :
+                                    operator === '=' ? lOperand === rOperand :
+                                        false
+                );
+            };
+        });
+
         await page.evaluate(ExposeStore, moduleRaid.toString());
         const authEventPayload = await this.authStrategy.getAuthEventPayload();
 
@@ -702,7 +746,14 @@ class Client extends EventEmitter {
         await this.pupPage.evaluate(() => {
             return window.Store.AppState.logout();
         });
-
+        await this.pupBrowser.close();
+        
+        let maxDelay = 0;
+        while (this.pupBrowser.isConnected() && (maxDelay < 10)) { // waits a maximum of 1 second before calling the AuthStrategy
+            await new Promise(resolve => setTimeout(resolve, 100));
+            maxDelay++; 
+        }
+        
         await this.authStrategy.logout();
     }
 

package/src/authStrategies/LocalAuth.js

@@ -44,10 +44,10 @@ class LocalAuth extends BaseAuthStrategy {
 
     async logout() {
         if (this.userDataDir) {
-            return (fs.rmSync ? fs.rmSync : fs.rmdirSync).call(this, this.userDataDir, { recursive: true });
+            return (fs.rmSync ? fs.rmSync : fs.rmdirSync).call(this, this.userDataDir, { recursive: true, force: true });
         }
     }
 
 }
 
-module.exports = LocalAuth;
+module.exports = LocalAuth;

package/src/structures/Chat.js

@@ -187,7 +187,7 @@ class Chat extends Base {
                 if (m.isNotification) {
                     return false; // dont include notification messages
                 }
-                if (searchOptions && searchOptions.fromMe && m.id.fromMe !== searchOptions.fromMe) {
+                if (searchOptions && searchOptions.fromMe !== undefined && m.id.fromMe !== searchOptions.fromMe) {
                     return false;
                 }
                 return true;

package/src/structures/GroupChat.js

@@ -153,8 +153,9 @@ class GroupChat extends Chat {
         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();
             try {
-                await window.Store.GroupUtils.setGroupDescription(chatWid, description, window.Store.MsgKey.newId(), descId);
+                await window.Store.GroupUtils.setGroupDescription(chatWid, description, newId, descId);
                 return true;
             } catch (err) {
                 if(err.name === 'ServerStatusCodeError') return false;
@@ -278,4 +279,4 @@ class GroupChat extends Chat {
 
 }
 
-module.exports = GroupChat;
+module.exports = GroupChat;

package/src/util/Injected.js

@@ -9,7 +9,7 @@ exports.ExposeStore = (moduleRaidStr) => {
     window.Store.AppState = window.mR.findModule('Socket')[0].Socket;
     window.Store.Conn = window.mR.findModule('Conn')[0].Conn;
     window.Store.BlockContact = window.mR.findModule('blockContact')[0];
-    window.Store.Call = window.mR.findModule('CallCollection')[0].CallCollection;
+    window.Store.Call = window.mR.findModule((module) => module.default && module.default.Call)[0].default.Call;
     window.Store.Cmd = window.mR.findModule('Cmd')[0].Cmd;
     window.Store.CryptoLib = window.mR.findModule('decryptE2EMedia')[0];
     window.Store.DownloadManager = window.mR.findModule('downloadManager')[0].downloadManager;
@@ -80,6 +80,12 @@ exports.ExposeStore = (moduleRaidStr) => {
         };
     }
 
+    if (window.mR.findModule('ChatCollection')[0] && window.mR.findModule('ChatCollection')[0].ChatCollection) {
+        if (typeof window.mR.findModule('ChatCollection')[0].ChatCollection.findImpl === 'undefined' && typeof window.mR.findModule('ChatCollection')[0].ChatCollection._find != 'undefined') {
+            window.mR.findModule('ChatCollection')[0].ChatCollection.findImpl = window.mR.findModule('ChatCollection')[0].ChatCollection._find;
+        }
+    }
+
     // TODO remove these once everybody has been updated to WWebJS with legacy sessions removed
     const _linkPreview = window.mR.findModule('queryLinkPreview');
     if (_linkPreview && _linkPreview[0] && _linkPreview[0].default) {
@@ -511,7 +517,7 @@ exports.LoadUtils = () => {
 
         // TODO: remove useOldImplementation and its checks once all clients are updated to >= v2.2327.4
         const useOldImplementation
-            = window.WWebJS.compareWwebVersions(window.Debug.VERSION, '<', '2.2327.4');
+            = window.compareWwebVersions(window.Debug.VERSION, '<', '2.2327.4');
 
         res.isMe = useOldImplementation
             ? contact.isMe
@@ -787,46 +793,4 @@ exports.LoadUtils = () => {
             throw err;
         }
     };
-
-    /**
-     * Inner function that compares between two WWeb versions. Its purpose is to help the developer to choose the correct code implementation depending on the comparison value and the WWeb version.
-     * @param {string} lOperand The left operand for the WWeb version string to compare with
-     * @param {string} operator The comparison operator
-     * @param {string} rOperand The right operand for the WWeb version string to compare with
-     * @returns {boolean} Boolean value that indicates the result of the comparison
-     */
-    window.WWebJS.compareWwebVersions = (lOperand, operator, rOperand) => {
-        if (!['>', '>=', '<', '<=', '='].includes(operator)) {
-            throw class _ extends Error {
-                constructor(m) { super(m); this.name = 'CompareWwebVersionsError'; }
-            }('Invalid comparison operator is provided');
-
-        }
-        if (typeof lOperand !== 'string' || typeof rOperand !== 'string') {
-            throw class _ extends Error {
-                constructor(m) { super(m); this.name = 'CompareWwebVersionsError'; }
-            }('A non-string WWeb version type is provided');
-        }
-
-        lOperand = lOperand.replace(/-beta$/, '');
-        rOperand = rOperand.replace(/-beta$/, '');
-
-        while (lOperand.length !== rOperand.length) {
-            lOperand.length > rOperand.length
-                ? rOperand = rOperand.concat('0')
-                : lOperand = lOperand.concat('0');
-        }
-
-        lOperand = Number(lOperand.replace(/\./g, ''));
-        rOperand = Number(rOperand.replace(/\./g, ''));
-
-        return (
-            operator === '>' ? lOperand > rOperand :
-                operator === '>=' ? lOperand >= rOperand :
-                    operator === '<' ? lOperand < rOperand :
-                        operator === '<=' ? lOperand <= rOperand :
-                            operator === '=' ? lOperand === rOperand :
-                                false
-        );
-    };
 };