@open-wa/wa-automate 4.71.15 → 4.72.1

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

@@ -191,6 +191,7 @@ export interface ProxyServerCredentials {
 }
 export interface ConfigObject {
     /**
+     * @deprecated
      * The authentication object (as a JSON object or a base64 encoded string) that is required to migrate a session from one instance to another or to just restart an existing instance.
      * This sessionData is provided in a generated JSON file (it's a json file but contains the JSON data as a base64 encoded string) upon QR scan or an event.
      *
@@ -223,6 +224,15 @@ export interface ConfigObject {
      * Setting the sessionData in the environmental variable will override the sessionData object in the config.
      */
     sessionData?: SessionData | Base64;
+    /**
+     * There is a new way to login to your host account by entering a link code after a confirmation step from the host account device. In order to use this feature you MUST set the host account number as a string or number beforehand as a property of the config object.
+     *
+     * e.g
+     * ```
+     * linkCode: '1234567890'
+     * ```
+     */
+    linkCode?: string;
     /**
      * ALPHA EXPERIMENTAL FEATURE! DO NOT USE IN PRODUCTION, REQUIRES TESTING.
      *

package/dist/build/build-postman.js

@@ -187,8 +187,8 @@ const postmanRequestGeneratorGenerator = setup => method => {
             }
         },
         url,
-        "documentationUrl": `https://docs.openwa.dev/classes/api_Client.Client.html#${method.name}`,
-        "description": `${method.text}\n[External Documentation](https://docs.openwa.dev/classes/api_Client.Client.html#${method.name})`
+        "documentationUrl": `https://docs.openwa.dev/docs/reference/api/Client/classes/Client#${(method.name || "").toLowerCase()}`,
+        "description": `${method.text}\n[External Documentation](https://docs.openwa.dev/docs/reference/api/Client/classes/Client#${(method.name || "").toLowerCase()})`
     };
     if (!(setup === null || setup === void 0 ? void 0 : setup.key))
         delete request.auth;

package/dist/cli/collections.js

@@ -56,7 +56,7 @@ const generateCollections = (config, spinner) => __awaiter(void 0, void 0, void
             "description": "All methods from the Client",
             "externalDocs": {
                 "description": "Find out more",
-                "url": "https://docs.openwa.dev/classes/api_Client.Client.html"
+                "url": "https://docs.openwa.dev/docs/reference/api/Client/classes/Client"
             }
         },
         {

package/dist/cli/integrations/chatwoot.js

@@ -367,6 +367,7 @@ class ChatwootClient {
                     false;
             }
             catch (error) {
+                __1.log.error(`CW SEARCH CONTACT ERROR: ${error.message}`);
                 return;
             }
         });
@@ -386,6 +387,7 @@ class ChatwootClient {
                 return resolvedConversation;
             }
             catch (error) {
+                __1.log.error(`CW GET CONVERSATION ERROR: ${error.message}`);
                 return;
             }
         });
@@ -400,6 +402,7 @@ class ChatwootClient {
                 return data;
             }
             catch (error) {
+                __1.log.error(`CW CREATE CONVERSATION ERROR: ${error.message}`);
                 return;
             }
         });
@@ -417,6 +420,7 @@ class ChatwootClient {
                 return data.payload.contact;
             }
             catch (error) {
+                __1.log.error(`CW CREATE CONTACT ERROR: ${error.message}`);
                 return;
             }
         });
@@ -430,6 +434,7 @@ class ChatwootClient {
                 return data;
             }
             catch (error) {
+                __1.log.error(`CW OPEN CONVERSATION ERROR: ${error.message}`);
                 return;
             }
         });
@@ -449,6 +454,7 @@ class ChatwootClient {
                 return data;
             }
             catch (error) {
+                __1.log.error(`CW SEND CONVERSATION MESSAGE ERROR: ${error.message}`);
                 return;
             }
         });
@@ -470,6 +476,7 @@ class ChatwootClient {
                 return data;
             }
             catch (error) {
+                __1.log.error(`CW SEND ATTACHMENT MESSAGE ERROR: ${error.message}`);
                 return;
             }
         });
@@ -507,6 +514,9 @@ class ChatwootClient {
                     }
                     else {
                         //create the conversation
+                        /**
+                         * TODO: Handle create conversation error
+                         */
                         convoReg[message.chatId] = (yield this.createConversation(contactReg[message.chatId])).id;
                         isNewConversation = convoReg[message.chatId];
                     }

package/dist/cli/setup.js

