snowykami/testpage
1
0
Fork 0
forked from bot/app
Code Pull Requests Activity

🐛 修复生命周期钩子函数的问题

Browse Source
This commit is contained in:
远野千束
2024-08-08 18:06:03 +08:00
parent c29a3fd6d4
commit f69feb1def
27 changed files with 172 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
liteyuki/_plugins/plugin_loader/__init__.py
View File

@ -1,41 +0,0 @@
import asyncio
import multiprocessing
import time
from liteyuki.plugin import PluginMetadata
from liteyuki import get_bot, chan
__plugin_metadata__ = PluginMetadata(
name="plugin_loader",
description="轻雪插件加载器",
usage="",
type="liteyuki-main",
homepage=""
)
from src.utils import TempConfig, common_db
liteyuki = get_bot()
@liteyuki.on_after_start
def _():
temp_data = common_db.where_one(TempConfig(), default=TempConfig())
# 储存重启计时信息
if temp_data.data.get("reload", False):
delta_time = time.time() - temp_data.data.get("reload_time", 0)
temp_data.data["delta_time"] = delta_time
common_db.save(temp_data) # 更新数据
print("轻雪实例", liteyuki)
chan.send(liteyuki, "instance")
# @liteyuki.on_before_start
# def _():
# print("轻雪启动中")
#
#
# @liteyuki.on_after_start
# async def _():
# print("轻雪启动完成")
# chan.send("轻雪启动完成")

10
liteyuki/_plugins/plugin_loader/data_source.py
View File

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

10
liteyuki/_plugins/what_litaco/__init__.py
View File

