hyper-bot 0.78__tar.gz → 0.78.2__tar.gz

{hyper-bot-0.78 → hyper-bot-0.78.2}/Hyper/Adapters/OneBot.py

@@ -178,27 +178,31 @@ class Actions:
         return Manager.Ret.fetch(packet.echo)
 
 
-async def tester(message_data: Event, actions: Actions) -> None:
+async def tester(message_data: Union[Event, HyperNotify], actions: Actions) -> None:
     ...
 
 
-def __handler(data: dict, actions: Actions) -> None:
-    if data.get("echo") is not None:
-        reports.put(data)
-    elif data.get("post_type") == "meta_event" or data.get("user_id") == data.get("self_id"):
-        pass
+def __handler(data: Union[dict, HyperNotify], actions: Actions) -> None:
+    if isinstance(data, dict):
+        if data.get("echo") is not None:
+            reports.put(data.get("echo"), data)
+        elif data.get("post_type") == "meta_event" or data.get("user_id") == data.get("self_id"):
+            pass
+        else:
+            # task = asyncio.create_task(handler(Events.em.new(data), actions))
+            asyncio.run(handler(Events.em.new(data), actions))
+            # await handler(Events.em.new(data), actions)
+            # timed = 0
+            #
+            # while not task.done():
+            #     time.sleep(0.1)
+            #     timed += 0.1
+            #     if timed >= 30:
+            #         task.cancel()
+            #         logger.log(f"处理{task.get_name()}超时", level=Logger.levels.ERROR)
+            #         break
     else:
-        # task = asyncio.create_task(handler(Events.em.new(data), actions))
-        asyncio.run(handler(Events.em.new(data), actions))
-        # timed = 0
-        #
-        # while not task.done():
-        #     time.sleep(0.1)
-        #     timed += 0.1
-        #     if timed >= 30:
-        #         task.cancel()
-        #         logger.log(f"处理{task.get_name()}超时", level=Logger.levels.ERROR)
-        #         break
+        asyncio.run(handler(data, actions))
 
 
 handler: callable = tester
@@ -242,6 +246,12 @@ def run():
             logger.log("成功建立连接", level=Logger.levels.INFO)
             retried = 0
             actions = Actions(connection)
+            data = HyperListenerStartNotify(
+                time_now=int(time.time()),
+                notify_type="listener_start",
+                connection=connection
+            )
+            threading.Thread(target=lambda: __handler(data, actions)).start()
             while True:
                 try:
                     data = connection.recv()
@@ -253,6 +263,7 @@ def run():
                     continue
                 # threading.Thread(target=lambda: asyncio.run(__handler(data, actions))).start()
                 threading.Thread(target=lambda: __handler(data, actions)).start()
+                # asyncio.create_task(__handler(data, actions))
     except KeyboardInterrupt:
         logger.log("正在退出(Ctrl+C)", level=Logger.levels.WARNING)
         try:

{hyper-bot-0.78 → hyper-bot-0.78.2}/Hyper/Adapters/OneBotLib/Manager.py

@@ -3,11 +3,12 @@ from Hyper import Configurator, Logger, Network, Segments
 from Hyper.Utils import Logic
 
 from typing import Union
-import queue
+# import queue
 import random
 import json
 
-reports = queue.Queue()
+# reports = queue.Queue()
+reports = Logic.KeyQueue()
 config = Configurator.cm.get_cfg()
 logger = Logger.Logger()
 logger.set_level(config.log_level)
@@ -112,20 +113,21 @@ class Message:
 
 
 class Ret:
-    def __init__(self, json_data: dict):
+    def __init__(self, json_data: dict, serializer):
         self.status = json_data["status"]
         self.ret_code = json_data["retcode"]
-        self.data = Hyper.Utils.TypeExt.ObjectedJson(json_data.get("data"))
+        self.data = serializer(json_data.get("data"))
         self.echo = json_data.get("echo")
 
     @classmethod
-    def fetch(cls, echo: str) -> "Ret":
-        old = None
-        while True:
-            content = reports.get()
-            if old is not None:
-                reports.put(old)
-            if content["echo"] == echo:
-                return cls(content)
-            else:
-                old = content
+    def fetch(cls, echo: str, serializer=Hyper.Utils.TypeExt.ObjectedJson) -> "Ret":
+        # old = None
+        # while True:
+        #     content = reports.get()
+        #     if old is not None:
+        #         reports.put(old)
+        #     if content["echo"] == echo:
+        #         return cls(content)
+        #     else:
+        #         old = content
+        return cls(reports.get(echo), serializer)

{hyper-bot-0.78 → hyper-bot-0.78.2}/Hyper/Events.py

@@ -1,8 +1,11 @@
 from Hyper import Configurator, Logger, Manager
 from Hyper.Utils.TypeExt import Integer
 from Hyper.Segments import message_types, At
