ErisPulse 2.1.15.dev3__py3-none-any.whl → 2.2.0.dev1__py3-none-any.whl

ErisPulse/__main__.py

@@ -249,8 +249,8 @@ class PackageManager:
         :raises ImportError: 核心模块不可用时抛出
         """
         try:
-            from ErisPulse.Core import mods
-            return mods.get_module_status(module_name)
+            from ErisPulse.Core import module_registry
+            return module_registry.get_module_status(module_name)
         except ImportError:
             return True
         except Exception:
@@ -339,28 +339,44 @@ class PackageManager:
                     [sys.executable, "-m", "pip"] + args,
                     stdout=subprocess.PIPE,
                     stderr=subprocess.PIPE,
-                    universal_newlines=True
+                    universal_newlines=True,
+                    bufsize=1  # 行缓冲
                 )
                 
                 stdout_lines = []
                 stderr_lines = []
                 
-                # 实时读取输出
-                while True:
-                    stdout_line = process.stdout.readline()
-                    stderr_line = process.stderr.readline()
-                    
-                    if stdout_line:
-                        stdout_lines.append(stdout_line)
-                        progress.update(task, advance=1)
-                        
-                    if stderr_line:
-                        stderr_lines.append(stderr_line)
-                        progress.update(task, advance=1)
-                        
-                    if stdout_line == '' and stderr_line == '' and process.poll() is not None:
-                        break
-                        
+                # 使用超时机制避免永久阻塞
+                import threading
+                import queue
+                
+                def read_output(pipe, lines_list):
+                    try:
+                        for line in iter(pipe.readline, ''):
+                            lines_list.append(line)
+                            progress.update(task, advance=5)  # 每行增加进度
+                        pipe.close()
+                    except Exception:
+                        pass
+                
+                stdout_thread = threading.Thread(target=read_output, args=(process.stdout, stdout_lines))
+                stderr_thread = threading.Thread(target=read_output, args=(process.stderr, stderr_lines))
+                
+                stdout_thread.start()
+                stderr_thread.start()
+                
+                # 等待进程结束，最多等待5分钟
+                try:
+                    process.wait(timeout=300)
+                except subprocess.TimeoutExpired:
+                    process.kill()
+                    process.wait()
+                    console.print("[warning]命令执行超时，已强制终止[/]")
+                    return False, "", "命令执行超时"
+                
+                stdout_thread.join(timeout=10)
+                stderr_thread.join(timeout=10)
+                
                 stdout = ''.join(stdout_lines)
                 stderr = ''.join(stderr_lines)
                 
@@ -368,7 +384,9 @@ class PackageManager:
             except subprocess.CalledProcessError as e:
                 console.print(f"[error]命令执行失败: {e}[/]")
                 return False, "", str(e)
-    
+            except Exception as e:
+                console.print(f"[error]执行过程中发生异常: {e}[/]")
+                return False, "", str(e)
 
     def _compare_versions(self, version1: str, version2: str) -> int:
         """
@@ -813,34 +831,83 @@ class PackageManager:
         if target_version:
             package_spec += f"=={target_version}"
         
-        # 执行更新命令
-        success, stdout, stderr = self._run_pip_command_with_output(
-            ["install", "--upgrade", package_spec],
-            f"更新 ErisPulse SDK {f'到 {target_version}' if target_version else '到最新版本'}"
-        )
-        
-        if success:
-            new_version = target_version or "最新版本"
-            console.print(Panel(
-                f"[success]ErisPulse SDK 更新成功[/]\n"
-                f"  当前版本: [bold]{current_version}[/]\n"
-                f"  更新版本: [bold]{new_version}[/]\n\n"
-                f"[dim]{stdout}[/]",
-                title="更新完成",
-                border_style="success"
-            ))
+        # 检查是否在Windows上且尝试更新自身
+        if sys.platform == "win32":
+            # 构建更新脚本
+            update_script = f"""
+import time
+import subprocess
+import sys
+import os
+
+# 等待原进程结束
+time.sleep(2)
+
+# 执行更新命令
+try:
+    result = subprocess.run([
+        sys.executable, "-m", "pip", "install", "--upgrade", "{package_spec}"
+    ], capture_output=True, text=True, timeout=300)
+    
+    if result.returncode == 0:
+        print("更新成功!")
+        print(result.stdout)
+    else:
+        print("更新失败:")
+        print(result.stderr)
+except Exception as e:
+    print(f"更新过程中出错: {{e}}")
+
+# 清理临时脚本
+try:
+    os.remove(__file__)
+except:
+    pass
+"""
+            # 创建临时更新脚本
+            import tempfile
+            script_path = os.path.join(tempfile.gettempdir(), "epsdk_update.py")
+            with open(script_path, "w", encoding="utf-8") as f:
+                f.write(update_script)
+            
+            # 启动更新进程并退出当前进程
+            console.print("[info]正在启动更新进程...[/]")
+            console.print("[info]请稍后重新运行CLI以使用新版本[/]")
             