@ -1,10 +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
"""

28
liteyuki/bot/__init__.py
View File

@ -1,3 +1,4 @@
import threading
import time
import asyncio
from typing import Any, Optional
@ -29,7 +30,10 @@ class LiteyukiBot:
self.lifespan: Lifespan = Lifespan()
self.chan = Channel() # 进程通信通道
self.pm: Optional[ProcessManager] = None # 启动时实例化
self.pm: ProcessManager = ProcessManager(bot=self, chan=self.chan)
self.loop = asyncio.new_event_loop()
asyncio.set_event_loop(self.loop)
self.loop_thread = threading.Thread(target=self.loop.run_forever, daemon=True)
print("\033[34m" + r"""
__ ______ ________ ________ __ __ __ __ __ __ ______
@ -44,8 +48,10 @@ $$$$$$$$/ $$$$$$/ $$/ $$$$$$$$/ $$/ $$$$$$/ $$/ $$/ $$$$$$/
""" + "\033[0m")
def run(self):
# load_plugins("liteyuki/plugins") # 加载轻雪插件
self.pm = ProcessManager(bot=self, chan=self.chan)
load_plugins("liteyuki/plugins") # 加载轻雪插件
self.loop_thread.start() # 启动事件循环
asyncio.run(self.lifespan.before_start()) # 启动前钩子
self.pm.add_target("nonebot", nb_run, **self.config)
self.pm.start("nonebot")
@ -53,7 +59,7 @@ $$$$$$$$/ $$$$$$/ $$/ $$$$$$$$/ $$/ $$$$$$/ $$/ $$/ $$$$$$/
self.pm.add_target("melobot", mb_run, **self.config)
self.pm.start("melobot")
run_coroutine(self.lifespan.after_start()) # 启动前
asyncio.run(self.lifespan.after_start()) # 启动后钩子
def restart(self, name: Optional[str] = None):
"""
@ -64,14 +70,14 @@ $$$$$$$$/ $$$$$$/ $$/ $$$$$$$$/ $$/ $$$$$$/ $$/ $$/ $$$$$$/
"""
logger.info("Stopping LiteyukiBot...")
logger.debug("Running before_restart functions...")
run_coroutine(self.lifespan.before_restart())
logger.debug("Running before_shutdown functions...")
run_coroutine(self.lifespan.before_shutdown())
self.loop.create_task(self.lifespan.before_shutdown()) # 重启前钩子
self.loop.create_task(self.lifespan.before_shutdown()) # 停止前钩子
if name:
self.chan.send(1, name)
else:
for name in self.pm.processes:
for name in self.pm.targets:
self.chan.send(1, name)
def init(self, *args, **kwargs):
@ -114,7 +120,7 @@ $$$$$$$$/ $$$$$$/ $$/ $$$$$$$$/ $$/ $$$$$$/ $$/ $$/ $$$$$$/
def on_before_shutdown(self, func: LIFESPAN_FUNC):
"""
注册停止前的函数
注册停止前的函数，为子进程停止时调用
Args:
func:
@ -136,7 +142,7 @@ $$$$$$$$/ $$$$$$/ $$/ $$$$$$$$/ $$/ $$$$$$/ $$/ $$/ $$$$$$/
def on_before_restart(self, func: LIFESPAN_FUNC):
"""
注册重启前的函数
注册重启前的函数，为子进程重启时调用
Args:
func:

8
liteyuki/bot/lifespan.py
View File

@ -10,6 +10,7 @@ Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved
"""
from typing import Any, Awaitable, Callable, TypeAlias
from liteyuki.log import logger
from liteyuki.utils import is_coroutine_callable
SYNC_LIFESPAN_FUNC: TypeAlias = Callable[[], Any]
@ -135,6 +136,7 @@ class Lifespan:
启动前
Returns:
"""
logger.debug("Running before_start functions")
await self._run_funcs(self._before_start_funcs)
async def after_start(self) -> None:
@ -142,6 +144,7 @@ class Lifespan:
启动后
Returns:
"""
logger.debug("Running after_start functions")
await self._run_funcs(self._after_start_funcs)
async def before_shutdown(self) -> None:
@ -149,6 +152,7 @@ class Lifespan:
停止前
Returns:
"""
logger.debug("Running before_shutdown functions")
await self._run_funcs(self._before_shutdown_funcs)
async def after_shutdown(self) -> None:
@ -156,6 +160,7 @@ class Lifespan:
停止后
Returns:
"""
logger.debug("Running after_shutdown functions")
await self._run_funcs(self._after_shutdown_funcs)
async def before_restart(self) -> None:
@ -163,6 +168,7 @@ class Lifespan:
重启前
Returns:
"""
logger.debug("Running before_restart functions")
await self._run_funcs(self._before_restart_funcs)
async def after_restart(self) -> None:
@ -171,6 +177,7 @@ class Lifespan:
Returns:
"""
logger.debug("Running after_restart functions")
await self._run_funcs(self._after_restart_funcs)
async def after_nonebot_init(self) -> None:
@ -178,4 +185,5 @@ class Lifespan:
NoneBot 初始化后
Returns:
"""
logger.debug("Running after_nonebot_init functions")
await self._run_funcs(self._after_nonebot_init_funcs)

62
liteyuki/core/manager.py
View File

@ -8,12 +8,17 @@ Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved
@File : manager.py
@Software: PyCharm
"""
import asyncio
import threading
from multiprocessing import Process
from typing import TYPE_CHECKING
from liteyuki.comm import Channel
from liteyuki.log import logger
if TYPE_CHECKING:
from liteyuki.bot import LiteyukiBot
TIMEOUT = 10
__all__ = [
@ -26,14 +31,15 @@ class ProcessManager:
在主进程中被调用
"""
def __init__(self, bot, chan: Channel):
def __init__(self, bot: "LiteyukiBot", chan: Channel):
self.bot = bot
self.chan = chan
self.processes: dict[str, tuple[callable, tuple, dict]] = {}
self.targets: dict[str, tuple[callable, tuple, dict]] = {}
self.processes: dict[str, Process] = {}
def start(self, name: str, delay: int = 0):
"""
开启后自动监控进程
开启后自动监控进程，并添加到进程字典中
Args:
name:
delay:
@ -42,33 +48,30 @@ class ProcessManager:
"""
if name not in self.processes:
if name not in self.targets:
raise KeyError(f"Process {name} not found.")
def _start():
should_exit = False
while not should_exit:
process = Process(target=self.processes[name][0], args=(self.chan, *self.processes[name][1]), kwargs=self.processes[name][2])
process = Process(target=self.targets[name][0], args=(self.chan, *self.targets[name][1]), kwargs=self.targets[name][2])
self.processes[name] = process
process.start()
while not should_exit:
# 0退出 1重启
data = self.chan.receive(name)
print("Received data: ", data, name)
if data == 1:
logger.info("Restarting LiteyukiBot...")
process.terminate()
process.join(TIMEOUT)
if process.is_alive():
process.kill()
logger.info(f"Restarting process {name}")
asyncio.run(self.bot.lifespan.before_shutdown())
asyncio.run(self.bot.lifespan.before_restart())
self.terminate(name)
break
elif data == 0:
logger.info("Stopping LiteyukiBot...")
logger.info(f"Stopping process {name}")
asyncio.run(self.bot.lifespan.before_shutdown())
should_exit = True
process.terminate()
process.join(TIMEOUT)
if process.is_alive():
process.kill()
self.terminate(name)
else:
logger.warning("Unknown data received, ignored.")
@ -78,16 +81,25 @@ class ProcessManager:
threading.Thread(target=_start).start()
def add_target(self, name: str, target, *args, **kwargs):
self.processes[name] = (target, args, kwargs)
self.targets[name] = (target, args, kwargs)
def join(self):
for name, process in self.processes:
for name, process in self.targets:
process.join()
def terminate(self):
for name, process in self.processes:
process.terminate()
process.join(TIMEOUT)
if process.is_alive():
process.kill()
self.processes = []
def terminate(self, name: str):
"""
终止进程并从进程字典中删除
Args:
name:
Returns:
"""
if name not in self.targets:
raise logger.warning(f"Process {name} not found.")
process = self.processes[name]
process.terminate()
process.join(TIMEOUT)
if process.is_alive():
process.kill()

17
liteyuki/core/spawn_process.py
View File

@ -1,16 +1,16 @@
import threading
from multiprocessing import Event, Queue
from typing import Optional
from typing import Optional, TYPE_CHECKING
import nonebot
import liteyuki
from liteyuki.core.nb import adapter_manager, driver_manager
if TYPE_CHECKING:
from liteyuki.comm.channel import Channel
timeout_limit: int = 20
"""导出对象，用于进程通信"""
chan_in_spawn: Optional["liteyuki.Channel"] = None
"""导出对象，用于主进程与nonebot通信"""
chan_in_spawn_nb: Optional["Channel"] = None
def nb_run(chan, *args, **kwargs):
@ -18,14 +18,15 @@ def nb_run(chan, *args, **kwargs):
初始化NoneBot并运行在子进程
Args:
chan:
*args:
**kwargs:
Returns:
"""
global chan_in_spawn
chan_in_spawn = chan
global chan_in_spawn_nb
chan_in_spawn_nb = chan
nonebot.init(**kwargs)
driver_manager.init(config=kwargs)
adapter_manager.init(kwargs)

4
liteyuki/plugin/model.py
View File

@ -16,10 +16,10 @@ from pydantic import BaseModel
class PluginMetadata(BaseModel):
"""
轻雪插件元数据，由插件编写者提供
轻雪插件元数据，由插件编写者提供，name为必填项
"""
name: str
description: str
description: str = ""
usage: str = ""
type: str = ""
homepage: str = ""

0
liteyuki/_plugins/process_manager/__init__.py → liteyuki/plugins/process_manager/__init__.py
View File

0
liteyuki/_plugins/resource_loader/__init__.py → liteyuki/plugins/resource_loader/__init__.py
View File

19
liteyuki/plugins/what_litaco/__init__.py Normal file
View File

@ -0,0 +1,19 @@
# -*- 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

4
liteyuki/utils.py
View File

@ -8,6 +8,8 @@ import threading
from pathlib import Path
from typing import Any, Callable, Coroutine
from liteyuki.log import logger
def is_coroutine_callable(call: Callable[..., Any]) -> bool:
"""
@ -55,7 +57,7 @@ def run_coroutine(*coro: Coroutine):
loop.close()
except Exception as e:
# 捕获其他异常，防止协程被重复等待
print(f"Exception occurred: {e}")
logger.error(f"Exception occurred: {e}")
def path_to_module_name(path: Path) -> str: