nonebot-plugin-areusleepy 0.1.7__py3-none-any.whl → 0.1.8__py3-none-any.whl

nonebot_plugin_areusleepy/__init__.py

@@ -9,7 +9,7 @@ from . import __main__ as __main__
 
 from .config import Config
 
-__version__ = "0.1.7"
+__version__ = "0.1.8"
 __plugin_meta__ = PluginMetadata(
     name="AreYouSleepy",
     description="基于 sleepy-project/sleepy 项目的状态查询插件！",

nonebot_plugin_areusleepy/__main__.py

@@ -11,7 +11,7 @@ from nonebot_plugin_alconna.uniseg import UniMessage
 from nonebot_plugin_apscheduler import scheduler
 from nonebot.log import logger
 
-import requests
+import httpx
 from urllib.parse import urljoin
 
 from .config import Config
@@ -23,7 +23,7 @@ config: Config = get_plugin_config(Config)
 # --- 处理函数
 
 
-def get_data(base_url: str, retries: int = config.sleepy_retries) -> tuple[bool, (dict | str)]:
+async def get_data(base_url: str, retries: int = config.sleepy_retries) -> tuple[bool, (dict | str)]:
     '''
     请求 api 获取数据
 
@@ -34,25 +34,27 @@ def get_data(base_url: str, retries: int = config.sleepy_retries) -> tuple[bool,
     '''
     success = False
     data = '未知错误'
-    query_url = urljoin(base_url, '/query?version=1')  # version=1 -> 为未来 (可能) 的 Sleepy /query API 修改提供兼容
-
-    while retries > 0:
-        try:
-            resp: requests.Response = requests.get(
-                url=query_url,
-                timeout=config.sleepy_timeout,
-                allow_redirects=True
-            )
-            data = resp.json()
-            success = True
-            break
-        except Exception as e:
-            data = f'请求 {query_url} 出错: {e}'
-            retries -= 1
+    query_url = urljoin(base_url, '/query')
+
+    async with httpx.AsyncClient() as client:
+        while retries > 0:
+            try:
+                resp: httpx.Response = await client.get(
+                    url=query_url,
+                    params={'version': '1'},  # version=1 -> 为未来 (可能?) 的 Sleepy /query API 修改提供兼容
+                    timeout=config.sleepy_timeout,
+                    follow_redirects=True
+                )
+                data = resp.json()
+                success = True
+                break
+            except Exception as e:
+                data = f'请求 {query_url} 出错: {e}'
+                retries -= 1
     return success, data
 
 
-def slice_text(text: str, max_length: int) -> str:
+async def slice_text(text: str, max_length: int) -> str:
     '''
     截取指定长度文本
 
@@ -70,7 +72,7 @@ def slice_text(text: str, max_length: int) -> str:
         return f'{text[:max_length-3]}...'
 
 
-def parse_data(url: str, data: dict) -> str:
+async def parse_data(url: str, data: dict) -> str:
     '''
     处理返回的数据
 
@@ -88,7 +90,7 @@ def parse_data(url: str, data: dict) -> str:
             devices.append(f'''
  - {device['show_name']}{f" ({i})" if config.sleepy_show_details else ""}
    * 状态: {"✅正在线上 Hi~ o(*￣▽￣*)ブ" if device['using'] else "❌离线 /(ㄒoㄒ)/~~"}
-   * 应用: {slice_text(device['app_name'], status_slice)}
+   * 应用: {await slice_text(device['app_name'], status_slice)}
 '''[1:-1])
     ret = f'''
 👋你好 {url}
@@ -116,20 +118,21 @@ rusleepy = on_command(
 async def handle_status(msg: Message = CommandArg()):
     '''
     处理 /sleepy (默认) 命令
-    '''    # 获取参数
+    '''
+    # 获取参数
     query_url = msg.extract_plain_text().strip() or config.sleepy_url
-    
+
     # 提示获取中
     if config.sleepy_prompt_loading:
         await rusleepy.send(f'正在从 {query_url} 获取状态, 请稍候...')
 
-    success, data = get_data(query_url)
+    success, data = await get_data(query_url)
     if success:
         # 成功 -> 处理数据
         try:
             # 确保 data 是 dict 类型
             if isinstance(data, dict):
-                parsed = parse_data(query_url, data)
+                parsed = await parse_data(query_url, data)
             else:
                 parsed = f'数据格式错误: {data}'
         except Exception as e:
@@ -148,34 +151,34 @@ async def send_scheduled_status():
     '''
     if not config.sleepy_scheduler_enabled:
         return
-    
+
     # 获取状态数据
     query_url = config.sleepy_url
-    success, data = get_data(query_url)
-    
+    success, data = await get_data(query_url)
+
     if not success:
         logger.error(f'定时任务获取状态失败: {data}')
         return
-    
+
     # 确保 data 是 dict 类型
     if not isinstance(data, dict):
         logger.error(f'定时任务获取到的数据格式错误: {data}')
         return
-    
+
     try:
-        parsed = parse_data(query_url, data)
+        parsed = await parse_data(query_url, data)
         message = f'📅 定时状态推送\n\n{parsed}'
     except Exception as e:
         logger.error(f'定时任务处理状态信息失败: {e}')
         return
-    
+
     # 获取机器人实例
     try:
         bot = get_bot()
     except Exception as e:
         logger.error(f'获取机器人实例失败: {e}')
         return
-    
+
     # 向配置的群组发送消息
     for group_id in config.sleepy_scheduler_groups:
         try:
@@ -198,4 +201,4 @@ if config.sleepy_scheduler_enabled:
         misfire_grace_time=60,
         replace_existing=True
     )
-    logger.info(f'定时任务已启用，Cron 表达式: {config.sleepy_scheduler_cron}')
+    logger.info(f'定时任务已启用, Cron 表达式: {config.sleepy_scheduler_cron}')

nonebot_plugin_areusleepy/config.py

@@ -9,11 +9,11 @@ class Config(BaseModel):
     sleepy_show_details: bool = False  # 是否显示详细信息
 
     # Sleepy 服务配置
-    sleepy_url: str = 'https://sleepy-preview.wyf9.top'  # Sleepy 服务地址
+    sleepy_url: str = 'https://sleepy-preview.wyf9.top'  # Sleepy 服务地址 (必须以 http:// 或 https:// 开头)
     sleepy_timeout: float = 5.0  # 请求超时 (秒)
     sleepy_retries: int = 3  # 请求失败时的重试次数
 
     # 定时任务配置
     sleepy_scheduler_enabled: bool = False  # 是否启用定时任务
     sleepy_scheduler_cron: str = '0 9,21 * * *'  # Cron 表达式，默认每天 9:00 和 21:00
-    sleepy_scheduler_groups: List[str] = []  # 推送的群组列表
+    sleepy_scheduler_groups: List[str] = []  # 推送的群组列表

{nonebot_plugin_areusleepy-0.1.7.dist-info → nonebot_plugin_areusleepy-0.1.8.dist-info}/METADATA

@@ -1,15 +1,14 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-areusleepy
-Version: 0.1.7
+Version: 0.1.8
 Summary: Let bot look!!!
 Author-Email: Murasame <congyu@sbhfy.cn>, wyf9 <wyf9@wyf9.top>
 License: MIT
 Project-URL: homepage, https://github.com/Murasame-Dev/nonebot-plugin-areusleepy
 Requires-Python: <4.0,>=3.9
-Requires-Dist: nonebot2>=2.0.0
+Requires-Dist: nonebot2[httpx]>=2.4.2
 Requires-Dist: nonebot-plugin-apscheduler>=0.3.0
 Requires-Dist: nonebot-plugin-alconna>=0.12.0
-Requires-Dist: requests>=2.32.3
 Description-Content-Type: text/markdown
 
 <!-- markdownlint-disable MD031 MD033 MD036 MD041 -->
@@ -114,19 +113,19 @@ env 配置示例，变量后面为默认配置:
 
 ```ini
 # 基本配置
-sleepy_command="aresleepy"    # 触发命令
+sleepy_command="areusleepy"    # 触发命令
 sleepy_prompt_loading=true # 是否在发送消息前显示 "正在获取, 请稍候"
 sleepy_show_details=false  # 是否显示详细信息 (状态的 id, 设备的 id, 最后更新时间的时区)
 
 # Sleepy 服务配置
-sleepy_url="https://status.0d000721.xin" # Sleepy 服务地址, 必须以 http:// 或 https:// 开头, 不以 / 结尾
+sleepy_url="https://status.0d000721.xin" # Sleepy 服务地址, 必须以 http:// 或 https:// 开头
 sleepy_timeout=5.0                       # 请求超时 (秒)
 sleepy_retries=3                         # 重试次数
 
 # sleepy 定时任务配置
 sleepy_scheduler_enabled=False  # 是否启用定时任务
 sleepy_scheduler_cron="0 9,21 * * *"  # Cron 表达式，默认每天 9:00 和 21:00
-sleepy_scheduler_groups:""  # 推送的群组列表，默认为空，开启定时任务后必须配置此项
+sleepy_scheduler_groups=""  # 推送的群组列表，默认为空，开启定时任务后必须配置此项
 ```
 
 ## 🎉 使用
@@ -136,7 +135,7 @@ sleepy_scheduler_groups:""  # 推送的群组列表，默认为空，开启定
 - `/sleepy` - 查询配置中网站的在线状态
 - `/sleepy [url]` - 查询其他网站的在线状态
   * 如: `/sleepy https://sleepy.wyf9.top`
-  * **注意: `url` 必须以 `http://` 或 `https://` 开头**
+  * **注意: `url` 必须以 `http://` 或 `https://` 开头 (与配置中相同)**
 
 ### 效果图
 
@@ -146,16 +145,20 @@ sleepy_scheduler_groups:""  # 推送的群组列表，默认为空，开启定
 
 ### Sleepy 项目
 
-QQ 群组: [点此加群](https://siiway.top/t/qq)
-Discord: [点此加入服务器](https://siiway.top/t/dc)
+QQ 群组: [点此加入](https://siiway.top/t/qq)
+
+Discord (推荐): [点此加入](https://siiway.top/t/dc)
+
 [更多联系方式](https://siiway.top/about/contact)
 
-> *人较多, 请注明来意*
+> *人较多, 建议注明来意*
 
 ### 本项目
 
-TG群组：[点此加入](https://t.me/LoveMurasame)
-QQ群：[1049319982](https://qm.qq.com/q/DfTsIDXuc8)
+TG 群组：[点此加入](https://t.me/LoveMurasame)
+
+QQ 群组：[点此加入](https://qm.qq.com/q/DfTsIDXuc8)
+
 作者邮箱：<congyu@sbhfy.cn>
 
 > *大概率没人*
@@ -168,12 +171,19 @@ QQ群：[1049319982](https://qm.qq.com/q/DfTsIDXuc8)
 
 ## 📝 更新日志
 
-### 0.1.0
-
-重构插件
+### 0.1.8
 
+将同步的 `requests` 替换为异步的 `httpx`, 支持并发使用
 
+<details>
+<summary>展开更多</summary>
 
 ### 0.1.2
 
 添加了定时任务
+
+### 0.1.0
+
+重构插件
+
+</details>

nonebot_plugin_areusleepy-0.1.8.dist-info/RECORD

@@ -0,0 +1,8 @@
+nonebot_plugin_areusleepy-0.1.8.dist-info/METADATA,sha256=-8nTOTrPAJwNzz6_MHysydNljG_7p7pSNeypPJ4-eIg,4649
+nonebot_plugin_areusleepy-0.1.8.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+nonebot_plugin_areusleepy-0.1.8.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+nonebot_plugin_areusleepy-0.1.8.dist-info/licenses/LICENSE,sha256=MVxFMTnhkkb66KBtMXZlHD7D0YbMVX1bSR9Z-jowliM,1086
+nonebot_plugin_areusleepy/__init__.py,sha256=Zqqaol2g08WuAb_JIWJ0PxjdISDapIwwOO9XMPbeOOU,747
+nonebot_plugin_areusleepy/__main__.py,sha256=-FgK46pZmEliPs2e7B6jJpZ-UipNLoMOTnrALRI9FPk,6138
+nonebot_plugin_areusleepy/config.py,sha256=AbJRRTdPRTHfckhdnOMi8RetoLQF-2mK8zvswDSMDiM,839
+nonebot_plugin_areusleepy-0.1.8.dist-info/RECORD,,

nonebot_plugin_areusleepy-0.1.7.dist-info/RECORD

@@ -1,8 +0,0 @@
-nonebot_plugin_areusleepy-0.1.7.dist-info/METADATA,sha256=lGMeCrrlGLlMsKzdlSH0EWR70GL2n1QuvxJh4vviSsY,4519
-nonebot_plugin_areusleepy-0.1.7.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-nonebot_plugin_areusleepy-0.1.7.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-nonebot_plugin_areusleepy-0.1.7.dist-info/licenses/LICENSE,sha256=MVxFMTnhkkb66KBtMXZlHD7D0YbMVX1bSR9Z-jowliM,1086
-nonebot_plugin_areusleepy/__init__.py,sha256=Gw0NQKuoyjvVOe63V3-UFe9bW2iO8SuAyvMPxcqPIUM,747
-nonebot_plugin_areusleepy/__main__.py,sha256=cA4aYmlKWc_dvCs0r8yOhETy0faZ-XRtgjfUoiIXE-Y,5982
-nonebot_plugin_areusleepy/config.py,sha256=Gtd67yVe3NnNzj1v9qELkVUszd-1CG1MY75KdL6_vtw,797
-nonebot_plugin_areusleepy-0.1.7.dist-info/RECORD,,