🐛 hotfix: from mypy import

README.md

@@ -25,6 +25,10 @@
 ### 感谢
 - 所有贡献者们
 
+### 参考及鸣谢
+- [nonebot-plugin-uninfo](https://github.com/RF-Tar-Railt/nonebot-plugin-uninfo)为会话部分用户信息提供了参考
+- [nonebot-plugin-alconna](https://github.com/nonebot/plugin-alconna/)为消息部分提供了参考
+
 
 [OneBot]: https://img.shields.io/badge/OneBot-11/12-blue?style=for-the-badge
 

docs/en/deploy/install.md

@@ -9,13 +9,23 @@ order: 1
 1. Install [`Git`](https://git-scm.com/download/) and [`Python3.10+`](https://www.python.org/downloads/release/python-31010/) Environment.
 
 ```bash
-# Clone the project
+# Clone Repo
 git clone https://github.com/LiteyukiStudio/LiteyukiBot --depth=1
-# change directory
+
+# Change directory
 cd LiteyukiBot
-# install dependencies
+
+# Create virtual environment
+python -m venv venv
+
+# Activate virtual environment
+.\venv\Scripts\activate # Windows
+source venv/bin/activate # Linux
+
+# Install dependencies
 pip install -r requirements.txt
-# start the bot!
+
+# Run Liteyuki
 python main.py
 ```
 
@@ -37,9 +47,6 @@ python main.py
 > If you are using Windows, please use the absolute project directory `/path/to/LiteyukiBot` instead of `$&#40;pwd&#41;` <br>
 > If you have modified the port number, please replace `20216:20216` with your port number
 
-## **Use TRSS Script**
- [TRSS_Liteyuki Management Script](https://timerainstarsky.github.io/TRSS_Liteyuki/), which provides a more convenient way to manage LiteyukiBot, recommended to use `Arch Linux`
-
 
 ## **Device Requirements**
 - Windows system version minimum `Windows10+`/`Windows Server 2019+`

docs/zh/deploy/config.md

@@ -14,7 +14,7 @@ order: 2
 
 ```yaml
 nonebot:
-  # Nonebot机器人的配置，以前的最外层配置项仍可为Nonebot服务，但是部分内容会被覆盖，请尽快迁移
+  # Nonebot机器人的配置，6.3.10版本后，NoneBot下配置已迁移至nonebot键下，不再使用外层配置，但是部分内容会被覆盖，请尽快迁移
   command_start: [ "/", "" ] # 指令前缀，若没有""空命令头，请开启alconna_use_command_start保证alconna解析正常
   host: 127.0.0.1 # 监听地址，默认为本机，若要接收外部请求请填写0.0.0.0
   port: 20216 # 绑定端口

docs/zh/deploy/install.md

@@ -2,11 +2,13 @@
 title: 安装
 order: 1
 ---
+
 # 安装
 
 ## **常规部署**
 
-1. 安装 [`Git`](https://git-scm.com/download/) 和 [`Python3.10+`](https://www.python.org/downloads/release/python-31010/) 环境
+1. 安装 [`Git`](https://git-scm.com/download/) 和 [
+   `Python3.10+`](https://www.python.org/downloads/release/python-31010/) 环境
 
 ```bash
 # 克隆项目到本地，轻雪使用Git进行版本管理，该步骤为必要项
@@ -14,19 +16,25 @@ git clone https://github.com/LiteyukiStudio/LiteyukiBot --depth=1 # 若你不能
 
 # 切换到Bot目录下
 cd LiteyukiBot
+
+# 创建虚拟环境
+python -m venv venv
+
+# 激活虚拟环境
+.\venv\Scripts\activate # Windows
+source venv/bin/activate # Linux
+
 # 安装依赖
 pip install -r requirements.txt
+
 # 启动Bot
 python main.py
 ```
 
-> [!tip]
-> 推荐使用虚拟环境来运行轻雪，以避免依赖冲突，你可以使用`python -m venv .venv`来创建虚拟环境，然后使用`.venv\Scripts\activate`来激活虚拟环境（Linux下使用`source .venv/bin/activate`激活）
-
 ## **使用Docker构建**
 
 1. 安装 [`Docker`](https://docs.docker.com/get-docker/)
-2. 克隆项目 `git clone https://github.com/LiteyukiStudio/LiteyukiBot --depth=1` 
+2. 克隆项目 `git clone https://github.com/LiteyukiStudio/LiteyukiBot --depth=1`
 3. 进入轻雪目录 `cd LiteyukiBot`
 4. 构建镜像 `docker build -t liteyukibot .`
 5. 启动容器 `docker run -p 20216:20216 -v $(pwd):/liteyukibot -v $(pwd)/.cache:/root/.cache liteyukibot`
@@ -35,10 +43,6 @@ python main.py
 > Windows请使用项目绝对目录`/path/to/LiteyukiBot`代替`$(pwd)` <br>
 > 若你修改了端口号请将`20216:20216`中的`20216`替换为你的端口号
 
-## **使用TRSS Scripts部署**
- [TRSS_Liteyuki轻雪机器人管理脚本](https://timerainstarsky.github.io/TRSS_Liteyuki/)，该功能由TRSS提供支持，不是LiteyukiBot官方提供的功能，推荐使用`Arch Linux`
-
-
 ## **装置要求**
 
 - Windows系统版本最低`Windows10+`/`Windows Server 2019+`
@@ -48,7 +52,8 @@ python main.py
 - 硬盘: 至少`1GB`空间
 
 > [!warning]
-> 如果装置上有多个环境，请使用`path/to/python -m pip install -r requirements.txt`来安装依赖，`path/to/python`为你的Python可执行文件路径
+> 如果装置上有多个环境，请使用`path/to/python -m pip install -r requirements.txt`来安装依赖，`path/to/python`
+> 为你的Python可执行文件路径
 
 > [!warning]
 > 轻雪的更新功能依赖Git，如果你没有安装Git直接下载源代码运行，你将无法使用更新功能

liteyuki/bot/__init__.py

@@ -1,22 +1,22 @@
 import asyncio
-import atexit
 import os
 import platform
-import signal
 import sys
 import threading
 import time
 from typing import Any, Optional
 
+from magicoca import Chan
+
 from liteyuki.bot.lifespan import LIFESPAN_FUNC, Lifespan, PROCESS_LIFESPAN_FUNC
 from liteyuki.comm.channel import get_channel
 from liteyuki.core.manager import ProcessManager
-from liteyuki.log import init_log, logger
-from liteyuki.plugin import load_plugin
-from liteyuki.utils import IS_MAIN_PROCESS
-
 # new version
 from liteyuki.core.manager import sub_process_manager
+from liteyuki.log import init_log, logger
+from liteyuki.plugin import load_plugin
+from liteyuki.session import message_handler_thread
+from liteyuki.utils import IS_MAIN_PROCESS
 
 __all__ = [
     "LiteyukiBot",
@@ -33,6 +33,10 @@ class LiteyukiBot:
         Args:
             **kwargs: 配置
         """
+        """总通道"""
+        self.i_chan = Chan[Any]()   # 外部输入通道
+        self.o_chan = Chan[Any]()   # 外部输出通道
+
         """常规操作"""
         print_logo()
         global _BOT_INSTANCE
@@ -65,7 +69,7 @@ class LiteyukiBot:
         await self.lifespan.before_start()  # 启动前钩子
         sub_process_manager.start_all()
         await self.lifespan.after_start()  # 启动后钩子
-        await self.keep_alive()
+        message_handler_thread([_.ctx.sub_chan for _ in sub_process_manager.processes.values()])
 
     def run(self):
         """
@@ -77,19 +81,7 @@ class LiteyukiBot:
         except KeyboardInterrupt:
             logger.opt(colors=True).info("<y>Liteyuki is stopping...</y>")
             self.stop()
-        logger.opt(colors=True).info("<y>Liteyuki is stopped...</y>")
-
-    async def keep_alive(self):
-        """
-        保持轻雪运行
-        """
-        logger.info("Liteyuki is keeping alive...")
-        try:
-            while not self.stop_event.is_set():
-                await asyncio.sleep(0.1)
-        except Exception:
-            logger.info("Liteyuki is exiting...")
-            self.stop()
+        logger.opt(colors=True).info("<y>Liteyuki is stopped !</y>")
 
     def restart(self, delay: int = 0):
         """

liteyuki/comm/socks_channel.py

@@ -1,48 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-基于socket的通道
-"""
-
-
-class SocksChannel:
-    """
-    通道类，可以在进程间和进程内通信，双向但同时只能有一个发送者和一个接收者
-    有两种接收工作方式，但是只能选择一种，主动接收和被动接收，主动接收使用 `receive` 方法，被动接收使用 `on_receive` 装饰器
-    """
-
-    def __init__(self, name: str):
-        """
-        初始化通道
-        Args:
-            name: 通道ID
-        """
-
-        self._name = name
-        self._conn_send = None
-        self._conn_recv = None
-        self._closed = False
-
-    def send(self, data):
-        """
-        发送数据
-        Args:
-            data: 数据
-        """
-
-        pass
-
-    def receive(self):
-        """
-        接收数据
-        Returns:
-            data: 数据
-        """
-
-        pass
-
-    def close(self):
-        """
-        关闭通道
-        """
-
-        pass

liteyuki/core/manager.py

@@ -225,17 +225,14 @@ class ProcessManager:
 
 
 class _SubProcessManager:
+    """
+    子进程管理器
+    若要子进程间通信，请先在子进程A中发送通信事件给主进程，包含当前进程信息及上下文信息，主进程再将信息发送给子进程B，子进程B再根据信息进行操作
+    """
 
     def __init__(self):
         self.processes: dict[str, SubProcess] = {}
 
-    def new_process(
-        self, name: str, *args, **kwargs
-    ) -> Callable[[ProcessFuncType], None]:
-        def decorator(func: ProcessFuncType):
-            self.processes[name] = SubProcess(name, func, *args, **kwargs)
-
-        return decorator
 
     def add(self, name: str, func: ProcessFuncType, *args, **kwargs):
         """
@@ -268,5 +265,33 @@ class _SubProcessManager:
             process.start()
             logger.debug(f"Starting process {name}")
 
+    def terminate(self, name: str):
+        """
+        终止指定子进程
+        Args:
+            name: 子进程名称
+        Returns:
+        """
+        if name not in self.processes:
+            raise KeyError(f"Process {name} not found.")
+        self.processes[name].terminate()
+
+    def terminate_all(self):
+        """
+        终止所有子进程
+        """
+        for name, process in self.processes.items():
+            process.terminate()
+            logger.debug(f"Terminating process {name}")
+
+    def get_process(self, name: str) -> SubProcess | None:
+        """
+        获取指定子进程
+        Args:
+            name: 子进程名称
+        Returns:
+        """
+        return self.processes.get(name, None)
+
 
 sub_process_manager = _SubProcessManager()

liteyuki/message/__init__.py

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved 
-
-@Time    : 2024/8/19 下午10:44
-@Author  : snowykami
-@Email   : snowykami@outlook.com
-@File    : __init__.py.py
-@Software: PyCharm
-"""

liteyuki/message/session.py

@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved 
-
-@Time    : 2024/8/19 下午10:47
-@Author  : snowykami
-@Email   : snowykami@outlook.com
-@File    : session.py
-@Software: PyCharm
-"""

liteyuki/plugins/liteecho.py

@@ -9,9 +9,9 @@ Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved
 @Software: PyCharm
 """
 
-from liteyuki.message.on import on_startswith
-from liteyuki.message.event import MessageEvent
-from liteyuki.message.rule import is_su_rule
+from liteyuki.session.on import on_startswith
+from liteyuki.session.event import MessageEvent
+from liteyuki.session.rule import is_su_rule
 
 
 @on_startswith(["liteecho"], rule=is_su_rule).handle()

liteyuki/session/__init__.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+"""
+该模块参考并引用了nonebot-plugin-alconna的消息段定义
+"""
+from typing import Any
+from typing import Iterable
+
+from magicoca import Chan, select
+
+
+def message_handler_thread(i_chans: Iterable[Chan[Any]]):
+    """
+    Args:
+        i_chans: 多路输入管道组
+    Returns:
+    """
+    for msg in select(*i_chans):
+        print("Recv from anybot", msg)

liteyuki/session/event.py

@@ -11,7 +11,6 @@ Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved
 from typing import Any, Optional
 
 from liteyuki import Channel
-from liteyuki.comm.storage import shared_memory
 
 
 class MessageEvent:

liteyuki/session/matcher.py

@@ -11,8 +11,8 @@ Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved
 import traceback
 from typing import Any, TypeAlias, Callable, Coroutine
 
-from liteyuki.message.event import MessageEvent
-from liteyuki.message.rule import Rule
+from liteyuki.session.event import MessageEvent
+from liteyuki.session.rule import Rule
 
 EventHandler: TypeAlias = Callable[[MessageEvent], Coroutine[None, None, Any]]
 

liteyuki/session/models.py

@@ -0,0 +1,51 @@
+from pydantic import BaseModel
+
+class User(BaseModel):
+    """
+    用户信息
+    Attributes:
+        id: 用户ID
+        name: 用户名
+        nick: 用户昵称
+        avatar: 用户头像图链接
+    """
+    id: str
+    name: str | None
+    nick: str | None
+    avatar: str | None
+
+class Scene(BaseModel):
+    """
+    场景信息
+    Attributes:
+        id: 场景ID
+        type: 场景类型
+        name: 场景名
+        avatar: 场景头像图链接
+        parent: 父场景
+    """
+    id: str
+    type: str
+    name: str | None
+    avatar: str | None
+    parent: "Scene | None"
+
+class Session(BaseModel):
+    """
+    会话信息
+    Attributes:
+        self_id: 机器人ID
+        adapter: 适配器ID
+        scope: 会话范围
+        scene: 场景信息
+        user: 用户信息
+        member: 成员信息，仅频道及群聊有效
+        operator: 操作者信息，仅频道及群聊有效
+    """
+    self_id: str
+    adapter: str
+    scope: str
+    scene: Scene
+    user: User
+    member: "Member | None"
+    operator: "Member | None"

liteyuki/session/on.py

@@ -11,33 +11,13 @@ Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved
 
 from queue import Queue
 
-from liteyuki.comm.storage import shared_memory
-from liteyuki.log import logger
-from liteyuki.message.event import MessageEvent
-from liteyuki.message.matcher import Matcher
-from liteyuki.message.rule import Rule, empty_rule
+from liteyuki.session.event import MessageEvent
+from liteyuki.session.matcher import Matcher
+from liteyuki.session.rule import Rule, empty_rule
 
 _matcher_list: list[Matcher] = []
 _queue: Queue = Queue()
 
-
-@shared_memory.on_subscriber_receive("event_to_liteyuki")
-async def _(event: MessageEvent):
-    print("AA")
-    current_priority = -1
-    for i, matcher in enumerate(_matcher_list):
-        logger.info(f"Running matcher {matcher} for event: {event}")
-        await matcher.run(event)
-        # 同优先级不阻断，不同优先级阻断
-        if current_priority != matcher.priority:
-            current_priority = matcher.priority
-            if matcher.block:
-                break
-    else:
-        logger.info(f"No matcher matched for event: {event}")
-    print("BB")
-
-
 def add_matcher(matcher: Matcher):
     for i, m in enumerate(_matcher_list):
         if m.priority < matcher.priority:

liteyuki/session/rule.py

@@ -11,7 +11,7 @@ Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved
 import inspect
 from typing import Optional, TypeAlias, Callable, Coroutine
 
-from liteyuki.message.event import MessageEvent
+from liteyuki.session.event import MessageEvent
 from liteyuki import get_config
 
 _superusers: list[str] = get_config("liteyuki.superusers", [])

pdm.lock

@@ -5,7 +5,7 @@
 groups = ["default", "dev"]
 strategy = ["inherit_metadata"]
 lock_version = "4.5.0"
-content_hash = "sha256:ca1b7f108fb7c5bc51977cf165511cbc7a95f64bc4effd6b6597f60bf893ba77"
+content_hash = "sha256:0ae69881170a4850760711fe7edf87f03fb6f0349f9d3008276d6c9ac3fcf83b"
 
 [[metadata.targets]]
 requires_python = ">=3.10"
@@ -89,7 +89,7 @@ files = [
 
 [[package]]
 name = "croterline"
-version = "1.0.3"
+version = "1.0.7"
 requires_python = ">=3.10"
 summary = "Default template for PDM package"
 groups = ["default"]
@@ -97,8 +97,8 @@ dependencies = [
     "magicoca>=1.0.1",
 ]
 files = [
-    {file = "croterline-1.0.3-py3-none-any.whl", hash = "sha256:e934041248bba97382cc522c658d6c4f507dbcfe751e90a1d4cb3076b530e99b"},
-    {file = "croterline-1.0.3.tar.gz", hash = "sha256:eb3874a96ed06d98fe210731ad9352a854df81218fb2c25e707e2b641b6daffb"},
+    {file = "croterline-1.0.7-py3-none-any.whl", hash = "sha256:45d2c65b58edf9e723428f5e84a84f54c4b5dae49dbe60c2bb7988ce31243ea4"},
+    {file = "croterline-1.0.7.tar.gz", hash = "sha256:9a72fb81786529ee23960cfe1c88edaf97a3270b5261b6675fad3413a09e7eb6"},
 ]
 
 [[package]]
@@ -142,18 +142,18 @@ files = [
 
 [[package]]
 name = "magicoca"
-version = "1.0.1"
+version = "1.0.5"
 requires_python = ">=3.10"
 summary = "A communication library for Python"
 groups = ["default"]
 files = [
-    {file = "magicoca-1.0.1-py3-none-any.whl", hash = "sha256:69e04be77f9c02d3d0730dc4e739246f4bdefee8b78631040b464cd98cdde51c"},
-    {file = "magicoca-1.0.1.tar.gz", hash = "sha256:0dbc9a35609db92ec79076f7126566c1e71bd4b853909ecbad9221dcc7fd6f31"},
+    {file = "magicoca-1.0.5-py3-none-any.whl", hash = "sha256:e11a88dcd71fdb779ddf646d3071249f198623756ec8b4ddc3b92f65f68570d3"},
+    {file = "magicoca-1.0.5.tar.gz", hash = "sha256:764a53be7cb170b1261d85f1db757cd98c584b8340d0bb3096dc7327266bb259"},
 ]
 
 [[package]]
 name = "mypy"
-version = "1.11.2"
+version = "1.12.0"
 requires_python = ">=3.8"
 summary = "Optional static typing for Python"
 groups = ["dev"]
@@ -163,23 +163,28 @@ dependencies = [
     "typing-extensions>=4.6.0",
 ]
 files = [
-    {file = "mypy-1.11.2-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d42a6dd818ffce7be66cce644f1dff482f1d97c53ca70908dff0b9ddc120b77a"},
-    {file = "mypy-1.11.2-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:801780c56d1cdb896eacd5619a83e427ce436d86a3bdf9112527f24a66618fef"},
-    {file = "mypy-1.11.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:41ea707d036a5307ac674ea172875f40c9d55c5394f888b168033177fce47383"},
-    {file = "mypy-1.11.2-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:6e658bd2d20565ea86da7d91331b0eed6d2eee22dc031579e6297f3e12c758c8"},
-    {file = "mypy-1.11.2-cp310-cp310-win_amd64.whl", hash = "sha256:478db5f5036817fe45adb7332d927daa62417159d49783041338921dcf646fc7"},
-    {file = "mypy-1.11.2-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:75746e06d5fa1e91bfd5432448d00d34593b52e7e91a187d981d08d1f33d4385"},
-    {file = "mypy-1.11.2-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a976775ab2256aadc6add633d44f100a2517d2388906ec4f13231fafbb0eccca"},
-    {file = "mypy-1.11.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:cd953f221ac1379050a8a646585a29574488974f79d8082cedef62744f0a0104"},
-    {file = "mypy-1.11.2-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:57555a7715c0a34421013144a33d280e73c08df70f3a18a552938587ce9274f4"},
-    {file = "mypy-1.11.2-cp311-cp311-win_amd64.whl", hash = "sha256:36383a4fcbad95f2657642a07ba22ff797de26277158f1cc7bd234821468b1b6"},
-    {file = "mypy-1.11.2-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:e8960dbbbf36906c5c0b7f4fbf2f0c7ffb20f4898e6a879fcf56a41a08b0d318"},
-    {file = "mypy-1.11.2-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:06d26c277962f3fb50e13044674aa10553981ae514288cb7d0a738f495550b36"},
-    {file = "mypy-1.11.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6e7184632d89d677973a14d00ae4d03214c8bc301ceefcdaf5c474866814c987"},
-    {file = "mypy-1.11.2-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:3a66169b92452f72117e2da3a576087025449018afc2d8e9bfe5ffab865709ca"},
-    {file = "mypy-1.11.2-cp312-cp312-win_amd64.whl", hash = "sha256:969ea3ef09617aff826885a22ece0ddef69d95852cdad2f60c8bb06bf1f71f70"},
-    {file = "mypy-1.11.2-py3-none-any.whl", hash = "sha256:b499bc07dbdcd3de92b0a8b29fdf592c111276f6a12fe29c30f6c417dd546d12"},
-    {file = "mypy-1.11.2.tar.gz", hash = "sha256:7f9993ad3e0ffdc95c2a14b66dee63729f021968bff8ad911867579c65d13a79"},
+    {file = "mypy-1.12.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4397081e620dc4dc18e2f124d5e1d2c288194c2c08df6bdb1db31c38cd1fe1ed"},
+    {file = "mypy-1.12.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:684a9c508a283f324804fea3f0effeb7858eb03f85c4402a967d187f64562469"},
+    {file = "mypy-1.12.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:6cabe4cda2fa5eca7ac94854c6c37039324baaa428ecbf4de4567279e9810f9e"},
+    {file = "mypy-1.12.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:060a07b10e999ac9e7fa249ce2bdcfa9183ca2b70756f3bce9df7a92f78a3c0a"},
+    {file = "mypy-1.12.0-cp310-cp310-win_amd64.whl", hash = "sha256:0eff042d7257f39ba4ca06641d110ca7d2ad98c9c1fb52200fe6b1c865d360ff"},
+    {file = "mypy-1.12.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:4b86de37a0da945f6d48cf110d5206c5ed514b1ca2614d7ad652d4bf099c7de7"},
+    {file = "mypy-1.12.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:20c7c5ce0c1be0b0aea628374e6cf68b420bcc772d85c3c974f675b88e3e6e57"},
+    {file = "mypy-1.12.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:a64ee25f05fc2d3d8474985c58042b6759100a475f8237da1f4faf7fcd7e6309"},
+    {file = "mypy-1.12.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:faca7ab947c9f457a08dcb8d9a8664fd438080e002b0fa3e41b0535335edcf7f"},
+    {file = "mypy-1.12.0-cp311-cp311-win_amd64.whl", hash = "sha256:5bc81701d52cc8767005fdd2a08c19980de9ec61a25dbd2a937dfb1338a826f9"},
+    {file = "mypy-1.12.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:8462655b6694feb1c99e433ea905d46c478041a8b8f0c33f1dab00ae881b2164"},
+    {file = "mypy-1.12.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:923ea66d282d8af9e0f9c21ffc6653643abb95b658c3a8a32dca1eff09c06475"},
+    {file = "mypy-1.12.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:1ebf9e796521f99d61864ed89d1fb2926d9ab6a5fab421e457cd9c7e4dd65aa9"},
+    {file = "mypy-1.12.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:e478601cc3e3fa9d6734d255a59c7a2e5c2934da4378f3dd1e3411ea8a248642"},
+    {file = "mypy-1.12.0-cp312-cp312-win_amd64.whl", hash = "sha256:c72861b7139a4f738344faa0e150834467521a3fba42dc98264e5aa9507dd601"},
+    {file = "mypy-1.12.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:52b9e1492e47e1790360a43755fa04101a7ac72287b1a53ce817f35899ba0521"},
+    {file = "mypy-1.12.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:48d3e37dd7d9403e38fa86c46191de72705166d40b8c9f91a3de77350daa0893"},
+    {file = "mypy-1.12.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:2f106db5ccb60681b622ac768455743ee0e6a857724d648c9629a9bd2ac3f721"},
+    {file = "mypy-1.12.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:233e11b3f73ee1f10efada2e6da0f555b2f3a5316e9d8a4a1224acc10e7181d3"},
+    {file = "mypy-1.12.0-cp313-cp313-win_amd64.whl", hash = "sha256:4ae8959c21abcf9d73aa6c74a313c45c0b5a188752bf37dace564e29f06e9c1b"},
+    {file = "mypy-1.12.0-py3-none-any.whl", hash = "sha256:fd313226af375d52e1e36c383f39bf3836e1f192801116b31b090dfcd3ec5266"},
+    {file = "mypy-1.12.0.tar.gz", hash = "sha256:65a22d87e757ccd95cbbf6f7e181e6caa87128255eb2b6be901bb71b26d8a99d"},
 ]
 
 [[package]]
@@ -438,29 +443,29 @@ files = [
 
 [[package]]
 name = "uv"
-version = "0.4.20"
+version = "0.4.24"
 requires_python = ">=3.8"
 summary = "An extremely fast Python package and project manager, written in Rust."
 groups = ["dev"]
 files = [
-    {file = "uv-0.4.20-py3-none-linux_armv6l.whl", hash = "sha256:d0566f3ce596b0192099f7a01be08e1f37061d7399e0128804794cf83cdf2806"},
-    {file = "uv-0.4.20-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:1f20251b5a6a1cc92d844153b128b346bd0be8178beb4945df63d1a76a905176"},
-    {file = "uv-0.4.20-py3-none-macosx_11_0_arm64.whl", hash = "sha256:d37f02ae48540104d9c13d2dfe27bf84b246d5945b55d91568404da08e2a3bd8"},
-    {file = "uv-0.4.20-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl", hash = "sha256:555f0275c3db5b1cd13f6a6825b0b0f23e116a58a46da65f55d4f07915b36b16"},
-    {file = "uv-0.4.20-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:a6faba47d13c1b916bfe9a1828a792ba21558871b4b81dbb79c157077f558fb3"},
-    {file = "uv-0.4.20-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:092d4d3cee4a9680832c16d5c1a5e816b2d07a31328580f04e4ddf437821b1f3"},
-    {file = "uv-0.4.20-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:5d62655450d173a4dbe76b70b9af81ffa501501d97224f311f126b30924b42f7"},
-    {file = "uv-0.4.20-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:865c5fbc2ebe73b4f4b71cbcc1b1bae90a335b15f6eaa9fa6495f77a6e86455e"},
-    {file = "uv-0.4.20-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a65eaec88b084094f5b08c2ad73f0ae972f7d6afd0d3ee1d0eb29a76c010a39b"},
-    {file = "uv-0.4.20-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b8e3492d5f1613e88201b6f68a2e5fba48b0bdbe0f11179df9b222e9dd8d89d3"},
-    {file = "uv-0.4.20-py3-none-manylinux_2_28_aarch64.whl", hash = "sha256:8ec4a7d0ab131ea749702d4885ff0f6734e1aca1dc26ebbc1c7c67969ba3c0fc"},
-    {file = "uv-0.4.20-py3-none-musllinux_1_1_armv7l.whl", hash = "sha256:588aedc47fe02f8cf0dfe0dec3fd5e1f3a707fdf674964b3d31f0523351db9d2"},
-    {file = "uv-0.4.20-py3-none-musllinux_1_1_i686.whl", hash = "sha256:309539e9b29f3fbbedb3835297a324a9206b42005e15b0af3fa73343ab966349"},
-    {file = "uv-0.4.20-py3-none-musllinux_1_1_ppc64le.whl", hash = "sha256:8ad94fb135bec5c061ba21b1f081f349c3de2b0f8660e168e5afc829d3069e6d"},
-    {file = "uv-0.4.20-py3-none-musllinux_1_1_x86_64.whl", hash = "sha256:74f78748e72893a674351ca9d708003629ddc1a00bc51100c901b5d47db73e43"},
-    {file = "uv-0.4.20-py3-none-win32.whl", hash = "sha256:dbf454b6f56f9181886426c7aed7a8dfc8258f80082365fe99b2044ff92261ba"},
-    {file = "uv-0.4.20-py3-none-win_amd64.whl", hash = "sha256:653bfec188d199384451804a6c055fb1d28662adfee7697fe7108c6fb78924ba"},
-    {file = "uv-0.4.20.tar.gz", hash = "sha256:b4c8a2027b1f19f8b8949132e728a750e4f9b4bb0ec02544d9b21df3f525ab1a"},
+    {file = "uv-0.4.24-py3-none-linux_armv6l.whl", hash = "sha256:bbc24b232c5e874741d863c5bec2257533db86f91381f1a101872028a0502ec9"},
+    {file = "uv-0.4.24-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:b8d467d4c4746127b2121d6f67686957a2b5431935d26767aa02fa4516694293"},
+    {file = "uv-0.4.24-py3-none-macosx_11_0_arm64.whl", hash = "sha256:7d076875e9fa4d8cda44d3e51c9b47efc578db830535c62f25884772bfa265bc"},
+    {file = "uv-0.4.24-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.musllinux_1_1_aarch64.whl", hash = "sha256:c40f75df1f2c45a7f67fcc69d80231760f6a017b7c8e889a16e21348651a34d7"},
+    {file = "uv-0.4.24-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:b459913d8ba6edba2c4b299e87fccfbd7fca4b2e2abe5fd4fa0da56147e19fc8"},
+    {file = "uv-0.4.24-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:5e3ce0350e74b3dba6854789dd253faeab2fdf8e84f2671b68573070bb40ff17"},
+    {file = "uv-0.4.24-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:d274f7ddc013697fb52962632bc7e77889a6ec87d2cd12316d218686cfece3d4"},
+    {file = "uv-0.4.24-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:7ef6914a7294ac7df5bd15b21652cbe61d1c12a0f29a94d178dce6192f858092"},
+    {file = "uv-0.4.24-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:4d8e5f66a8756d4908121cb59189e6f9992fdbd0f9c26a5a30a069b94f8acab3"},
+    {file = "uv-0.4.24-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2a3ea6780e3451c81ce1635656abcd8a47e43f1b0f02542c433b4b6dd459df8e"},
+    {file = "uv-0.4.24-py3-none-manylinux_2_28_aarch64.whl", hash = "sha256:beaff8fdaad3bcd781a8d28b60843b8d1cd2a04229847dc314c1bb7e0bb39ca2"},
+    {file = "uv-0.4.24-py3-none-musllinux_1_1_armv7l.whl", hash = "sha256:70a76cb5b8a459d6f6931becf2b5689599382c2512341d566ce335b8304c44e8"},
+    {file = "uv-0.4.24-py3-none-musllinux_1_1_i686.whl", hash = "sha256:29c514752873c1be259afd82b975e528ec6783564a306fd24deee0cccb2dc566"},
+    {file = "uv-0.4.24-py3-none-musllinux_1_1_ppc64le.whl", hash = "sha256:c03a411f1b86ce7de25d6271d90358ba2d33e87b4922dc5378c4c07674909363"},
+    {file = "uv-0.4.24-py3-none-musllinux_1_1_x86_64.whl", hash = "sha256:a03bc4b2ca2236eece97fffb8b5605b7a2248cd8a4b9a9c67955ad08756a1ceb"},
+    {file = "uv-0.4.24-py3-none-win32.whl", hash = "sha256:a97c347af12deb687c09fed82dc829efd6e5fbc4d76a38e98b2eaa2b065e4cfe"},
+    {file = "uv-0.4.24-py3-none-win_amd64.whl", hash = "sha256:ec0570f5e2e4dbfd83a89e9a55d5f033050d749f684bd0e7d4c327fd49f89b12"},
+    {file = "uv-0.4.24.tar.gz", hash = "sha256:f71a00f10cfa15b4f4f0184a67da19f35c48683bba9bb49cebe9c206f1b2bc1f"},
 ]
 
 [[package]]

pyproject.toml

@@ -15,13 +15,13 @@ license = { text = "MIT&LSO" }
 
 dependencies = [
     "loguru~=0.7.2",
-    "pydantic>=2.8.2",
+    "pydantic>=2.9.2",
     "PyYAML>=6.0.2",
     "toml>=0.10.2",
     "watchdog>=4.0.1",
     "pdm-backend>=2.3.3",
-    "magicoca>=1.0.1",
-    "croterline>=1.0.3"
+    "magicoca>=1.0.5",
+    "croterline~=1.0.5",
 ]
 
 [project.urls]

requirements.txt

@@ -1,7 +1,7 @@
+# app dependencies
 aiohttp>=3.9.3
 aiofiles>=23.2.1
 colored>=2.2.4
-croterline>=1.0.3
 GitPython>=3.1.43
 httpx>=0.27.0
 nonebot-plugin-htmlrender>=0.1.0
@@ -31,4 +31,7 @@ loguru~=0.7.2
 pydantic~=2.9.2
 pip~=23.2.1
 fastapi~=0.115.0
-magicoca~=1.0.1
+
+# liteyuki dependencies
+croterline>=1.0.7
+magicoca>=1.0.5

src/liteyuki_plugins/hello_liteyuki.py

@@ -9,8 +9,8 @@ Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved
 @Software: PyCharm
 """
 from liteyuki.plugin import PluginMetadata, PluginType
-from liteyuki.message.on import on_message
-from liteyuki.message.event import MessageEvent
+from liteyuki.session.on import on_message
+from liteyuki.session.event import MessageEvent
 
 __plugin_meta__ = PluginMetadata(
     name="你好轻雪",

src/liteyuki_plugins/nonebot/__init__.py

@@ -4,7 +4,6 @@ from pathlib import Path
 import nonebot
 from croterline.utils import IsMainProcess
 
-from liteyuki import get_bot
 from liteyuki.core import sub_process_manager
 from liteyuki.plugin import PluginMetadata, PluginType
 
@@ -28,6 +27,7 @@ def nb_run(*args, **kwargs):
 if IsMainProcess:
     from .dev_reloader import *
     bot = get_bot()
+
     sub_process_manager.add(
         name="nonebot", func=nb_run, **bot.config.get("nonebot", {})
     )

src/liteyuki_plugins/nonebot/nonebot_plugins/liteyuki_uniblacklist/__init__.py

@@ -1,17 +0,0 @@
-from nonebot.plugin import PluginMetadata
-from .api import *
-
-__author__ = "snowykami"
-__plugin_meta__ = PluginMetadata(
-    name="联合黑名单(测试中...)",
-    description="",
-    usage="",
-    type="application",
-    homepage="https://github.com/snowykami/LiteyukiBot",
-    extra={
-            "liteyuki": True,
-            "toggleable"     : True,
-            "default_enable" : True,
-    }
-)
-

src/liteyuki_plugins/nonebot/nonebot_plugins/liteyuki_uniblacklist/api.py

@@ -1,58 +0,0 @@
-import datetime
-
-import aiohttp
-import nonebot
-from nonebot import require
-from nonebot.exception import IgnoredException
-from nonebot.message import event_preprocessor
-from nonebot_plugin_alconna.typings import Event
-
-require("nonebot_plugin_apscheduler")
-
-from nonebot_plugin_apscheduler import scheduler
-
-blacklist_data: dict[str, set[str]] = {}
-blacklist: set[str] = set()
-
-
-@scheduler.scheduled_job("interval", minutes=10, next_run_time=datetime.datetime.now())
-async def update_blacklist():
-    await request_for_blacklist()
-
-
-async def request_for_blacklist():
-    global blacklist
-    urls = [
-            "https://cdn.liteyuki.icu/static/ubl/"
-    ]
-
-    platforms = [
-            "qq"
-    ]
-
-    for plat in platforms:
-        for url in urls:
-            url += f"{plat}.txt"
-            async with aiohttp.ClientSession() as client:
-                resp = await client.get(url)
-                blacklist_data[plat] = set((await resp.text()).splitlines())
-    blacklist = get_uni_set()
-    nonebot.logger.info("blacklists updated")
-
-
-def get_uni_set() -> set:
-    s = set()
-    for new_set in blacklist_data.values():
-        s.update(new_set)
-    return s
-
-
-@event_preprocessor
-async def pre_handle(event: Event):
-    try:
-        user_id = str(event.get_user_id())
-    except:
-        return
-
-    if user_id in get_uni_set():
-        raise IgnoredException("UserId in blacklist")

src/liteyuki_plugins/nonebot/nonebot_plugins/to_liteyuki.py

@@ -8,16 +8,11 @@ Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved
 @File    : to_liteyuki.py
 @Software: PyCharm
 """
-import asyncio
 
-from nonebot import Bot, get_bot, on_message, get_driver
+from croterline.process import get_ctx
+from nonebot.adapters.onebot.v11 import MessageEvent
 from nonebot.plugin import PluginMetadata
-from nonebot.adapters.onebot.v11 import MessageEvent, Bot
-
-from liteyuki import Channel
-from liteyuki.comm import get_channel
-from liteyuki.comm.storage import shared_memory
-from liteyuki.message.event import MessageEvent as LiteyukiMessageEvent
+from nonebot import on_message
 
 __plugin_meta__ = PluginMetadata(
     name="轻雪push",
@@ -25,31 +20,11 @@ __plugin_meta__ = PluginMetadata(
     usage="用户无需使用",
 )
 
-recv_channel = Channel[LiteyukiMessageEvent](name="event_to_nonebot")
+ctx = get_ctx()
 
+@on_message().handle()
+async def _(event: MessageEvent):
+    print("Push message to Liteyuki")
 
-# @on_message().handle()
-# async def _(bot: Bot, event: MessageEvent):
-#     liteyuki_event = LiteyukiMessageEvent(
-#         message_type=event.message_type,
-#         message=event.dict()["message"],
-#         raw_message=event.raw_message,
-#         data=event.dict(),
-#         bot_id=bot.self_id,
-#         user_id=str(event.user_id),
-#         session_id=str(event.user_id if event.message_type == "private" else event.group_id),
-#         session_type=event.message_type,
-#         receive_channel=recv_channel,
-#     )
-#     shared_memory.publish("event_to_liteyuki", liteyuki_event)
+    ctx.sub_chan << event.raw_message
 
-
-# @get_driver().on_bot_connect
-# async def _():
-#     while True:
-#         event = await recv_channel.async_receive()
-#         bot: Bot = get_bot(event.bot_id)  # type: ignore
-#         if event.message_type == "private":
-#             await bot.send_private_msg(user_id=int(event.session_id), message=event.data["message"])
-#         elif event.message_type == "group":
-#             await bot.send_group_msg(group_id=int(event.session_id), message=event.data["message"])

src/liteyuki_plugins/nonebot/np_main/loader.py

@@ -18,7 +18,6 @@ driver = get_driver()
 
 @driver.on_startup
 async def load_plugins():
-    print("load from", os.path.join(os.path.dirname(__file__), "../nonebot_plugins"))
     nonebot.plugin.load_plugins(os.path.abspath(os.path.join(os.path.dirname(__file__), "../nonebot_plugins")))
     # 从数据库读取已安装的插件
     if not get_config("safe_mode", False):