@open-wa/wa-automate 4.23.15 → 4.24.0

package/dist/api/Client.js

@@ -355,7 +355,8 @@ class Client {
             const START_TIME = Date.now();
             spinner.info("Opening session in new tab");
             const newTab = yield this._page.browser().newPage();
-            yield newTab.goto(puppeteer_config_1.puppeteerConfig.WAUrl);
+            yield browser_1.initPage(this.getSessionId(), this._createConfig, this._createConfig.customUserAgent, spinner, newTab, true);
+            //  await newTab.goto(puppeteerConfig.WAUrl);
             //Two promises. One that closes the previous page, one that sets up the new page
             const closePageOnConflict = () => __awaiter(this, void 0, void 0, function* () {
                 const useHere = yield this._page.evaluate(() => WAPI.getUseHereString());
@@ -470,20 +471,28 @@ class Client {
             const res = yield this._page.evaluate(pageFunction, ...args);
             if (this._createConfig.onError && typeof res == "string" && (res.startsWith("Error") || res.startsWith("ERROR"))) {
                 const e = this._createConfig.onError;
-                if (e == model_1.OnError.AS_STRING || e == model_1.OnError.NOTHING)
-                    return res;
-                if (e == model_1.OnError.LOG_AND_FALSE) {
-                    console.error(res);
-                    return true;
-                }
-                if (e == model_1.OnError.LOG_AND_STRING) {
+                /**
+                 * Log error
+                 */
+                if (e == model_1.OnError.LOG_AND_FALSE ||
+                    e == model_1.OnError.LOG_AND_STRING ||
+                    res.includes("get.openwa.dev"))
                     console.error(res);
+                /**
+                 * Return res
+                 */
+                if (e == model_1.OnError.AS_STRING ||
+                    e == model_1.OnError.NOTHING ||
+                    e == model_1.OnError.LOG_AND_STRING)
                     return res;
-                }
+                /**
+                 * Return false
+                 */
+                if (e == model_1.OnError.LOG_AND_FALSE ||
+                    e == model_1.OnError.RETURN_FALSE)
+                    return false;
                 if (e == model_1.OnError.RETURN_ERROR)
                     return new Error(res);
-                if (e == model_1.OnError.RETURN_FALSE)
-                    return false;
                 if (e == model_1.OnError.THROW)
                     throw new Error(res);
             }

package/dist/api/model/chat.d.ts

@@ -5,26 +5,83 @@ export interface Chat {
     archive: boolean;
     changeNumberNewJid: any;
     changeNumberOldJid: any;
+    /**
+     * The contact related to this chat
+     */
     contact: Contact;
+    /**
+     * Group metadata for this chat
+     */
     groupMetadata: GroupMetadata;
+    /**
+     * The id of the chat
+     */
     id: ChatId;
+    /**
+     * If the chat is a group chat is restricted
+     */
     isAnnounceGrpRestrict: any;
+    /**
+     * The title of the chat
+     */
     formattedTitle?: string;
+    /**
+     * Whether your host account is able to send messages to this chat
+     */
     canSend?: boolean;
+    /**
+     * Whether the chat is a group chat
+     */
     isGroup: boolean;
+    /**
+     * Whether the chat is a group chat and the group is restricted
+     */
     isReadOnly: boolean;
     kind: string;
+    /**
+     * The labels attached to this chat.
+     */
     labels: any;
+    /**
+     * The ID of the last message received in this chat
+     */
     lastReceivedKey: any;
     modifyTag: number;
+    /**
+     * The messages in the chat
+     */
     msgs: any;
+    /**
+     * The expiration timestamp of the chat mute
+     */
     muteExpiration: number;
+    /**
+     * The name of the chat
+     */
     name: string;
+    /**
+     * Whether the chat is marked as spam
+     */
     notSpam: boolean;
+    /**
+     * Messages that are pending to be sent
+     */
     pendingMsgs: boolean;
+    /**
+     * Whether the chat is pinned
+     */
     pin: number;
+    /**
+     * The presence state of the chat participant
+     */
     presence: any;
+    /**
+     * The timestamp of the last interaction in the chat
+     */
     t: number;
+    /**
+     * The number of undread messages in this chat
+     */
     unreadCount: number;
     ack?: any;
     /**

package/dist/api/model/media.d.ts

@@ -44,6 +44,14 @@ export declare type StickerMetadata = {
      * @default `attention`
      */
     cropPosition?: 'top' | 'right top' | 'right' | 'right bottom' | 'bottom' | 'left bottom' | 'left' | 'left top' | 'north' | 'northeast' | 'east' | 'southeast' | 'south' | 'southwest' | 'west' | 'northwest' | 'center' | 'centre' | 'entropy' | 'attention';
+    /**
+     * The corner radius of the sticker when `stickerMetadata.circle` is set to true.
+     * @default `100`
+     * @minimum `1`
+     * @maximum `100`
+     * @multipleOf `1`
+     */
+    cornerRadius?: number;
 };
 export declare type Mp4StickerConversionProcessOptions = {
     /**

package/dist/cli/collections.js

@@ -37,7 +37,8 @@ const postman_2_swagger_1 = __importDefault(require("postman-2-swagger"));
 const fs_extra_1 = require("fs-extra");
 const typeconv_1 = require("typeconv");
 const fs = __importStar(require("fs"));
-const glob_promise_1 = __importDefault(require("glob-promise"));
+const glob = require("tiny-glob");
+const path = __importStar(require("path"));
 exports.collections = {};
 const generateCollections = (config, spinner) => __awaiter(void 0, void 0, void 0, function* () {
     let swCol = null;
@@ -118,7 +119,7 @@ const getTypeSchemas = () => __awaiter(void 0, void 0, void 0, function* () {
     const { convert } = typeconv_1.makeConverter(reader, writer, {
         simplify: true
     });
-    const s = (yield Promise.all([...(yield glob_promise_1.default('../**/*.d.ts')), ...(yield glob_promise_1.default('../**/message.js')), ...(yield glob_promise_1.default('../**/chat.js'))])).filter(f => !f.includes('node_modules'));
+    const s = (yield Promise.all([...(yield glob(path.resolve(__dirname, '../**/*.d.ts'))), ...(yield glob(path.resolve(__dirname, '../**/message.js'))), ...(yield glob(path.resolve(__dirname, '../**/chat.js')))])).filter(f => !f.includes('node_modules'));
     const res = {};
     yield Promise.all(s.map((x) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;

package/dist/cli/index.js

@@ -20,6 +20,7 @@ const axios_1 = __importDefault(require("axios"));
 const setup_1 = require("./setup");
 const collections_1 = require("./collections");
 const server_1 = require("./server");
+const localtunnel_1 = __importDefault(require("localtunnel"));
 let checkUrl = (s) => (typeof s === "string") && is_url_superb_1.default(s);
 const ready = (config) => __awaiter(void 0, void 0, void 0, function* () {
     if (process.send) {
@@ -176,6 +177,11 @@ function start() {
                     spinner.succeed(`\n• Listening on port ${PORT}!`);
                     yield ready(Object.assign(Object.assign(Object.assign(Object.assign({}, cliConfig), createConfig), client.getSessionInfo()), { hostAccountNumber: yield client.getHostNumber() }));
                 }));
+                if (cliConfig.tunnel) {
+                    spinner.info(`\n• Setting up external tunnel`);
+                    const tunnel = yield localtunnel_1.default({ port: PORT });
+                    spinner.succeed(`\n\t${terminal_link_1.default('External address', tunnel.url)}`);
+                }
                 const apiDocsUrl = cliConfig.apiHost ? `${cliConfig.apiHost}/api-docs/ ` : `${cliConfig.host.includes('http') ? '' : 'http://'}${cliConfig.host}:${PORT}/api-docs/ `;
                 const link = terminal_link_1.default('API Explorer', apiDocsUrl);
                 if (cliConfig && cliConfig.generateApiDocs)

package/dist/cli/setup.js

@@ -251,6 +251,11 @@ const optionList = [{
         type: Boolean,
         description: "Don't validate webhook URLs. Enables use of non-FQDNs."
     },
+    {
+        name: 'tunnel',
+        type: Boolean,
+        description: "Expose a tunnel to your EASY API session - this is for testing and it is unsecured."
+    },
     {
         name: 'help',
         description: 'Print this usage guide.'

package/dist/config/puppeteer.config.d.ts

@@ -4,8 +4,8 @@ declare const puppeteerConfig: {
     height: number;
     chromiumArgs: string[];
 };
-export declare const useragent = "WhatsApp/2.2108.8 Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36";
 export declare const createUserAgent: (waVersion: string) => string;
+export declare const useragent: string;
 export { puppeteerConfig };
 export declare const width: number;
 export declare const height: number;

package/dist/config/puppeteer.config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.height = exports.width = exports.puppeteerConfig = exports.createUserAgent = exports.useragent = void 0;
+exports.height = exports.width = exports.puppeteerConfig = exports.useragent = exports.createUserAgent = void 0;
 const puppeteerConfig = {
     WAUrl: 'https://web.whatsapp.com',
     width: 1440,
@@ -52,8 +52,8 @@ const puppeteerConfig = {
     ]
 };
 exports.puppeteerConfig = puppeteerConfig;
-exports.useragent = 'WhatsApp/2.2108.8 Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36';
-const createUserAgent = (waVersion) => `WhatsApp/${waVersion} Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/81.0.4044.138 Safari/537.36`;
+const createUserAgent = (waVersion) => `WhatsApp/${waVersion} Mozilla/5.0 (Macintosh; Intel Mac OS X 11_2_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36`;
 exports.createUserAgent = createUserAgent;
+exports.useragent = exports.createUserAgent('2.2144.11');
 exports.width = puppeteerConfig.width;
 exports.height = puppeteerConfig.height;

package/dist/controllers/browser.d.ts

@@ -1,7 +1,7 @@
 import { Page } from 'puppeteer';
 import { Spin } from './events';
 import { ConfigObject } from '../api/model';
-export declare function initPage(sessionId?: string, config?: ConfigObject, customUserAgent?: string, spinner?: Spin): Promise<Page>;
+export declare function initPage(sessionId?: string, config?: ConfigObject, customUserAgent?: string, spinner?: Spin, _page?: Page, skipAuth?: boolean): Promise<Page>;
 export declare const deleteSessionData: (config: ConfigObject) => boolean;
 export declare const getSessionDataFilePath: (sessionId: string, config: ConfigObject) => string | boolean;
 export declare const addScript: (page: Page, js: string) => Promise<unknown>;

package/dist/controllers/browser.js

@@ -42,7 +42,7 @@ const pico_s3_1 = require("pico-s3");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const puppeteer = require('puppeteer-extra');
 let browser;
-function initPage(sessionId, config, customUserAgent, spinner) {
+function initPage(sessionId, config, customUserAgent, spinner, _page, skipAuth) {
     var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function* () {
         const setupPromises = [];
@@ -52,10 +52,13 @@ function initPage(sessionId, config, customUserAgent, spinner) {
             const { default: stealth } = yield Promise.resolve().then(() => __importStar(require('puppeteer-extra-plugin-stealth')));
             puppeteer.use(stealth());
         }
-        spinner === null || spinner === void 0 ? void 0 : spinner.info('Launching Browser');
-        browser = yield initBrowser(sessionId, config);
-        const waPage = yield getWAPage(browser);
-        spinner === null || spinner === void 0 ? void 0 : spinner.info('Setting Up Browser');
+        let waPage = _page;
+        if (!waPage) {
+            spinner === null || spinner === void 0 ? void 0 : spinner.info('Launching Browser');
+            browser = yield initBrowser(sessionId, config);
+            waPage = yield getWAPage(browser);
+        }
+        spinner === null || spinner === void 0 ? void 0 : spinner.info('Setting Up Page');
         if (config === null || config === void 0 ? void 0 : config.proxyServerCredentials) {
             yield waPage.authenticate(config.proxyServerCredentials);
         }
@@ -115,40 +118,51 @@ function initPage(sessionId, config, customUserAgent, spinner) {
                     request.continue();
             }));
         }
-        spinner === null || spinner === void 0 ? void 0 : spinner.info('Loading session data');
-        let sessionjson = getSessionDataFromFile(sessionId, config, spinner);
-        if (!sessionjson && sessionjson !== "" && config.sessionDataBucketAuth) {
-            try {
-                spinner === null || spinner === void 0 ? void 0 : spinner.info('Unable to find session data file locally, attempting to find session data in cloud storage..');
-                sessionjson = JSON.parse(Buffer.from(yield pico_s3_1.getTextFile(Object.assign(Object.assign({ directory: '_sessionData' }, JSON.parse(Buffer.from(config.sessionDataBucketAuth, 'base64').toString('ascii'))), { filename: `${config.sessionId || 'session'}.data.json` })), 'base64').toString('ascii'));
-                spinner === null || spinner === void 0 ? void 0 : spinner.succeed('Successfully downloaded session data file from cloud storage!');
-            }
-            catch (error) {
-                spinner === null || spinner === void 0 ? void 0 : spinner.fail(`${error instanceof pico_s3_1.FileNotFoundError ? 'The session data file was not found in the cloud storage bucket' : 'Something went wrong while fetching session data from cloud storage bucket'}. Continuing...`);
-            }
-        }
-        if (sessionjson) {
-            spinner === null || spinner === void 0 ? void 0 : spinner.info(config.multiDevice ? "multi-device enabled. Session data skipped..." : 'Existing session data detected. Injecting...');
-            if (!(config === null || config === void 0 ? void 0 : config.multiDevice))
-                yield waPage.evaluateOnNewDocument(session => {
-                    localStorage.clear();
-                    Object.keys(session).forEach(key => localStorage.setItem(key, session[key]));
-                }, sessionjson);
-            spinner === null || spinner === void 0 ? void 0 : spinner.succeed('Existing session data injected');
+        if (skipAuth) {
+            spinner.info("Skipping Authentication");
         }
         else {
-            if (config === null || config === void 0 ? void 0 : config.multiDevice) {
-                spinner === null || spinner === void 0 ? void 0 : spinner.info("No session data detected. Opting in for MD.");
-                spinner === null || spinner === void 0 ? void 0 : spinner.info("Make sure to keep the session alive for at least 5 minutes after scanning the QR code before trying to restart a session!!");
-                yield waPage.evaluateOnNewDocument(session => {
-                    localStorage.clear();
-                    Object.keys(session).forEach(key => localStorage.setItem(key, session[key]));
-                }, {
-                    "md-opted-in": "true",
-                    "MdUpgradeWamFlag": "true",
-                    "remember-me": "true"
-                });
+            /**
+             * AUTH
+             */
+            spinner === null || spinner === void 0 ? void 0 : spinner.info('Loading session data');
+            let sessionjson = getSessionDataFromFile(sessionId, config, spinner);
+            if (!sessionjson && sessionjson !== "" && config.sessionDataBucketAuth) {
+                try {
+                    spinner === null || spinner === void 0 ? void 0 : spinner.info('Unable to find session data file locally, attempting to find session data in cloud storage..');
+                    sessionjson = JSON.parse(Buffer.from(yield pico_s3_1.getTextFile(Object.assign(Object.assign({ directory: '_sessionData' }, JSON.parse(Buffer.from(config.sessionDataBucketAuth, 'base64').toString('ascii'))), { filename: `${config.sessionId || 'session'}.data.json` })), 'base64').toString('ascii'));
+                    spinner === null || spinner === void 0 ? void 0 : spinner.succeed('Successfully downloaded session data file from cloud storage!');
+                }
+                catch (error) {
+                    spinner === null || spinner === void 0 ? void 0 : spinner.fail(`${error instanceof pico_s3_1.FileNotFoundError ? 'The session data file was not found in the cloud storage bucket' : 'Something went wrong while fetching session data from cloud storage bucket'}. Continuing...`);
+                }
+            }
+            if (sessionjson) {
+                spinner === null || spinner === void 0 ? void 0 : spinner.info(config.multiDevice ? "multi-device enabled. Session data skipped..." : 'Existing session data detected. Injecting...');
+                if (!(config === null || config === void 0 ? void 0 : config.multiDevice))
+                    yield waPage.evaluateOnNewDocument(session => {
+                        localStorage.clear();
+                        Object.keys(session).forEach(key => localStorage.setItem(key, session[key]));
+                    }, sessionjson);
+                spinner === null || spinner === void 0 ? void 0 : spinner.succeed('Existing session data injected');
+            }
+            else {
+                if (config === null || config === void 0 ? void 0 : config.multiDevice) {
+                    spinner === null || spinner === void 0 ? void 0 : spinner.info("No session data detected. Opting in for MD.");
+                    spinner === null || spinner === void 0 ? void 0 : spinner.info("Make sure to keep the session alive for at least 5 minutes after scanning the QR code before trying to restart a session!!");
+                    yield waPage.evaluateOnNewDocument(session => {
+                        localStorage.clear();
+                        Object.keys(session).forEach(key => localStorage.setItem(key, session[key]));
+                    }, {
+                        "md-opted-in": "true",
+                        "MdUpgradeWamFlag": "true",
+                        "remember-me": "true"
+                    });
+                }
             }
+            /**
+             * END AUTH
+             */
         }
         if ((config === null || config === void 0 ? void 0 : config.proxyServerCredentials) && !(config === null || config === void 0 ? void 0 : config.useNativeProxy)) {
             yield proxy(waPage, proxyAddr);

package/dist/controllers/initializer.js

@@ -158,7 +158,7 @@ function create(config = {}) {
              * Check if the IGNORE folder exists, therefore, assume that the session is MD.
              */
             const mdDir = config["userDataDir"] || `${(config === null || config === void 0 ? void 0 : config.inDocker) ? '/sessions' : (config === null || config === void 0 ? void 0 : config.sessionDataPath) || '.'}/_IGNORE_${(config === null || config === void 0 ? void 0 : config.sessionId) || 'session'}`;
-            if (fs.existsSync(mdDir) && !(config === null || config === void 0 ? void 0 : config.multiDevice)) {
+            if (process.env.AUTO_MD && fs.existsSync(mdDir) && !(config === null || config === void 0 ? void 0 : config.multiDevice)) {
                 spinner.info(`Multi-Device directory detected. multiDevice set to true.`);
                 config.multiDevice = true;
             }
@@ -269,7 +269,10 @@ function create(config = {}) {
                 const race = [];
                 race.push(auth_1.smartQr(waPage, config, spinner));
                 if ((config === null || config === void 0 ? void 0 : config.qrTimeout) !== 0) {
-                    race.push(timeout(((config === null || config === void 0 ? void 0 : config.qrTimeout) || 60) * 1000));
+                    let to = ((config === null || config === void 0 ? void 0 : config.qrTimeout) || 60) * 1000;
+                    if (config === null || config === void 0 ? void 0 : config.multiDevice)
+                        to = to * 2;
+                    race.push(timeout(to));
                 }
                 const result = yield Promise.race(race);
                 if (result === "MULTI_DEVICE_DETECTED" && !(config === null || config === void 0 ? void 0 : config.multiDevice)) {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@open-wa/wa-automate",
-  "version": "4.23.15",
+  "version": "4.24.0",
   "licenseCheckUrl": "https://openwa.dev/license-check",
   "brokenMethodReportUrl": "https://openwa.dev/report-bm",
-  "patches": "https://cdn.openwa.dev/patches.json",
+  "patches": "http://127.0.0.1:5503/functions/patches.json",
   "stickerUrl": "https://sticker-api.openwa.dev",
   "description": " 💬 🤖 The most reliable NodeJS whatsapp library for chatbots with advanced features.",
   "main": "dist/index.js",
@@ -69,6 +69,7 @@
     "@types/express": "^4.17.11",
     "@types/fs-extra": "^9.0.11",
     "@types/line-reader": "0.0.34",
+    "@types/localtunnel": "^2.0.1",
     "@types/marked": "^3.0.0",
     "@types/mime-types": "^2.1.0",
     "@types/node": "^16.0.0",
@@ -120,11 +121,11 @@
     "find-up": "^5.0.0",
     "fs-extra": "^10.0.0",
     "get-port": "^5.1.1",
-    "glob-promise": "^4.2.2",
     "hasha": "^5.2.0",
     "image-type": "^4.1.0",
     "is-url-superb": "^5.0.0",
     "json5": "^2.2.0",
+    "localtunnel": "^2.0.2",
     "lodash.uniq": "^4.5.0",
     "meow": "^9.0.0",
     "node-persist": "^3.1.0",
@@ -154,6 +155,7 @@
     "swagger-ui-express": "^4.1.4",
     "tcp-port-used": "^1.0.1",
     "terminal-link": "^2.1.1",
+    "tiny-glob": "^0.2.9",
     "tree-kill": "^1.2.2",
     "ts-json-schema-generator": "^0.95.0",
     "ts-morph": "^12.0.0",