ErisPulse 2.1.13rc2__py3-none-any.whl → 2.1.14__py3-none-any.whl

ErisPulse/Core/{server.py → router.py}

@@ -1,6 +1,8 @@
+# router.py (新文件名)
 """
-ErisPulse Adapter Server
-提供统一的适配器服务入口，支持HTTP和WebSocket路由
+ErisPulse 路由系统
+
+提供统一的HTTP和WebSocket路由管理，支持多适配器路由注册和生命周期管理。
 
 {!--< tips >!--}
 1. 适配器只需注册路由，无需自行管理服务器
@@ -19,9 +21,9 @@ from hypercorn.config import Config
 from hypercorn.asyncio import serve
 
 
-class AdapterServer:
+class RouterManager:
     """
-    适配器服务器管理器
+    路由管理器
     
     {!--< tips >!--}
     核心功能：
@@ -33,18 +35,18 @@ class AdapterServer:
 
     def __init__(self):
         """
-        初始化适配器服务器
+        初始化路由管理器
         
         {!--< tips >!--}
         会自动创建FastAPI实例并设置核心路由
         {!--< /tips >!--}
         """
         self.app = FastAPI(
-            title="ErisPulse Adapter Server",
-            description="统一适配器服务入口点",
+            title="ErisPulse Router",
+            description="统一路由管理入口点",
             version="1.0.0"
         )
-        self._webhook_routes: Dict[str, Dict[str, Callable]] = defaultdict(dict)
+        self._http_routes: Dict[str, Dict[str, Callable]] = defaultdict(dict)
         self._websocket_routes: Dict[str, Dict[str, Tuple[Callable, Optional[Callable]]]] = defaultdict(dict)
         self.base_url = ""
         self._server_task: Optional[asyncio.Task] = None
@@ -66,7 +68,7 @@ class AdapterServer:
             :return: 
                 Dict[str, str]: 包含服务状态的字典
             """
-            return {"status": "ok", "service": "ErisPulse Adapter Server"}
+            return {"status": "ok", "service": "ErisPulse Router"}
             
         @self.app.get("/routes")
         async def list_routes() -> Dict[str, Any]:
@@ -74,36 +76,23 @@ class AdapterServer:
             列出所有已注册路由
             
             :return: 
-                Dict[str, Any]: 包含所有路由信息的字典，格式为:
-                {
-                    "http_routes": [
-                        {
-                            "path": "/adapter1/route1",
-                            "adapter": "adapter1",
-                            "methods": ["POST"]
-                        },
-                        ...
-                    ],
-                    "websocket_routes": [
-                        {
-                            "path": "/adapter1/ws",
-                            "adapter": "adapter1",
-                            "requires_auth": true
-                        },
-                        ...
-                    ],
-                    "base_url": self.base_url
-                }
+                Dict[str, Any]: 包含所有路由信息的字典
             """
             http_routes = []
-            for adapter, routes in self._webhook_routes.items():
+            for adapter, routes in self._http_routes.items():
                 for path, handler in routes.items():
-                    route = self.app.router.routes[-1]  # 获取最后添加的路由
-                    if isinstance(route, APIRoute) and route.path == path:
+                    # 查找对应的路由对象
+                    route_obj = None
+                    for route in self.app.router.routes:
+                        if isinstance(route, APIRoute) and route.path == path:
+                            route_obj = route
+                            break
+                    
+                    if route_obj:
                         http_routes.append({
                             "path": path,
                             "adapter": adapter,
-                            "methods": route.methods
+                            "methods": list(route_obj.methods)
                         })
             
             websocket_routes = []
@@ -121,9 +110,9 @@ class AdapterServer:
                 "base_url": self.base_url
             }
 
