2.3.6

增加登录封锁的详细信息

@@ -4,5 +4,5 @@ SERVER:
  reconnect_interval: 3
  reconnect_interval: 3
 
 
 VERSION:
 VERSION:
- code: 125
- name: 2.3.5
+ code: 126
+ name: 2.3.6

@@ -110,7 +110,6 @@ class Monitor(callback.CallBack):
  # 处理制表符，换行符
  # 处理制表符，换行符
  email = email.strip().strip('\r\n')
  email = email.strip().strip('\r\n')
  password = password.strip().strip('\r\n')
  password = password.strip().strip('\r\n')
- # cookie = cookie.strip().strip('\r\n')
  limit = 100
  limit = 100
  if self.size >= limit:
  if self.size >= limit:
  raise Exception("单台终端登录到达上限，%d个号" % limit)
  raise Exception("单台终端登录到达上限，%d个号" % limit)

@@ -37,6 +37,7 @@ class Session(Session_):
  content = res.text
  content = res.text
  set_cookie = res.headers.get('Set-Cookie', None)
  set_cookie = res.headers.get('Set-Cookie', None)
  if 'checkpoint' in res.url:
  if 'checkpoint' in res.url:
+ # self.get_deal_lock_method(int(kwargs['data']['jazoest']), kwargs['data']['lsd'])
  raise FBchatUserError('账号被封锁:' + parse_html.checkpoint_text(content))
  raise FBchatUserError('账号被封锁:' + parse_html.checkpoint_text(content))
  elif 'ServerRedirect' in content and self._match_redirect_(content) == '\\/checkpoint\\/block\\/':
  elif 'ServerRedirect' in content and self._match_redirect_(content) == '\\/checkpoint\\/block\\/':
  raise FBchatUserError('账号被封锁')
  raise FBchatUserError('账号被封锁')
@@ -60,6 +61,39 @@ class Session(Session_):
  hasattr(self, 'logout_call') and self.logout_call()
  hasattr(self, 'logout_call') and self.logout_call()
  raise
  raise
 
 
+ def get_init_lock_args(self, jazoest: str, lsd: str):
+ """
+ 获取解封方式 所需要参数
+ """
+ res = super().request('GET', 'https://www.facebook.com/checkpoint/?next')
+ args = parse_html.get_lock_init(res.text)
+ fb_dtsg_ag = args[0]
+ nh = args[1]
+ params = {
+ 'modules': 'FormSubmit',
+ "dpr": 2,
+ "fb_dtsg_ag": fb_dtsg_ag,
+ "jazoest": jazoest,
+ "nh": nh,
+ "lsd": lsd
+ }
+ return params
+
+ def get_deal_lock_method(self, jazoest, lsd):
+ params = self.get_init_lock_args(jazoest, lsd)
+ res = super().request('GET', 'https://www.facebook.com/ajax/bootloader-endpoint',
+ params=params)
+
+ res = super().request('POST', 'https://www.facebook.com/cookie/consent/',
+ params=params)
+
+ params['submit[Continue]'] = 'Continue'
+ res = super().request('POST',
+ 'https://www.facebook.com/checkpoint/async?next'
+ , data=params
+ )
+ pass
+
 
 
 class PCState(State):
 class PCState(State):
 
 
@@ -128,7 +162,6 @@ class PCState(State):
  'lgnjs': int(time.time()),
  'lgnjs': int(time.time()),
  'timezone': '-480'
  'timezone': '-480'
  })
  })
-
  r = session.post('https://www.facebook.com/login/device-based/regular/login/?login_attempt=1&lwv=110',
  r = session.post('https://www.facebook.com/login/device-based/regular/login/?login_attempt=1&lwv=110',
  data=data)
  data=data)
  setCookie = r.headers.get('Set-Cookie') or ''
  setCookie = r.headers.get('Set-Cookie') or ''

@@ -544,11 +544,28 @@ def get_members_ids(text):
 def checkpoint_text(text):
 def checkpoint_text(text):
  try:
  try:
  b = bs4.BeautifulSoup(text, 'html.parser')
  b = bs4.BeautifulSoup(text, 'html.parser')
- return b.find('form', class_='checkpoint').find('span').text
+ c = b.find('form', class_='checkpoint')
+ for mark in ['span', 'p', 'h3', 'strong']:
+ content = ''.join([k.text for k in c.find_all(mark)])
+ if content:
+ return content
+ return ""
  except:
  except:
  return ""
  return ""
 
 
 
 
+def get_lock_init(text):
+ try:
+ args = list()
+ result = re.findall(r'{"token":"(.*?)"}', text)
+ args.append(result[0])
+ result = re.findall(r'name="nh" value="(.*?)"', text)
+ args.append(result[0])
+ return args
+ except:
+ return ''
+
+
 def get_location_info(html):
 def get_location_info(html):
  try:
  try:
  selector = etree.HTML(html)
  selector = etree.HTML(html)