From 184b9c92ef76fb3906c0377dbc43146bf02b5023 Mon Sep 17 00:00:00 2001 From: shenjack <3695888@qq.com> Date: Thu, 25 Jan 2024 22:08:02 +0800 Subject: [PATCH] up to 0.2.3! --- bot/types.py | 64 ----------- data_struct.py | 4 + ica-rs/build.rs | 3 +- ica-rs/src/config.rs | 2 +- ica-rs/src/main.rs | 13 ++- main.py | 249 +++++++++++++++++++++++++------------------ news.md | 9 ++ requirements.txt | 2 + 8 files changed, 177 insertions(+), 169 deletions(-) delete mode 100644 bot/types.py create mode 100644 news.md diff --git a/bot/types.py b/bot/types.py deleted file mode 100644 index 2a7433c..0000000 --- a/bot/types.py +++ /dev/null @@ -1,64 +0,0 @@ -from typing import Optional -from lib_not_dr.types import Options - - -class SocketData(Options): - name = 'SocketData' - - def init(self, **kwargs) -> bool: - self.from_json(kwargs) - return False - - def from_json(self, data: dict): - ... - - def to_json(self) -> dict: - return self.option() - - -class Message(SocketData): - name = 'icalingua socket message' - - # 消息 id - message_id: str - # 发送者 id - sender_id: int - # 发送者昵称 - sender_name: str - # 消息内容 - content: str - - # 消息时间戳 - # 13:32:46 - time_stamp: str - # 消息日期 - # 2023/10/05 - date: str - # unix 时间戳 - # 1633395166 - unix_time_stamp: int - - # 发送者身份 - role: str - # 发送者群昵称/备注 - title: str - # 匿名 id - anonymous_id: Optional[int] = None - # 是否匿名 - is_anonymous: bool = False - # 啊 ? - bubble_id: int - # 啊 ? - sub_id: int - - file: Optional[dict] = None - files: Optional[list] = None - - -class AddMessage(SocketData): - name = 'icalingua socket add message event' - - room_id: int - - - diff --git a/data_struct.py b/data_struct.py index 82ded30..08bec99 100644 --- a/data_struct.py +++ b/data_struct.py @@ -47,6 +47,10 @@ class Message(Options): 'sticker': self.sticker, 'messageType': self.message_type } + + def to_content(self, content: str) -> "Message": + self.content = content + return self class BotConfig(Options): diff --git a/ica-rs/build.rs b/ica-rs/build.rs index 61458da..ef5b948 100644 --- a/ica-rs/build.rs +++ b/ica-rs/build.rs @@ -10,7 +10,8 @@ fn pyo3_config() { // wsl #[cfg(target_os = "linux")] { - env::set_var("PYO3_PYTHON", "python3.10") + env::set_var("PYO3_PRINT_CONFIG", "1"); + env::set_var("PYO3_PYTHON", "/usr/bin/python3.11"); } } diff --git a/ica-rs/src/config.rs b/ica-rs/src/config.rs index 59e6662..7e55f88 100644 --- a/ica-rs/src/config.rs +++ b/ica-rs/src/config.rs @@ -17,7 +17,7 @@ pub struct IcaConfig { /// 是否提醒 pub notice_start: Option, /// Python 插件路径 - pub py_plugin_path: Option + pub py_plugin_path: Option, } impl IcaConfig { diff --git a/ica-rs/src/main.rs b/ica-rs/src/main.rs index 5884846..63748b9 100644 --- a/ica-rs/src/main.rs +++ b/ica-rs/src/main.rs @@ -30,8 +30,17 @@ fn ws_main() { let connect_call_back = |payload: Payload, _client: RawClient| match payload { Payload::Text(values) => { if let Some(value) = values.first() { - if let Some("authSucceed") = value.as_str() { - println!("{}", "已经登录到 icalingua!".green()); + // if let Some("authSucceed") = value.as_str() { + // println!("{}", "已经登录到 icalingua!".green()); + // } + match value.as_str() { + Some("authSucceed") => println!("{}", "已经登录到 icalingua!".green()), + Some("authFailed") => { + println!("{}", "登录到 icalingua 失败!".red()); + panic!("登录失败") + } + Some("authRequired") => println!("{}", "需要登录到 icalingua!".yellow()), + _ => (), } } } diff --git a/main.py b/main.py index a29abcf..2df1376 100644 --- a/main.py +++ b/main.py @@ -1,35 +1,36 @@ - import time +import json import random import asyncio import argparse import traceback - + from typing import Dict, List, Tuple, Any -# import qtoml +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 -_version_ = "0.2.2" +_version_ = "0.2.3" -logger = config.get_logger('icalingua') +logger = config.get_logger("icalingua") BOTCONFIG: BotConfig = get_config() -if __name__ == '__main__': +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) + 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 @@ -44,49 +45,50 @@ BotStatus = BotStatus() sio: socketio.AsyncClient = socketio.AsyncClient() -@sio.on('connect') # type: ignore +@sio.on("connect") # type: ignore def connect(): - logger.info(f'{Fore.GREEN}icalingua 已连接') + logger.info(f"{Fore.GREEN}icalingua 已连接") -@sio.on('requireAuth') # type: ignore +@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) + 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 +@sio.on("auth") # type: ignore def auth(data: Dict[str, Any]): logger.info(f"auth: {data}") -@sio.on('authFailed') # type: ignore +@sio.on("authFailed") # type: ignore async def auth_failed(): logger.info(f"{Fore.RED}authFailed") await sio.disconnect() -@sio.on('authSucceed') # type: ignore +@sio.on("authSucceed") # type: ignore def auth_succeed(): logger.info(f"{Fore.GREEN}authSucceed") -@sio.on('connect_error') # type: ignore +@sio.on("connect_error") # type: ignore def connect_error(*args, **kwargs): logger.info(f"连接错误 {args}, {kwargs}") -@sio.on('updateRoom') # type: ignore +@sio.on("updateRoom") # type: ignore def update_room(data: Dict[str, Any]): logger.info(f"{Fore.CYAN}update_room: {data}") @@ -99,35 +101,38 @@ def safe_eval(code: str) -> str: # code = code.replace('decode', '坏东西！\n') # code = code.replace('compile', '屑的！\n') # code = code.replace('globals', '拿不到！\n') - code = code.replace('os', '坏东西！\n') - code = code.replace('sys', '坏东西！\n') + code = code.replace("os", "坏东西！\n") + code = code.replace("sys", "坏东西！\n") # code = code.replace('input', '坏东西！\n') # code = code.replace('__', '啊哈！\n') # code = code.replace('import', '很坏！\n') - code = code.replace(' kill', '别跑！\n') - code = code.replace(' rm ', '别跑！\n') - code = code.replace('exit', '好坏！\n') - code = code.replace('eval', '啊哈！\n') - code = code.replace('exec', '抓住！\n') + code = code.replace(" kill", "别跑！\n") + code = code.replace(" rm ", "别跑！\n") + code = code.replace("exit", "好坏！\n") + code = code.replace("eval", "啊哈！\n") + code = code.replace("exec", "抓住！\n") start_time = time.time() try: import os import math import decimal - global_val = {'time': time, - 'math': math, - 'decimal': decimal, - 'random': random, - '__import__': '', - 'globals': '也别惦记你那个 globals 了', - 'compile': '想得美', - 'help': '虽然但是 help 也不行', - 'exit': '不许 exit', - 'input': '你想干嘛', - 'return': '别惦记你那个 return 了', - 'getattr': '', - 'setattr': ''} - os.system = '不许' + + global_val = { + "time": time, + "math": math, + "decimal": decimal, + "random": random, + "__import__": "", + "globals": "也别惦记你那个 globals 了", + "compile": "想得美", + "help": "虽然但是 help 也不行", + "exit": "不许 exit", + "input": "你想干嘛", + "return": "别惦记你那个 return 了", + "getattr": "", + "setattr": "", + } + os.system = "不许" result = str(eval(code, global_val, {})) limit = 500 if len(result) > limit: @@ -135,40 +140,39 @@ def safe_eval(code: str) -> str: except: result = traceback.format_exc() end_time = time.time() - result = result.replace(BOTCONFIG.private_key, '***') - result = result.replace(BOTCONFIG.host, '***') + result = result.replace(BOTCONFIG.private_key, "***") + result = result.replace(BOTCONFIG.host, "***") logger.info(f"{Fore.MAGENTA}safe_eval: {result}") - if result == '6' or result == 6: - result = '他确实等于 6' + if result == "6" or result == 6: + result = "他确实等于 6" - result = f'{code}\neval result:\n{result}\n耗时: {end_time - start_time} s' + result = f"{code}\neval result:\n{result}\n耗时: {end_time - start_time} s" return result except: error = traceback.format_exc() - result = f'error:\n{error}' + result = f"error:\n{error}" return result -@sio.on('addMessage') # type: ignore +@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'] + 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: - if content == '/bot': - message = Message(content=f'icalingua bot test v{_version_}', - room_id=data['roomId'], - reply_to=ReplyMessage(id=data['message']['_id'])) - await sio.emit('sendMessage', message.to_json()) - elif content.startswith('=='): - + if content == "/bot": + message = reply_msg.to_content(f"icalingua bot pong v{_version_}") + await sio.emit("sendMessage", message.to_json()) + elif content.startswith("=="): evals: str = content[2:] result = safe_eval(evals) @@ -183,97 +187,140 @@ async def add_message(data: Dict[str, Any]): # result = '你在干嘛' # else: # result = str(eval(express)) - - reply = ReplyMessage(id=data['message']['_id']) - message = Message(content=result, - reply_to=reply, - room_id=room_id) + message = reply_msg.to_content(result) await asyncio.sleep(random.random() * 2) - await sio.emit('sendMessage', message.to_json()) - elif content == '!!jrrp': - randomer = random.Random(f'{sender_id}-{data["message"]["date"]}-jrrp-{_version_}') + await sio.emit("sendMessage", message.to_json()) + elif content == "!!jrrp": + randomer = random.Random( + f'{sender_id}-{data["message"]["date"]}-jrrp-{_version_}' + ) result = randomer.randint(0, 50) + randomer.randint(0, 50) - logger.info(f'{sender_name} 今日人品值为 {result}') - reply = ReplyMessage(id=data['message']['_id']) - message = Message(content=f'{sender_name} 今日人品值为 {result}', - reply_to=reply, - room_id=room_id) + logger.info(f"{sender_name} 今日人品值为 {result}") + message = reply_msg.to_content(f"{sender_name} 今日人品为 {result}") await asyncio.sleep(0.5) - await sio.emit('sendMessage', message.to_json()) - # 如果只包括一个或多个 6 - # elif data['message']['content'].replace(' ', '') in ('6', '666', '六', '3+3', '5+1', '4+2', '2+4', '1+5'): - # reply = ReplyMessage(id=data['message']['_id']) - # message = Message(content='你 6 nm 呢', - # reply_to=reply, - # room_id=room_id) - # await asyncio.sleep(0.5) - # await sio.emit('sendMessage', message.to_json()) + await sio.emit("sendMessage", message.to_json()) + elif content == "/bmcl": + await asyncio.sleep(0.1) + await sio.emit( + "sendMessage", reply_msg.to_content("请求数据中……").to_json() + ) + async with aiohttp.ClientSession() as session: + async with session.get( + "https://bd.bangbang93.com/openbmclapi/metric/dashboard" + ) as response: + if not response.status == "200": + sio.emit( + "sendMessage", + reply_msg.to_content( + f"请求数据失败\n{response.status}" + ).to_json(), + ) + logger.warn( + f"数据请求失败, 请检查网络\n{response.status}", + tag="bmclapi_dashboard", + ) + return + raw_data = await response.text() + try: + data = json.loads(raw_data) + data_bytes: int = data["bytes"] + data_hits: int = data["hits"] + data_bandwidth: float = data["currentBandwidth"] + load_str: float = data["load"] * 100 + online_node: int = data["currentNodes"] + online_bandwidth: int = data["bandwidth"] + + report_msg = ( + "OpenBMCLAPI 状态:\n" + f"在线节点: {online_node} 带宽: {online_bandwidth}Mbps\n" + f"实时负载带宽: {data_bandwidth}Mbps 负载: {load_str}%\n" + f"当日 总请求: {data_hits} 总数据量: {data_bytes}" + ) + await sio.emit( + "sendMessage", + reply_msg.to_content(report_msg).to_json() + ) + + except (json.JSONDecodeError, AttributeError, ValueError) as e: + await sio.emit( + "sendMessage", + reply_msg.to_content(f"返回数据解析错误\n{e}").to_json(), + ) + logger.warn(f"返回数据解析错误\n{e}", tag="bmclapi_dashboard") + """ + async with aiohttp.ClientSession() as session: + async with session.get('http://httpbin.org/get') as resp: + print(resp.status) + print(await resp.text())""" -@sio.on('deleteMessage') # type: ignore +@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 +@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'])}") + 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()) + 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') + logger.info("inited", tag="notice room") else: - logger.warn(f"未找到通知房间: {notice_room}", tag='notice room') + logger.warn(f"未找到通知房间: {notice_room}", tag="notice room") await asyncio.sleep(random.randint(2, 5)) -@sio.on('setAllRooms') # type: ignore +@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 + 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') + 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') + logger.info(f"更新房间: {room_list}", tag="setAllRooms") -@sio.on('setAllChatGroups') # type: ignore +@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 +@sio.on("notify") # type: ignore def notify(data: List[Tuple[str, Any]]): logger.info(f"notify: {data}") -@sio.on('closeLoading') # type: ignore +@sio.on("closeLoading") # type: ignore def close_loading(_): logger.info(f"{Fore.GREEN}close_loading") -@sio.on('onlineData') # type: ignore +@sio.on("onlineData") # type: ignore def online_data(data: Dict[str, Any]): logger.info(f"{Fore.GREEN}online_data: {data}") -@sio.on('*') # type: ignore +@sio.on("*") # type: ignore def catch_all(event, data): logger.info(f"{Fore.RED}catch_all: {event}|{data}") - async def main(): """ while True: @@ -288,11 +335,11 @@ async def main(): await sio.connect(BOTCONFIG.host) await sio.wait() -if __name__ == '__main__': + +if __name__ == "__main__": try: asyncio.run(main()) except KeyboardInterrupt: logger.info("KeyboardInterrupt") except Exception: logger.error(traceback.format_exc()) - diff --git a/news.md b/news.md new file mode 100644 index 0000000..8d12bdd --- /dev/null +++ b/news.md @@ -0,0 +1,9 @@ +# 更新日志 + +## 0.2.3 + +添加了 `/bmcl` 请求 bmclapi 状态 + +## 0.2.2 + +重构了一波整体代码 diff --git a/requirements.txt b/requirements.txt index ff5d046..f8e4d4c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,6 @@ lib-not-dr >= 0.3.13 colorama qtoml pynacl + python-socketio[asyncio_client] +aiohttp