From 18bb976db199e0f227b16c970a5b7e7068310e88 Mon Sep 17 00:00:00 2001 From: shenjack-5600u <3695888@qq.com> Date: Fri, 2 Feb 2024 21:44:15 +0800 Subject: [PATCH] =?UTF-8?q?merge=20=E4=B8=80=E6=B3=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- connect.py | 197 +++++++++++++++++++++++++++ data_struct.py | 14 +- main.py | 173 +---------------------- bmcl.py => plugins/bmcl.py | 0 safe_eval.py => plugins/safe_eval.py | 4 + yw.py => plugins/yw.py | 0 requirements.txt | 2 +- router.py | 13 +- 8 files changed, 228 insertions(+), 175 deletions(-) create mode 100644 connect.py rename bmcl.py => plugins/bmcl.py (100%) rename safe_eval.py => plugins/safe_eval.py (98%) rename yw.py => plugins/yw.py (100%) diff --git a/connect.py b/connect.py new file mode 100644 index 0000000..04f83fd --- /dev/null +++ b/connect.py @@ -0,0 +1,197 @@ +import time +import json +import random +import asyncio +import argparse +import traceback + +from typing import Dict, List, Tuple, Any + +import socketio +from colorama import Fore +from nacl.signing import SigningKey + +from lib_not_dr.loggers import config + +from data_struct import SendMessage, ReplyMessage, get_config, BotConfig, BotStatus + +_version_ = "0.3.0" + +logger = config.get_logger("icalingua") + +BOTCONFIG: BotConfig = get_config() + +if __name__ == "__main__": + # --debug + # --config=config.toml + # -n --no-notice + parser = argparse.ArgumentParser() + parser.add_argument("-d", "--debug", action="store_true") + parser.add_argument("-n", "--no-notice", action="store_true") + parser.add_argument("-c", "--config", type=str) + args = parser.parse_args() + if args.debug: + logger.global_level = 0 + if args.config: + # global BOTCONFIG + BOTCONFIG: BotConfig = get_config(args.config) + if args.no_notice: + BOTCONFIG.notice_start = False + +BotStatus = BotStatus() + +sio: socketio.AsyncClient = socketio.AsyncClient() + + +@sio.on("connect") # type: ignore +def connect(): + logger.info(f"{Fore.GREEN}icalingua 已连接") + + +@sio.on("requireAuth") # type: ignore +async def require_auth(salt: str, versions: Dict[str, str]): + logger.info(f"{Fore.BLUE}versions: {versions}\n{type(salt)}|{salt=}") + # 准备数据 + sign = SigningKey(bytes.fromhex(BOTCONFIG.private_key)) + signature = sign.sign(bytes.fromhex(salt)) + + # 发送数据 + await sio.emit("auth", signature.signature) + logger.info(f"{Fore.BLUE}send auth emit") + + +# @sio.on('requireAuth') +# def require_auth(*data: Dict[str, Any]): +# logger.info(f"{Fore.BLUE}requireAuth: {data}") + + +@sio.on("auth") # type: ignore +def auth(data: Dict[str, Any]): + logger.info(f"auth: {data}") + + +@sio.on("authFailed") # type: ignore +async def auth_failed(): + logger.info(f"{Fore.RED}authFailed") + await sio.disconnect() + + +@sio.on("authSucceed") # type: ignore +def auth_succeed(): + logger.info(f"{Fore.GREEN}authSucceed") + + +@sio.on("connect_error") # type: ignore +def connect_error(*args, **kwargs): + logger.info(f"连接错误 {args}, {kwargs}") + + +@sio.on("updateRoom") # type: ignore +def update_room(data: Dict[str, Any]): + logger.info(f"{Fore.CYAN}update_room: {data}") + + +@sio.on("addMessage") # type: ignore +async def add_message(data: Dict[str, Any]): + logger.info(f"{Fore.MAGENTA}add_message: {data}") + + is_self = data["message"]["senderId"] == BOTCONFIG.self_id + sender_name = data["message"]["username"] + sender_id = data["message"]["senderId"] + content = data["message"]["content"] + room_id = data["roomId"] + msg_id = data["message"]["_id"] + + reply_msg = SendMessage(content="", room_id=room_id, reply_to=ReplyMessage(id=msg_id)) + if not is_self: + route(content, sio) + + +@sio.on("deleteMessage") # type: ignore +def delete_message(message_id: str): + logger.info(f"{Fore.MAGENTA}delete_message: {message_id}") + + +@sio.on("setMessages") # type: ignore +def set_messages(data: Dict[str, Any]): + logger.info( + f"{Fore.YELLOW}set_messages: {data}\nmessage_len: {len(data['messages'])}" + ) + + +async def notice_startup(room_list: List[int]): + for notice_room in BOTCONFIG.notice_room: + if notice_room in room_list: + notice_message = SendMessage( + content=f"ica bot v{_version_}", room_id=notice_room + ) + await sio.emit("sendMessage", notice_message.to_json()) + BotStatus.inited = True + logger.info("inited", tag="notice room") + else: + logger.warn(f"未找到通知房间: {notice_room}", tag="notice room") + await asyncio.sleep(random.randint(2, 5)) + + +@sio.on("setAllRooms") # type: ignore +async def set_all_rooms(rooms: List[Dict[str, Any]]): + BotStatus.running = True + room_list: List[int] = [room.get("roomId") for room in rooms] # type: ignore + if not BotStatus.inited: + logger.info("initing...", tag="setAllRooms") + logger.debug(f"room_list: {room_list}", tag="setAllRooms") + if BOTCONFIG.notice_start: + await notice_startup(room_list) + if room_list != BotStatus.rooms: + logger.info(f"{Fore.YELLOW}set_all_rooms: {rooms}\nlen: {len(rooms)}\n") + BotStatus.rooms = room_list + logger.info(f"更新房间: {room_list}", tag="setAllRooms") + + +@sio.on("setAllChatGroups") # type: ignore +def set_all_chat_groups(groups: List[Dict[str, Any]]): + logger.info(f"{Fore.YELLOW}set_all_chat_groups: {groups}\nlen: {len(groups)}\n") + + +@sio.on("notify") # type: ignore +def notify(data: List[Tuple[str, Any]]): + logger.info(f"notify: {data}") + + +@sio.on("closeLoading") # type: ignore +def close_loading(_): + logger.info(f"{Fore.GREEN}close_loading") + + +@sio.on("onlineData") # type: ignore +def online_data(data: Dict[str, Any]): + logger.info(f"{Fore.GREEN}online_data: {data}") + + +@sio.on("*") # type: ignore +def catch_all(event, data): + logger.info(f"{Fore.RED}catch_all: {event}|{data}") + + +async def main(): + """ + while True: + await self.eio.wait() + await self.sleep(1) # give the reconnect task time to start up + if not self._reconnect_task: + break + await self._reconnect_task + if self.eio.state != 'connected': + break + """ + await sio.connect(BOTCONFIG.host) + await sio.wait() + + +if __name__ == "__main__": + try: + asyncio.run(main()) + except KeyboardInterrupt: + logger.info("KeyboardInterrupt") + except Exception: + logger.error(traceback.format_exc()) diff --git a/data_struct.py b/data_struct.py index 08bec99..81180f5 100644 --- a/data_struct.py +++ b/data_struct.py @@ -24,7 +24,7 @@ class ReplyMessage(Options): } -class Message(Options): +class SendMessage(Options): content: str room_id: Optional[int] = None room: Optional[int] = None # room id 和 room 二选一 ( 实际上直接填 room id 就行了 ) @@ -48,11 +48,21 @@ class Message(Options): 'messageType': self.message_type } - def to_content(self, content: str) -> "Message": + def to_content(self, content: str) -> "SendMessage": self.content = content return self +class NewMessage(Options): + sender_id: int + room_id: int + content: str + msg_id: str + + # def is_self(self) -> bool: + # return self.sender_id == BOTCONFIG.self_id + + class BotConfig(Options): name = 'icalingua bot config' # _check_filled = True diff --git a/main.py b/main.py index 4b14d62..820bed5 100644 --- a/main.py +++ b/main.py @@ -1,25 +1,18 @@ import time -import json -import random import asyncio import argparse import traceback -from typing import Dict, List, Tuple, Any - -import aiohttp import socketio -from colorama import Fore -from nacl.signing import SigningKey # from lib_not_dr.types import Options from lib_not_dr.loggers import config -from data_struct import Message, ReplyMessage, get_config, BotConfig, BotStatus +from data_struct import SendMessage, ReplyMessage, get_config, BotConfig, BotStatus -_version_ = "0.2.3" +_version_ = "0.3.0" -logger = config.get_logger("icalingua") +logger = config.get_logger("bot") BOTCONFIG: BotConfig = get_config() @@ -38,162 +31,4 @@ if __name__ == "__main__": # global BOTCONFIG BOTCONFIG: BotConfig = get_config(args.config) if args.no_notice: - BOTCONFIG.notice_start = False - -BotStatus = BotStatus() - -sio: socketio.AsyncClient = socketio.AsyncClient() - - -@sio.on("connect") # type: ignore -def connect(): - logger.info(f"{Fore.GREEN}icalingua 已连接") - - -@sio.on("requireAuth") # type: ignore -async def require_auth(salt: str, versions: Dict[str, str]): - logger.info(f"{Fore.BLUE}versions: {versions}\n{type(salt)}|{salt=}") - # 准备数据 - sign = SigningKey(bytes.fromhex(BOTCONFIG.private_key)) - signature = sign.sign(bytes.fromhex(salt)) - - # 发送数据 - await sio.emit("auth", signature.signature) - logger.info(f"{Fore.BLUE}send auth emit") - - -# @sio.on('requireAuth') -# def require_auth(*data: Dict[str, Any]): -# logger.info(f"{Fore.BLUE}requireAuth: {data}") - - -@sio.on("auth") # type: ignore -def auth(data: Dict[str, Any]): - logger.info(f"auth: {data}") - - -@sio.on("authFailed") # type: ignore -async def auth_failed(): - logger.info(f"{Fore.RED}authFailed") - await sio.disconnect() - - -@sio.on("authSucceed") # type: ignore -def auth_succeed(): - logger.info(f"{Fore.GREEN}authSucceed") - - -@sio.on("connect_error") # type: ignore -def connect_error(*args, **kwargs): - logger.info(f"连接错误 {args}, {kwargs}") - - -@sio.on("updateRoom") # type: ignore -def update_room(data: Dict[str, Any]): - logger.info(f"{Fore.CYAN}update_room: {data}") - - -@sio.on("addMessage") # type: ignore -async def add_message(data: Dict[str, Any]): - logger.info(f"{Fore.MAGENTA}add_message: {data}") - - is_self = data["message"]["senderId"] == BOTCONFIG.self_id - sender_name = data["message"]["username"] - sender_id = data["message"]["senderId"] - content = data["message"]["content"] - room_id = data["roomId"] - msg_id = data["message"]["_id"] - - reply_msg = Message(content="", room_id=room_id, reply_to=ReplyMessage(id=msg_id)) - if not is_self: - route(content, sio) - - -@sio.on("deleteMessage") # type: ignore -def delete_message(message_id: str): - logger.info(f"{Fore.MAGENTA}delete_message: {message_id}") - - -@sio.on("setMessages") # type: ignore -def set_messages(data: Dict[str, Any]): - logger.info( - f"{Fore.YELLOW}set_messages: {data}\nmessage_len: {len(data['messages'])}" - ) - - -async def notice_startup(room_list: List[int]): - for notice_room in BOTCONFIG.notice_room: - if notice_room in room_list: - notice_message = Message( - content=f"ica bot v{_version_}", room_id=notice_room - ) - await sio.emit("sendMessage", notice_message.to_json()) - BotStatus.inited = True - logger.info("inited", tag="notice room") - else: - logger.warn(f"未找到通知房间: {notice_room}", tag="notice room") - await asyncio.sleep(random.randint(2, 5)) - - -@sio.on("setAllRooms") # type: ignore -async def set_all_rooms(rooms: List[Dict[str, Any]]): - BotStatus.running = True - room_list: List[int] = [room.get("roomId") for room in rooms] # type: ignore - if not BotStatus.inited: - logger.info("initing...", tag="setAllRooms") - logger.debug(f"room_list: {room_list}", tag="setAllRooms") - if BOTCONFIG.notice_start: - await notice_startup(room_list) - if room_list != BotStatus.rooms: - logger.info(f"{Fore.YELLOW}set_all_rooms: {rooms}\nlen: {len(rooms)}\n") - BotStatus.rooms = room_list - logger.info(f"更新房间: {room_list}", tag="setAllRooms") - - -@sio.on("setAllChatGroups") # type: ignore -def set_all_chat_groups(groups: List[Dict[str, Any]]): - logger.info(f"{Fore.YELLOW}set_all_chat_groups: {groups}\nlen: {len(groups)}\n") - - -@sio.on("notify") # type: ignore -def notify(data: List[Tuple[str, Any]]): - logger.info(f"notify: {data}") - - -@sio.on("closeLoading") # type: ignore -def close_loading(_): - logger.info(f"{Fore.GREEN}close_loading") - - -@sio.on("onlineData") # type: ignore -def online_data(data: Dict[str, Any]): - logger.info(f"{Fore.GREEN}online_data: {data}") - - -@sio.on("*") # type: ignore -def catch_all(event, data): - logger.info(f"{Fore.RED}catch_all: {event}|{data}") - - -async def main(): - """ - while True: - await self.eio.wait() - await self.sleep(1) # give the reconnect task time to start up - if not self._reconnect_task: - break - await self._reconnect_task - if self.eio.state != 'connected': - break - """ - await sio.connect(BOTCONFIG.host) - await sio.wait() - - -if __name__ == "__main__": - try: - asyncio.run(main()) - except KeyboardInterrupt: - logger.info("KeyboardInterrupt") - except Exception: - logger.error(traceback.format_exc()) + BOTCONFIG.notice_start = False \ No newline at end of file diff --git a/bmcl.py b/plugins/bmcl.py similarity index 100% rename from bmcl.py rename to plugins/bmcl.py diff --git a/safe_eval.py b/plugins/safe_eval.py similarity index 98% rename from safe_eval.py rename to plugins/safe_eval.py index 4ed4663..03ae983 100644 --- a/safe_eval.py +++ b/plugins/safe_eval.py @@ -1,3 +1,7 @@ +import time +import random +import traceback + def safe_eval(code: str) -> str: try: # code = code.replace('help', '坏东西！\n') diff --git a/yw.py b/plugins/yw.py similarity index 100% rename from yw.py rename to plugins/yw.py diff --git a/requirements.txt b/requirements.txt index f8e4d4c..0c0a52b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,5 @@ colorama qtoml pynacl -python-socketio[asyncio_client] +python-socketio aiohttp diff --git a/router.py b/router.py index c5b6592..b7ea50e 100644 --- a/router.py +++ b/router.py @@ -1,6 +1,13 @@ -from safe_eval import safe_eval -import bmcl -import yw +import random +import asyncio + +from lib_not_dr.loggers import config + +from plugins.safe_eval import safe_eval +from plugins.bmcl import bmcl +from plugins.yw import yw + +logger = config.get_logger("router") async def route(content, sio): if content == "/bot":