-    def register_webhook(
+    def register_http_route(
         self, 
-        adapter_name: str,
+        module_name: str,
         path: str,
         handler: Callable,
         methods: List[str] = ["POST"]
@@ -131,35 +120,37 @@ class AdapterServer:
         """
         注册HTTP路由
         
-        :param adapter_name: str 适配器名称
-        :param path: str 路由路径(如"/message")
+        :param module_name: str 模块名称
+        :param path: str 路由路径
         :param handler: Callable 处理函数
         :param methods: List[str] HTTP方法列表(默认["POST"])
         
         :raises ValueError: 当路径已注册时抛出
-        
-        {!--< tips >!--}
-        路径会自动添加适配器前缀，如：/adapter_name/path
-        {!--< /tips >!--}
         """
-        full_path = f"/{adapter_name}{path}"
+        full_path = f"/{module_name}{path}"
         
-        if full_path in self._webhook_routes[adapter_name]:
+        if full_path in self._http_routes[module_name]:
             raise ValueError(f"路径 {full_path} 已注册")
             
         route = APIRoute(
             path=full_path,
             endpoint=handler,
             methods=methods,
-            name=f"{adapter_name}{path}"
+            name=f"{module_name}_{path.replace('/', '_')}"
         )
         self.app.router.routes.append(route)
-        self._webhook_routes[adapter_name][full_path] = handler
+        self._http_routes[module_name][full_path] = handler
         logger.info(f"注册HTTP路由: {self.base_url}{full_path} 方法: {methods}")
 
+    def register_webhook(self, *args, **kwargs) -> None:
+        """
+        兼容性方法：注册HTTP路由（适配器旧接口）
+        """
+        return self.register_http_route(*args, **kwargs)
+
     def register_websocket(
         self,
-        adapter_name: str,
+        module_name: str,
         path: str,
         handler: Callable[[WebSocket], Awaitable[Any]],
         auth_handler: Optional[Callable[[WebSocket], Awaitable[bool]]] = None,
@@ -167,29 +158,21 @@ class AdapterServer:
         """
         注册WebSocket路由
         
-        :param adapter_name: str 适配器名称
-        :param path: str WebSocket路径(如"/ws")
+        :param module_name: str 模块名称
+        :param path: str WebSocket路径
         :param handler: Callable[[WebSocket], Awaitable[Any]] 主处理函数
         :param auth_handler: Optional[Callable[[WebSocket], Awaitable[bool]]] 认证函数
         
         :raises ValueError: 当路径已注册时抛出
-        
-        {!--< tips >!--}
-        认证函数应返回布尔值，False将拒绝连接
-        {!--< /tips >!--}
         """
-        full_path = f"/{adapter_name}{path}"
+        full_path = f"/{module_name}{path}"
         
-        if full_path in self._websocket_routes[adapter_name]:
+        if full_path in self._websocket_routes[module_name]:
             raise ValueError(f"WebSocket路径 {full_path} 已注册")
             
         async def websocket_endpoint(websocket: WebSocket) -> None:
             """
             WebSocket端点包装器
-            
-            {!--< internal-use >!--}
-            处理连接生命周期和错误处理
-            {!--< /internal-use >!--}
             """
             await websocket.accept()
             
@@ -209,17 +192,16 @@ class AdapterServer:
         self.app.add_api_websocket_route(
             path=full_path,
             endpoint=websocket_endpoint,
-            name=f"{adapter_name}{path}"
+            name=f"{module_name}_{path.replace('/', '_')}"
         )
-        self._websocket_routes[adapter_name][full_path] = (handler, auth_handler)
+        self._websocket_routes[module_name][full_path] = (handler, auth_handler)
         logger.info(f"注册WebSocket: {self.base_url}{full_path} {'(需认证)' if auth_handler else ''}")
 
     def get_app(self) -> FastAPI:
         """
         获取FastAPI应用实例
         
-        :return: 
-            FastAPI: FastAPI应用实例
+        :return: FastAPI应用实例
         """
         return self.app
 
@@ -231,7 +213,7 @@ class AdapterServer:
         ssl_keyfile: Optional[str] = None
     ) -> None:
         """
-        启动适配器服务器
+        启动路由服务器
         
         :param host: str 监听地址(默认"0.0.0.0")
         :param port: int 监听端口(默认8000)
@@ -252,25 +234,24 @@ class AdapterServer:
             config.keyfile = ssl_keyfile
         
         self.base_url = f"http{'s' if ssl_certfile else ''}://{host}:{port}"
-        logger.info(f"启动服务器 {self.base_url}")
+        logger.info(f"启动路由服务器 {self.base_url}")
         
         self._server_task = asyncio.create_task(serve(self.app, config))
 
     async def stop(self) -> None:
         """
         停止服务器
-        
-        {!--< tips >!--}
-        会等待所有连接正常关闭
-        {!--< /tips >!--}
         """
         if self._server_task:
             self._server_task.cancel()
             try:
                 await self._server_task
             except asyncio.CancelledError:
-                logger.info("服务器已停止")
+                logger.info("路由服务器已停止")
             self._server_task = None
 
+# 主要实例
+router = RouterManager()
 
-adapter_server = AdapterServer()
+# 兼容性实例
+adapter_server = router

ErisPulse/__init__.py

@@ -10,37 +10,47 @@ ErisPulse SDK 主模块
 {!--< /tips >!--}
 """
 
+__version__ = "2.1.14"
+__author__  = "ErisPulse"
+
 import os
 import sys
 import importlib
+import asyncio
 import inspect
 import importlib.metadata
 from typing import Dict, List, Tuple, Type, Any
 from pathlib import Path
 
 # BaseModules: SDK核心模块
-from .Core import util
-from .Core import raiserr
 from .Core import logger
 from .Core import env
 from .Core import mods
 from .Core import adapter, AdapterFather, SendDSL
-from .Core import adapter_server
+from .Core import router, adapter_server
+from .Core import exceptions
+from .Core import config
 
 sdk = sys.modules[__name__]
 
 BaseModules = {
-    "util": util,
     "logger": logger,
-    "raiserr": raiserr,
+    "config": config,
+    "exceptions": exceptions,
     "env": env,
     "mods": mods,
     "adapter": adapter,
+    "router": router,
+    "adapter_server": adapter_server,
     "SendDSL": SendDSL,
     "AdapterFather": AdapterFather,
     "BaseAdapter": AdapterFather
 }
 
+asyncio_loop = asyncio.get_event_loop()
+
+exceptions.setup_async_loop(asyncio_loop)
+
 for module, moduleObj in BaseModules.items():
     setattr(sdk, module, moduleObj)
 
@@ -664,23 +674,24 @@ def _prepare_environment() -> bool:
     {!--< internal-use >!--}
     准备运行环境
     
-    1. 初始化项目环境文件
-    2. 加载环境变量配置
+    初始化项目环境文件
 
     :return: bool 环境准备是否成功
     """
     logger.info("[Init] 准备初始化环境...")
     try:
+        from .Core.erispulse_config import get_erispulse_config
+        get_erispulse_config()
+        logger.info("[Init] 配置文件已加载")
+        
         main_init = init_progress()
         if main_init:
             logger.info("[Init] 项目入口已生成, 你可以在 main.py 中编写一些代码")
-        env.load_env_file()
         return True
     except Exception as e:
         logger.error(f"环境准备失败: {e}")
         return False
 
-
 def init() -> bool:
     """
     SDK初始化入口

ErisPulse/__main__.py

@@ -19,7 +19,6 @@ import json
 import asyncio
 from urllib.parse import urlparse
 from typing import List, Dict, Tuple, Optional, Callable, Any
-from importlib.metadata import version, PackageNotFoundError
 from watchdog.observers import Observer
 from watchdog.events import FileSystemEventHandler
 
@@ -188,26 +187,38 @@ class PackageManager:
         
         try:
             # 查找模块和适配器
-            for dist in importlib.metadata.distributions():
-                if "ErisPulse-" in dist.metadata["Name"]:
-                    entry_points = dist.entry_points
-                    for ep in entry_points:
-                        if ep.group == "erispulse.module":
-                            packages["modules"][ep.name] = {
-                                "package": dist.metadata["Name"],
-                                "version": dist.version,
-                                "summary": dist.metadata["Summary"],
-                                "enabled": self._is_module_enabled(ep.name)
-                            }
-                        elif ep.group == "erispulse.adapter":
-                            packages["adapters"][ep.name] = {
-                                "package": dist.metadata["Name"],
-                                "version": dist.version,
-                                "summary": dist.metadata["Summary"]
-                            }
+            entry_points = importlib.metadata.entry_points()
+            
+            # 处理模块
+            if hasattr(entry_points, 'select'):
+                module_entries = entry_points.select(group='erispulse.module')
+            else:
+                module_entries = entry_points.get('erispulse.module', [])
+            
+            for entry in module_entries:
+                dist = entry.dist
+                packages["modules"][entry.name] = {
+                    "package": dist.metadata["Name"],
+                    "version": dist.version,
+                    "summary": dist.metadata["Summary"],
+                    "enabled": self._is_module_enabled(entry.name)
+                }
+            
+            # 处理适配器
+            if hasattr(entry_points, 'select'):
+                adapter_entries = entry_points.select(group='erispulse.adapter')
+            else:
+                adapter_entries = entry_points.get('erispulse.adapter', [])
+            
+            for entry in adapter_entries:
+                dist = entry.dist
+                packages["adapters"][entry.name] = {
+                    "package": dist.metadata["Name"],
+                    "version": dist.version,
+                    "summary": dist.metadata["Summary"]
+                }
             
             # 查找CLI扩展
-            entry_points = importlib.metadata.entry_points()
             if hasattr(entry_points, 'select'):
                 cli_entries = entry_points.select(group='erispulse.cli')
             else:
@@ -222,9 +233,9 @@ class PackageManager:
                 }
                 
         except Exception as e:
-            console.print(f"[error]获取已安装包信息失败: {e}[/]")
+            print(f"[error] 获取已安装包信息失败: {e}")
             import traceback
-            console.print(traceback.format_exc())
+            print(traceback.format_exc())
         
         return packages
     
@@ -329,7 +340,7 @@ class PackageManager:
         
         :raises KeyboardInterrupt: 用户取消操作时抛出
         """
-        installed = self.package_manager.get_installed_packages()
+        installed = self.get_installed_packages()
         all_packages = set()
         
         for pkg_type in ["modules", "adapters", "cli_extensions"]:
@@ -443,12 +454,44 @@ class ReloadHandler(FileSystemEventHandler):
 
     def _handle_reload(self, event, reason: str):
         """
-        处理重载逻辑
-        
+        处理热重载逻辑
         :param event: 文件系统事件
-        :param reason: 重载原因描述
+        :param reason: 重载原因
         """
-        console.print(f"\n[reload]{reason}: [path]{event.src_path}[/][/]")
+        from ErisPulse.Core import adapter, logger
+        # 在重载前确保所有适配器正确停止
+        try:
+            # 检查适配器是否正在运行
+            if hasattr(adapter, '_started_instances') and adapter._started_instances:
+                logger.info("正在停止适配器...")
+                # 创建新的事件循环来运行异步停止操作
+                import asyncio
+                import threading
+                
+                # 如果在主线程中
+                if threading.current_thread() is threading.main_thread():
+                    try:
+                        # 尝试获取当前事件循环
+                        loop = asyncio.get_running_loop()
+                        # 在新线程中运行适配器停止
+                        stop_thread = threading.Thread(target=lambda: asyncio.run(adapter.shutdown()))
+                        stop_thread.start()
+                        stop_thread.join(timeout=10)  # 最多等待10秒
+                    except RuntimeError:
+                        # 没有运行中的事件循环
+                        asyncio.run(adapter.shutdown())
+                else:
+                    # 在非主线程中，创建新的事件循环
+                    new_loop = asyncio.new_event_loop()
+                    asyncio.set_event_loop(new_loop)
+                    new_loop.run_until_complete(adapter.shutdown())
+                
+                logger.info("适配器已停止")
+        except Exception as e:
+            logger.warning(f"停止适配器时出错: {e}")
+        
+        # 原有的重载逻辑
+        logger.info(f"检测到文件变更 ({reason})，正在重启...")
         self._terminate_process()
         self.start_process()
 
@@ -652,6 +695,22 @@ class CLI:
         
         return parser
     
+    def _get_external_commands(self) -> List[str]:
+        """
+        获取所有已注册的第三方命令名称
+        
+        :return: 第三方命令名称列表
+        """
+        try:
+            entry_points = importlib.metadata.entry_points()
+            if hasattr(entry_points, 'select'):
+                cli_entries = entry_points.select(group='erispulse.cli')
+            else:
+                cli_entries = entry_points.get('erispulse.cli', [])
+            return [entry.name for entry in cli_entries]
+        except Exception:
+            return []
+
     def _load_external_commands(self, subparsers):
         """
         加载第三方CLI命令
@@ -1019,17 +1078,38 @@ class CLI:
                 
                 try:
                     while True:
-                        time.sleep(1)
+                        time.sleep(0.5)
                 except KeyboardInterrupt:
                     console.print("\n[info]正在安全关闭...[/]")
+                    self._cleanup_adapters()
                     self._cleanup()
                     console.print("[success]已安全退出[/]")
                     
             elif args.command == "init":
                 from ErisPulse import sdk
-                sdk.init(force=args.force)
+                sdk.init()
                 console.print("[success]ErisPulse项目初始化完成[/]")
                 
+            # 处理第三方命令
+            elif args.command in self._get_external_commands():
+                # 获取第三方命令的处理函数并执行
+                entry_points = importlib.metadata.entry_points()
+                if hasattr(entry_points, 'select'):
+                    cli_entries = entry_points.select(group='erispulse.cli')
+                else:
+                    cli_entries = entry_points.get('erispulse.cli', [])
+                
+                for entry in cli_entries:
+                    if entry.name == args.command:
+                        cli_func = entry.load()
+                        if callable(cli_func):
+                            # 创建一个新的解析器来解析第三方命令的参数
+                            subparser = self.parser._subparsers._group_actions[0].choices[args.command]
+                            parsed_args = subparser.parse_args(sys.argv[2:])
+                            # 调用第三方命令处理函数
+                            parsed_args.func(parsed_args)
+                        break
+                
         except KeyboardInterrupt:
             console.print("\n[warning]操作被用户中断[/]")
             self._cleanup()
@@ -1040,6 +1120,44 @@ class CLI:
                 console.print(traceback.format_exc())
             self._cleanup()
             sys.exit(1)
+    
+    def _cleanup_adapters(self):
+        """
+        清理适配器资源
+        """
+        from ErisPulse import adapter, logger
+        try:
+            import asyncio
+            import threading
+            
+            # 检查是否有正在运行的适配器
+            if (hasattr(adapter, '_started_instances') and 
+                adapter._started_instances):
+                
+                logger.info("正在停止所有适配器...")
+                
+                if threading.current_thread() is threading.main_thread():
+                    try:
+                        loop = asyncio.get_running_loop()
+                        if loop.is_running():
+                            # 在新线程中运行
+                            stop_thread = threading.Thread(
+                                target=lambda: asyncio.run(adapter.shutdown())
+                            )
+                            stop_thread.start()
+                            stop_thread.join(timeout=5)
+                        else:
+                            asyncio.run(adapter.shutdown())
+                    except RuntimeError:
+                        asyncio.run(adapter.shutdown())
+                else:
+                    new_loop = asyncio.new_event_loop()
+                    asyncio.set_event_loop(new_loop)
+                    new_loop.run_until_complete(adapter.shutdown())
+                    
+                logger.info("适配器已全部停止")
+        except Exception as e:
+            logger.error(f"清理适配器资源时出错: {e}")
 
 def main():
     """