From 4fc7d65b9b3cfbedc38dca3971b621853e9c3cb6 Mon Sep 17 00:00:00 2001
From: Ralf Vogler <ralf.vogler@gmail.com>
Date: Thu, 24 Feb 2022 16:46:15 +0100
Subject: [PATCH] pull up try, #7

---
 epic-games.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/epic-games.js b/epic-games.js
index 7d5f4ee..2f228c7 100644
--- a/epic-games.js
+++ b/epic-games.js
@@ -114,20 +114,20 @@ const TIMEOUT = 20 * 1000; // 20s, default is 30s
       // await page.pause();
       // I Agree button is only shown for EU accounts! https://github.com/vogler/free-games-claimer/pull/7#issuecomment-1038964872
       const btnAgree = iframe.locator('button:has-text("I Agree")');
-      // @ts-ignore https://caniuse.com/?search=promise.any
-      await Promise.any([btnAgree.waitFor(), page.waitForSelector('text=Thank you for buying')]); // TODO non-EU case will fail with timeout here instead of below; could pull up try, but then it would cover future hcaptcha solving for headless as well
-      // await clickIfExists('button:has-text("I Agree")', iframe); // default arg: FrameLocator is incompatible with Page and even Locator...
-      if (await btnAgree.count() > 0)
-        await btnAgree.click();
-      // This is true even when there is no captcha challenge shown! That was the reason why old.stealth.js worked - it did not have this check... TODO check for hcaptcha
-      // if (await iframe.frameLocator('#talon_frame_checkout_free_prod').locator('text=Please complete a security check to continue').count() > 0) {
-      //   console.error('Encountered hcaptcha. Giving up :(');
-      //   await page.pause();
-      //   process.exit(1);
-      // }
-      // await page.waitForTimeout(3000);
       try {
-        await page.waitForSelector('text=Thank you for buying');
+        // @ts-ignore https://caniuse.com/?search=promise.any
+        await Promise.any([btnAgree.waitFor(), page.waitForSelector('text=Thank you for buying')]); // EU: wait for agree button, non-EU: potentially done
+        // await clickIfExists('button:has-text("I Agree")', iframe); // default arg: FrameLocator is incompatible with Page and even Locator...
+        if (await btnAgree.count() > 0)
+          await btnAgree.click();
+        // TODO check for hcaptcha - the following is even true when no captcha is shown...
+        // if (await iframe.frameLocator('#talon_frame_checkout_free_prod').locator('text=Please complete a security check to continue').count() > 0) {
+        //   console.error('Encountered hcaptcha. Giving up :(');
+        //   await page.pause();
+        //   process.exit(1);
+        // }
+        // await page.waitForTimeout(3000);
+        await page.waitForSelector('text=Thank you for buying'); // EU: wait, non-EU: wait again
         console.log('Claimed successfully!');
       } catch (e) {
         console.log(e);