feat: addProxy

orkestral · Dec 23, 2021 · 22f9f01 · 22f9f01
1 parent b008ca8
commit 22f9f01
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/src/config/create-config.ts b/src/config/create-config.ts
@@ -171,6 +171,21 @@ export interface CreateConfig {
    * @default false
    */
   logger?: Logger;
+  /**
+   * Add proxy server
+   * @default null
+   */
+  addProxy?: string[];
+  /**
+   * Proxy username
+   * @default null
+   */
+  userProxy?: string;
+  /**
+   * Proxy password
+   * @default null
+   */
+  userPass?: string;
 }
 export const defaultOptions: CreateConfig = {
   multidevice: true,

diff --git a/src/controllers/browser.ts b/src/controllers/browser.ts
@@ -77,6 +77,20 @@ export async function initWhatsapp(
     try {
       await waPage.setUserAgent(useragentOverride);
       await waPage.setBypassCSP(true);
+      if (
+        typeof options.userPass === 'string' &&
+        options.userPass.length &&
+        typeof options.userProxy === 'string' &&
+        options.userProxy.length &&
+        Array.isArray(options.addProxy) &&
+        options.addProxy.length
+      ) {
+        await waPage.authenticate({
+          username: options.userProxy,
+          password: options.userPass
+        });
+      }
+
       await waPage.goto(puppeteerConfig.whatsappUrl, {
         waitUntil: 'domcontentloaded'
       });
@@ -236,6 +250,17 @@ export async function initBrowser(
   // Use stealth plugin to avoid being detected as a bot
   puppeteer.use(StealthPlugin());
 
+  if (Array.isArray(options.addProxy) && options.addProxy.length) {
+    const proxy =
+      options.addProxy[Math.floor(Math.random() * options.addProxy.length)];
+    options.browserArgs
+      ? Object.assign(options.browserArgs, [`--proxy-server=${proxy}`])
+      : Object.assign(puppeteerConfig.chromiumArgs, [
+          `--proxy-server=${proxy}`
+        ]);
+    // console.log(puppeteerConfig.chromiumArgs);
+  }
+
   let browser = null;
   if (options.browserWS && options.browserWS != '') {
     await puppeteer

diff --git a/src/controllers/initializer.ts b/src/controllers/initializer.ts
@@ -276,7 +276,7 @@ export async function create(
           () => {
             if (
               document.querySelector('canvas') &&
-              document.querySelectorAll('#startup').length == 0
+              document.querySelectorAll('._2Nr6U').length == 0
             ) {
               return true;
             }
@@ -299,7 +299,7 @@ export async function create(
       if (state === SocketState.PAIRING) {
         await page.waitForFunction(
           () => {
-            if (document.querySelectorAll('#startup').length) {
+            if (document.querySelectorAll('._2Nr6U').length) {
               return true;
             }
           },