Fix getting only preloaded posts in full mode (#33)

* fix(user): fixes getting initial photos of a user, which has less then 10 photos

* test: removes jest.setTimeout in new test

* fix(instagram): moves this.finished check to getNext

* fix(instagram): add responseFromAPI field

Author: goooseman

src/api/instagram.ts

@@ -137,6 +137,7 @@ export class Instagram<PostType> {
 
     // Number of jumps before exiting because lack of data
     private failedJumps: number = 20;
+    private responseFromAPI: boolean = false;
 
     // Strings denoting the access methods of API objects
     private readonly pageQuery: string;
@@ -434,6 +435,9 @@ export class Instagram<PostType> {
                 continue;
             }
 
+            // Acknowlege receipt of response
+            this.responseFromAPI = true;
+
             // Get JSON data
             let data: JSON;
             try {
@@ -609,18 +613,27 @@ export class Instagram<PostType> {
             await this.jump();
 
             // Stop if no data is being gathered
-            if (this.jumps === this.failedJumps && this.index === 0) {
-                this.finished = true;
+            if (this.jumps === this.failedJumps) {
+                if (this.fullAPI) {
+                    if (!this.responseFromAPI) {
+                        this.finished = true;
+                    }
+                } else if (this.index === 0) {
+                    this.finished = true;
 
-                const pageContent = {content: ""};
-                try {
-                    pageContent.content = await this.page.content();
-                } catch (e) {
-                    // No content
-                }
+                    const pageContent = {content: ""};
+                    try {
+                        pageContent.content = await this.page.content();
+                    } catch (e) {
+                        // No content
+                    }
 
-                this.logger.error("Page failed to make requests", pageContent);
-                break;
+                    this.logger.error(
+                        "Page failed to make requests",
+                        pageContent,
+                    );
+                    break;
+                }
             }
 
             // Enable grafting if required

tests/test.spec.ts

@@ -150,6 +150,27 @@ describe("Full API", () => {
     }
 });
 
+testWrapper("Account with < 10 photos", async () => {
+    // This is a not well-known account and it can be deleted at any moment
+    // If this test starts to fail, need to find another user
+    // which has less then 10 photos
+    const id = "zhiznizmelochei";
+    const fullApiOption: IOptionsFullApi = {
+        ...libraryTestOptions,
+        fullAPI: true,
+    };
+    const api = createApi("user", id, fullApiOption);
+    const scraped = [];
+    for await (const post of api.generator()) {
+        expect(post).toBeDefined();
+        scraped.push(post);
+    }
+    expect(scraped.length).toBeGreaterThan(0);
+    // If this user will start to do new posts
+    // Need to find a new one
+    expect(scraped.length).toBeLessThan(10);
+});
+
 describe("API limits", () => {
     class ApiTestConditions {
         public api: "hashtag" | "user";