instauto 9.1.6 → 9.1.9

package/README.md

@@ -1,5 +1,7 @@
 ![](logo.png)
 
+[![Discord](https://img.shields.io/discord/986052713425027072)](https://discord.gg/Rh3KT9zyhj) [![PayPal](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://paypal.me/mifino/usd)
+
 instauto is an Instagram automation/bot library written in modern, clean javascript using Google's Puppeteer. Goal is to be very easy to set up, use, and extend, and obey instagram's limits. Heavily inspired by [InstaPy](https://github.com/timgrossmann/InstaPy), but I thought it was way too heavy and hard to setup.
 
 **NEW! 🎉**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "instauto",
-  "version": "9.1.6",
+  "version": "9.1.9",
   "description": "Instagram automation library written in Node.js",
   "main": "src/index.js",
   "scripts": {

package/src/index.js

@@ -170,11 +170,14 @@ const Instauto = async (db, browser, options) => {
     return new Date().getTime() - followedUserEntry.time < dontUnfollowUntilTimeElapsed;
   }
 
+  // See https://github.com/mifi/SimpleInstaBot/issues/140#issuecomment-1149105387
+  const gotoUrl = async (url) => page.goto(url, { waitUntil: ['load', 'domcontentloaded', 'networkidle0'] });
+
   async function gotoWithRetry(url) {
     const maxAttempts = 3;
     for (let attempt = 0; ; attempt += 1) {
       logger.log(`Goto ${url}`);
-      const response = await page.goto(url);
+      const response = await gotoUrl(url);
       await sleep(2000);
       const status = response.status();
 
@@ -312,17 +315,23 @@ const Instauto = async (db, browser, options) => {
   }
 
   async function findUnfollowButton() {
-    const elementHandles = await page.$x("//header//button[text()='Following']");
+    let button = await findButtonWithText('Following');
+    if (button) return button;
+
+    button = await findButtonWithText('Requested');
+    if (button) return button;
+
+    let elementHandles = await page.$x("//header//button[*//span[@aria-label='Following']]");
     if (elementHandles.length > 0) return elementHandles[0];
 
-    const elementHandles2 = await page.$x("//header//button[text()='Requested']");
-    if (elementHandles2.length > 0) return elementHandles2[0];
+    elementHandles = await page.$x("//header//button[*//span[@aria-label='Requested']]");
+    if (elementHandles.length > 0) return elementHandles[0];
 
-    const elementHandles3 = await page.$x("//header//button[*//span[@aria-label='Following']]");
-    if (elementHandles3.length > 0) return elementHandles3[0];
+    elementHandles = await page.$x("//header//button[*//*[name()='svg'][@aria-label='Following']]");
+    if (elementHandles.length > 0) return elementHandles[0];
 
-    const elementHandles4 = await page.$x("//header//button[*//*[name()='svg'][@aria-label='Following']]");
-    if (elementHandles4.length > 0) return elementHandles4[0];
+    elementHandles = await page.$x("//header//button[*//*[name()='svg'][@aria-label='Requested']]");
+    if (elementHandles.length > 0) return elementHandles[0];
 
     return undefined;
   }
@@ -795,7 +804,7 @@ const Instauto = async (db, browser, options) => {
 
   if (enableCookies) await tryLoadCookies();
 
-  const goHome = async () => page.goto(`${instagramBaseUrl}/?hl=en`);
+  const goHome = async () => gotoUrl(`${instagramBaseUrl}/?hl=en`);
 
   // https://github.com/mifi/SimpleInstaBot/issues/28
   async function setLang(short, long, assumeLoggedIn = false) {
@@ -807,7 +816,7 @@ const Instauto = async (db, browser, options) => {
       // when logged in, we need to go to account in order to be able to check/set language
       // (need to see the footer)
       if (assumeLoggedIn) {
-        await page.goto(`${instagramBaseUrl}/accounts/edit/`);
+        await gotoUrl(`${instagramBaseUrl}/accounts/edit/`);
       } else {
         await goHome();
       }
@@ -872,6 +881,19 @@ const Instauto = async (db, browser, options) => {
     }
   }
 
+  async function tryClickLogin() {
+    async function tryClickButton(xpath) {
+      const btn = (await page.$x(xpath))[0];
+      if (!btn) return false;
+      await btn.click();
+      return true;
+    }
+
+    if (await tryClickButton("//button[.//text() = 'Log In']")) return true;
+    if (await tryClickButton("//button[.//text() = 'Log in']")) return true; // https://github.com/mifi/instauto/pull/110 https://github.com/mifi/instauto/issues/109
+    return false;
+  }
+
   await setEnglishLang(false);
 
   await tryPressButton(await page.$x('//button[contains(text(), "Accept")]'), 'Accept cookies dialog');
@@ -900,11 +922,8 @@ const Instauto = async (db, browser, options) => {
     await sleep(1000);
 
     for (;;) {
-      const loginButton = (await page.$x("//button[.//text() = 'Log In']"))[0];
-      if (loginButton) {
-        await loginButton.click();
-        break;
-      }
+      const didClickLogin = await tryClickLogin();
+      if (didClickLogin) break;
       logger.warn('Login button not found. Maybe you can help me click it? And also report an issue on github with a screenshot of what you\'re seeing :)');
       await sleep(6000);
     }