ErisPulse 1.1.3__py3-none-any.whl → 1.1.6__py3-none-any.whl

ErisPulse/__init__.py

@@ -136,15 +136,13 @@ def init():
             moduleObj = module_objs[module_name]
             meta_name = moduleObj.moduleInfo["meta"]["name"]
 
-            if hasattr(moduleObj.Main, "register_adapters"):
-                try:
-                    adapters = moduleObj.Main.register_adapters()
-                    if isinstance(adapters, dict):
-                        for platform_name, adapter_class in adapters.items():
-                            sdk.adapter.register(platform_name, adapter_class)
-                            logger.info(f"模块 {meta_name} 注册了适配器: {platform_name}")
-                except Exception as e:
-                    logger.error(f"模块 {meta_name} 注册适配器失败: {e}")
+            try:
+                if hasattr(moduleObj, "adapterInfo") and isinstance(moduleObj.adapterInfo, dict):
+                    for platform_name, adapter_class in moduleObj.adapterInfo.items():
+                        sdk.adapter.register(platform_name, adapter_class)
+                        logger.info(f"模块 {meta_name} 注册了适配器: {platform_name}")
+            except Exception as e:
+                logger.error(f"模块 {meta_name} 注册适配器失败: {e}")
 
         # ==== 存储模块信息到数据库 ====
         all_modules_info = {}

ErisPulse/adapter.py

@@ -1,6 +1,6 @@
 import functools
 import asyncio
-from typing import Callable, Any, Dict, List, Type, Optional
+from typing import Callable, Any, Dict, List, Type, Optional, Set
 from collections import defaultdict
 
 
@@ -82,22 +82,36 @@ class BaseAdapter:
 class AdapterManager:
     def __init__(self):
         self._adapters: Dict[str, BaseAdapter] = {}
-
+        self._adapter_instances: Dict[Type[BaseAdapter], BaseAdapter] = {}
+        self._started_instances: Set[BaseAdapter] = set()
     def register(self, platform: str, adapter_class: Type[BaseAdapter]) -> bool:
         if not issubclass(adapter_class, BaseAdapter):
             raise TypeError("适配器必须继承自BaseAdapter")
         from . import sdk
-        self._adapters[platform] = adapter_class(sdk)
+
+        if adapter_class in self._adapter_instances:
+            self._adapters[platform] = self._adapter_instances[adapter_class]
+        else:
+            instance = adapter_class(sdk)
+            self._adapters[platform] = instance
+            self._adapter_instances[adapter_class] = instance
+
         return True
 
     async def startup(self, platforms: List[str] = None):
         if platforms is None:
-            platforms = self._adapters.keys()
+            platforms = list(self._adapters.keys())
 
         for platform in platforms:
             if platform not in self._adapters:
                 raise ValueError(f"平台 {platform} 未注册")
             adapter = self._adapters[platform]
+
+            # 如果该实例已经被启动过，跳过
+            if adapter in self._started_instances:
+                continue
+
+            self._started_instances.add(adapter)
             asyncio.create_task(self._run_adapter(adapter, platform))
 
     async def _run_adapter(self, adapter: BaseAdapter, platform: str):
@@ -107,6 +121,9 @@ class AdapterManager:
         while retry_count < max_retry:
             try:
                 await adapter.start()
+                sdk.logger.debug(f"尝试启动适配器 {platform}，实例ID: {id(adapter)}")
+                if adapter in self._started_instances:
+                    sdk.logger.info(f"适配器 {platform}（实例ID: {id(adapter)}）已启动，跳过")
                 break
             except Exception as e:
                 retry_count += 1

{erispulse-1.1.3.dist-info → erispulse-1.1.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 1.1.3
+Version: 1.1.6
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Author-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>, runoneall <runoobsteve@gmail.com>
 Classifier: Development Status :: 5 - Production/Stable

{erispulse-1.1.3.dist-info → erispulse-1.1.6.dist-info}/RECORD

@@ -1,13 +1,13 @@
-ErisPulse/__init__.py,sha256=E3HUelqdyAnmi6soRn41TX7NM-vC9Nh2LjvrsqOH-aQ,7769
+ErisPulse/__init__.py,sha256=ZQlAumhGUM3skHfBRwSbbP_koy3FJaHiotVh-fD7YYc,7678
 ErisPulse/__main__.py,sha256=-UdhsYP_X7EagomCjo73Y_qQdXwtMbDS5KoOSrI-OcU,32181
-ErisPulse/adapter.py,sha256=9AaUrCNQ6UwN3rE7Tqdbl2mxIbOtiLQGcEm10mcKkEw,5017
+ErisPulse/adapter.py,sha256=cpynhF4HSSTUdPKlkXnGFf4RCfjzBmXxdXDm3K0M9Hw,5848
 ErisPulse/db.py,sha256=cd2AUfm-ZPzXlU8PLKK23QGd6VF0eSgYQl9dyRRpl_Y,4425
 ErisPulse/logger.py,sha256=HIQMYD75K-PL4IETMlm7V6Eyg0ussZ11_riEw5E5a08,5899
 ErisPulse/mods.py,sha256=M9XQWUQYNZ11m845hxbewBAauWXnysy-aOdLwb5xy_M,3312
 ErisPulse/raiserr.py,sha256=z8BigWkVrBE9dD_dJa5np2YYREwdugyWXKE4_-LEO_Q,2616
 ErisPulse/util.py,sha256=b9TqyRZKkpclN2fkHmWqBl3lnBMnUbucMvKvbqD5Ws8,2541
-erispulse-1.1.3.dist-info/METADATA,sha256=4rCX2VPQTs9GuYgXNhUsE-N-nJZN8I8CBfPuEOiroxE,2282
-erispulse-1.1.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-erispulse-1.1.3.dist-info/entry_points.txt,sha256=AjKvOdYR7QGXVpEJhjUYUwV2JluE4lm9vNbknC3hjOM,155
-erispulse-1.1.3.dist-info/top_level.txt,sha256=Lm_qtkVvNJR8_dXh_qEDdl_12cZGpic-i4HUlVVUMZc,10
-erispulse-1.1.3.dist-info/RECORD,,
+erispulse-1.1.6.dist-info/METADATA,sha256=KQ1UD2ORHTkr4dr1LcshMQ2DZVrrpe96f-AzjxDucTI,2282
+erispulse-1.1.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+erispulse-1.1.6.dist-info/entry_points.txt,sha256=AjKvOdYR7QGXVpEJhjUYUwV2JluE4lm9vNbknC3hjOM,155
+erispulse-1.1.6.dist-info/top_level.txt,sha256=Lm_qtkVvNJR8_dXh_qEDdl_12cZGpic-i4HUlVVUMZc,10
+erispulse-1.1.6.dist-info/RECORD,,