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

ErisPulse/__init__.py

@@ -22,8 +22,6 @@ setattr(sdk, "adapter", adapter)
 setattr(sdk, "SendDSL", SendDSL)
 setattr(sdk, "BaseAdapter", BaseAdapter)
 
-env.load_env_file()
-
 # 注册 ErrorHook 并预注册常用错误类型
 raiserr.register("CaughtExternalError"      , doc="捕获的非SDK抛出的异常")
 raiserr.register("InitError"               , doc="SDK初始化错误")
@@ -34,6 +32,10 @@ raiserr.register("ModuleLoadError"          , doc="模块加载错误")
 
 def init():
     try:
+        logger.info("[Init] SDK 正在初始化...")
+        env.create_env_file_if_not_exists()
+        env.load_env_file()
+
         sdkModulePath = os.path.join(os.path.dirname(__file__), "modules")
 
         if not os.path.exists(sdkModulePath):

ErisPulse/adapter.py

@@ -10,8 +10,13 @@ class SendDSLBase:
         self._adapter = adapter
         self._target_type = target_type
         self._target_id = target_id
+        self._target_to = target_id
+
+    def To(self, target_type: str = None, target_id: str = None) -> 'SendDSL':
+        if target_id is None and target_type is not None:
+            target_id = target_type
+            target_type = None
 
-    def To(self, target_type: str, target_id: str) -> 'SendDSL':
         return self.__class__(self._adapter, target_type, target_id)
 
     def __getattr__(self, name: str):
@@ -83,60 +88,79 @@ class AdapterManager:
     def __init__(self):
         self._adapters: Dict[str, BaseAdapter] = {}
         self._adapter_instances: Dict[Type[BaseAdapter], BaseAdapter] = {}
