update api

Author: 0honus0

wechatrobot/Api.py

@@ -7,7 +7,7 @@ class Api:
     port : int = 18888
 
     def IsLoginIn(self , **params) -> bool:
-        return self.post(WECHAT_IS_LOGIN , IsLoginInBody(**params))
+        return self.post(WECHAT_IS_LOGIN , IsLoginBody(**params))
 
     def GetSelfInfo(self , **params):
         return self.post(WECHAT_GET_SELF_INFO , GetSelfInfoBody(**params))
@@ -133,7 +133,7 @@ def GetQrcodeImage(self , **params):
         return self.post(WECHAT_GET_QRCODE_IMAGE , GetQrcodeImageBody(**params))
 
     def post(self , type : int, params : Body):
-        return json.loads(requests.post( f"http://127.0.0.1:{self.port}/api/?type={type}", data = params.json()).text)
+        return requests.post( f"http://127.0.0.1:{self.port}/api/?type={type}", data = params.json()).text
 
     def exec_command(self , item: str) -> Callable:
         return eval(f"self.{item}")

wechatrobot/Bus.py

@@ -1,6 +1,5 @@
 from typing import Callable, List, Any
 from collections import defaultdict
-from .Utils import run_funcs
 
 class EventBus:
     def __init__(self):
@@ -10,4 +9,7 @@ def subscribe(self, event: str, func: Callable) -> None:
         self._subscribers[event].add(func)
 
     def emit(self, event: str, *args, **kwargs) -> List[Any]:
-        return run_funcs(self._subscribers[event], *args,**kwargs)
+        results = []
+        for f in self._subscribers[event]:
+            results.append(f(*args, **kwargs))
+        return results

wechatrobot/Utils.py

@@ -1,8 +1 @@
-from typing import Any, Callable, Awaitable, Iterable, List
 
-def run_funcs(funcs: Iterable[Callable[..., Awaitable[Any]]], *args,
-                          **kwargs) -> List[Any]:
-    results = []
-    for f in funcs:
-        results.append(f(*args, **kwargs))
-    return results

wechatrobot/WeChatRobot.py

@@ -15,10 +15,6 @@ def __init__(self , ip : str = "0.0.0.0" , port : int = 23456):
         self.ip = ip
         self.port = port
         self.api = Api()
-        #StartHook
-        print(self.StartMsgHook(port = port))
-        print(self.StartImageHook(save_path = ""))
-        print(self.StartVoiceHook(save_path = ""))
 
         self.url = "http://{}:{}/".format(ip , port)
 
@@ -30,13 +26,25 @@ def deco(func: Callable) -> Callable:
         return deco
 
     def run(self , main_thread : bool = True):
-        def receive_callback(data):
-            return self.post(data)
-        
+        #StartHook
+        self.StartMsgHook(port = self.port)
+        self.StartImageHook(save_path = "")
+        self.StartVoiceHook(save_path = "")
+
         class ReceiveMsgSocketServer(socketserver.BaseRequestHandler):
             def __init__(self, *args, **kwargs):
                 super().__init__(*args, **kwargs)
 
+            def receive_callback(msg):
+                if 1 == msg["isSendMsg"]:
+                    Bus.emit("self_msg", msg)
+                elif "chatroom" in msg["sender"]:
+                    Bus.emit("group_msg", msg) 
+                elif "gh" in msg["sender"]:
+                    Bus.emit("public_msg", msg)
+                else:
+                    Bus.emit("friend_msg", msg)
+
             def handle(self):
                 conn = self.request
                 while True:
@@ -49,14 +57,7 @@ def handle(self):
                                 conn.sendall("200 OK".encode())
                                 break
                         msg = json.loads(ptr_data.decode('utf-8'))
-
-                        if 1 == msg["isSendMsg"]:
-                            Bus.emit("self_msg", msg)
-                        elif "chatroom" in msg["sender"]:
-                            Bus.emit("group_msg", msg) 
-                        else:
-                            Bus.emit("friend_msg", msg)
-                        
+                        receive_callback(msg)
                     except OSError:
                         break
                     except json.JSONDecodeError:
@@ -79,10 +80,6 @@ def handle(self):
             print(e)
         return None
 
-    # on_friend_msg = on("friend_msg")
-    # on_group_msg  = on("group_msg")
-    # on_self_msg =   on("self_msg")
-
     def __getattr__(self , item : str):
         return self.api.exec_command(item)