Merge branch 'feature/anti-cap' of bitbucket.org:panleicim/appointment_tool into feature/anti-cap

requirements.txt

@@ -5,7 +5,7 @@ playwright==1.25.0
 dataclasses~=0.6
 SpeechRecognition==3.8.1
 pymongo==4.1.1
-anticaptchaofficial==1.0.43
+wget==3.2.0
 oci~=2.54.1
 XlsxWriter~=3.0.3
 playwright-stealth==1.0.5

src/workers/GeoCaptchSolver.py

@@ -22,6 +22,7 @@ number_text_dict = {'eight': 8,
                     'four': 4,
                     'for': 4,
                     'five': 5,
+                    'by': 5,
                     'six': 6,
                     'seven': 7, 'i': 9, 'nine': 9}
 
@@ -68,7 +69,7 @@ class GeoCaptchaSolver:
             print(number_to_type)
             if len(number_to_type) == 6:
                 self.input_numbers(number_to_type)
-            print("App thinks you said " + text)
+            self.logger.info("App thinks you said " + text)
             return False
         except sr.UnknownValueError:
             print("App could not understand audio")
@@ -109,4 +110,10 @@ class GeoCaptchaSolver:
 
         self.iframe.query_selector(".audio-captcha-verify-button").evaluate("""(btn)=>{
             btn.click()};""")
+        self.iframe.query_selector(".audio-captcha-verify-button").evaluate("""(btn)=>{
+            btn.click()};""")
+        # time.sleep(3)
+
         self.delete_audio_file()
+        # self.iframe.query_selector(".audio-captcha-verify-button").evaluate("""(btn)=>{
+        #     btn.click()};""")

src/workers/commandor_page.py

@@ -2,15 +2,13 @@ import datetime
 import logging
 import random
 import re
-
-import requests
 import sys
-import threading
 import time
 import traceback
 from typing import Union
 
 from playwright_stealth import stealth_sync
+import requests
 
 from src import params, definitions
 from src.db.mongo_manager import MONGO_STORE_MANAGER
@@ -165,7 +163,7 @@ class CommandorPage:
         self.page = context.new_page()
         # hide webdriver information
         self.page.add_init_script("""() => {
-                Object.defineProperty(navigator,'webdriver',{get: () => undefined});
+                Object.defineProperty(navigator,'webdriver',{get: () => false});
                 Object.defineProperty(navigator, 'platform', {
                     get: () => {
                         return "iPhone";
@@ -446,13 +444,6 @@ def launch_page():
     return page.start_page(params.get_proxy(ProxyType.RESIDENTIAL), use_proxy=False)
 
 
-def wait_for_otp(event: threading.Event, commandor: CommandorPage):
-    sec = input("Press Enter otp to continue...\n")
-    print("input otp is: " + sec)
-    commandor.otp_value = sec
-    event.set()
-
-
 if __name__ == '__main__':
     launch_page()
     # time = get_random_wait_time()