更新部分接口

lemon
core/callback.py
core/command.py
core/core.py
core/monitor.py
lib/common.py
lib/facebook.py
lib/socket_.py
utils/_attachment.py
--- a/core/callback.py
查看文件 @cbb2c5a
+++ b/core/callback.py
查看文件 @cbb2c5a
@@ -11,7 +11,6 @@ from fbchat import ThreadType, Message, \
  ShareAttachment, FileAttachment, AudioAttachment, VideoAttachment, ImageAttachment, Sticker, LocationAttachment
 from lib import common
-from lib.common import TaskStatus
 from lib.facebook import FacebookClient
 from lib.sqlhelper import UserList, Status
 from munch import Munch
@@ -20,14 +19,6 @@ log = logging.getLogger(__name__)
 class CallBack():
- def __init__(self):
- self._socket = None
-
- @classmethod
- def bind(cls, socket):
- self = cls()
- self._socket = socket
- return self
  def _notify_(self, type_, client, body: dict):
  print('【%s】' % type_, body)
@@ -53,7 +44,7 @@ class CallBack():
  client=client,
  body={'event': 'onUpdateMyInfo', 'info': client.info()}
  )
- t = Thread(target=client.listen, name=client.email,args=(True,))
+ t = Thread(target=client.listen, name=client.email, args=(True,))
  t.setDaemon(True)
  t.start()
@@ -177,8 +168,8 @@ class CallBack():
  'adminText': msg['messageMetadata']['adminText'],
  'type': msg['type'],
  'class': msg['class'],
- 'thread_id':thread_id,
- 'thread_type':thread_type.name,
+ 'thread_id': thread_id,
+ 'thread_type': thread_type.name,
  }
  body.update(msg['untypedData'])
  self._notify_(type_="colorChange", client=client, body=body)
@@ -196,13 +187,13 @@ class CallBack():
  msg=None,
  ):
  body = {
- 'new_emoji':new_emoji,
+ 'new_emoji': new_emoji,
  'actorFbId': msg['messageMetadata']['actorFbId'],
  'adminText': msg['messageMetadata']['adminText'],
  'type': msg['type'],
  'class': msg['class'],
- 'thread_id':thread_id,
- 'thread_type':thread_type.name,
+ 'thread_id': thread_id,
+ 'thread_type': thread_type.name,
  }
  body.update(msg['untypedData'])
  self._notify_(type_="emojiChange", client=client, body=body)
@@ -220,13 +211,13 @@ class CallBack():
  msg=None,
  ):
  body = {
- 'new_title':new_title,
+ 'new_title': new_title,
  'actorFbId': msg['messageMetadata']['actorFbId'],
  'adminText': msg['messageMetadata']['adminText'],
  'type': msg['type'],
  'class': msg['class'],
- 'thread_id':thread_id,
- 'thread_type':thread_type.name,
+ 'thread_id': thread_id,
+ 'thread_type': thread_type.name,
  }
  body.update(msg['untypedData'])
  self._notify_(type_="nicknameChange", client=client, body=body)
@@ -258,13 +249,13 @@ class CallBack():
  msg=None,
  ):
  body = {
- 'new_nickname':new_nickname,
+ 'new_nickname': new_nickname,
  'actorFbId': msg['messageMetadata']['actorFbId'],
  'adminText': msg['messageMetadata']['adminText'],
  'type': msg['type'],
  'class': msg['class'],
- 'thread_id':thread_id,
- 'thread_type':thread_type.name,
+ 'thread_id': thread_id,
+ 'thread_type': thread_type.name,
  }
  body.update(msg['untypedData'])
  self._notify_(type_="nicknameChange", client=client, body=body)
