From 9adea7e9fab0a9bcdcc332aa5e5614e63d4eb101 Mon Sep 17 00:00:00 2001
From: Lei PAN <paneicim@gmail.com>
Date: Tue, 24 Sep 2024 14:02:32 +0200
Subject: [PATCH] use same SlidingCaptchaSolver instance

---
 src/workers/CommandorPage.js | 7 +++----
 src/workers/OCRChecker.js    | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/workers/CommandorPage.js b/src/workers/CommandorPage.js
index ef0c8f8..0050d7b 100644
--- a/src/workers/CommandorPage.js
+++ b/src/workers/CommandorPage.js
@@ -88,6 +88,7 @@ class CommandorPage {
         this.shareCookiesWithRequests = shareCookiesWithRequests;
         this.port = port;
         this.sender = sender;
+        this.slidingCaptchaSolver = new SlidingCaptchaSolver(this.device);
         this.ocrChecker = new OCRChecker(this.device, this.contact);
         // this.browserPackageName = "com.brave.browser";
         this.browserPackageName = "com.android.chrome";
@@ -730,7 +731,6 @@ class CommandorPage {
         }
     }
 
-
     async slidingCaptcha(onResult) {
         logWithDevice("slidingCaptcha", this.device);
         if (this.device.model() === "MI 5s" || this.device.model() === "ASUS_X00QD" || this.device.model() === "ASUS_Z012D" || this.device.model() === "HUAWEI NXT-TL00") {
@@ -738,9 +738,8 @@ class CommandorPage {
             await exec(cmd);
             await delay(5000);
         }
-        let slidingCaptchaSolver = new SlidingCaptchaSolver(this.device);
-        await slidingCaptchaSolver.solve(this.page, async (isSuccessful) => {
-            console.log("check isAlwaysBlocked")
+        await this.slidingCaptchaSolver.solve(this.page, async (isSuccessful) => {
+            logWithDevice("check isAlwaysBlocked",this.device)
             this.isFillingFields = false
             onResult(isSuccessful)
         })
diff --git a/src/workers/OCRChecker.js b/src/workers/OCRChecker.js
index ae7c16a..c2ac2e6 100644
--- a/src/workers/OCRChecker.js
+++ b/src/workers/OCRChecker.js
@@ -50,6 +50,7 @@ const MESSAGE_FILL_FIELD_FR_5 = "email vous sera envoyé pour vous"
 const MESSAGE_FILL_FIELD_FR_6 = "Prénom* Téléphone*"
 const WELCOME_MESSAGE_FR = "Bienvenue dans Chrome"
 const WELCOME_MESSAGE_FR_2 = "Chrome Connectez-vous"
+const WELCOME_MESSAGE_FR_3 = "Connectez-Vou's pour"
 const PAGE_OPTIMIZATION_CHROME_FR = "Vous pouvez changer d'avis a tout moment dans"
 const PAGE_OPTIMIZATION_CHROME_FR_6 = "Vous pouvez changer davis a tout moment"
 const PAGE_OPTIMIZATION_CHROME_FR_2 = "Vous pouvez modifier vos options a tout moment"
@@ -152,6 +153,7 @@ class OCRChecker {
                 return OCRResult.SLIDING_CAPTCHA
             } else if (result.includes(WELCOME_MESSAGE_FR)
                 || result.includes(WELCOME_MESSAGE_FR_2)
+                || result.includes(WELCOME_MESSAGE_FR_3)
             ) {
                 await this.deleteFile(fileName)
                 return OCRResult.NEED_TO_CLICK_LATE_BTN