@@ -116,7 +116,7 @@ exports.helptext = (0, command_line_usage_1.default)([{
         ]
     },
     {
-        content: `Please check here for more information on some of the above mentioned parameters: {underline https://docs.openwa.dev/interfaces/api_model_config.configobject}`
+        content: `Please check here for more information on some of the above mentioned parameters: {underline https://docs.openwa.dev/docs/reference/api/model/config/interfaces/ConfigObject}`
     },
     {
         content: 'Project home: {underline https://github.com/open-wa/wa-automate-nodejs}'

package/dist/controllers/auth.d.ts

@@ -25,6 +25,7 @@ export declare class QRManager {
     setConfig(config: any): void;
     qrEvF(config?: ConfigObject): any;
     grabAndEmit(qrData: any, waPage: Page, config: ConfigObject, spinner: Spin): Promise<void>;
+    linkCode(waPage: Page, config?: ConfigObject, spinner?: Spin): Promise<boolean | void | string>;
     smartQr(waPage: Page, config?: ConfigObject, spinner?: Spin): Promise<boolean | void | string>;
     emitFirst(waPage: Page, config?: ConfigObject, spinner?: Spin): Promise<void>;
     /**

package/dist/controllers/auth.js

@@ -67,8 +67,11 @@ const needsToScan = (waPage) => {
             //     }).catch(() => resolve(true))
             // ]).catch(() => { })
             // console.log("🚀 ~ needsToScan ~ raceResult:", raceResult)
-            const elementResult = yield waPage.waitForSelector("canvas[aria-label='Scan me!']", { timeout: 0 }).catch(() => { });
-            console.log("🚀 ~ needsToScan ~ elementResult:", elementResult);
+            const elementResult = yield Promise.race([
+                waPage.waitForSelector("canvas[aria-label='Scan this QR code to link a device!']", { timeout: 0 }).catch(() => { }),
+                waPage.waitForSelector("canvas[aria-label]", { timeout: 0 }).catch(() => { })
+            ]);
+            logging_1.log.info("🚀 ~ needsToScan ~ elementResult:", elementResult);
             resolve(false);
         }
         catch (error) {
@@ -145,6 +148,7 @@ class QRManager {
     }
     grabAndEmit(qrData, waPage, config, spinner) {
         return __awaiter(this, void 0, void 0, function* () {
+            const isLinkCode = qrData.length === 9;
             this.qrNum++;
             if (config.qrMax && this.qrNum > config.qrMax) {
                 spinner.info('QR Code limit reached, exiting...');
@@ -156,9 +160,14 @@ class QRManager {
             if (qrData) {
                 qrEv.emit(qrData, `qrData`);
                 if (!config.qrLogSkip) {
-                    qrcode.generate(qrData, { small: true }, terminalQrCode => {
-                        console.log((0, boxen_1.default)(terminalQrCode, { title: config.sessionId, padding: 1, titleAlignment: 'center' }));
-                    });
+                    if (isLinkCode) {
+                        console.log((0, boxen_1.default)(qrData, { title: `ENTER THIS CODE ON THE HOST ACCOUNT DEVICE: ${config.sessionId}`, padding: 1, titleAlignment: 'center' }));
+                    }
+                    else {
+                        qrcode.generate(qrData, { small: true }, terminalQrCode => {
+                            console.log((0, boxen_1.default)(terminalQrCode, { title: config.sessionId, padding: 1, titleAlignment: 'center' }));
+                        });
+                    }
                 }
                 else {
                     console.log(`New QR Code generated. Not printing in console because qrLogSkip is set to true`);
@@ -172,7 +181,7 @@ class QRManager {
                 this._internalQrPngLoaded = true;
             }
             try {
-                const qrPng = yield waPage.evaluate(`window.getQrPng()`);
+                const qrPng = isLinkCode ? qrData : yield waPage.evaluate(`window.getQrPng()`);
                 if (qrPng) {
                     qrEv.emit(qrPng);
                     (0, tools_1.processSend)('ready');
@@ -208,6 +217,30 @@ class QRManager {
             }
         });
     }
+    linkCode(waPage, config, spinner) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const evalResult = yield waPage.evaluate("window.Store && window.Store.State");
+            if (evalResult === false) {
+                console.log('Seems as though you have been TOS_BLOCKed, unable to refresh QR Code. Please see https://github.com/open-wa/wa-automate-nodejs#best-practice for information on how to prevent this from happeing. You will most likely not get a QR Code');
+                logging_1.log.warn('Seems as though you have been TOS_BLOCKed, unable to refresh QR Code. Please see https://github.com/open-wa/wa-automate-nodejs#best-practice for information on how to prevent this from happeing. You will most likely not get a QR Code');
+                if (config.throwErrorOnTosBlock)
+                    throw new Error('TOSBLOCK');
+            }
+            const isAuthed = yield (0, exports.isAuthenticated)(waPage);
+            if (isAuthed)
+                return true;
+            const _hasDefaultStateYet = yield waPage.evaluate("!!(window.Store &&  window.Store.State && window.Store.State.Socket)");
+            if (!_hasDefaultStateYet) {
+                //expecting issue, take a screenshot then wait a few seconds before continuing
+                yield (0, tools_1.timeout)(2000);
+            }
+            spinner.info('Link Code requested, please use the link code to login from your host account device');
+            const linkCode = yield waPage.evaluate((number) => window['linkCode'](number), config === null || config === void 0 ? void 0 : config.linkCode);
+            spinner === null || spinner === void 0 ? void 0 : spinner.succeed(`Link Code please use this to login from your host account device: ${linkCode}`);
+            yield this.grabAndEmit(linkCode, waPage, config, spinner);
+            return yield isInsideChat(waPage).toPromise();
+        });
+    }
     smartQr(waPage, config, spinner) {
         return __awaiter(this, void 0, void 0, function* () {
             const evalResult = yield waPage.evaluate("window.Store && window.Store.State");
@@ -272,6 +305,9 @@ class QRManager {
      */
     waitFirstQr(waPage, config, spinner) {
         return __awaiter(this, void 0, void 0, function* () {
+            /**
+             * Check if session is authed already
+             */
             const fqr = yield waPage.waitForFunction(`!!(${this.qrCheck})`, {
                 polling: 500,
                 timeout: 10000

package/dist/controllers/initializer.js

@@ -298,7 +298,11 @@ function create(config = {}) {
             else {
                 spinner.info('Authenticate to continue');
                 const race = [];
-                race.push(qrManager.smartQr(waPage, config, spinner));
+                if (config === null || config === void 0 ? void 0 : config.linkCode) {
+                    race.push(qrManager.linkCode(waPage, config, spinner));
+                }
+                else
+                    race.push(qrManager.smartQr(waPage, config, spinner));
                 if ((config === null || config === void 0 ? void 0 : config.qrTimeout) !== 0) {
                     let to = ((config === null || config === void 0 ? void 0 : config.qrTimeout) || 60) * 1000;
                     if (config === null || config === void 0 ? void 0 : config.multiDevice)