instauto 9.1.5 → 9.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "instauto",
-  "version": "9.1.5",
+  "version": "9.1.8",
   "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;
   }
@@ -553,7 +562,7 @@ const Instauto = async (db, browser, options) => {
 
       await window.instautoSleep(3000);
 
-      const closeButtonChild = document.querySelector('button [aria-label=Close]');
+      const closeButtonChild = document.querySelector('svg[aria-label="Close"]');
 
       if (!closeButtonChild) throw new Error('Close button not found (aria-label)');
 
@@ -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();
       }