@@ -523,7 +514,6 @@ class CallBack():
  """
  print("onTyping")
-
  def onGamePlayed(
  self,
  client: FacebookClient,
@@ -589,7 +579,7 @@ class CallBack():
  'author_id': author_id,
  'mid': mid,
  'action': 'add',
- 'reaction':reaction.value
+ 'reaction': reaction.value
  }
  self._notify_('reactionMsg', client, body=body)
@@ -622,7 +612,6 @@ class CallBack():
  }
  self._notify_('reactionMsg', client, body=body)
-
  def onBlock(
  self, client: FacebookClient, author_id=None, thread_id=None, thread_type=None, ts=None, msg=None
  ):
--- a/core/command.py 0 → 100644
查看文件 @cbb2c5a
+++ b/core/command.py 0 → 100644
查看文件 @cbb2c5a
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Time : 2020-02-13 09:25
+# @Author : Lemon
+# @File : command.py
+# @Software: PyCharm
+import os
+
+from fbchat import ThreadType, EmojiSize
+
+from lib import common
+from lib.facebook import FacebookClient
+import uuid
+from base64 import b64decode
+
+
+def _send_msg(local_func, remote_func, to, content, thread_type, suffix):
+ _type = getattr(ThreadType, thread_type.upper())
+ if content.startswith('http'):
+ res = remote_func(content, thread_id=to, thread_type=_type)
+ else:
+ _temp = b64decode(content.encode('utf-8'))
+ _temp_path = 'filecache'
+ if not os.path.exists(_temp_path): os.mkdir(_temp_path)
+ filename = os.path.join(_temp_path, '%s.%s' % (uuid.uuid1().hex, suffix))
+ with open(filename, 'wb') as f:
+ f.write(_temp)
+ try:
+ res = local_func(filename, thread_id=to, thread_type=_type)
+ except BaseException as err:
+ os.remove(filename)
+ raise err
+ return res
+
+
+class Executor():
+
+ def __init__(self, client):
+ self.client = client
+
+ def textMsg(self, to, content, thread_type="USER"):
+ _type = getattr(ThreadType, thread_type.upper())
+ res = self.client.sendMessage(message=content, thread_id=to, thread_type=_type)
+ return res
+
+ def imageMsg(self, to, image, thread_type="USER", suffix='jpg'):
+ return _send_msg(self.client.sendLocalImage,
+ self.client.sendRemoteImage,
+ to,
+ image,
+ thread_type,
+ suffix)
+
+ def voiceMsg(self, to, voice, thread_type='USER', suffix='mp3'):
+ return _send_msg(self.client.sendLocalVoiceClips,
+ self.client.sendRemoteVoiceClips,
+ to,
+ voice,
+ thread_type,
+ suffix)
+
+ def fileMsg(self, to, link, thread_type="USER"):
+ _type = getattr(ThreadType, thread_type.upper())
+ return self.client.sendRemoteFiles(link, thread_id=to, thread_type=_type)
+
+ def stickerMsg(self, to, sticker_id, thread_type="USER"):
+ _type = getattr(ThreadType, thread_type.upper())
+ return self.client.sendSticker(sticker_id, thread_id=to, thread_type=_type)
+
+ def emojiMsg(self, to, emoji, size='small', thread_type="USER"):
+ _type = getattr(ThreadType, thread_type.upper())
+ _size = getattr(EmojiSize, size.upper())
+ return self.client.sendEmoji(emoji=emoji, size=_size, thread_id=to, thread_type=_type)
+
+ def linkMsg(self, to, link, thread_type='USER'):
+ _type = getattr(ThreadType, thread_type.upper())
+ return self.client.sendPictureLink(link, thread_id=to, thread_type=_type)
+
+ def searchForUsers(self, name, limit=5):
+ users = self.client.searchForUsers(name, limit)
+ keys = ['type', 'gender', 'is_friend', 'name', 'photo', 'uid', 'url']
+ result=[]
+ for u in users:
+ info = common.todict(u, keys)
+ info['type'] = info.get('type').name
+ result.append(info)
+ return result
--- a/core/core.py
查看文件 @cbb2c5a
+++ b/core/core.py
查看文件 @cbb2c5a
@@ -5,11 +5,13 @@
 # @File : core.py
 # @Software: PyCharm
 import json
+import threading
 from tornado import ioloop
 from conf import settings
 from core.monitor import Monitor
+from lib.common import Exchange
 from lib.socket_ import MessageSocketClient
 socket = MessageSocketClient()
@@ -20,36 +22,23 @@ def message_receive(message):
  print("收到消息", message)
  if message == 'login1':
  monitor.login("[email protected]", "nantian888")
- elif message == 'login2':
- monitor.login('[email protected]', 'nantian888')
  elif message == 'exit1':
  monitor.logout('100047151842270')
- elif message == 'exit2':
- monitor.logout('100046875247681')
- elif message == 'size':
- len = monitor.size()
- socket.send({"size": len})
  elif message == 'uid':
  socket.send({"keys": monitor.members()})
- elif message == 'info1':
- monitor.cmd('100047151842270', 'info')
- elif message == 'info2':
- monitor.cmd('100046875247681', 'info')
  else:
  try:
  req = json.loads(message)
  type_ = req.get('type')
  data_ = req.get('data')
  if type_ == 'task':
- commands = json.loads(data_) # list[Dict]
+ commands = json.loads(data_)
  for cmd in commands:
  monitor.execute(cmd)
  elif type_ == 'initialize':
  commands = json.loads(data_)
- disable_sync = commands.get('disableSync')
- print(disable_sync)
-
- except BaseException as e:
+ monitor.init_config = commands
+ except:
  import traceback
  print(traceback.format_exc())
--- a/core/monitor.py
查看文件 @cbb2c5a
+++ b/core/monitor.py
查看文件 @cbb2c5a
@@ -6,7 +6,6 @@
 # @Software: PyCharm
 import time
 import uuid
-from threading import Thread, currentThread, Timer
 import functools
 import logging
 from concurrent.futures import ThreadPoolExecutor
@@ -29,10 +28,18 @@ class Monitor(callback.CallBack):
  def __init__(self):
  super().__init__()
+ self._socket = None
  self._listenlist = dict()
  self._imei = Config.get('imei', lambda: uuid.uuid1().hex)
  self._name = Config.get('name', lambda: 'DEV')
  self.executor = ThreadPoolExecutor(50, 'task_thread')
+ self.init_config = {}
+
+ @classmethod
+ def bind(cls, socket):
+ self = cls()
+ self._socket = socket
+ return self
  def _auto_login(self):
  user_list = UserList.query(status=Status.ONLINE)
@@ -97,15 +104,9 @@ class Monitor(callback.CallBack):
  def members(self):
  return list(self._listenlist.keys())
- def cmd(self, email, action):
- client = self._get_member(email)
- if not client:
- return False
-
- if action == 'info':
- self._socket.send(client.info())
-
  def _heartbeat(self):
+ if self.init_config.get("disableSync"):
+ return None
  payload = {
  "data": tostr({
  'online': self.members(),
--- a/lib/common.py
查看文件 @cbb2c5a
+++ b/lib/common.py
查看文件 @cbb2c5a
@@ -7,6 +7,7 @@
 import datetime
+from enum import Enum
 from attr import attrs, attrib
@@ -84,11 +85,41 @@ class TaskStatus():
  EXECUTE = 0
  SUCCESS = 1
-def todict(obj):
- keys=dir(obj)
- res={}
+
+class Exchange(Enum):
+ CLIENT = 0
+
+ # SERVER = 1
+ # NSQ = 2
+ # MQTT = 3
+
+ @classmethod
+ def get(cls, code) -> Enum:
+ if isinstance(code, str):
+ code = int(code)
+
+ keys = [x for x in dir(cls) if not x.startswith('__')]
+ for key in keys:
+ member = getattr(cls, key)
+ if member.value == code:
+ return member
+ return None
+
+
+def todict(obj,include:list=None):
+ keys = dir(obj)
+ res = {}
+ if include:
+ for key in include:
+ try:
+ value = getattr(obj, key)
+ res[key] = value
+ except:
+ pass
+ return res
+ else:
  for key in keys:
  if not key.startswith('_'):
- value=getattr(obj,key)
- res[key]=value
+ value = getattr(obj, key)
+ res[key] = value
  return res
--- a/lib/facebook.py
查看文件 @cbb2c5a
+++ b/lib/facebook.py
查看文件 @cbb2c5a
@@ -18,7 +18,7 @@ from fbchat._state import State, session_factory, is_home
 from lib import google_map
 from lib.common import WorkPlace, College
-from utils import parse_html, share_attachment
+from utils import parse_html, _attachment
 class PCState(State):
@@ -344,7 +344,7 @@ class FacebookClient(Client):
  if thread_type == ThreadType.USER:
  data["specific_to_list[0]"] = "fbid:{}".format(thread_id)
  data["specific_to_list[1]"] = "fbid:{}".format(self.uid)
- info = share_attachment.parse(self._parse_link(link))
+ info = _attachment.parse(self._parse_link(link))
  data.update(info)
  return self._doSendRequest(data)
--- a/lib/socket_.py
查看文件 @cbb2c5a
+++ b/lib/socket_.py
查看文件 @cbb2c5a
@@ -150,7 +150,10 @@ class MessageSocketClient(WebSocketClient):
  return {"type": "ping"}
  def sendheartbeat(self):
- if self.send(self.payload_data()):
+ msg = self.payload_data()
+ bool = self.send(msg) if msg else False
+
+ if msg is None or bool:
  self._io_loop.call_later(self.heartbeat_interval_in_secs,
  functools.partial(self.sendheartbeat))
--- a/utils/_attachment.py 0 → 100644
查看文件 @cbb2c5a
+++ b/utils/_attachment.py 0 → 100644
查看文件 @cbb2c5a
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# @Time : 2020-02-13 14:49
+# @Author : Lemon
+# @File : share_attachment.py
+# @Software: PyCharm
+
+def _get_share_data(result, res, keys):
+ if isinstance(res, dict):
+ for key, value in res.items():
+  _handler_data(key, value, keys, result)
+ elif isinstance(res, list):
+ for i, value in enumerate(res):
+ _get_share_data(result, value, keys + ("[%d]" % i))
+ else:
+ result.update({keys: res})
+
+
+def _handler_data(key, value, keys, result):
+ if value is None:
+ value = ''
+ if isinstance(value, dict):
+ _get_share_data(result, value, keys + ("[%s]" % key))
+ elif isinstance(value, list):
+ if value:
+ _get_share_data(result, value, keys + ("[%s]" % key))
+ else:
+ result.update({
+ keys + '[%s]' % key: value
+ })
+
+
+def parse(t):
+ data = t.get('share_data')
+ result = dict()
+ _get_share_data(result, data, "shareable_attachment")
+ return result