+from Hyper.Network import WebsocketConnection, HTTPConnection
 from Hyper.Logger import levels
 
+from typing import Union, Any
+
 config = Configurator.cm.get_cfg()
 logger = Logger.Logger()
 logger.set_level(config.log_level)
@@ -163,7 +166,8 @@ class GroupAdminEvent(NoticeEvent):
         self.print_log()
 
     def print_log(self) -> None:
-        logger.log(f"用户 {self.user_id} 在群 {self.group_id} 被{'设置' if self.sub_type == 'set' else '取消'}管理员身份")
+        logger.log(
+            f"用户 {self.user_id} 在群 {self.group_id} 被{'设置' if self.sub_type == 'set' else '取消'}管理员身份")
 
 
 @em.reg("notice", "group_decrease")
@@ -203,7 +207,8 @@ class GroupMuteEvent(NoticeEvent):
         self.print_log()
 
     def print_log(self) -> None:
-        logger.log(f"{self.user_id} 在群 {self.group_id} 被{'' if self.sub_type == 'ban' else '解除'}禁言， 时长为{self.duration}")
+        logger.log(
+            f"{self.user_id} 在群 {self.group_id} 被{'' if self.sub_type == 'ban' else '解除'}禁言， 时长为{self.duration}")
 
 
 @em.reg("notice", "friend_add")
@@ -264,7 +269,8 @@ class GroupEssenceEvent(NoticeEvent):
 
     def print_log(self) -> None:
         action = "设置" if self.sub_type == "add" else "移除"
-        logger.log(f"{self.operator_id} 在群 {self.group_id} 中将 {self.sender_id} 的消息 {self.message_id} {action}精华")
+        logger.log(
+            f"{self.operator_id} 在群 {self.group_id} 中将 {self.sender_id} 的消息 {self.message_id} {action}精华")
 
 
 @em.reg("notice", "reaction")
@@ -298,4 +304,20 @@ class GroupAddInviteEvent(RequestEvent):
         self.sub_type = data.get("sub_type")
 
 
+class HyperNotify:
+    def __init__(self, time_now: int, notify_type: str):
+        self.time = time_now
+        self.type = notify_type
+
+
+class HyperListenerStartNotify(HyperNotify):
+    def __init__(self, time_now: int, notify_type: str, connection: Union[WebsocketConnection, HTTPConnection]):
+        super().__init__(time_now, notify_type)
+        self.connection = connection
+
+
+class HyperListenerStopNotify(HyperNotify):
+    pass
+
+
 

{hyper-bot-0.78 → hyper-bot-0.78.2}/Hyper/Listener.py

@@ -1,7 +1,6 @@
 from Hyper import Configurator
 
 import sys
-import os
 
 config = Configurator.cm.get_cfg()
 
@@ -14,5 +13,5 @@ elif config.protocol == "Satori":
 def restart() -> None:
     stop()
     os.execv(sys.executable, ['python'] + sys.argv)
-    os._exit(1)
+    # os._exit(1)
 

{hyper-bot-0.78 → hyper-bot-0.78.2}/Hyper/Utils/Logic.py

@@ -3,7 +3,7 @@ import os
 import shutil
 import traceback
 import asyncio
-from typing import Union
+from typing import Union, Any
 import aiohttp
 import time
 import requests
@@ -331,3 +331,20 @@ class Downloader:
                 for i in range(0, len(result)):
                     r += result[str(i)]
                 f.write(r)
+
+
+class KeyQueue:
+    def __init__(self):
+        self.contents = {}
+
+    def put(self, key: str, obj: Any) -> None:
+        if key in list(self.contents.keys()):
+            return
+        self.contents[key] = obj
+
+    def get(self, key: str) -> Any:
+        while 1:
+            try:
+                return self.contents[key]
+            except KeyError:
+                pass

hyper-bot-0.78.2/Hyper/__init__.py

@@ -0,0 +1 @@
+HYPER_BOT_VERSION = "0.78.2"

{hyper-bot-0.78 → hyper-bot-0.78.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyper-bot
-Version: 0.78
+Version: 0.78.2
 Summary: 稳定高效、易于开发的QQ Bot框架
 Home-page: https://github.com/HarcicYang/HypeR_Bot
 Author: Harcic

{hyper-bot-0.78 → hyper-bot-0.78.2}/hyper_bot.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hyper-bot
-Version: 0.78
+Version: 0.78.2
 Summary: 稳定高效、易于开发的QQ Bot框架
 Home-page: https://github.com/HarcicYang/HypeR_Bot
 Author: Harcic

hyper-bot-0.78/Hyper/__init__.py

@@ -1 +0,0 @@
-HYPER_BOT_VERSION = "0.78"