+        self._platform_to_instance: Dict[str, 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
 
+        # 如果该类已经创建过实例，复用
         if adapter_class in self._adapter_instances:
-            self._adapters[platform] = self._adapter_instances[adapter_class]
+            instance = self._adapter_instances[adapter_class]
         else:
             instance = adapter_class(sdk)
-            self._adapters[platform] = instance
             self._adapter_instances[adapter_class] = instance
 
+        # 注册平台名，并统一映射到该实例
+        self._adapters[platform] = instance
+        self._platform_to_instance[platform] = instance
+
         return True
 
     async def startup(self, platforms: List[str] = None):
         if platforms is None:
             platforms = list(self._adapters.keys())
 
+        # 已经被调度过的 adapter 实例集合（防止重复调度）
+        scheduled_adapters = set()
+
         for platform in platforms:
             if platform not in self._adapters:
                 raise ValueError(f"平台 {platform} 未注册")
             adapter = self._adapters[platform]
 
-            # 如果该实例已经被启动过，跳过
-            if adapter in self._started_instances:
+            # 如果该实例已经被启动或已调度，跳过
+            if adapter in self._started_instances or adapter in scheduled_adapters:
                 continue
 
-            self._started_instances.add(adapter)
+            # 加入调度队列
+            scheduled_adapters.add(adapter)
             asyncio.create_task(self._run_adapter(adapter, platform))
 
     async def _run_adapter(self, adapter: BaseAdapter, platform: str):
         from . import sdk
         retry_count = 0
         max_retry = 3
-        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
-                sdk.logger.error(f"平台 {platform} 启动失败（第{retry_count}次重试）: {e}")
-                try:
-                    await adapter.shutdown()
-                except Exception as stop_err:
-                    sdk.logger.warning(f"停止适配器失败: {stop_err}")
 
-                if retry_count >= max_retry:
-                    sdk.logger.critical(f"平台 {platform} 达到最大重试次数，放弃重启")
-                    sdk.raiserr.AdapterStartFailedError(f"平台 {platform} 适配器无法重写启动: {e}")
+        # 加锁防止并发启动
+        if not getattr(adapter, "_starting_lock", None):
+            adapter._starting_lock = asyncio.Lock()
+
+        async with adapter._starting_lock:
+            # 再次确认是否已经被启动
+            if adapter in self._started_instances:
+                sdk.logger.info(f"适配器 {platform}（实例ID: {id(adapter)}）已被其他协程启动，跳过")
+                return
 
+            while retry_count < max_retry:
+                try:
+                    await adapter.start()
+                    self._started_instances.add(adapter)
+                    sdk.logger.info(f"适配器 {platform}（实例ID: {id(adapter)}）已启动")
+                    break
+                except Exception as e:
+                    retry_count += 1
+                    sdk.logger.error(f"平台 {platform} 启动失败（第{retry_count}次重试）: {e}")
+                    try:
+                        await adapter.shutdown()
+                    except Exception as stop_err:
+                        sdk.logger.warning(f"停止适配器失败: {stop_err}")
+
+                    if retry_count >= max_retry:
+                        sdk.logger.critical(f"平台 {platform} 达到最大重试次数，放弃重启")
+                        raise sdk.raiserr.AdapterStartFailedError(f"平台 {platform} 适配器无法重写启动: {e}")
     async def shutdown(self):
         for adapter in self._adapters.values():
             await adapter.shutdown()

ErisPulse/db.py

@@ -16,7 +16,6 @@ class EnvManager:
     def __init__(self):
         if not hasattr(self, "_initialized"):
             self._init_db()
-            self._create_env_file_if_not_exists()
             self._initialized = True
 
     def _init_db(self):
@@ -90,7 +89,7 @@ class EnvManager:
                 if not key.startswith("__") and isinstance(value, (dict, list, str, int, float, bool)):
                     self.set(key, value)
 
-    def _create_env_file_if_not_exists(self):
+    def create_env_file_if_not_exists(self):
         env_file = Path("env.py")
         if not env_file.exists():
             content = '''# env.py
@@ -122,7 +121,7 @@ from ErisPulse import sdk
         try:
             return self.get(key)
         except KeyError:
-            from . import sdk
-            sdk.logger.error(f"配置项 {key} 不存在")
+            from .logger import logger
+            logger.error(f"配置项 {key} 不存在")
 
 env = EnvManager()

ErisPulse/logger.py

@@ -148,5 +148,8 @@ class Logger:
         if self._get_effective_level(caller_module) <= logging.CRITICAL:
             self._save_in_memory(caller_module, msg)
             self._logger.critical(f"[{caller_module}] {msg}", *args, **kwargs)
+            from .raiserr import raiserr
+            raiserr.register("CriticalError", doc="发生致命错误")
+            raiserr.CriticalError(f"程序发生致命错误：{msg}", exit=True)
 
 logger = Logger()

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

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

erispulse-1.1.8.dist-info/RECORD

@@ -0,0 +1,13 @@
+ErisPulse/__init__.py,sha256=wNfAnZu0-jFzCLyQhfiXvj7lb0DxSLmRCBUowxUYJW0,7783
+ErisPulse/__main__.py,sha256=-UdhsYP_X7EagomCjo73Y_qQdXwtMbDS5KoOSrI-OcU,32181
+ErisPulse/adapter.py,sha256=u7XdJxIEHxGRh4RXwTX-vv1R1_oP0M6ZJBehe3rKi0I,6807
+ErisPulse/db.py,sha256=OIndsysBOUfSyGMhKs-YVYj9dv5D92YIAltM0ZmwrkA,4379
+ErisPulse/logger.py,sha256=sMA1mUZvwJ8wHwdyCrgIf_VRICv_uBCkx3tmd1stF3E,6094
+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.8.dist-info/METADATA,sha256=UnKdj5QcnPTnmW0zRHWo2mxUME2CjJSM9ffcB1UUQNM,2282
+erispulse-1.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+erispulse-1.1.8.dist-info/entry_points.txt,sha256=AjKvOdYR7QGXVpEJhjUYUwV2JluE4lm9vNbknC3hjOM,155
+erispulse-1.1.8.dist-info/top_level.txt,sha256=Lm_qtkVvNJR8_dXh_qEDdl_12cZGpic-i4HUlVVUMZc,10
+erispulse-1.1.8.dist-info/RECORD,,

erispulse-1.1.6.dist-info/RECORD

@@ -1,13 +0,0 @@
-ErisPulse/__init__.py,sha256=ZQlAumhGUM3skHfBRwSbbP_koy3FJaHiotVh-fD7YYc,7678
-ErisPulse/__main__.py,sha256=-UdhsYP_X7EagomCjo73Y_qQdXwtMbDS5KoOSrI-OcU,32181
-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.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,,