nonebot-plugin-areusleepy 0.0.2__py3-none-any.whl → 0.1.3__py3-none-any.whl

nonebot_plugin_areusleepy/__init__.py

@@ -1,23 +1,21 @@
-from nonebot import get_plugin_config
-from nonebot.plugin import PluginMetadata, inherit_supported_adapters, require
-
-require("nonebot_plugin_alconna")
-
-from . import __main__ as __main__
-from . import getsleepy as getsleepy
-
-from .config import Config
-
-__version__ = "0.0.2"
-__plugin_meta__ = PluginMetadata(
-    name="AreYouSleepy",
-    description="基于 sleepy-project/sleepy 项目的状态查询插件！",
-    usage="/areusleepy /getsleepy url",
-    type="application",
-    homepage="https://github.com/Murasame-Dev/nonebot-plugin-areusleepy",
-    supported_adapters=inherit_supported_adapters("nonebot_plugin_alconna"),
-    config=Config,
-)
-
-config = get_plugin_config(Config)
-
+from nonebot import get_plugin_config
+from nonebot.plugin import PluginMetadata, inherit_supported_adapters, require
+
+require("nonebot_plugin_alconna")
+
+from . import __main__ as __main__
+
+from .config import Config
+
+__version__ = "0.1.3"
+__plugin_meta__ = PluginMetadata(
+    name="AreYouSleepy",
+    description="基于 sleepy-project/sleepy 项目的状态查询插件！",
+    usage="/areusleepy [url]",
+    type="application",
+    homepage="https://github.com/Murasame-Dev/nonebot-plugin-areusleepy",
+    supported_adapters=inherit_supported_adapters("nonebot_plugin_alconna"),
+    config=Config,
+)
+
+config = get_plugin_config(Config)

nonebot_plugin_areusleepy/__main__.py

@@ -1,83 +1,201 @@
+# coding: utf-8
+
+# --- 导入模块
+
 from nonebot import on_command
 from nonebot.matcher import Matcher
 from nonebot.params import CommandArg
 from nonebot.adapters import Event as BaseEvent, Message
 from nonebot import get_plugin_config, get_bot
-
-import httpx
-
 from nonebot_plugin_alconna.uniseg import UniMessage
-from typing import Optional
+from nonebot_plugin_apscheduler import scheduler
+from nonebot.log import logger
+
+import requests
+from urllib.parse import urljoin
 
 from .config import Config
 
