🐛 fix 通道无法在进程内传递消息的问题

liteyuki/plugins/code_watchdog/__init__.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+"""
+Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved 
+
+@Time    : 2024/8/11 下午8:50
+@Author  : snowykami
+@Email   : snowykami@outlook.com
+@File    : __init__.py.py
+@Software: PyCharm
+"""
+from liteyuki.core import IS_MAIN_PROCESS
+from liteyuki.plugin import PluginMetadata
+
+from .observer import *
+
+__plugin_meta__ = PluginMetadata(
+    name="代码热重载监视",
+)
+
+if IS_MAIN_PROCESS:
+    config = get_config("liteyuki.reload")

liteyuki/plugins/code_watchdog/observer.py

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+"""
+Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved 
+
+@Time    : 2024/8/11 下午10:01
+@Author  : snowykami
+@Email   : snowykami@outlook.com
+@File    : observer.py
+@Software: PyCharm
+"""
+from watchdog.events import FileSystemEventHandler
+from watchdog.observers import Observer
+from liteyuki import get_config, logger, get_bot
+
+liteyuki_bot = get_bot()
+
+if get_config("debug", False):
+
+    src_directories = (
+            "src/nonebot_plugins",
+            "src/utils",
+    )
+    src_excludes_extensions = (
+            "pyc",
+    )
+    logger.debug("Liteyuki Reload enabled, watching for file changes...")
+
+    class CodeModifiedHandler(FileSystemEventHandler):
+        """
+        Handler for code file changes
+        """
+        def on_modified(self, event):
+            if event.src_path.endswith(
+                    src_excludes_extensions) or event.is_directory or "__pycache__" in event.src_path:
+                return
+            logger.info(f"{event.src_path} modified, reloading bot...")
+            liteyuki_bot.restart_process("nonebot")
+
+    code_modified_handler = CodeModifiedHandler()
+
+    observer = Observer()
+    for directory in src_directories:
+        observer.schedule(code_modified_handler, directory, recursive=True)
+    observer.start()

liteyuki/plugins/lifespan_monitor.py

@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved 
-#
-# @Time    : 2024/7/22 上午11:25
-# @Author  : snowykami
-# @Email   : snowykami@outlook.com
-# @File    : asa.py
-# @Software: PyCharm
-import asyncio
-
-from liteyuki.plugin import PluginMetadata
-from liteyuki import get_bot, logger
-from liteyuki.comm.channel import get_channel
-
-__plugin_meta__ = PluginMetadata(
-    name="lifespan_monitor",
-)
-
-bot = get_bot()
-nbp_chan = get_channel("nonebot-passive")
-mbp_chan = get_channel("melobot-passive")
-
-
-@bot.on_before_start
-def _():
-    logger.info("生命周期监控器：准备启动")
-
-
-@bot.on_before_shutdown
-def _():
-    print(get_channel("main"))
-    logger.info("生命周期监控器：准备停止")
-
-
-@bot.on_before_restart
-def _():
-    logger.info("生命周期监控器：准备重启")
-
-
-@bot.on_after_start
-def _():
-    logger.info("生命周期监控器：启动完成")
-
-
-@bot.on_after_start
-async def _():
-    logger.info("生命周期监控器：启动完成")
-
-
-
-# @mbp_chan.on_receive()
-# @nbp_chan.on_receive()
-# async def _(data):
-#     print("主进程收到数据", data)