-            if not target_version:
-                console.print("[info]请重新启动CLI以使用新版本[/]")
+            subprocess.Popen([
+                sys.executable, script_path
+            ], creationflags=subprocess.CREATE_NEW_CONSOLE)
+            
+            return True
         else:
-            console.print(Panel(
-                f"[error]ErisPulse SDK 更新失败[/]\n\n"
-                f"[dim]{stderr}[/]",
-                title="更新失败",
-                border_style="error"
-            ))
+            # 非Windows平台
+            success, stdout, stderr = self._run_pip_command_with_output(
+                ["install", "--upgrade", package_spec],
+                f"更新 ErisPulse SDK {f'到 {target_version}' if target_version else '到最新版本'}"
+            )
             
-        return success
+            if success:
+                new_version = target_version or "最新版本"
+                console.print(Panel(
+                    f"[success]ErisPulse SDK 更新成功[/]\n"
+                    f"  当前版本: [bold]{current_version}[/]\n"
+                    f"  更新版本: [bold]{new_version}[/]\n\n"
+                    f"[dim]{stdout}[/]",
+                    title="更新完成",
+                    border_style="success"
+                ))
+                
+                if not target_version:
+                    console.print("[info]请重新启动CLI以使用新版本[/]")
+            else:
+                console.print(Panel(
+                    f"[error]ErisPulse SDK 更新失败[/]\n\n"
+                    f"[dim]{stderr}[/]",
+                    title="更新失败",
+                    border_style="error"
+                ))
+                
+            return success
 
 class ReloadHandler(FileSystemEventHandler):
     """
@@ -1651,21 +1718,21 @@ class CLI:
                     sys.exit(1)
                     
             elif args.command == "module":
-                from ErisPulse.Core import mods
+                from ErisPulse.Core import module_registry
                 installed = self.package_manager.get_installed_packages()
                 
                 if args.module_command == "enable":
                     if args.module not in installed["modules"]:
                         console.print(f"[error]模块 [bold]{args.module}[/] 不存在或未安装[/]")
                     else:
-                        mods.set_module_status(args.module, True)
+                        module_registry.set_module_status(args.module, True)
                         console.print(f"[success]模块 [bold]{args.module}[/] 已启用[/]")
                         
                 elif args.module_command == "disable":
                     if args.module not in installed["modules"]:
                         console.print(f"[error]模块 [bold]{args.module}[/] 不存在或未安装[/]")
                     else:
-                        mods.set_module_status(args.module, False)
+                        module_registry.set_module_status(args.module, False)
                         console.print(f"[warning]模块 [bold]{args.module}[/] 已禁用[/]")
                 else:
                     self.parser.parse_args(["module", "--help"])

{erispulse-2.1.15.dev3.dist-info → erispulse-2.2.0.dev1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse
-Version: 2.1.15.dev3
+Version: 2.2.0.dev1
 Summary: ErisPulse 是一个模块化、可扩展的异步 Python SDK 框架，主要用于构建高效、可维护的机器人应用程序。
 Author-email: "艾莉丝·格雷拉特(WSu2059)" <wsu2059@qq.com>
 License: MIT License
@@ -34,6 +34,12 @@ License: MIT License
         - Metadata definitions
         
         This ensures consistent behavior and interoperability across all adapter implementations.
+        
+        感谢所有为开源社区做出贡献的开发者和作者
+        
+        请尊重每一位开源作者的劳动成果，承诺在使用、修改和分发本软件时，将严格遵守相关许可证条款，并保留所有原始版权声明
+        
+        开源精神的核心在于分享、协作与尊重。我们希望通过本项目，能够传承这一精神，为开源社区的发展贡献一份力量
 License-File: LICENSE
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers

erispulse-2.2.0.dev1.dist-info/RECORD

@@ -0,0 +1,27 @@
+ErisPulse/__init__.py,sha256=L-YLh-5qMYydReBiBO9weceeH7PVv2ONBo40o5ekr3Y,27133
+ErisPulse/__main__.py,sha256=GUh_30fEkWmE0udDFe1Kkwf41hg2v4WgbRY1RswJ9Uc,76331
+ErisPulse/Core/__init__.py,sha256=96QS7gD0QNt27wQkIprye7y_Nja_IH2XUqPstZ4uLsY,589
+ErisPulse/Core/adapter.py,sha256=y75u_heNmpYLDjIBtVTfMzTHZFixWtYFv0JVskNI-2w,18300
+ErisPulse/Core/config.py,sha256=y0ChfCuw-6jAqs9Ii2tPJg0e4A765qzQLRcK6O8zh4c,2425
+ErisPulse/Core/env.py,sha256=IT_6Xks5Ka089O_4SVTvYNIC9Ly1IHX_Esb3SsleRj8,338
+ErisPulse/Core/erispulse_config.py,sha256=QDx401hNX9JcSHqCSVK33X6VTubl6HI1znAK3T_J0K0,3034
+ErisPulse/Core/exceptions.py,sha256=zuTREGczwGzbYT4Z6dACqHwgNRpiJeLFR8aCxFdOg7k,3667
+ErisPulse/Core/logger.py,sha256=g8HgpzK3k-WpnuiU_UQKWdw4s7BLLHOS23uDFrO_7W8,11285
+ErisPulse/Core/module.py,sha256=wCIFC3qHukeu7DSj8TuNMw8s_gzTwk7_coM4oflmieA,4680
+ErisPulse/Core/module_registry.py,sha256=BeOQwh3Pwv2fceBLJEObF6Ek65td0VOFzv3L0aEudXY,7740
+ErisPulse/Core/router.py,sha256=s2EBh2qpt3UXYhB06Ppc1XTFuZ3u0ZfXENJxwkgPoq8,8542
+ErisPulse/Core/storage.py,sha256=oRum4eVaTc3yxcaafggoIvrk41LPbvApSCxkGM3YmzU,17904
+ErisPulse/Core/Event/__init__.py,sha256=xndqrBPwIrvS8rspy8c_4We6sfrjNCFBJNmcBuMv0NU,1019
+ErisPulse/Core/Event/base.py,sha256=cr7FEaSnxxpAKNMR9a4RkX6xX5BiqndsMwBZV_me4W8,3741
+ErisPulse/Core/Event/cmd.py,sha256=iiKcvHFYYj_1ZnhmFJ0Ow4X96MjwSYIrGW_IWw0Z74w,6909
+ErisPulse/Core/Event/exceptions.py,sha256=iGcuPaC7F4cZeujcvBdZb9bzQGnHBdb9CcPKoB760Bo,711
+ErisPulse/Core/Event/manager.py,sha256=S__BVAyGbY41W4ocPiTQ00BDaPxH-kj0lWoLl2Q3MRw,4225
+ErisPulse/Core/Event/message.py,sha256=TBDmeribhCRQrV6M0Df_815PgBwneap1-e0xc9IvT9k,2581
+ErisPulse/Core/Event/meta.py,sha256=ThUrYhTDPjzy3XwlMEGTFTzQBOV7-irtIvbPEe76Mk4,2243
+ErisPulse/Core/Event/notice.py,sha256=lnPJCTfAe5xviO-IkpCkcP8UhaAEJ3FvtBbNmoS9Ji4,2789
+ErisPulse/Core/Event/request.py,sha256=Ri46OFYu7jkFeRqS4kHD_6j7KCpOdmDNjrxAki5YsWQ,1817
+erispulse-2.2.0.dev1.dist-info/METADATA,sha256=9W2b-GP4uSM5IO4xV_owvZJcPUJmvT2EgsXrggvMjUY,7290
+erispulse-2.2.0.dev1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+erispulse-2.2.0.dev1.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
+erispulse-2.2.0.dev1.dist-info/licenses/LICENSE,sha256=b2XwzcfWuv_36Op3xGdjcuPHgfCz62yT3bXYjfStpxY,1852
+erispulse-2.2.0.dev1.dist-info/RECORD,,

{erispulse-2.1.15.dev3.dist-info → erispulse-2.2.0.dev1.dist-info}/licenses/LICENSE

@@ -28,4 +28,10 @@ This SDK's core adapter standardization layer strictly follows OneBot12 specific
 - Message segment definitions
 - Metadata definitions
 
-This ensures consistent behavior and interoperability across all adapter implementations.
+This ensures consistent behavior and interoperability across all adapter implementations.
+
+感谢所有为开源社区做出贡献的开发者和作者
+
+请尊重每一位开源作者的劳动成果，承诺在使用、修改和分发本软件时，将严格遵守相关许可证条款，并保留所有原始版权声明
+
+开源精神的核心在于分享、协作与尊重。我们希望通过本项目，能够传承这一精神，为开源社区的发展贡献一份力量

erispulse-2.1.15.dev3.dist-info/RECORD

@@ -1,17 +0,0 @@
-ErisPulse/__init__.py,sha256=ElwKDJgga0oePhwPXuxgUsWMevpfXdsii0X0zuJPmC0,26790
-ErisPulse/__main__.py,sha256=ePvZuyPEq5-ODog3aFMPQJCbj3TNKsZU_N3kynJ6aek,73908
-ErisPulse/Core/__init__.py,sha256=VCYMC8Ehfw603jV9KFaWdiWAh4UORSqrMTRuVfXZK0I,481
-ErisPulse/Core/adapter.py,sha256=y75u_heNmpYLDjIBtVTfMzTHZFixWtYFv0JVskNI-2w,18300
-ErisPulse/Core/config.py,sha256=y0ChfCuw-6jAqs9Ii2tPJg0e4A765qzQLRcK6O8zh4c,2425
-ErisPulse/Core/env.py,sha256=IT_6Xks5Ka089O_4SVTvYNIC9Ly1IHX_Esb3SsleRj8,338
-ErisPulse/Core/erispulse_config.py,sha256=QDx401hNX9JcSHqCSVK33X6VTubl6HI1znAK3T_J0K0,3034
-ErisPulse/Core/exceptions.py,sha256=zuTREGczwGzbYT4Z6dACqHwgNRpiJeLFR8aCxFdOg7k,3667
-ErisPulse/Core/logger.py,sha256=6p53nQE7NFXSqs_lftW-HQB1BQcgruAYOpIYx25QLVA,11252
-ErisPulse/Core/mods.py,sha256=vKLEDr2nQ4kUULHmUQYFbRL04ePIKlwLEOGB-ldMYS8,7130
-ErisPulse/Core/router.py,sha256=s2EBh2qpt3UXYhB06Ppc1XTFuZ3u0ZfXENJxwkgPoq8,8542
-ErisPulse/Core/storage.py,sha256=oRum4eVaTc3yxcaafggoIvrk41LPbvApSCxkGM3YmzU,17904
-erispulse-2.1.15.dev3.dist-info/METADATA,sha256=2F6t5xA_I3utUv6eRjgXJ24--oYEpHWQ8ZauCLRbI6I,6856
-erispulse-2.1.15.dev3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-erispulse-2.1.15.dev3.dist-info/entry_points.txt,sha256=Jss71M6nEha0TA-DyVZugPYdcL14s9QpiOeIlgWxzOc,182
-erispulse-2.1.15.dev3.dist-info/licenses/LICENSE,sha256=4jyqikiB0G0n06CEEMMTzTXjE4IShghSlB74skMSPQs,1464
-erispulse-2.1.15.dev3.dist-info/RECORD,,