@open-wa/wa-automate 4.28.6 → 4.28.7

package/dist/api/Client.js

@@ -427,9 +427,9 @@ class Client {
         return rest;
     }
     pup(pageFunction, ...args) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
-            const { safeMode, callTimeout, idChecking, logFile, logging } = this._createConfig;
+            const { safeMode, callTimeout, idCorrection, logging } = this._createConfig;
             let _t;
             if (safeMode) {
                 if (!this._page || this._page.isClosed())
@@ -438,19 +438,34 @@ class Client {
                 if (state !== model_1.STATE.CONNECTED)
                     throw new errors_1.CustomError(errors_1.ERROR_NAME.STATE_ERROR, `state: ${state}`);
             }
-            if (idChecking && args[0]) {
-                Object.entries(args[0]).map(([k, v]) => {
-                    if (["to", "chatId", "groupChatId", "groupId", "contactId"].includes(k) && typeof v == "string" && v) {
-                        args[0][k] = (v === null || v === void 0 ? void 0 : v.includes('-')) ?
-                            //it is a group chat, make sure it has a @g.us at the end
-                            `${v === null || v === void 0 ? void 0 : v.replace(/@(c|g).us/g, '')}@g.us` :
-                            //it is a normal chat, make sure it has a @c.us at the end
-                            `${v === null || v === void 0 ? void 0 : v.replace(/@(c|g).us/g, '')}@c.us`;
-                    }
-                });
+            if (idCorrection && args[0]) {
+                const fixId = (id) => {
+                    var _a;
+                    let isGroup = false;
+                    let scrubbedId = (_a = id === null || id === void 0 ? void 0 : id.match(/\d|-/g)) === null || _a === void 0 ? void 0 : _a.join('');
+                    scrubbedId = scrubbedId.match(/-/g) && scrubbedId.match(/-/g).length == 1 && scrubbedId.split('-')[1].length === 10 ? scrubbedId : scrubbedId.replace(/-/g, '');
+                    if (scrubbedId.includes('-') || scrubbedId.length === 18)
+                        isGroup = true;
+                    const fixed = isGroup ?
+                        `${scrubbedId === null || scrubbedId === void 0 ? void 0 : scrubbedId.replace(/@(c|g).us/g, '')}@g.us` :
+                        `${scrubbedId === null || scrubbedId === void 0 ? void 0 : scrubbedId.replace(/@(c|g).us/g, '')}@c.us`;
+                    logging_1.log.info('Fixed ID', { id, fixed });
+                    return fixed;
+                };
+                if (typeof args[0] === 'string' && args[0] && !(args[0].includes("@g.us") || args[0].includes("@c.us")) && ((_c = (_b = (((_a = pageFunction === null || pageFunction === void 0 ? void 0 : pageFunction.toString()) === null || _a === void 0 ? void 0 : _a.match(/[^(]*\(([^)]*)\)/)[1]) || "")) === null || _b === void 0 ? void 0 : _b.replace(/\s/g, '')) === null || _c === void 0 ? void 0 : _c.split(','))) {
+                    const p = ((pageFunction === null || pageFunction === void 0 ? void 0 : pageFunction.toString().match(/[^(]*\(([^)]*)\)/)[1]) || "").replace(/\s/g, '').split(',');
+                    if (["to", "chatId", "groupChatId", "groupId", "contactId"].includes(p[0]))
+                        args[0] = fixId(args[0]);
+                }
+                else if (typeof args[0] === 'object')
+                    Object.entries(args[0]).map(([k, v]) => {
+                        if (["to", "chatId", "groupChatId", "groupId", "contactId"].includes(k) && typeof v == "string" && v && !(v.includes("@g.us") || v.includes("@c.us"))) {
+                            args[0][k] = fixId(v);
+                        }
+                    });
             }
             if (logging) {
-                const wapis = (_b = (((_a = pageFunction === null || pageFunction === void 0 ? void 0 : pageFunction.toString()) === null || _a === void 0 ? void 0 : _a.match(/WAPI\.(\w*)\(/g)) || [])) === null || _b === void 0 ? void 0 : _b.map(s => s.replace(/WAPI|\.|\(/g, ''));
+                const wapis = (_e = (((_d = pageFunction === null || pageFunction === void 0 ? void 0 : pageFunction.toString()) === null || _d === void 0 ? void 0 : _d.match(/WAPI\.(\w*)\(/g)) || [])) === null || _e === void 0 ? void 0 : _e.map(s => s.replace(/WAPI|\.|\(/g, ''));
                 _t = Date.now();
                 logging_1.log.info(`Request ${_t}`, Object.assign({ _method: (wapis === null || wapis === void 0 ? void 0 : wapis.length) === 1 ? wapis[0] : wapis }, args[0]));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-wa/wa-automate",
-  "version": "4.28.6",
+  "version": "4.28.7",
   "licenseCheckUrl": "https://openwa.dev/license-check",
   "brokenMethodReportUrl": "https://openwa.dev/report-bm",
   "patches": "https://cdn.openwa.dev/patches.json",