diff --git a/proxy_manager/proxy_manager.py b/proxy_manager/proxy_manager.py index 2b580b5..5b56ef6 100644 --- a/proxy_manager/proxy_manager.py +++ b/proxy_manager/proxy_manager.py @@ -63,8 +63,8 @@ FR_RES_IP_ROYAL_ROTATING = { # MOBILE_PROXY_LIST = [FR_MOBILE_ANY_IP_STICKY, FR_PROXY_MOB_OXY_STICKY] -# MOBILE_PROXY_LIST = [FR_PROXY_MOB_OXY_STICKY] -MOBILE_PROXY_LIST = [FR_MOBILE_ANY_IP_STICKY] +MOBILE_PROXY_LIST = [FR_PROXY_MOB_OXY_STICKY] +# MOBILE_PROXY_LIST = [FR_MOBILE_ANY_IP_STICKY] class ProxyManager: @@ -77,13 +77,6 @@ class ProxyManager: return [FR_MOBILE_ANY_IP_ROTATING] # return [FR_RES_IP_ROYAL_ROTATING] # return [FR_PROXY_RES_OXY] - # if len(links_to_validate) > 15: - # return [FR_PROXY_RES_OXY, FR_PROXY_MOB_OXY, FR_PROXY_ASOCK_RES_2, FR_DATA_IMPULSE_RES] - # # return [FR_PROXY_RES_OXY, FR_PROXY_ASOCK_RES_2, FR_DATA_IMPULSE_RES, FR_ASOCKS_MOBILE_PROXY] - # else: - # - # return [FR_PROXY_RES_OXY, FR_PROXY_MOB_OXY, FR_PROXY_ASOCK_RES_2, FR_DATA_IMPULSE_RES] - # return [FR_PROXY_RES_OXY] def get_random_sticky_iproyal_proxy(self) -> dict: _session_info = random.choice(FR_IPROYAL_STICKY_PROXY_LIST) diff --git a/workers/sender.py b/workers/sender.py index f46d14e..4ad880e 100644 --- a/workers/sender.py +++ b/workers/sender.py @@ -120,24 +120,33 @@ class Sender: self._csrf = csrf _csrf = csrf self.logger.info("model is:{}".format(model)) - js_data.ua = "Mozilla/5.0 (Linux; Android 9; {}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.58 Mobile Safari/537.36".format( - model) + # the following code is used to add model to user agent + # js_data.ua = "Mozilla/5.0 (Linux; Android 9; {}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.58 Mobile Safari/537.36".format( + # model) _chrome_code = get_chrome_version_from_ua(js_data.ua) _chrome_version = None + _chrome_ua_header = '"Not A;Brand";v="99", "Chromium";v="99", "Google Chrome";v="99"' + _chrome_ua_version = '"Not A;Brand";v="99.0.0.0", "Chromium";v="99.0.4844.58", "Google Chrome";v="99.0.4844.58"' + _chrome_version = "99.0.4844.58" if _chrome_code == '128': _chrome_version = "128.0.6613.147" + _chrome_ua_header = '"Google Chrome";v="128", "Not=A?Brand";v="8", "Chromium";v="128"' + _chrome_ua_version = '"Google Chrome";v="128.0.6613.147", "Not=A?Brand";v="8.0.0.0", "Chromium";v="128.0.6613.147"' + elif _chrome_code == '137': + _chrome_version = "137.0.7151.89" + _chrome_ua_header = '"Google Chrome";v="137", "Not/A)Brand";v="24", "Chromium";v="137"' + _chrome_ua_version = '"Google Chrome";v="137.0.7151.89", "Not=A?Brand";v="8.0.0.0", "Chromium";v="137.0.7151.89"' elif _chrome_code == '129': - _chrome_version = "129.0.6668.54" + _chrome_version = "129.0.6668.81" + _chrome_ua_header = '"Google Chrome";v="129", "Not=A?Brand";v="8", "Chromium";v="129"' + _chrome_ua_version = '"Google Chrome";v="129.0.6668.81", "Not=A?Brand";v="8.0.0.0", "Chromium";v="129.0.6668.81"' elif _chrome_code == '116': _chrome_version = "116.0.5845.114" + _chrome_ua_header = '"Google Chrome";v="116", "Not=A?Brand";v="8", "Chromium";v="116"' elif _chrome_code == '114': _chrome_version = "114.0.5735.53" - elif _chrome_code == '99': - _chrome_version = "99.0.4844.58" - # 99: " Not A;Brand";v="99", "Chromium";v="99", "Google Chrome";v="99" - # " Not A;Brand";v="99.0.0.0", "Chromium";v="99.0.4844.58", "Google Chrome";v="99.0.4844.58" - _chrome_ua_version = 'Not A;Brand";v="99.0.0.0", "Chromium";v="99.0.4844.58", "Google Chrome";v="99.0.4844.58"' - _chrome_ua_header = 'Not A;Brand";v="99", "Chromium";v="99", "Google Chrome";v="99"' + _chrome_ua_header = '"Google Chrome";v="114", "Not=A?Brand";v="8", "Chromium";v="114"' + self.logger.info("chrome_ua_header is:{}".format(_chrome_ua_header)) self.logger.info("_chrome_ua_version is:{}".format(_chrome_ua_version)) # 默认为空,也就是随机 @@ -160,7 +169,7 @@ class Sender: 'sec-ch-ua-model': '"{}"'.format(model), 'Sec-Fetch-Dest': 'document', 'Accept-Language': 'fr-FR,fr;q=0.6'} - if _chrome_version is not None: + if _chrome_ua_version is not None: headers['sec-ch-ua-full-version-list'] = _chrome_ua_version data = {'check': '', '_csrf': _csrf, 'prefer': _selected_store, 'surname': contact.last_name.capitalize(), 'name': contact.first_name.capitalize(),