liteyuki/plugins/nonebot_launcher/__init__.py

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+"""
+Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved 
+
+@Time    : 2024/8/11 下午5:24
+@Author  : snowykami
+@Email   : snowykami@outlook.com
+@File    : __init__.py.py
+@Software: PyCharm
+"""
+
+import nonebot
+
+from liteyuki.plugin import PluginMetadata
+from liteyuki import get_bot
+from liteyuki.comm import Channel, set_channel
+from liteyuki.core import IS_MAIN_PROCESS
+from .nb_utils import adapter_manager, driver_manager
+
+__plugin_meta__ = PluginMetadata(
+    name="NoneBot2启动器",
+)
+
+liteyuki = get_bot()
+
+
+def nb_run(chan_active: "Channel", chan_passive: "Channel", **kwargs):
+    """
+    初始化NoneBot并运行在子进程
+    Args:
+
+        chan_active:
+        chan_passive:
+        **kwargs:
+
+    Returns:
+    """
+    # 给子进程传递通道对象
+    set_channel("nonebot-active", chan_active)
+    set_channel("nonebot-passive", chan_passive)
+
+    kwargs.update(kwargs.get("nonebot", {}))    # nonebot配置优先
+    nonebot.init(**kwargs)
+
+    driver_manager.init(config=kwargs)
+    adapter_manager.init(kwargs)
+    adapter_manager.register()
+    nonebot.load_plugin("src.liteyuki_main")
+    nonebot.run()
+
+
+if IS_MAIN_PROCESS:
+    @liteyuki.on_after_start
+    def start_run_nonebot():
+        liteyuki.process_manager.add_target(name="nonebot", target=nb_run, args=(), kwargs=liteyuki.config)
+        liteyuki.process_manager.start("nonebot")

liteyuki/plugins/nonebot_launcher/nb_utils/adapter_manager/__init__.py

@@ -0,0 +1,14 @@
+from . import (
+    satori,
+    onebot
+)
+
+
+def init(config: dict):
+    onebot.init()
+    satori.init(config)
+
+
+def register():
+    onebot.register()
+    satori.register()

liteyuki/plugins/nonebot_launcher/nb_utils/adapter_manager/onebot.py

@@ -0,0 +1,12 @@
+import nonebot
+from nonebot.adapters.onebot import v11, v12
+
+
+def init():
+    pass
+
+
+def register():
+    driver = nonebot.get_driver()
+    driver.register_adapter(v11.Adapter)
+    driver.register_adapter(v12.Adapter)

liteyuki/plugins/nonebot_launcher/nb_utils/adapter_manager/satori.py

@@ -0,0 +1,26 @@
+import json
+import os
+
+import nonebot
+from nonebot.adapters import satori
+
+
+def init(config: dict):
+    if config.get("satori", None) is None:
+        nonebot.logger.info("Satori config not found, skip Satori init.")
+        return None
+    satori_config = config.get("satori")
+    if not satori_config.get("enable", False):
+        nonebot.logger.info("Satori not enabled, skip Satori init.")
+        return None
+    if os.getenv("SATORI_CLIENTS", None) is not None:
+        nonebot.logger.info("Satori clients already set in environment variable, skip.")
+    os.environ["SATORI_CLIENTS"] = json.dumps(satori_config.get("hosts", []), ensure_ascii=False)
+    config['satori_clients'] = satori_config.get("hosts", [])
+    return
+
+
+def register():
+    if os.getenv("SATORI_CLIENTS", None) is not None:
+        driver = nonebot.get_driver()
+        driver.register_adapter(satori.Adapter)

liteyuki/plugins/nonebot_launcher/nb_utils/driver_manager/__init__.py

@@ -0,0 +1,6 @@
+from .auto_set_env import auto_set_env
+
+
+def init(config: dict):
+    auto_set_env(config)
+    return

liteyuki/plugins/nonebot_launcher/nb_utils/driver_manager/auto_set_env.py

@@ -0,0 +1,20 @@
+import os
+
+import dotenv
+import nonebot
+
+from .defines import *
+
+
+def auto_set_env(config: dict):
+    dotenv.load_dotenv(".env")
+    if os.getenv("DRIVER", None) is not None:
+        nonebot.logger.info("Driver already set in environment variable, skip auto configure.")
+        return
+    if config.get("satori", {'enable': False}).get("enable", False):
+        os.environ["DRIVER"] = get_driver_string(ASGI_DRIVER, HTTPX_DRIVER, WEBSOCKETS_DRIVER)
+        nonebot.logger.info("Enable Satori, set driver to ASGI+HTTPX+WEBSOCKETS")
+    else:
+        os.environ["DRIVER"] = get_driver_string(ASGI_DRIVER)
+        nonebot.logger.info("Disable Satori, set driver to ASGI")
+    return

