hyper-bot 0.82.1__tar.gz → 0.82.2__tar.gz

{hyper_bot-0.82.1 → hyper_bot-0.82.2}/PKG-INFO

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

{hyper_bot-0.82.1 → hyper_bot-0.82.2}/hyper_bot.egg-info/PKG-INFO

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

{hyper_bot-0.82.1 → hyper_bot-0.82.2}/hyperot/LecAdapters/Milky.py

@@ -40,7 +40,7 @@ class Actions:
 
         self.custom = CustomAction(self.connection)
 
-    async def send(
+    async def send_msg(
             self, message: Union[common.Message, str], group_id: int = None, user_id: int = None
     ) -> common.Ret[MsgSendRsp]:
         if group_id is None:
@@ -65,8 +65,18 @@ class Actions:
             ret = common.Ret(res)
             ret.data = MsgSendRsp({"message_id": msg_enid(1, res["message_seq"], group_id)})
             return ret
+    
+    async def send_group_msg(
+            self, message: Union[common.Message, str], group_id: int = None
+    ) -> common.Ret[MsgSendRsp]:
+        return await self.send_msg(message, group_id=group_id)
 
-    async def del_message(self, message_id: int) -> None:
+    async def send_private_msg(
+            self, message: Union[common.Message, str], user_id: int = None
+    ) -> common.Ret[MsgSendRsp]:
+        return await self.send_msg(message, user_id=user_id)
+    
+    async def del_msg(self, message_id: int) -> None:
         ...
 
     async def set_group_kick(self, group_id: int, user_id: int) -> None:

{hyper_bot-0.82.1 → hyper_bot-0.82.2}/hyperot/LecAdapters/OneBot.py

@@ -1,5 +1,4 @@
 import json
-import threading
 import time
 import asyncio
 import sys
@@ -11,7 +10,7 @@ from ..utils import errors, logic
 from ..utils.apiresponse import *
 from ..LecAdapters.OneBotLib.Manager import reports, Packet
 from ..events import *
-from ..utils.hypetyping import Any, Union, NoReturn
+from ..utils.hypetyping import Any, Union, NoReturn, Callable
 
 config = configurator.BotConfig.get("hyper-bot")
 logger = hyperogger.Logger()
@@ -27,7 +26,7 @@ class Actions:
             def __init__(self, cnt_i: Union[network.WebsocketConnection, network.HTTPConnection]):
                 self.connection = cnt_i
 
-            def __getattr__(self, item) -> callable:
+            def __getattr__(self, item) -> Callable:
                 async def wrapper(**kwargs) -> str:
                     packet = Packet(
                         str(item),
@@ -40,7 +39,7 @@ class Actions:
 
         self.custom = CustomAction(self.connection)
 
-    async def send(
+    async def send_msg(
             self, message: Union[common.Message, str], group_id: int = None, user_id: int = None
     ) -> common.Ret[MsgSendRsp]:
         if isinstance(message, str):
@@ -63,7 +62,17 @@ class Actions:
         logger.info(f"向{(('群 ' + str(group_id)) if group_id else ('用户' + str(user_id))) + ' '}发送：{str(message)}")
         return await common.Ret.fetch(packet.echo, MsgSendRsp)
 
-    async def del_message(self, message_id: int) -> None:
+    async def send_group_msg(
+            self, message: Union[common.Message, str], group_id: int = None
+    ) -> common.Ret[MsgSendRsp]:
+        return await self.send_msg(message, group_id=group_id)
+
+    async def send_private_msg(
+            self, message: Union[common.Message, str], user_id: int = None
+    ) -> common.Ret[MsgSendRsp]:
+        return await self.send_msg(message, user_id=user_id)
+
+    async def del_msg(self, message_id: int) -> None:
         await Packet(
             "delete_msg",
             message_id=message_id,
@@ -227,10 +236,10 @@ async def __handler(data: Union[dict, HyperNotify], actions: Actions) -> None:
         await handler(data, actions)
 
 
-handler: callable = tester
+handler: Callable = tester
 
 
-def reg(func: callable) -> None:
+def reg(func: Callable) -> None:
     global handler
     handler = func
 
@@ -244,6 +253,8 @@ class LagrangeOneBotService(IServiceBase):
         pass
 
     async def server(self, bot_config: configurator.BotConfig) -> None:
+        if isinstance(config.connection, dict):
+            raise errors.ListenerNotRegisteredError("未注册接收器")
         proc = subprocess.Popen(
             args=config.connection.ob_exec,
             cwd=config.connection.ob_startup_path,
@@ -274,7 +285,7 @@ async def run() -> NoReturn:
         while True:
             try:
                 connection.connect()
-            except ConnectionRefusedError or TimeoutError:
+            except (ConnectionRefusedError, TimeoutError):
                 if retried >= config.connection.retries:
                     logger.critical(f"重试次数达到最大值({config.connection.retries})，退出")
                     break

{hyper_bot-0.82.1 → hyper_bot-0.82.2}/hyperot/__init__.py

@@ -1,19 +1,38 @@
-import signal
 from . import configurator
 from .utils import screens
 
-from typing import Union
+from typing import Union, Callable
 import asyncio
 import sys
 import os
+import signal
 
-HYPER_BOT_VERSION = "0.82.1"
+HYPER_BOT_VERSION = "0.82.2"
 
 # listener = None
 
 screens.play_startup()
 screens.play_info(HYPER_BOT_VERSION)
 
+ANY_EVENT = Union[
+    "events.GroupMessageEvent",
+    "events.PrivateMessageEvent",
+    "events.GroupFileUploadEvent",
+    "events.GroupAdminEvent",
+    "events.GroupMemberDecreaseEvent",
+    "events.GroupMemberIncreaseEvent",
+    "events.GroupMuteEvent",
+    "events.FriendAddEvent",
+    "events.GroupRecallEvent",
+    "events.FriendRecallEvent",
+    "events.NotifyEvent",
+    "events.GroupEssenceEvent",
+    "events.MessageReactionEvent",
+    "events.GroupAddInviteEvent",
+    "events.HyperListenerStartNotify",
+    "events.HyperListenerStopNotify"
+]
+
 
 class Client:
     def __init__(self):
@@ -22,26 +41,16 @@ class Client:
 
     def subscribe(
             self,
-            func: callable,
-            event: Union[
-                "events.GroupMessageEvent",
-                "events.PrivateMessageEvent",
-                "events.GroupFileUploadEvent",
-                "events.GroupAdminEvent",
-                "events.GroupMemberDecreaseEvent",
-                "events.GroupMemberIncreaseEvent",
-                "events.GroupMuteEvent",
-                "events.FriendAddEvent",
-                "events.GroupRecallEvent",
-                "events.FriendRecallEvent",
-                "events.NotifyEvent",
-                "events.GroupEssenceEvent",
-                "events.MessageReactionEvent",
-                "events.GroupAddInviteEvent",
-                "events.HyperListenerStartNotify",
-                "events.HyperListenerStopNotify"
-            ]
+            func: Callable,
+            event: Union[ANY_EVENT, list[ANY_EVENT]]
     ) -> None:
+        if isinstance(event, list):
+            for e in event:
+                self._subscribe(func, e)
+        else:
+            self._subscribe(func, event)
+
+    def _subscribe(self, func: Callable, event: ANY_EVENT) -> None:
         if not self.records.get(event):
             self.records[event] = [func]
         else:
@@ -65,10 +74,29 @@ class Client:
         if self.records:
             stop = asyncio.Event()
             loop = asyncio.get_running_loop()
-            for i in (signal.SIGINT, signal.SIGTERM):
-                loop.add_signal_handler(i, stop.set)
+            _wakeup_task = None
+            if sys.platform == "win32":
+                def _win32_handler(signum, frame):
+                    stop.set()
+
+                signal.signal(signal.SIGINT, _win32_handler)
+                try:
+                    signal.signal(signal.SIGBREAK, _win32_handler)
+                except AttributeError:
+                    pass
+
+                async def _win32_wakeup():
+                    while 1:
+                        await asyncio.sleep(0.1)
+
+                _wakeup_task = asyncio.create_task(_win32_wakeup())
+            else:
+                for i in (signal.SIGINT, signal.SIGTERM):
+                    loop.add_signal_handler(i, stop.set)
             task = asyncio.create_task(self.lis.run())
             await stop.wait()
+            if _wakeup_task:
+                _wakeup_task.cancel()
             task.cancel()
             try:
                 await task

{hyper_bot-0.82.1 → hyper_bot-0.82.2}/hyperot/adapters/listener.py

@@ -12,12 +12,22 @@ class Actions:
     def __init__(self):
         self.custom: type
 
-    async def send(
+    async def send_msg(
             self, message: Union[common.Message, str], group_id: int = None, user_id: int = None
     ) -> common.Ret[MsgSendRsp]:
         ...
 
-    async def del_message(self, message_id: int) -> None:
+    async def send_group_msg(
+            self, message: Union[common.Message, str], group_id: int = None
+    ) -> common.Ret[MsgSendRsp]:
+        ...
+
+    async def send_private_msg(
+            self, message: Union[common.Message, str], user_id: int = None
+    ) -> common.Ret[MsgSendRsp]:
+        ...
+
+    async def del_msg(self, message_id: int) -> None:
         ...
 
     async def set_group_kick(self, group_id: int, user_id: int) -> None: