instauto 9.1.3 → 9.1.6

package/package.json

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

package/src/index.js

@@ -45,6 +45,8 @@ const Instauto = async (db, browser, options) => {
     followUserMinFollowers = null,
     followUserMinFollowing = null,
 
+    shouldFollowUser = null,
+
     dontUnfollowUntilTimeElapsed = 3 * 24 * 60 * 60 * 1000,
 
     excludeUsers = [],
@@ -58,6 +60,7 @@ const Instauto = async (db, browser, options) => {
   } = options;
 
   let myUsername = myUsernameIn;
+  const userDataCache = {};
 
   assert(cookiesPath);
   assert(db);
@@ -168,15 +171,20 @@ const Instauto = async (db, browser, options) => {
   }
 
   async function gotoWithRetry(url) {
+    const maxAttempts = 3;
     for (let attempt = 0; ; attempt += 1) {
       logger.log(`Goto ${url}`);
       const response = await page.goto(url);
-      await sleep(1000);
+      await sleep(2000);
       const status = response.status();
 
       // https://www.reddit.com/r/Instagram/comments/kwrt0s/error_560/
       // https://github.com/mifi/instauto/issues/60
-      if (![560, 429].includes(status) || attempt > 3) return status;
+      if (![560, 429].includes(status)) return status;
+
+      if (attempt > maxAttempts) {
+        throw new Error(`Navigate to user failed after ${maxAttempts} attempts, last status: ${status}`);
+      }
 
       logger.info(`Got ${status} - Retrying request later...`);
       if (status === 429) logger.warn('429 Too Many Requests could mean that Instagram suspects you\'re using a bot. You could try to use the Instagram Mobile app from the same IP for a few days first');
@@ -184,42 +192,61 @@ const Instauto = async (db, browser, options) => {
     }
   }
 
-  async function safeGotoUser(url, checkPageForUsername) {
-    const status = await gotoWithRetry(url);
-    if (status === 200) {
-      if (checkPageForUsername != null) {
-        // some pages return 200 but nothing there (I think deleted accounts)
-        // https://github.com/mifi/SimpleInstaBot/issues/48
-        // example: https://www.instagram.com/victorialarson__/
-        // so we check if the page has the user's name on it
-        return page.evaluate((username) => window.find(username), checkPageForUsername);
-      }
-      return true;
-    }
-    if (status === 404) {
-      logger.log('User not found');
-      return false;
-    }
-    throw new Error(`Navigate to user failed with status ${status}`);
+  const getUserPageUrl = (username) => `${instagramBaseUrl}/${encodeURIComponent(username)}`;
+
+  function isAlreadyOnUserPage(username) {
+    const url = getUserPageUrl(username);
+    // optimization: already on URL? (ignore trailing slash)
+    return (page.url().replace(/\/$/, '') === url.replace(/\/$/, ''));
   }
 
   async function navigateToUser(username) {
-    const url = `${instagramBaseUrl}/${encodeURIComponent(username)}`;
-    if (page.url().replace(/\/$/, '') === url.replace(/\/$/, '')) return true; // optimization: already on URL? (ignore trailing slash)
+    if (isAlreadyOnUserPage(username)) return true;
+
     // logger.log('navigating from', page.url(), 'to', url);
     logger.log(`Navigating to user ${username}`);
-    return safeGotoUser(url, username);
+
+    const url = getUserPageUrl(username);
+    const status = await gotoWithRetry(url);
+    if (status === 404) {
+      logger.warn('User page returned 404');
+      return false;
+    }
+
+    if (status === 200) {
+      // some pages return 200 but nothing there (I think deleted accounts)
+      // https://github.com/mifi/SimpleInstaBot/issues/48
+      // example: https://www.instagram.com/victorialarson__/
+      // so we check if the page has the user's name on it
+      const foundUsernameOnPage = await page.evaluate((u) => window.find(u), username);
+      if (!foundUsernameOnPage) logger.warn(`Cannot find "${username}" on page`);
+      return foundUsernameOnPage;
+    }
+
+    throw new Error(`Navigate to user failed with status ${status}`);
   }
 
   async function navigateToUserWithCheck(username) {
     if (!(await navigateToUser(username))) throw new Error('User not found');
   }
 
-  async function getPageJson() {
-    return JSON.parse(await (await (await page.$('pre')).getProperty('textContent')).jsonValue());
-  }
-
   async function navigateToUserAndGetData(username) {
+    const cachedUserData = userDataCache[username];
+
+    if (isAlreadyOnUserPage(username)) {
+      // assume we have data
+      return cachedUserData;
+    }
+
+    if (cachedUserData != null) {
+      // if we already have userData, just navigate
+      await navigateToUserWithCheck(username);
+      return cachedUserData;
+    }
+
+    // intercept special XHR network request that fetches user's data and store it in a cache
+    // TODO fallback to DOM to get user ID if this request fails?
+    // https://github.com/mifi/SimpleInstaBot/issues/125#issuecomment-1145354294
     const [foundResponse] = await Promise.all([
       page.waitForResponse((response) => {
         const request = response.request();
@@ -230,7 +257,13 @@ const Instauto = async (db, browser, options) => {
     ]);
 
     const json = JSON.parse(await foundResponse.text());
-    return json.data.user;
+    const userData = json.data.user;
+    userDataCache[username] = userData;
+    return userData;
+  }
+
+  async function getPageJson() {
+    return JSON.parse(await (await (await page.$('pre')).getProperty('textContent')).jsonValue());
   }
 
   async function isActionBlocked() {
@@ -300,7 +333,7 @@ const Instauto = async (db, browser, options) => {
   }
 
   async function followUser(username) {
-    await navigateToUserWithCheck(username);
+    await navigateToUserAndGetData(username);
     const elementHandle = await findFollowButton();
 
     if (!elementHandle) {
@@ -342,7 +375,7 @@ const Instauto = async (db, browser, options) => {
   // See https://github.com/timgrossmann/InstaPy/pull/2345
   // https://github.com/timgrossmann/InstaPy/issues/2355
   async function unfollowUser(username) {
-    await navigateToUserWithCheck(username);
+    await navigateToUserAndGetData(username);
     logger.log(`Unfollowing user ${username}`);
 
     const res = { username, time: new Date().getTime() };
@@ -520,7 +553,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)');
 
@@ -541,7 +574,7 @@ const Instauto = async (db, browser, options) => {
   async function likeUserImages({ username, likeImagesMin, likeImagesMax } = {}) {
     if (!likeImagesMin || !likeImagesMax || likeImagesMax < likeImagesMin || likeImagesMin < 1) throw new Error('Invalid arguments');
 
-    await navigateToUserWithCheck(username);
+    await navigateToUserAndGetData(username);
 
     logger.log(`Liking ${likeImagesMin}-${likeImagesMax} user images`);
     try {
@@ -563,9 +596,7 @@ const Instauto = async (db, browser, options) => {
 
     const graphqlUser = await navigateToUserAndGetData(username);
 
-    const followedByCount = graphqlUser.edge_followed_by.count;
-    const followsCount = graphqlUser.edge_follow.count;
-    const isPrivate = graphqlUser.is_private;
+    const { edge_followed_by: { count: followedByCount }, edge_follow: { count: followsCount }, is_private: isPrivate, is_verified: isVerified, is_business_account: isBusinessAccount, is_professional_account: isProfessionalAccount, full_name: fullName, biography, profile_pic_url_hd: profilePicUrlHd, external_url: externalUrl, business_category_name: businessCategoryName, category_name: categoryName } = graphqlUser;
 
     // logger.log('followedByCount:', followedByCount, 'followsCount:', followsCount);
 
@@ -591,6 +622,10 @@ const Instauto = async (db, browser, options) => {
       logger.log('User has too many followers compared to follows or opposite, skipping');
       return false;
     }
+    if (shouldFollowUser !== null && (typeof shouldFollowUser === 'function' && !shouldFollowUser({ username, isVerified, isBusinessAccount, isProfessionalAccount, fullName, biography, profilePicUrlHd, externalUrl, businessCategoryName, categoryName }) === true)) {
+      logger.log(`Custom follow logic returned false for ${username}, skipping`);
+      return false;
+    }
 
     await followUser(username);
 
@@ -686,6 +721,8 @@ const Instauto = async (db, browser, options) => {
             const userFound = await navigateToUser(username);
 
             if (!userFound) {
+              // to avoid repeatedly unfollowing failed users, flag them as already unfollowed
+              logger.log('User not found for unfollow');
               await addPrevUnfollowedUser({ username, time: new Date().getTime(), noActionTaken: true });
               await sleep(3000);
             } else {
@@ -720,6 +757,8 @@ const Instauto = async (db, browser, options) => {
       }
     }
 
+    logger.log('Done with unfollowing', i, j);
+
     return j;
   }