liteyuki/plugins/nonebot_launcher/nb_utils/driver_manager/defines.py

@@ -0,0 +1,17 @@
+ASGI_DRIVER = "~fastapi"
+HTTPX_DRIVER = "~httpx"
+WEBSOCKETS_DRIVER = "~websockets"
+
+
+def get_driver_string(*argv):
+    output_string = ""
+    if ASGI_DRIVER in argv:
+        output_string += ASGI_DRIVER
+    for arg in argv:
+        if arg != ASGI_DRIVER:
+            output_string = f"{output_string}+{arg}"
+    return output_string
+
+
+def get_driver_full_string(*argv):
+    return f"DRIVER={get_driver_string(argv)}"

liteyuki/plugins/plugins_loader/__init__.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+"""
+Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved 
+
+@Time    : 2024/8/11 下午10:02
+@Author  : snowykami
+@Email   : snowykami@outlook.com
+@File    : __init__.py.py
+@Software: PyCharm
+"""
+from liteyuki.plugin import PluginMetadata, load_plugins
+
+__plugin_meta__ = PluginMetadata(
+    name="外部轻雪插件加载器",
+    version="0.1.0",
+    author="snowykami",
+    description="插件加载器，用于加载轻雪原生插件"
+)
+
+load_plugins("src/liteyuki_plugins")

liteyuki/plugins/register_service.py

@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved 
-
-@Time    : 2024/8/10 下午11:25
-@Author  : snowykami
-@Email   : snowykami@outlook.com
-@File    : register_service.py
-@Software: PyCharm
-"""
-import json
-import os.path
-import platform
-
-import requests
-from git import Repo
-from liteyuki.plugin import PluginMetadata
-from liteyuki import get_bot, logger
-
-__plugin_meta__ = PluginMetadata(
-    name="注册服务",
-)
-
-liteyuki = get_bot()
-commit_hash = Repo(".").head.commit.hexsha
-
-
-def register_bot():
-    url = "https://api.liteyuki.icu/register"
-    data = {
-            "name"     : "LiteyukiBot",
-            "version"  : "RollingUpdate",
-            "hash"     : commit_hash,
-            "version_i": 0,
-            "python"   : f"{platform.python_implementation()} {platform.python_version()}",
-            "os"       : f"{platform.system()} {platform.version()} {platform.machine()}"
-    }
-    try:
-        logger.info("Waiting for register to Liteyuki...")
-        resp = requests.post(url, json=data, timeout=(10, 15))
-        if resp.status_code == 200:
-            data = resp.json()
-            if liteyuki_id := data.get("liteyuki_id"):
-                with open("data/liteyuki/liteyuki.json", "wb") as f:
-                    f.write(json.dumps(data).encode("utf-8"))
-                logger.success(f"Register {liteyuki_id} to Liteyuki successfully")
-            else:
-                raise ValueError(f"Register to Liteyuki failed: {data}")
-
-    except Exception as e:
-        logger.warning(f"Register to Liteyuki failed, but it's no matter: {e}")
-
-
-@liteyuki.on_before_start
-async def _():
-    if not os.path.exists("data/liteyuki/liteyuki.json"):
-        register_bot()

liteyuki/plugins/reloader_monitor.py

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

liteyuki/plugins/what_litaco/__init__.py

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved 
-
-@Time    : 2024/7/25 上午2:28
-@Author  : snowykami
-@Email   : snowykami@outlook.com
-@File    : __init__.py
-@Software: PyCharm
-"""
-# -*- coding: utf-8 -*-
-#
-# Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved
-#
-# @Time    : 2024/7/22 上午11:25
-# @Author  : snowykami
-# @Email   : snowykami@outlook.com
-# @File    : asa.py
-# @Software: PyCharm