instauto 9.1.0 → 9.1.3

package/README.md

@@ -25,7 +25,7 @@ Now there is a GUI application for those who don't want to code: [SimpleInstaBot
 
 You can run this code for example once every day using cron or pm2 or similar
 
-See [index.js](https://github.com/mifi/instauto/blob/master/index.js) for available options.
+See [index.js](https://github.com/mifi/instauto/blob/master/src/index.js) for available options.
 
 ## Supported functionality
 

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "instauto",
-  "version": "9.1.0",
+  "version": "9.1.3",
   "description": "Instagram automation library written in Node.js",
-  "main": "index.js",
+  "main": "src/index.js",
   "scripts": {
     "lint": "eslint .",
     "test": "exit 0"
   },
+  "files": [
+    "src"
+  ],
   "author": "Mikael Finstad <finstaden@gmail.com>",
   "repository": "mifi/instauto",
   "license": "MIT",

package/{index.js → src/index.js}

@@ -73,7 +73,6 @@ const Instauto = async (db, browser, options) => {
 
   // State
   let page;
-  let graphqlUserMissing = false;
 
   async function takeScreenshot() {
     if (!screenshotOnError) return;
@@ -221,37 +220,17 @@ const Instauto = async (db, browser, options) => {
   }
 
   async function navigateToUserAndGetData(username) {
-    // https://github.com/mifi/SimpleInstaBot/issues/36
-    if (graphqlUserMissing) {
-      // https://stackoverflow.com/questions/37593025/instagram-api-get-the-userid
-      // https://stackoverflow.com/questions/17373886/how-can-i-get-a-users-media-from-instagram-without-authenticating-as-a-user
-      const found = await safeGotoUser(`${instagramBaseUrl}/${encodeURIComponent(username)}?__a=1`);
-      if (!found) throw new Error('User not found');
-
-      const json = await getPageJson();
-
-      const { user } = json.graphql;
-
-      await navigateToUserWithCheck(username);
-      return user;
-    }
-
-    await navigateToUserWithCheck(username);
-
-    // eslint-disable-next-line no-underscore-dangle
-    const sharedData = await page.evaluate(() => window._sharedData);
-    try {
-      // eslint-disable-next-line prefer-destructuring
-      return sharedData.entry_data.ProfilePage[0].graphql.user;
-
-      // JSON.parse(Array.from(document.getElementsByTagName('script')).find(el => el.innerHTML.startsWith('window.__additionalDataLoaded(\'feed\',')).innerHTML.replace(/^window.__additionalDataLoaded\('feed',({.*})\);$/, '$1'));
-      // JSON.parse(Array.from(document.getElementsByTagName('script')).find(el => el.innerHTML.startsWith('window._sharedData')).innerHTML.replace(/^window._sharedData ?= ?({.*});$/, '$1'));
-      // Array.from(document.getElementsByTagName('a')).find(el => el.attributes?.href?.value.includes(`${username}/followers`)).innerText
-    } catch (err) {
-      logger.warn('Missing graphql in page, falling back to alternative method...');
-      graphqlUserMissing = true; // Store as state so we don't have to do this every time from now on.
-      return navigateToUserAndGetData(username); // Now try again with alternative method
-    }
+    const [foundResponse] = await Promise.all([
+      page.waitForResponse((response) => {
+        const request = response.request();
+        return request.method() === 'GET' && new RegExp(`https:\\/\\/i\\.instagram\\.com\\/api\\/v1\\/users\\/web_profile_info\\/\\?username=${encodeURIComponent(username.toLowerCase())}`).test(request.url());
+      }),
+      navigateToUserWithCheck(username),
+      // page.waitForNavigation({ waitUntil: 'networkidle0' }),
+    ]);
+
+    const json = JSON.parse(await foundResponse.text());
+    return json.data.user;
   }
 
   async function isActionBlocked() {
@@ -309,6 +288,9 @@ const Instauto = async (db, browser, options) => {
     const elementHandles3 = await page.$x("//header//button[*//span[@aria-label='Following']]");
     if (elementHandles3.length > 0) return elementHandles3[0];
 
+    const elementHandles4 = await page.$x("//header//button[*//*[name()='svg'][@aria-label='Following']]");
+    if (elementHandles4.length > 0) return elementHandles4[0];
+
     return undefined;
   }
 
@@ -578,6 +560,7 @@ const Instauto = async (db, browser, options) => {
       logger.log('Skipping already followed user', username);
       return false;
     }
+
     const graphqlUser = await navigateToUserAndGetData(username);
 
     const followedByCount = graphqlUser.edge_followed_by.count;
@@ -629,9 +612,9 @@ const Instauto = async (db, browser, options) => {
 
     let numFollowedForThisUser = 0;
 
-    const userData = await navigateToUserAndGetData(username);
+    const { id: userId } = await navigateToUserAndGetData(username);
 
-    for await (const followersBatch of getFollowersOrFollowingGenerator({ userId: userData.id, getFollowers: true })) {
+    for await (const followersBatch of getFollowersOrFollowingGenerator({ userId, getFollowers: true })) {
       logger.log('User followers batch', followersBatch);
 
       for (const follower of followersBatch) {
@@ -643,13 +626,13 @@ const Instauto = async (db, browser, options) => {
             return;
           }
 
-          if (enableFollow) {
-            if (await followUserRespectingRestrictions({ username: follower, skipPrivate })) {
-              numFollowedForThisUser += 1;
-            }
-          }
+          let didActuallyFollow = false;
+          if (enableFollow) didActuallyFollow = await followUserRespectingRestrictions({ username: follower, skipPrivate });
+          if (didActuallyFollow) numFollowedForThisUser += 1;
+
+          const didFailToFollow = enableFollow && !didActuallyFollow;
 
-          if (enableLikeImages) {
+          if (enableLikeImages && !didFailToFollow) {
             // Note: throws error if user isPrivate
             await likeUserImages({ username: follower, likeImagesMin, likeImagesMax });
           }
@@ -934,16 +917,14 @@ const Instauto = async (db, browser, options) => {
     throw new Error('Don\'t know what\'s my username');
   }
 
-  const myUserData = await navigateToUserAndGetData(myUsername);
-  const myUserId = myUserData.id;
+  const { id: myUserId } = await navigateToUserAndGetData(myUsername);
 
   // --- END OF INITIALIZATION
 
   async function doesUserFollowMe(username) {
     try {
       logger.info('Checking if user', username, 'follows us');
-      const userData = await navigateToUserAndGetData(username);
-      const userId = userData.id;
+      const { id: userId } = await navigateToUserAndGetData(username);
 
       const elementHandles = await page.$x("//a[contains(.,' following')][contains(@href,'/following')]");
       if (elementHandles.length === 0) throw new Error('Following button not found');

package/.eslintrc

@@ -1,36 +0,0 @@
-{
-  "env": {
-    "node": true
-  },
-  "extends": "airbnb/base",
-  "parserOptions": {
-    "sourceType": "script",
-    "ecmaVersion": 2022
-  },
-  "globals": {
-    "window": true,
-    "document": true
-  },
-  "rules": {
-    "max-len": 0,
-    "arrow-parens": 0,
-    "no-console": 0,
-    "no-await-in-loop": 0,
-    "object-curly-newline": 0,
-    'no-restricted-syntax': [
-      'error',
-      {
-        selector: 'ForInStatement',
-        message: 'for..in loops iterate over the entire prototype chain, which is virtually never what you want. Use Object.{keys,values,entries}, and iterate over the resulting array.',
-      },
-      {
-        selector: 'LabeledStatement',
-        message: 'Labels are a form of GOTO; using them makes code confusing and hard to maintain and understand.',
-      },
-      {
-        selector: 'WithStatement',
-        message: '`with` is disallowed in strict mode because it makes code impossible to predict and optimize.',
-      },
-    ],
-  }
-}

package/.github/FUNDING.yml

@@ -1,2 +0,0 @@
-github: mifi
-custom: https://mifi.no/thanks

package/example.js

@@ -1,107 +0,0 @@
-'use strict';
-
-const puppeteer = require('puppeteer'); // eslint-disable-line import/no-extraneous-dependencies
-
-const Instauto = require('instauto'); // eslint-disable-line import/no-unresolved
-
-// Optional: Custom logger with timestamps
-const log = (fn, ...args) => console[fn](new Date().toISOString(), ...args);
-const logger = Object.fromEntries(['log', 'info', 'debug', 'error', 'trace', 'warn'].map((fn) => [fn, (...args) => log(fn, ...args)]));
-
-const options = {
-  cookiesPath: './cookies.json',
-
-  username: 'your-ig-username',
-  password: 'your-ig-password',
-
-  // Global limit that prevents follow or unfollows (total) to exceed this number over a sliding window of one hour:
-  maxFollowsPerHour: 20,
-  // Global limit that prevents follow or unfollows (total) to exceed this number over a sliding window of one day:
-  maxFollowsPerDay: 150,
-  // (NOTE setting the above parameters too high will cause temp ban/throttle)
-
-  maxLikesPerDay: 50,
-
-  // Don't follow users that have a followers / following ratio less than this:
-  followUserRatioMin: 0.2,
-  // Don't follow users that have a followers / following ratio higher than this:
-  followUserRatioMax: 4.0,
-  // Don't follow users who have more followers than this:
-  followUserMaxFollowers: null,
-  // Don't follow users who have more people following them than this:
-  followUserMaxFollowing: null,
-  // Don't follow users who have less followers than this:
-  followUserMinFollowers: null,
-  // Don't follow users who have more people following them than this:
-  followUserMinFollowing: null,
-
-  // NOTE: The dontUnfollowUntilTimeElapsed option is ONLY for the unfollowNonMutualFollowers function
-  // This specifies the time during which the bot should not touch users that it has previously followed (in milliseconds)
-  // After this time has passed, it will be able to unfollow them again.
-  // TODO should remove this option from here
-  dontUnfollowUntilTimeElapsed: 3 * 24 * 60 * 60 * 1000,
-
-  // Usernames that we should not touch, e.g. your friends and actual followings
-  excludeUsers: [],
-
-  // If true, will not do any actions (defaults to true)
-  dryRun: false,
-  
-  logger,
-};
-
-(async () => {
-  let browser;
-
-  try {
-    browser = await puppeteer.launch({ headless: false });
-
-    // Create a database where state will be loaded/saved to
-    const instautoDb = await Instauto.JSONDB({
-      // Will store a list of all users that have been followed before, to prevent future re-following.
-      followedDbPath: './followed.json',
-      // Will store all unfollowed users here
-      unfollowedDbPath: './unfollowed.json',
-      // Will store all likes here
-      likedPhotosDbPath: './liked-photos.json',
-    });
-
-    const instauto = await Instauto(instautoDb, browser, options);
-
-    // This can be used to unfollow people:
-    // Will unfollow auto-followed AND manually followed accounts who are not following us back, after some time has passed
-    // The time is specified by config option dontUnfollowUntilTimeElapsed
-    // await instauto.unfollowNonMutualFollowers();
-    // await instauto.sleep(10 * 60 * 1000);
-
-    // Unfollow previously auto-followed users (regardless of whether or not they are following us back)
-    // after a certain amount of days (2 weeks)
-    // Leave room to do following after this too (unfollow 2/3 of maxFollowsPerDay)
-    const unfollowedCount = await instauto.unfollowOldFollowed({ ageInDays: 14, limit: options.maxFollowsPerDay * (2 / 3) });
-
-    if (unfollowedCount > 0) await instauto.sleep(10 * 60 * 1000);
-
-    // List of usernames that we should follow the followers of, can be celebrities etc.
-    const usersToFollowFollowersOf = ['lostleblanc', 'sam_kolder'];
-
-    // Now go through each of these and follow a certain amount of their followers
-    await instauto.followUsersFollowers({
-      usersToFollowFollowersOf,
-      maxFollowsTotal: options.maxFollowsPerDay - unfollowedCount,
-      skipPrivate: true,
-      enableLikeImages: true,
-      likeImagesMax: 3,
-    });
-
-    await instauto.sleep(10 * 60 * 1000);
-
-    console.log('Done running');
-
-    await instauto.sleep(30000);
-  } catch (err) {
-    console.error(err);
-  } finally {
-    console.log('Closing browser');
-    if (browser) await browser.close();
-  }
-})();

package/instabot.yml

@@ -1,5 +0,0 @@
-apps:
-  - script: example.js
-    name: instabot
-    restart_delay: 60000
-    log_date_format: 'YYYY-MM-DD HH:mm Z'