diff --git a/migrate_to_data_cache_2.py b/migrate_to_data_cache_2.py index f6bef00..51e29f1 100644 --- a/migrate_to_data_cache_2.py +++ b/migrate_to_data_cache_2.py @@ -3,4 +3,4 @@ from queue_message.CookiesPublisher import MORNING_DATA_CACHE_2, MORNING_DATA_CA from workers.MessagerTransporter import migrate_message_to_queue if __name__ == '__main__': - migrate_message_to_queue(from_queue=MORNING_DATA_CACHE,to_queue=MORNING_DATA_CACHE_BAK) + migrate_message_to_queue(from_queue=MORNING_DATA_CACHE,to_queue=MORNING_DATA_CACHE_2) diff --git a/proxy_manager/proxy_manager.py b/proxy_manager/proxy_manager.py index f6f0140..50f5c35 100644 --- a/proxy_manager/proxy_manager.py +++ b/proxy_manager/proxy_manager.py @@ -49,6 +49,8 @@ MOBILE_PROXY_LIST = [FR_PROXY_MOB_OXY_STICKY, FR_PROXY_MOB_OXY_STICKY, FR_PROXY_ FR_PROXY_RES_OXY_STICKY, FR_PROXY_DATA_IMPULSE_STICKY] +# MOBILE_PROXY_LIST = [FR_MOBILE_ANY_IP_STICKY] + # MOBILE_PROXY_LIST = [FR_MOBILE_ANY_IP_STICKY] diff --git a/queue_message/appointmentrequestsender.py b/queue_message/appointmentrequestsender.py index aa0d361..8daef59 100644 --- a/queue_message/appointmentrequestsender.py +++ b/queue_message/appointmentrequestsender.py @@ -141,41 +141,43 @@ class AppointmentRequestSender(threading.Thread): if csrf_result == RequestResult.BLOCKED: can_continue = RequestResult.CSRF_BLOCKED break - _new_cookies = captchaResultGetter.get_valid_ch_cookie(sender.proxy_to_use, js_data, - old_valid_cookie=_received_cookies) + _new_le_cookies =_received_cookies + _new_cookies = _received_cookies + # _new_cookies = captchaResultGetter.get_valid_ch_cookie(sender.proxy_to_use, js_data, + # old_valid_cookie=_received_cookies) if _new_cookies is not None: - self.logger.info("new cookie is " + _new_cookies) - time.sleep(random.randint(1, 3)) - # m_s_c = f.scroll - m_s_c = random.randint(0, 3) - m_c_c = random.randint(3, 5) # click count - m_m_c = random.randint(3, 5) # move count - m_cm_r = m_c_c / m_m_c - m_ms_r = -1 # move scroll ratio - if m_s_c == 0: - m_ms_r = -1 - else: - m_ms_r = m_m_c / m_s_c - - js_le_data = JsDataLeTypePojo(glrd=_received_dict['glrd'], glvd=_received_dict['glvd'], - hc=_received_dict['hc'], - ua=_received_dict['ua'], br_oh=_received_dict['br_oh'], - br_ow=_received_dict['br_ow'], - ars_h=_received_dict['ars_h'], ars_w=_received_dict['ars_w'], - pr=_received_dict['pr'], - plg=_received_dict['plg'], br_h=_received_dict['br_h'], - br_w=_received_dict['br_w'], - plu=_received_dict['plu'], vnd=_received_dict['vnd'], - dvm=_received_dict['dvm'], - ts_mtp=_received_dict['ts_mtp'], eva=_received_dict['eva'], - rs_h=_received_dict['rs_h'], - rs_w=_received_dict['rs_w'], rs_cd=_received_dict['rs_cd'], - m_s_c=m_s_c, m_m_c=m_m_c, m_c_c=m_c_c, - m_cm_r=m_cm_r, m_ms_r=m_ms_r, emd=_received_dict['emd']) - time.sleep(random.randint(1, 4)) - _new_le_cookies = captchaResultGetter.get_le_valid_cookie(proxy_to_use=_proxy_to_use, - js_le_type_data=js_le_data, - old_valid_cookie=_new_cookies) + # self.logger.info("new cookie is " + _new_cookies) + # time.sleep(random.randint(1, 3)) + # # m_s_c = f.scroll + # m_s_c = random.randint(0, 3) + # m_c_c = random.randint(3, 5) # click count + # m_m_c = random.randint(3, 5) # move count + # m_cm_r = m_c_c / m_m_c + # m_ms_r = -1 # move scroll ratio + # if m_s_c == 0: + # m_ms_r = -1 + # else: + # m_ms_r = m_m_c / m_s_c + # + # js_le_data = JsDataLeTypePojo(glrd=_received_dict['glrd'], glvd=_received_dict['glvd'], + # hc=_received_dict['hc'], + # ua=_received_dict['ua'], br_oh=_received_dict['br_oh'], + # br_ow=_received_dict['br_ow'], + # ars_h=_received_dict['ars_h'], ars_w=_received_dict['ars_w'], + # pr=_received_dict['pr'], + # plg=_received_dict['plg'], br_h=_received_dict['br_h'], + # br_w=_received_dict['br_w'], + # plu=_received_dict['plu'], vnd=_received_dict['vnd'], + # dvm=_received_dict['dvm'], + # ts_mtp=_received_dict['ts_mtp'], eva=_received_dict['eva'], + # rs_h=_received_dict['rs_h'], + # rs_w=_received_dict['rs_w'], rs_cd=_received_dict['rs_cd'], + # m_s_c=m_s_c, m_m_c=m_m_c, m_c_c=m_c_c, + # m_cm_r=m_cm_r, m_ms_r=m_ms_r, emd=_received_dict['emd']) + # time.sleep(random.randint(1, 4)) + # _new_le_cookies = captchaResultGetter.get_le_valid_cookie(proxy_to_use=_proxy_to_use, + # js_le_type_data=js_le_data, + # old_valid_cookie=_new_cookies) if _new_le_cookies is not None: # self.logger.info("new le type cookie is " + _new_le_cookies) sender.cookie_str = _new_le_cookies diff --git a/request_sender_test.py b/request_sender_test.py index 6f6beab..9e8d698 100644 --- a/request_sender_test.py +++ b/request_sender_test.py @@ -57,7 +57,7 @@ def send_appointment_request(message_queue_name, _contact_list, stop_at_hour=11, logger.info(_contact) _cookiesPublisher = CookiesPublisher(queue_name=message_queue_name) _cookiesPublisher.set_up_connection() - _backUp_cookiesPublisher = CookiesPublisher(queue_name=MORNING_DATA_CACHE_2) + _backUp_cookiesPublisher = CookiesPublisher(queue_name=MORNING_DATA_CACHE_BAK) _backUp_cookiesPublisher.set_up_connection() receiver = AppointmentRequestSender(sub_contact_list=_contact_list, queue_name=message_queue_name, @@ -103,6 +103,6 @@ if __name__ == '__main__': # '~/Desktop/contact_list_2024-05-21.xlsx', # '~/Desktop/15_05_to_test.xlsx'] # file_list = ['~/Desktop/15_05_to_test.xlsx', '~/Desktop/16_05_to_test.xlsx'] - file_list = ['~/Desktop/contact_list_2024-09-11_200_pt.xlsx'] - send_request_for_file_list(file_list=file_list, thread_number=20, + file_list = ['~/Desktop/contact_list_all.xlsx'] + send_request_for_file_list(file_list=file_list, thread_number=1, data_queue_name=MORNING_DATA_CACHE, stop_at_hour=18, stop_at_mins=30) diff --git a/workers/captcha_result_getter.py b/workers/captcha_result_getter.py index bbce44b..821009d 100644 --- a/workers/captcha_result_getter.py +++ b/workers/captcha_result_getter.py @@ -14,7 +14,8 @@ from workers.proxies_constants import PROXY_LIST_FR API_KEY = "d66aaf490d8aa424a5175e1fbd1aadea" HOST_ADDRESS = "https://api.2captcha.com/createTask" -HERMES_REGISTER = "https://rendezvousparis.hermes.com/client/register" +HERMES_REGISTER = "https://rendezvousparis.hermes.com/client/register?lang=en" +# HERMES_REGISTER = "https://rendezvousparis.hermes.com/client/register" class CaptchaResultGetter: diff --git a/workers/link_validator_with_provided_list.py b/workers/link_validator_with_provided_list.py index 7f65b76..1be3714 100644 --- a/workers/link_validator_with_provided_list.py +++ b/workers/link_validator_with_provided_list.py @@ -62,11 +62,14 @@ class LinkValidatorWithProvidedList(threading.Thread): 'Accept': '*/*', 'Accept-Encoding': 'gzip, deflate, br', 'Cache-Control': 'max-age=0', - 'Referer': linkPojo.url, + # 'Referer': linkPojo.url, 'Cookie': self.cookie_str, 'Sec-Fetch-Mode': 'navigate', 'Host': 'rendezvousparis.hermes.com', 'Sec-Fetch-Site': 'same-origin', + 'sec-ch-ua': '"Brave";v="125", "Chromium";v="125", "Not.A/Brand";v="24"', + 'sec-ch-ua-platform': '"Android"', + 'sec-ch-ua-model': '""', 'Sec-Fetch-Dest': 'document', 'Accept-Language': 'fr-FR,fr;q=0.6'} print("received cookie is " + str(self.cookie_str)) diff --git a/workers/sender.py b/workers/sender.py index 5ac8c65..b70fd61 100644 --- a/workers/sender.py +++ b/workers/sender.py @@ -73,6 +73,12 @@ class Sender: if contact.store is not None and contact.store != "random": _selected_store = contact.store self.logger.info("store is:{}".format(_selected_store)) + if "lang=" not in self.cookie_str: + self.cookie_str = self.cookie_str + "; lang=en" + else: + self.cookie_str.replace("lang=fr", "lang=en") + + self.logger.info("cookie_str is:{}".format(self.cookie_str)) headers = {'Content-Type': 'application/x-www-form-urlencoded', 'User-Agent': js_data.ua, 'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8',