Merge branch 'develop' into feature/proxy_manager
This commit is contained in:
@@ -10,6 +10,7 @@ class ContactPojo:
|
||||
mail: str
|
||||
ccid: str
|
||||
position: int
|
||||
store: str
|
||||
note: str
|
||||
|
||||
def __init__(self, phone_number: str, passport_number: str, last_name: str, first_name: str, mail: str,
|
||||
@@ -31,6 +32,7 @@ class ContactPojo:
|
||||
u'last_name': self.last_name,
|
||||
u'first_name': self.first_name,
|
||||
u'mail': self.mail,
|
||||
u'store': self.store,
|
||||
u'ccid': self.ccid,
|
||||
u'position': self.position
|
||||
}
|
||||
@@ -39,13 +41,15 @@ class ContactPojo:
|
||||
|
||||
@staticmethod
|
||||
def from_firestore_dict(source):
|
||||
ccid = source['ccid']
|
||||
phone = source['phone']
|
||||
position = source['position']
|
||||
passport = source['passport']
|
||||
email = source['mail']
|
||||
last_name = source['last_name']
|
||||
first_name = source['first_name']
|
||||
result = ContactPojo(ccid=ccid, phone_number=phone, passport_number=passport, position=position, mail=email,
|
||||
ip_country = "FR"
|
||||
if source.get('ip_country'):
|
||||
ip_country = source['ip_country']
|
||||
result = ContactPojo(phone_number=phone, passport_number=passport, mail=email,
|
||||
last_name=last_name, first_name=first_name)
|
||||
result.ip_country = ip_country
|
||||
return result
|
||||
|
||||
@@ -0,0 +1,63 @@
|
||||
import json
|
||||
|
||||
from models.jsdata_pojo import JsDataPojo
|
||||
|
||||
|
||||
# "log2": true,
|
||||
# "dcok": ".hermes.com",
|
||||
# "m_fmi": false,
|
||||
# "tbce": 0,
|
||||
# "es_sigmdn": null,
|
||||
# "es_mumdn": null,
|
||||
# "es_distmdn": null,
|
||||
# "es_angsmdn": null,
|
||||
# "es_angemdn": null,
|
||||
# "m_s_c": 0,
|
||||
# "m_m_c": 3,
|
||||
# "m_c_c": 3,
|
||||
# "m_cm_r": 1,
|
||||
# "m_ms_r": -1
|
||||
class JsDataLeTypePojo(JsDataPojo):
|
||||
|
||||
def __init__(self, glrd, glvd, hc, br_oh, ua, br_ow, br_h, br_w, rs_h, rs_w, rs_cd, ars_h, ars_w, plg, eva, plu,
|
||||
vnd, pr, ts_mtp, dvm, m_s_c, m_m_c, m_c_c, m_cm_r, m_ms_r):
|
||||
super().__init__(glrd, glvd, hc, br_oh, ua, br_ow, br_h, br_w, rs_h, rs_w, rs_cd, ars_h, ars_w, plg, eva, plu,
|
||||
vnd, pr, ts_mtp, dvm)
|
||||
self.log2 = True
|
||||
self.dcok = ".hermes.com"
|
||||
self.m_fmi = False
|
||||
self.tbce = 0
|
||||
self.es_sigmdn = None
|
||||
self.es_mumdn = None
|
||||
self.es_distmdn = None
|
||||
self.es_angsmdn = None
|
||||
self.es_angemdn = None
|
||||
self.m_s_c = m_s_c
|
||||
self.m_m_c = m_m_c
|
||||
self.m_c_c = m_c_c
|
||||
self.m_cm_r = m_cm_r
|
||||
self.m_ms_r = m_ms_r
|
||||
self.cfpfe = "RXJyb3I6IENhbm5vdCByZWFkIHByb3BlcnRpZXMgb2YgbnVsbA==" # 4.25.1
|
||||
self.stcfp = "ckFsbCAoaHR0cHM6Ly9kLmRpZ2l0YWwuaGVybWVzL3RhZ3MuanM6Mjo3NjQ3MykKICAgIGF0IEhUTUxEb2N1bWVudC5yIChodHRwczovL3JlbmRlenZvdXNwYXJpcy5oZXJtZXMuY29tL2Rpc3QvdmVuZG9yLWM2Mjk1ZTljMjg3ZGExNzYwODllLmpzOjI6ODg2Nzkp" # 4.25.1
|
||||
|
||||
|
||||
|
||||
test_data_json = """{"glvd": "Qualcomm", "glrd": "Adreno (TM) 630", "hc": 2, "br_oh": 663, "br_ow": 384, "br_h": 663,
|
||||
"br_w": 384, "rs_h": 811, "rs_w": 384, "rs_cd": 24, "ars_h": 811, "ars_w": 384, "plg": 2, "eva": 33,
|
||||
"vnd": "Google Inc.", "plu": ["5gQIEKN", "Iv26GLka"],
|
||||
"ua": "Mozilla/5.0 (Linux; Android 11) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36",
|
||||
"dvm": 4, "acw": "probably", "pr": 2.8125, "ts_mtp": 5,
|
||||
"cookiesStr": "app.sig=Arp0SzXCTBF2ordHf3pPTd6cS14;datadome=o_7W8TjHcQjqvnFjFBGAZZ0OmNOd0fnJXfzgqOajAHBBNv7zNMFi2~Jn7wQbTEIZdr2qvg0IFFQQr~Zk5ifzM154V1XxZVhgDZeVkNyRKrQewLBIzVeSagWs587fBqdX;app=eyJmbGFzaCI6e30sImNhY2hlZmxhc2giOltdLCJjc3JmU2VjcmV0IjoieVVRWmJBWnlRTnQ5bFlNbDdNN3R6eHhqIn0=;policy=accepted;lang=fr;"}"""
|
||||
|
||||
if __name__ == '__main__':
|
||||
test_data_dict = json.loads(test_data_json)
|
||||
le_js_data = JsDataLeTypePojo(glrd=test_data_dict['glrd'], glvd=test_data_dict['glvd'], hc=test_data_dict['hc'],
|
||||
ua=test_data_dict['ua'], br_oh=test_data_dict['br_oh'], br_ow=test_data_dict['br_ow'],
|
||||
ars_h=test_data_dict['ars_h'], ars_w=test_data_dict['ars_w'], pr=test_data_dict['pr'],
|
||||
plg=test_data_dict['plg'], br_h=test_data_dict['br_h'], br_w=test_data_dict['br_w'],
|
||||
plu=test_data_dict['plu'], vnd=test_data_dict['vnd'], dvm=test_data_dict['dvm'],
|
||||
ts_mtp=test_data_dict['ts_mtp'], eva=test_data_dict['eva'],
|
||||
rs_h=test_data_dict['rs_h'],
|
||||
rs_w=test_data_dict['rs_w'], rs_cd=test_data_dict['rs_cd'], m_s_c=0, m_m_c=3, m_c_c=3,
|
||||
m_cm_r=1, m_ms_r=-1)
|
||||
print(le_js_data.to_url_encoded_json())
|
||||
@@ -9,7 +9,7 @@ import jsonpickle
|
||||
|
||||
@dataclass
|
||||
class JsDataPojo:
|
||||
opts: str
|
||||
# opts: str
|
||||
ttst: int
|
||||
ifov: bool
|
||||
hc: int
|
||||
@@ -137,8 +137,8 @@ class JsDataPojo:
|
||||
|
||||
def __init__(self, glrd, glvd, hc, br_oh, ua, br_ow, br_h, br_w, rs_h, rs_w, rs_cd, ars_h, ars_w, plg, eva, plu,
|
||||
vnd, pr, ts_mtp, dvm):
|
||||
self.opts = "endpoint,ajaxListenerPath"
|
||||
self.ttst = random.randint(38, 94)
|
||||
# self.opts = "endpoint,ajaxListenerPath"
|
||||
self.ttst = random.randint(38, 148)
|
||||
self.ifov = False
|
||||
self.hc = hc
|
||||
self.br_oh = br_oh
|
||||
@@ -166,7 +166,7 @@ class JsDataPojo:
|
||||
self.pr = pr
|
||||
self.ars_h = ars_h
|
||||
self.ars_w = ars_w
|
||||
self.tz = -60
|
||||
self.tz = -120
|
||||
self.str_ss = True
|
||||
self.str_ls = True
|
||||
self.str_idb = True
|
||||
@@ -236,8 +236,8 @@ class JsDataPojo:
|
||||
self.vc1ts = True
|
||||
self.dvm = dvm
|
||||
self.set_default_values()
|
||||
self.glrd = glrd
|
||||
self.glvd = glvd
|
||||
self.glrd = glrd
|
||||
self.wwl = False
|
||||
self.jset = int(time.time())
|
||||
|
||||
@@ -265,8 +265,8 @@ class JsDataPojo:
|
||||
self.emt = False
|
||||
self.bfr = False
|
||||
self.dbov = False
|
||||
self.cfpfe = "ZnVuY3Rpb24oKXt2YXIgdD1kb2N1bWVudFsnXHg3MVx4NzVceDY1XHg3Mlx4NzlceDUzXHg2NVx4NmNceDY1XHg2M1x4NzRceDZmXHg3MiddKCdceDYyXHg3Mlx4NmZceDc3XHg3M1x4NjVceDcyXHg2Nlx4NmNceDZmXHg3N1x4MmRceDYzXHg2Zlx4NmVceDc0XHg2" # 4.24.1
|
||||
self.stcfp = "Oi8vZC5kaWdpdGFsLmhlcm1lcy90YWdzLmpzOjI6NzYzMDIpCiAgICBhdCB0LmV4cG9ydHMuZGRfYWIgKGh0dHBzOi8vZC5kaWdpdGFsLmhlcm1lcy90YWdzLmpzOjI6OTA2MjIpCiAgICBhdCBodHRwczovL2QuZGlnaXRhbC5oZXJtZXMvdGFncy5qczoyOjUxNzMz" # 4.24.1
|
||||
self.cfpfe = "ZnVuY3Rpb24oKXt2YXIgdD1kb2N1bWVudFsnXHg3MVx4NzVceDY1XHg3Mlx4NzlceDUzXHg2NVx4NmNceDY1XHg2M1x4NzRceDZmXHg3MiddKCdceDYyXHg3Mlx4NmZceDc3XHg3M1x4NjVceDcyXHg2Nlx4NmNceDZmXHg3N1x4MmRceDYzXHg2Zlx4NmVceDc0XHg2" # 4.25.1
|
||||
self.stcfp = "aWdpdGFsLmhlcm1lcy90YWdzLmpzOjI6NzY0NzMpCiAgICBhdCA8Y29tcHV0ZWQ+IFthcyBkZF9hYl0gKGh0dHBzOi8vZC5kaWdpdGFsLmhlcm1lcy90YWdzLmpzOjI6OTAxMTgpCiAgICBhdCBodHRwczovL2QuZGlnaXRhbC5oZXJtZXMvdGFncy5qczoyOjUyMjY2" # 4.25.1
|
||||
self.ckwa = True
|
||||
|
||||
def to_url_encoded_json(self):
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
class MailAddress:
|
||||
def __init__(self, mail, password):
|
||||
self.mail = mail
|
||||
self.password = password
|
||||
|
||||
def __repr__(self):
|
||||
return "邮箱:{}, 密码:{}".format(self.mail, self.password)
|
||||
|
||||
def to_firestore_dict(self):
|
||||
dest = {
|
||||
u'mail': self.mail,
|
||||
u'password': self.password
|
||||
}
|
||||
return dest
|
||||
|
||||
@staticmethod
|
||||
def from_firestore_dict(source):
|
||||
password = source['password']
|
||||
mail = source['mail']
|
||||
return MailAddress(mail=mail, password=password)
|
||||
|
||||
|
||||
class MailPojo:
|
||||
from_address: str
|
||||
to_address: str
|
||||
body: str
|
||||
subject: str
|
||||
mail_address: str = ""
|
||||
isImapClient = False
|
||||
|
||||
def __init__(self, from_address, body, subject):
|
||||
self.body = body
|
||||
self.subject = subject
|
||||
self.from_address = from_address
|
||||
self.isImapClient = False
|
||||
self.to_address = ""
|
||||
@@ -8,3 +8,4 @@ class RequestResult(Enum):
|
||||
COOKIES_ERROR = "COOKIES_ERROR"
|
||||
UNKNOWN = "UNKNOWN"
|
||||
BAD_GATEWAY = "BAD_GATEWAY"
|
||||
CTRF_ERROR = "CTRF_ERROR"
|
||||
|
||||
Reference in New Issue
Block a user