-# 获取插件配置
-plugin_config = get_plugin_config(Config)
+# --- 获取配置
+
+config: Config = get_plugin_config(Config)
+
+# --- 处理函数
+
+
+def get_data(base_url: str, retries: int = config.sleepy_retries) -> tuple[bool, (dict | str)]:
+    '''
+    请求 api 获取数据
+
+    :param base_url: 服务地址
+    :param retries: 重试次数
+    :return bool: 是否成功
+    :return dict | str: 返回数据 (如成功则为返回数据 (dict), 如失败则为错误信息 (str))
+    '''
+    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
+    return success, data
+
+
+def slice_text(text: str, max_length: int) -> str:
+    '''
+    截取指定长度文本
+
+    :param text: 原文本
+    :param max_length: 最大长度
+
+    :return str: 处理后文本
+    '''
+    if (
+        len(text) <= max_length or  # 文本长度小于指定截取长度
+        max_length == 0  # 截取长度设置为 0 (禁用)
+    ):
+        return text
+    else:
+        return f'{text[:max_length-3]}...'
+
+
+def parse_data(url: str, data: dict) -> str:
+    '''
+    处理返回的数据
+
+    :param url: 网站地址
+    :param data: /query 返回数据
+    :return str: 处理后的消息文本
+    '''
+    devices = []
+    n = '\n'
+    if data.get('device'):
+        raw_devices: dict = data.get('device')
+        status_slice: int = data.get('device_status_slice')
+        for i in raw_devices.keys():
+            device: dict = raw_devices[i]
+            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)}
+'''[1:-1])
+    ret = f'''
+👋你好 {url}
+
+👀 在线状态
+状态: {data['info']['name']}{f" ({data['status']})" if config.sleepy_show_details else ""}
+详细信息: {data['info']['desc']}
+
+💻 设备状态
+{n.join(devices) if devices else '无'}
+
+⏱ 最后更新: {data['last_updated']}{f" ({data['timezone']})" if config.sleepy_show_details else ""}
+'''[1:-1]
+    return ret
 
-fetch_status = on_command(
-    "areusleepy",
-    aliases={"获取Sleepy状态"}
+# --- 定义命令
+
+
+rusleepy = on_command(
+    cmd=config.sleepy_command
 )
 
-async def get_status_data() -> Optional[dict]:
-    url = f"{plugin_config.sleepyurl}/query"
-    try:
-        async with httpx.AsyncClient(timeout=10.0) as client:
-            response = await client.get(url)
-            if response.status_code == 200:
-                return response.json()
-            return None
-    except Exception as e:
-        return None
-
-
-def format_device_info(device_data: dict) -> str:
-    device_lines = []
-    for device_name, info in device_data.items():
-        using_status = "✅ 使用中" if info.get('using', False) else "❌ 未使用"
-        device_lines.append(
-            f"  - {info.get('show_name', device_name)}: {using_status}\n"
-            f"    应用: {info.get('app_name')}"
-        )
-    return "\n".join(device_lines)
-
-async def create_status_message(data: dict) -> UniMessage:
-    msg = UniMessage()
-
-    # info
-    if 'info' in data and isinstance(data['info'], dict):
-        info = data['info']
-        msg += (
-            f"👋你好，{plugin_config.sleepyurl}\n"
-            f"🌐 个人信息:\n"
-            f"  状态: {info.get('name')}\n"
-            f"  {info.get('desc')}\n"
-        )
-
-    # device info
-    if 'device' in data and isinstance(data['device'], dict):
-        msg += "\n\n📱 设备使用情况:\n"
-        msg += format_device_info(data['device'])
-
-    # 最后更新时间
-    if 'last_updated' in data:
-        msg += f"\n\n⏱ 最后更新: {data['last_updated']}"
+
+@rusleepy.handle()
+async def handle_status(msg: Message = CommandArg()):
+    '''
+    处理 /sleepy (默认) 命令
+    '''    # 获取参数
+    query_url = msg.extract_plain_text().strip() or config.sleepy_url
     
-    return msg
+    # 提示获取中
+    if config.sleepy_prompt_loading:
+        await rusleepy.send(f'正在从 {query_url} 获取状态, 请稍候...')
+
+    success, data = get_data(query_url)
+    if success:
+        # 成功 -> 处理数据
+        try:
+            # 确保 data 是 dict 类型
+            if isinstance(data, dict):
+                parsed = parse_data(query_url, data)
+            else:
+                parsed = f'数据格式错误: {data}'
+        except Exception as e:
+            parsed = f'处理状态信息失败: {e}'
+        await rusleepy.send(parsed)
+    else:
+        # 失败 -> 返回错误
+        await rusleepy.send(f'获取状态信息失败: {data}')
 
-@fetch_status.handle()
-async def _(arg_msg: Message = CommandArg()):
-    """处理queryFetch命令"""
-    await fetch_status.send("正在获取状态信息，请稍候...")
 
+# --- 定时任务功能
+
+async def send_scheduled_status():
+    '''
+    定时发送状态信息
+    '''
+    if not config.sleepy_scheduler_enabled:
+        return
+    
     # 获取状态数据
-    data = await get_status_data()
+    query_url = config.sleepy_url
+    success, data = get_data(query_url)
+    
+    if not success:
+        logger.error(f'定时任务获取状态失败: {data}')
+        return
     
-    # 如果获取数据失败，返回错误信息
-    if data is None:
-        await fetch_status.send("获取状态信息失败，请稍后重试")
+    # 确保 data 是 dict 类型
+    if not isinstance(data, dict):
+        logger.error(f'定时任务获取到的数据格式错误: {data}')
         return
+    
+    try:
+        parsed = 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:
+            await rusleepy.send(group_id=int(group_id), message=message)
+            logger.info(f'定时状态已发送到群组: {group_id}')
+        except Exception as e:
+            logger.error(f'向群组 {group_id} 发送定时状态失败: {e}')
+
 
-    # 生成并发送消息
-    msg = await create_status_message(data)
-    await fetch_status.send(str(msg))
+# 注册定时任务
+if config.sleepy_scheduler_enabled:
+    scheduler.add_job(
+        send_scheduled_status,
+        "cron",
+        id="sleepy_scheduled_status",
+        **{k: v for k, v in zip(
+            ["second", "minute", "hour", "day", "month", "day_of_week"],
+            config.sleepy_scheduler_cron.split()
+        ) if v != "*"},
+        misfire_grace_time=60,
+        replace_existing=True
+    )
+    logger.info(f'定时任务已启用，Cron 表达式: {config.sleepy_scheduler_cron}')

nonebot_plugin_areusleepy/config.py

@@ -1,5 +1,19 @@
-from pydantic import BaseModel
-
-
-class Config(BaseModel):
-    sleepyurl: str = "https://127.0.0.1:9010"
+from pydantic import BaseModel
+from typing import List, Optional
+
+
+class Config(BaseModel):
+    # 基本配置
+    sleepy_command: str = 'areusleepy'  # 触发命令
+    sleepy_prompt_loading: bool = True  # 是否提示获取中
+    sleepy_show_details: bool = True  # 是否显示详细信息
+
+    # Sleepy 服务配置
+    sleepy_url: str = 'https://sleepy-preview.wyf9.top'  # Sleepy 服务地址
+    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] = []  # 推送的群组列表

{nonebot_plugin_areusleepy-0.0.2.dist-info → nonebot_plugin_areusleepy-0.1.3.dist-info}/METADATA

@@ -1,14 +1,15 @@
 Metadata-Version: 2.1
 Name: nonebot-plugin-areusleepy
-Version: 0.0.2
+Version: 0.1.3
 Summary: Let bot look!!!
-Author-Email: Murasame <congyu@sbhfy.cn>
+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.4.1
-Requires-Dist: nonebot-plugin-alconna>=0.54.2
-Requires-Dist: httpx>=0.28.1
+Requires-Dist: nonebot2>=2.0.0
+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 -->
@@ -34,13 +35,11 @@ _✨基于 [sleepy-project/sleepy](https://github.com/sleepy-project/sleepy) 项
 
 ## 📖 介绍
 
-此插件可以发送在 [sleepy-project/sleepy](https://github.com/sleepy-project/sleepy) 目前的状态信息，可以显示用户的设备是否在使用中，正在听的歌曲(支持情况以 sleepy 项目为准)，支持多设备状态列表
-
-
+此插件可以发送在 [sleepy-project/sleepy](https://github.com/sleepy-project/sleepy) 目前的状态信息，可以显示用户的设备是否在使用中，正在听的歌曲 (支持情况以 sleepy 项目为准)，支持多设备状态列表
 
 ## 💿 安装
 
-以下提到的方法 任选**其一** 即可
+以下提到的方法 任选**其一**即可
 
 <details open>
 <summary>[推荐] 使用 nb-cli 安装</summary>
@@ -111,23 +110,33 @@ plugins = [
 
 ## ⚙️ 配置
 
-#### `sleepyurl` - /getsleepy 使用的默认地址
-
-默认: "http://127.0.0.1:9010"
+env 配置示例，变量后面为默认配置:
 
-****必须要有http://或https://****
-
-## 🎉 使用
+```ini
+# 基本配置
+sleepy_command="aresleepy"    # 触发命令
+sleepy_prompt_loading=true # 是否在发送消息前显示 "正在获取, 请稍候"
+sleepy_show_details=false  # 是否显示详细信息 (状态的 id, 设备的 id, 最后更新时间的时区)
 
-### 指令表
+# Sleepy 服务配置
+sleepy_url="https://status.0d000721.xin" # Sleepy 服务地址, 必须以 http:// 或 https:// 开头, 不以 / 结尾
+sleepy_timeout=5.0                       # 请求超时 (秒)
+sleepy_retries=3                         # 重试次数
 
-#### `areusleepy` - 查询默认配置的状态信息
+# sleepy 定时任务配置
+sleepy_scheduler_enabled=False  # 是否启用定时任务
+sleepy_scheduler_cron="0 9,21 * * *"  # Cron 表达式，默认每天 9:00 和 21:00
+sleepy_scheduler_groups:""  # 推送的群组列表，默认为空，开启定时任务后必须配置此项
+```
 
-查询配置文件内的网站信息并输出
+## 🎉 使用
 
-#### `getsleepy url` - 查询其他站点的状态信息
+用法:
 
-url 可填写为任意地址，**但需要注意http://或https://**
+- `/sleepy` - 查询配置中网站的在线状态
+- `/sleepy [url]` - 查询其他网站的在线状态
+  * 如: `/sleepy https://sleepy.wyf9.top`
+  * **注意: `url` 必须以 `http://` 或 `https://` 开头**
 
 ### 效果图
 
@@ -135,14 +144,36 @@ url 可填写为任意地址，**但需要注意http://或https://**
 
 ## 📞 联系
 
-TG群组：[点此加入](https://t.me/LoveMurasame)   
-QQ群：[1049319982](https://qm.qq.com/q/DfTsIDXuc8)   
-邮箱：<congyu@sbhfy.cn>   
+### Sleepy 项目
+
+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)
+作者邮箱：<congyu@sbhfy.cn>
+
+> *大概率没人*
 
 ## 💡 鸣谢
 
-[sleepy-project/sleepy: Are you sleeping?](https://github.com/sleepy-project/sleepy) - 提供灵感，感谢开发者 [wyf9](https://github.com/wyf9) 的耐心指导
+本项目基于 [sleepy-project/sleepy: Are you sleeping?](https://github.com/sleepy-project/sleepy)
+
+感谢 Sleepy 开发者 [wyf9](https://github.com/wyf9) 重构插件
 
 ## 📝 更新日志
 
-芝士刚刚发布的插件，还没有更新日志的说 qwq~
+### 0.1.0
+
+重构插件
+
+
+
+### 0.1.2
+
+添加了定时任务

nonebot_plugin_areusleepy-0.1.3.dist-info/RECORD

@@ -0,0 +1,8 @@
+nonebot_plugin_areusleepy-0.1.3.dist-info/METADATA,sha256=HSPf9fQEw9vvojOa68ZfZyqbq2wyytTe7qNZQdP7aHY,4519
+nonebot_plugin_areusleepy-0.1.3.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+nonebot_plugin_areusleepy-0.1.3.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+nonebot_plugin_areusleepy-0.1.3.dist-info/licenses/LICENSE,sha256=MVxFMTnhkkb66KBtMXZlHD7D0YbMVX1bSR9Z-jowliM,1086
+nonebot_plugin_areusleepy/__init__.py,sha256=m5zu4O5-Phez7EXMqcVPFAN4LDRJNeiarK1fkorNLs4,661
+nonebot_plugin_areusleepy/__main__.py,sha256=cA4aYmlKWc_dvCs0r8yOhETy0faZ-XRtgjfUoiIXE-Y,5982
+nonebot_plugin_areusleepy/config.py,sha256=WChgbr07OyZrNaTojLUCpzSHiV5mU5XBMAkQysrktgw,796
+nonebot_plugin_areusleepy-0.1.3.dist-info/RECORD,,

{nonebot_plugin_areusleepy-0.0.2.dist-info → nonebot_plugin_areusleepy-0.1.3.dist-info}/licenses/LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

nonebot_plugin_areusleepy/getsleepy.py

@@ -1,90 +0,0 @@
-from nonebot import on_command
-from nonebot.matcher import Matcher
-from nonebot.params import CommandArg
-from nonebot.adapters import Event as BaseEvent, Message
-from nonebot import get_plugin_config, get_bot
-
-import httpx
-
-from nonebot_plugin_alconna.uniseg import UniMessage
-from typing import Optional
-
-from .config import Config
-
-# 获取插件配置
-plugin_config = get_plugin_config(Config)
-
-get_other_status = on_command(
-    "getsleepy",
-    aliases={"获取其他Sleepy状态"}
-)
-
-async def get_status_data(custom_url: Optional[str] = None) -> Optional[dict]:
-    url = f"{custom_url or plugin_config.sleepyurl}/query"
-    try:
-        async with httpx.AsyncClient(timeout=10.0) as client:
-            response = await client.get(url)
-            if response.status_code == 200:
-                return response.json()
-            return None
-    except Exception as e:
-        return None
-
-
-def format_device_info(device_data: dict) -> str:
-    device_lines = []
-    for device_name, info in device_data.items():
-        using_status = "✅ 使用中" if info.get('using', False) else "❌ 未使用"
-        device_lines.append(
-            f"  - {info.get('show_name', device_name)}: {using_status}\n"
-            f"    应用: {info.get('app_name')}"
-        )
-    return "\n".join(device_lines)
-
-async def create_status_message(data: dict, url: Optional[str] = None) -> UniMessage:
-    msg = UniMessage()
-
-    # info
-    if 'info' in data and isinstance(data['info'], dict):
-        info = data['info']
-        display_url = url or plugin_config.sleepyurl
-        msg += (
-            f"👋你好 {display_url}\n"
-            f"🌐 个人信息:\n"
-            f"  状态: {info.get('name')}\n"
-            f"  {info.get('desc')}\n"
-        )
-
-    # device info
-    if 'device' in data and isinstance(data['device'], dict):
-        msg += "\n\n📱 设备使用情况:\n"
-        msg += format_device_info(data['device'])
-
-    # 最后更新时间
-    if 'last_updated' in data:
-        msg += f"\n\n⏱ 最后更新: {data['last_updated']}"
-    
-    return msg
-
-@get_other_status.handle()
-async def handle_get_other_status(arg_msg: Message = CommandArg()):
-    """处理getsleepy命令"""
-    # 获取URL参数
-    url = arg_msg.extract_plain_text().strip()
-    if not url:
-        await get_other_status.send("请提供要查询的URL\n用法: /getsleepy url")
-        return
-
-    await get_other_status.send("正在获取状态信息，请稍候...")
-
-    # 获取状态数据
-    data = await get_status_data(url)
-    
-    # 如果获取数据失败，返回错误信息
-    if data is None:
-        await get_other_status.send("获取状态信息失败，请检查URL是否正确")
-        return
-
-    # 生成并发送消息
-    msg = await create_status_message(data, url)
-    await get_other_status.send(str(msg))

nonebot_plugin_areusleepy-0.0.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-nonebot_plugin_areusleepy-0.0.2.dist-info/METADATA,sha256=NbJ7Nkvkbe5-J173KElNVv8bexuXR0hO-iHCzOaqhEY,3484
-nonebot_plugin_areusleepy-0.0.2.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-nonebot_plugin_areusleepy-0.0.2.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-nonebot_plugin_areusleepy-0.0.2.dist-info/licenses/LICENSE,sha256=DPGO8xTl-MaoRnTMo5L8Wi6X_uC5K3Nedi2EizrgEaY,1085
-nonebot_plugin_areusleepy/__init__.py,sha256=mgd65Jzn47klTuicOVD4VEOMqyD0qqrOGMRyAQ5Uzks,687
-nonebot_plugin_areusleepy/__main__.py,sha256=FOXqsR923ARc3n_vK0OM9bL47tkzTvwBXi_F2D6cuKI,2556
-nonebot_plugin_areusleepy/config.py,sha256=q_GnTRBE8KJZp8LjFIHhcnuOb9ge-3uMVftU4QflfnU,103
-nonebot_plugin_areusleepy/getsleepy.py,sha256=Tts-Z8hwbZ13BuhJuDCjY9B2iicKaQpLTMh4OF41_v8,2925
-nonebot_plugin_areusleepy-0.0.2.dist-info/RECORD,,