diff --git a/src/workers/commandor_page.py b/src/workers/commandor_page.py index 4e6a648..fa4b490 100644 --- a/src/workers/commandor_page.py +++ b/src/workers/commandor_page.py @@ -97,6 +97,7 @@ class CommandorPage: self.otp_value = None # device = None device_key = random.choice(params.DEVICES) + device_key = random.sample(list(self.tls.playwright.devices), 1)[0] device = self.tls.playwright.devices[device_key] # while device is None: # device_key = random.sample(list(self.tls.playwright.devices), 1)[0] @@ -130,8 +131,8 @@ class CommandorPage: def start_browser(self, proxy, pwright, device, use_proxy=True) -> Union[str, None]: try: - default_browser_type = device['default_browser_type'] - if default_browser_type == "webkit": + self.default_browser_type = device['default_browser_type'] + if self.default_browser_type == "webkit": if use_proxy: self.browser = pwright.webkit.launch(headless=self.headless, timeout=PAGE_TIMEOUT, proxy=proxy) else: @@ -225,9 +226,14 @@ class CommandorPage: def _setPhoneCountryAndStore(self): try: if self.store_type == 0: - self.page.evaluate("""()=>{ - document.getElementById("phone_country").focus(); - document.getElementById("phone_country").value = \"CN\"; }""") + if self.default_browser_type == "webkit": + self.page.evaluate("""()=>{ + document.getElementById("phone_country").focus(); + document.getElementById("phone_country").value = \"CN\"; }""") + else: + self.page.evaluate("""()=>{ + document.getElementById("phone_country").focus(); + document.getElementById("phone_country").value = \"FR\"; }""") else: store_to_choose = self.store_map[self.store_type] self.page.evaluate("""(store_to_choose)=>{ @@ -273,8 +279,6 @@ class CommandorPage: print("audio_button not found") return False - - def get_errors(self): # send error result if self.page.url != BLANK_URL: