ryry-cli 4.23__tar.gz → 4.25__tar.gz

{ryry_cli-4.23/ryry_cli.egg-info → ryry_cli-4.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 4.23
+Version: 4.25
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen

{ryry_cli-4.23 → ryry_cli-4.25}/ryry/constant.py

@@ -1,6 +1,6 @@
 #!!!!! do not change this file !!!!!
-app_version="4.23"
-app_bulld_anchor="Noh_2025-07-24 11:15:30.181544"
+app_version="4.25"
+app_bulld_anchor="Noh_2025-07-29 15:39:39.681916"
 app_name="ryry-cli"
 import sys, os
 if getattr(sys, 'frozen', False):

{ryry_cli-4.23 → ryry_cli-4.25}/ryry/daemon_base.py

@@ -27,9 +27,6 @@ class SimpleDaemonBase:
         # 配置加载
         self._load_config()
         
-        # 信号处理
-        self._setup_signal_handlers()
-        
         print(f"【{self.widget_name}】Daemon实例创建完成", file=sys.stderr)
 
     def _load_config(self):
@@ -50,20 +47,6 @@ class SimpleDaemonBase:
             print(f"配置加载失败: {e}", file=sys.stderr)
             self.timeout = 600
 
-    def _setup_signal_handlers(self):
-        """设置信号处理器"""
-        def signal_handler(signum, frame):
-            print(f"【{self.widget_name}】收到信号 {signum}，开始停止", file=sys.stderr)
-            self.running = False
-        
-        # 注册信号处理器
-        if platform.system() != "Windows":
-            signal.signal(signal.SIGINT, signal_handler)   # Ctrl+C (在Windows上禁用)
-        signal.signal(signal.SIGTERM, signal_handler)  # 终止信号
-        
-        if hasattr(signal, 'SIGBREAK'):
-            signal.signal(signal.SIGBREAK, signal_handler)
-
     # ==================== 生命周期方法 ====================
     
     def initialize(self):
@@ -100,8 +83,14 @@ class SimpleDaemonBase:
         """发送就绪信号"""
         try:
             ready_file = os.path.join(self.base_path, f"daemon_ready_{self.widget_id}.json")
+            ready_data = {
+                "accept_tasks": False,
+                "timestamp": time.time(),
+                "pid": os.getpid()
+            }
             with open(ready_file, 'w', encoding='utf-8') as f:
-                json.dump({"accept_tasks": False}, f)
+                json.dump(ready_data, f)
+            print(f"【{self.widget_name}】就绪信号已发送", file=sys.stderr)
         except Exception as e:
             print(f"发送就绪信号失败: {e}", file=sys.stderr)
 

{ryry_cli-4.23 → ryry_cli-4.25}/ryry/daemon_manager.py

@@ -72,9 +72,13 @@ class DaemonManager:
                             return False
             else:
                 # Unix-like系统使用os.kill(pid, 0)
-                os.kill(pid, 0)
-                return True
-        except (OSError, ProcessLookupError):
+                try:
+                    os.kill(pid, 0)
+                    return True
+                except (OSError, ProcessLookupError):
+                    return False
+        except Exception as e:
+            taskUtils.taskPrint(None, f"检查进程存活状态时出错: {e}")
             return False
     
     def _send_command_to_process(self, widget_id: str, command: dict, timeout: int = 30) -> Optional[dict]:
@@ -173,22 +177,40 @@ class DaemonManager:
         """启动指定widget的常驻进程"""
         with self.lock:
             config = self._read_daemon_config()
+            
             # 检查是否已经在运行
             if widget_id in config:
                 daemon_info = config[widget_id]
-                if daemon_info.get("running", False) and self._is_process_alive(daemon_info.get("pid", 0)):
+                pid = daemon_info.get("pid", 0)
+                
+                # 更严格的检查：不仅检查配置中的running状态，还要检查进程是否真的活着
+                if daemon_info.get("running", False) and self._is_process_alive(pid):
+                    taskUtils.taskPrint(None, f"Daemon {widget_id} already running with PID {pid}")
                     return True  # 已经在运行
-                # 清理无效的进程信息
-                del config[widget_id]
-                self._write_daemon_config(config)
+                
+                # 如果进程不存在但配置显示在运行，清理配置
+                if daemon_info.get("running", False) and not self._is_process_alive(pid):
+                    taskUtils.taskPrint(None, f"Cleaning up dead daemon {widget_id} with PID {pid}")
+                    del config[widget_id]
+                    self._write_daemon_config(config)
+            
+            # 再次检查是否有其他同名进程在运行（防止竞态条件）
+            if widget_id in config:
+                daemon_info = config[widget_id]
+                if daemon_info.get("running", False) and self._is_process_alive(daemon_info.get("pid", 0)):
+                    taskUtils.taskPrint(None, f"Daemon {widget_id} was started by another process")
+                    return True
+            
             if not self.should_start_daemon(widget_id):
                 return False
+                
             try:
                 widget_path = self._get_widget_path(widget_id)
                 if not widget_path:
                     return False
                 widget_dir = os.path.dirname(widget_path)
                 daemon_file = os.path.join(widget_dir, "daemon.py")
+                
                 # 获取widget的timeout配置和version
                 if widget_info and isinstance(widget_info, dict):
                     timeout = widget_info.get("timeout", 600)
@@ -197,12 +219,14 @@ class DaemonManager:
                     widget_config = self._get_widget_config(widget_id)
                     timeout = widget_config.get("timeout", 600) if widget_config else 600
                     version = widget_config.get("version", "1.0") if widget_config else "1.0"
+                
                 # 启动进程
                 process = subprocess.Popen(
                     [sys.executable, daemon_file, widget_id, constant.base_path],
                     cwd=widget_dir,
                     env=os.environ.copy()
                 )
+                
                 # 记录进程信息
                 daemon_info = {
                     "widget_id": widget_id,
@@ -216,10 +240,12 @@ class DaemonManager:
                 }
                 config[widget_id] = daemon_info
                 self._write_daemon_config(config)
+                
                 # 等待就绪信号（通过文件）
                 ready_file = os.path.join(constant.base_path, f"daemon_ready_{widget_id}.json")
                 start_time = time.time()
-                while time.time() - start_time < 30:  # 30秒超时
+                timeout_seconds = 30
+                while time.time() - start_time < timeout_seconds:
                     if os.path.exists(ready_file):
                         try:
                             with open(ready_file, 'r', encoding='utf-8') as f:
@@ -229,15 +255,20 @@ class DaemonManager:
                             daemon_info["accept_tasks"] = ready_info.get("accept_tasks", False)
                             config[widget_id] = daemon_info
                             self._write_daemon_config(config)
+                            taskUtils.taskPrint(None, f"Daemon {widget_id} 就绪信号已收到")
                             break
-                        except:
+                        except Exception as e:
+                            taskUtils.taskPrint(None, f"读取就绪信号文件失败: {e}")
                             pass
                     time.sleep(1)
+                
                 if not daemon_info["ready"]:
+                    taskUtils.taskPrint(None, f"Daemon {widget_id} 就绪信号超时，终止进程")
                     process.terminate()
                     del config[widget_id]
                     self._write_daemon_config(config)
                     return False
+                
                 taskUtils.taskPrint(None, f"Daemon process {widget_id} started, PID: {process.pid}, accept_tasks: {daemon_info['accept_tasks']}")
                 return True
             except Exception as e:
@@ -337,11 +368,14 @@ class DaemonManager:
         daemon_info = config.get(widget_id, {})
         
         if not daemon_info:
+            taskUtils.taskPrint(None, f"Daemon {widget_id} 无配置信息")
             return {"running": False, "ready": False, "accept_tasks": False}
         
         pid = daemon_info.get("pid", 0)
         running = daemon_info.get("running", False) and self._is_process_alive(pid)
         
+        taskUtils.taskPrint(None, f"Daemon {widget_id} 状态检查: PID={pid}, config_running={daemon_info.get('running', False)}, process_alive={self._is_process_alive(pid)}, final_running={running}")
+        
         # 如果进程还活着，检查是否有停止信号文件
         if running:
             stop_file = os.path.join(constant.base_path, f"daemon_stopped_{widget_id}.json")
@@ -353,11 +387,13 @@ class DaemonManager:
                     # 验证PID是否匹配
                     if stop_info.get("pid") == pid:
                         running = False
+                        taskUtils.taskPrint(None, f"Daemon {widget_id} 收到停止信号")
                 except:
                     pass
         
         if not running and daemon_info.get("running", False):
             # 清理无效进程
+            taskUtils.taskPrint(None, f"清理无效的daemon配置: {widget_id}")
             with self.lock:
                 config = self._read_daemon_config()
                 if widget_id in config:
@@ -391,6 +427,8 @@ class DaemonManager:
         """同步daemon状态与widgetMap，自动关闭不需要的daemon，启动需要的新daemon"""
         config = self._read_daemon_config()
         widget_map = store.widgetMap()
+        
+        taskUtils.taskPrint(None, f"开始同步daemon状态，当前配置: {list(config.keys())}")
 
         # 0. 首先检查所有已死亡的daemon进程并清理
         dead_daemons = []
@@ -398,8 +436,12 @@ class DaemonManager:
             if daemon_info.get("running", False):
                 pid = daemon_info.get("pid", 0)
                 # 检查进程是否还活着
-                if not self._is_process_alive(pid):
+                is_alive = self._is_process_alive(pid)
+                taskUtils.taskPrint(None, f"检查daemon {widget_id} (PID: {pid}): {'活着' if is_alive else '死亡'}")
+                
+                if not is_alive:
                     dead_daemons.append(widget_id)
+                    taskUtils.taskPrint(None, f"Found dead daemon {widget_id} with PID {pid}")
                 else:
                     # 检查是否有停止信号文件
                     stop_file = os.path.join(constant.base_path, f"daemon_stopped_{widget_id}.json")
@@ -411,6 +453,7 @@ class DaemonManager:
                             # 验证PID是否匹配
                             if stop_info.get("pid") == pid:
                                 dead_daemons.append(widget_id)
+                                taskUtils.taskPrint(None, f"Found stopped daemon {widget_id} with PID {pid}")
                         except:
                             pass
 
@@ -428,32 +471,56 @@ class DaemonManager:
             daemon_info = config[widget_id]
             widget_info = widget_map.get(widget_id)
             need_stop = False
+            reason = ""
+            
             # widget已被移除
             if widget_info is None:
                 need_stop = True
+                reason = "widget已被移除"
             else:
                 # 屏蔽
                 is_block = widget_info.get("isBlock", False)
                 if is_block:
                     need_stop = True
+                    reason = "widget被屏蔽"
                 # 版本号不一致（仅当daemon正在运行时才判断）
                 version = widget_info.get("version", "1.0")
                 daemon_version = daemon_info.get("version", None)
                 if daemon_info.get("running", False) and daemon_version is not None and daemon_version != version:
                     need_stop = True
+                    reason = f"版本不一致: daemon={daemon_version}, widget={version}"
+            
             if need_stop:
+                taskUtils.taskPrint(None, f"Stopping daemon {widget_id}: {reason}")
                 self.stop_daemon(widget_id)
                 
         # 2. 启动需要的daemon（未运行、或因上述原因被重启）
         for widget_id, widget_info in widget_map.items():
             is_block = widget_info.get("isBlock", False)
             version = widget_info.get("version", "1.0")
+            
             if not is_block and self.should_start_daemon(widget_id):
                 status = self.get_daemon_status(widget_id)
                 daemon_info = config.get(widget_id)
-                # 未运行 或 版本号不一致（仅当daemon正在运行时才判断）
-                if (not status.get("running", False)) or (daemon_info and daemon_info.get("running", False) and daemon_info.get("version", None) != version):
+                
+                taskUtils.taskPrint(None, f"检查widget {widget_id}: status={status.get('running', False)}, daemon_info={daemon_info.get('running', False) if daemon_info else 'None'}")
+                
+                # 检查是否需要启动
+                need_start = False
+                reason = ""
+                
+                if not status.get("running", False):
+                    need_start = True
+                    reason = "daemon未运行"
+                elif daemon_info and daemon_info.get("running", False) and daemon_info.get("version", None) != version:
+                    need_start = True
+                    reason = f"版本不一致: daemon={daemon_info.get('version')}, widget={version}"
+                
+                if need_start:
+                    taskUtils.taskPrint(None, f"Starting daemon {widget_id}: {reason}")
                     self.start_daemon(widget_id, widget_info)
+                else:
+                    taskUtils.taskPrint(None, f"Daemon {widget_id} 无需启动")
 
     # 建议在start_all_daemons后调用一次同步
     def start_all_daemons(self):
@@ -462,7 +529,13 @@ class DaemonManager:
         for widget_id in widget_map:
             widget_info = widget_map[widget_id]
             if self.should_start_daemon(widget_id) and not widget_info.get("isBlock", False):
-                self.start_daemon(widget_id, widget_info)
+                # 检查是否已经在运行
+                status = self.get_daemon_status(widget_id)
+                if not status.get("running", False):
+                    taskUtils.taskPrint(None, f"Starting daemon {widget_id} (start_all_daemons)")
+                    self.start_daemon(widget_id, widget_info)
+                else:
+                    taskUtils.taskPrint(None, f"Daemon {widget_id} already running, skipping start_all_daemons")
 
 
 # 创建全局实例

{ryry_cli-4.23 → ryry_cli-4.25}/ryry/main.py

@@ -1,4 +1,4 @@
-import sys, os, urllib3, time, platform, json, curses
+import sys, os, urllib3, time, platform, json
 
 from ryry import utils
 from ryry import ryry_service
@@ -6,6 +6,7 @@ from ryry import ryry_widget
 from ryry import store
 from ryry import utils
 from ryry import taskUtils
+from ryry import proxy_manager
 
 ll = 29
 def scr_str(s):
@@ -68,6 +69,26 @@ def device_status(stdscr, idx):
     idx+=1
     return idx
 
+def proxy_status(stdscr, idx):
+    def real_stdsrc(*args):
+        if platform.system() == 'Windows':
+            print(args[2])
+        else:
+            stdscr.addstr(*args)
+    
+    proxy_info = proxy_manager.get_proxy_status()
+    status_text = "✅ 代理已启用" if proxy_info['enabled'] else "❌ 代理未启用"
+    real_stdsrc(idx, 0, scr_str(f"Proxy Status: {status_text}".ljust(ll*3-2)))
+    idx+=1
+    
+    if proxy_info['enabled']:
+        real_stdsrc(idx, 0, scr_str(f"HTTP: {proxy_info['http_proxy']}".ljust(ll*3-2)))
+        idx+=1
+        real_stdsrc(idx, 0, scr_str(f"SOCKS: {proxy_info['socks_proxy']}".ljust(ll*3-2)))
+        idx+=1
+    
+    return idx
+
 def widget_status(stdscr, idx):
     def real_stdsrc(*args):
         if platform.system() == 'Windows':
@@ -127,7 +148,10 @@ def widget_status(stdscr, idx):
         max_task_number_str = ""
         if max_task_number > 0:
             max_task_number_str = f"*{max_task_number}"
-        real_stdsrc(idx, 0, scr_str(f'{f"[{name}{max_task_number_str} v{version}] {it}{end_args}".ljust(maxJust)}'.ljust(ll*3-2)), curses.color_pair(color_pair))
+        if platform.system() == 'Windows':
+            real_stdsrc(idx, 0, scr_str(f'{f"[{name}{max_task_number_str} v{version}] {it}{end_args}".ljust(maxJust)}'.ljust(ll*3-2)))
+        else:
+            real_stdsrc(idx, 0, scr_str(f'{f"[{name}{max_task_number_str} v{version}] {it}{end_args}".ljust(maxJust)}'.ljust(ll*3-2)), curses.color_pair(color_pair))
         idx+=1
         real_stdsrc(idx, 0, scr_str(f'  PATH:{path}'.ljust(ll*3-2)))
         idx+=1
@@ -183,9 +207,12 @@ def status():
         print(scr_line("-" * ll*3))
         device_status(None, 0)
         print(scr_line("-" * ll*3))
+        proxy_status(None, 0)
+        print(scr_line("-" * ll*3))
         widget_status(None, 0)
         print(scr_line("-" * ll*3))
     else:
+        import curses
         stdscr = curses.initscr()
         curses.noecho()
         curses.cbreak()
@@ -228,6 +255,9 @@ def status():
                 idx = device_status(stdscr, idx)
                 stdscr.addstr(idx, 0, scr_line("-" * ll*3))
                 idx+=1
+                idx = proxy_status(stdscr, idx)
+                stdscr.addstr(idx, 0, scr_line("-" * ll*3))
+                idx+=1
                 idx = widget_status(stdscr, idx)
                 stdscr.addstr(idx, 0, scr_line("-" * ll*3))
                 stdscr.refresh()
@@ -251,6 +281,14 @@ def service():
             print('Service is already running.')
         else:
             print(f'Starting service...[args = {" ".join(sys.argv)}]')
+            
+            # # 启动代理服务
+            # print("🚀 正在启动代理服务...")
+            # if proxy_manager.init_proxy():
+            #     print("✅ 代理服务启动成功")
+            # else:
+            #     print("⚠️  代理服务启动失败，继续启动主服务")
+            
             threadNum = 1
             idx = 2
             while idx < len(sys.argv):
@@ -267,6 +305,12 @@ def service():
         else:
             print('Stopping service...')
             service.stop()
+            
+            # # 停止代理服务
+            # print("🛑 正在停止代理服务...")
+            # proxy_manager.stop_proxy()
+            # print("✅ 代理服务已停止")
+            
     elif command == 'status': 
         status()
     else:
@@ -351,6 +395,49 @@ def widget():
     else:
         print("Unknown command:", command)
 
+def proxy():
+    """代理管理功能"""
+    if len(sys.argv) <= 2:
+        print('please set command! Usage: ryry proxy [start|stop|status|config]')
+        return
+
+    command = sys.argv[2]
+    
+    if command == 'start':
+        print("🚀 正在启动代理服务...")
+        if proxy_manager.init_proxy():
+            print("✅ 代理服务启动成功")
+        else:
+            print("❌ 代理服务启动失败")
+            
+    elif command == 'stop':
+        print("🛑 正在停止代理服务...")
+        proxy_manager.stop_proxy()
+        print("✅ 代理服务已停止")
+        
+    elif command == 'status':
+        info = proxy_manager.get_proxy_status()
+        print("📊 代理服务状态:")
+        print(f"   状态: {'✅ 运行中' if info['enabled'] else '❌ 已停止'}")
+        print(f"   配置文件: {info['config_path']}")
+        if info['enabled']:
+            print(f"   HTTP代理: {info['http_proxy']}")
+            print(f"   SOCKS代理: {info['socks_proxy']}")
+            
+    elif command == 'config':
+        if len(sys.argv) > 3:
+            config_path = sys.argv[3]
+            print(f"📝 正在加载配置文件: {config_path}")
+            # 这里可以添加加载自定义配置的逻辑
+            print("✅ 配置文件加载成功")
+        else:
+            print("📝 当前配置文件位置:")
+            info = proxy_manager.get_proxy_status()
+            print(f"   {info['config_path']}")
+            
+    else:
+        print("Unknown command:", command)
+
 def main():
     urllib3.disable_warnings()
     urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -363,6 +450,8 @@ def main():
             service()
         elif module == "status":
             status()
+        elif module == "proxy":
+            proxy()
         else:
             print(f"Unknown command:{module}")
             sys.exit(0)

ryry_cli-4.25/ryry/proxy_manager.py

@@ -0,0 +1,445 @@
+import os
+import sys
+import json
+import yaml
+import subprocess
+import threading
+import time
+import requests
+import zipfile
+import tarfile
+import hashlib
+import platform
+from pathlib import Path
+from typing import Optional, Dict, Any
+from urllib.parse import urlparse
+
+class ProxyManager:
+    """代理管理器，用于管理clashcore代理"""
+    
+    def __init__(self, config_path: Optional[str] = None):
+        pass
+        self.config_path = config_path or self._get_default_config_path()
+        self.clash_process = None
+        self.proxy_enabled = False
+        self.config_data = None
+        self.clash_binary_path = None
+        self.clash_dir = self._get_clash_dir()
+        self._load_config()
+        
+    def _get_default_config_path(self) -> str:
+        """获取默认配置文件路径"""
+        base_path = os.path.dirname(os.path.abspath(__file__))
+        return os.path.join(base_path, "clash_config.yaml")
+    
+    def _get_clash_dir(self) -> str:
+        """获取clash安装目录"""
+        base_path = os.path.dirname(os.path.abspath(__file__))
+        clash_dir = os.path.join(base_path, "clash_binary")
+        os.makedirs(clash_dir, exist_ok=True)
+        return clash_dir
+    
+    def _get_system_info(self) -> Dict[str, str]:
+        """获取系统信息"""
+        system = platform.system().lower()
+        machine = platform.machine().lower()
+        
+        # 映射系统架构
+        arch_map = {
+            'x86_64': 'amd64',
+            'amd64': 'amd64',
+            'i386': '386',
+            'i686': '386',
+            'arm64': 'arm64',
+            'aarch64': 'arm64',
+            'armv7l': 'armv7',
+            'armv8l': 'arm64'
+        }
+        
+        arch = arch_map.get(machine, machine)
+        
+        return {
+            'system': system,
+            'arch': arch,
+            'machine': machine
+        }
+    
+    def _get_clash_download_url(self) -> str:
+        """获取clash下载URL"""
+        system_info = self._get_system_info()
+        system = system_info['system']
+        arch = system_info['arch']
+        
+        # Clash Core 下载地址映射
+        base_url = "https://github.com/Dreamacro/clash/releases/download"
+        version = "v1.18.0"  # 可以更新到最新版本
+        
+        if system == "windows":
+            filename = f"clash-windows-{arch}-{version}.zip"
+        elif system == "darwin":
+            filename = f"clash-darwin-{arch}-{version}.gz"
+        else:  # linux
+            filename = f"clash-linux-{arch}-{version}.gz"
+        
+        return f"{base_url}/{version}/{filename}"
+    
+    def _download_file(self, url: str, filepath: str) -> bool:
+        """下载文件"""
+        try:
+            print(f"📥 正在下载: {url}")
+            response = requests.get(url, stream=True, timeout=30)
+            response.raise_for_status()
+            
+            total_size = int(response.headers.get('content-length', 0))
+            downloaded = 0
+            
+            with open(filepath, 'wb') as f:
+                for chunk in response.iter_content(chunk_size=8192):
+                    if chunk:
+                        f.write(chunk)
+                        downloaded += len(chunk)
+                        if total_size > 0:
+                            percent = (downloaded / total_size) * 100
+                            print(f"\r📥 下载进度: {percent:.1f}%", end='', flush=True)
+            
+            print(f"\n✅ 下载完成: {filepath}")
+            return True
+            
+        except Exception as e:
+            print(f"\n❌ 下载失败: {e}")
+            return False
+    
+    def _extract_file(self, archive_path: str, extract_dir: str) -> bool:
+        """解压文件"""
+        try:
+            print(f"📦 正在解压: {archive_path}")
+            
+            if archive_path.endswith('.zip'):
+                with zipfile.ZipFile(archive_path, 'r') as zip_ref:
+                    zip_ref.extractall(extract_dir)
+            elif archive_path.endswith('.gz'):
+                import gzip
+                import shutil
+                
+                # 对于.gz文件，直接解压为clash可执行文件
+                output_path = os.path.join(extract_dir, 'clash')
+                with gzip.open(archive_path, 'rb') as f_in:
+                    with open(output_path, 'wb') as f_out:
+                        shutil.copyfileobj(f_in, f_out)
+                
+                # 设置执行权限
+                os.chmod(output_path, 0o755)
+            
+            print(f"✅ 解压完成: {extract_dir}")
+            return True
+            
+        except Exception as e:
+            print(f"❌ 解压失败: {e}")
+            return False
+    
+    def _install_clash(self) -> bool:
+        """安装clash"""
+        try:
+            # 检查是否已安装
+            clash_binary = os.path.join(self.clash_dir, 'clash')
+            if sys.platform == "win32":
+                clash_binary = os.path.join(self.clash_dir, 'clash.exe')
+            
+            if os.path.exists(clash_binary):
+                # 检查版本
+                try:
+                    result = subprocess.run([clash_binary, "--version"], 
+                                          capture_output=True, text=True, timeout=5)
+                    if result.returncode == 0:
+                        print(f"✅ Clash已安装: {clash_binary}")
+                        self.clash_binary_path = clash_binary
+                        return True
+                except:
+                    pass
+            
+            # 下载并安装
+            download_url = self._get_clash_download_url()
+            archive_name = os.path.basename(urlparse(download_url).path)
+            archive_path = os.path.join(self.clash_dir, archive_name)
+            
+            # 下载
+            if not self._download_file(download_url, archive_path):
+                return False
+            
+            # 解压
+            if not self._extract_file(archive_path, self.clash_dir):
+                return False
+            
+            # 清理下载文件
+            try:
+                os.remove(archive_path)
+            except:
+                pass
+            
+            # 验证安装
+            if os.path.exists(clash_binary):
+                try:
+                    result = subprocess.run([clash_binary, "--version"], 
+                                          capture_output=True, text=True, timeout=5)
+                    if result.returncode == 0:
+                        print(f"✅ Clash安装成功: {clash_binary}")
+                        self.clash_binary_path = clash_binary
+                        return True
+                except Exception as e:
+                    print(f"❌ Clash验证失败: {e}")
+            
+            return False
+            
+        except Exception as e:
+            print(f"❌ 安装Clash失败: {e}")
+            return False
+    
+    def _load_config(self):
+        """加载配置文件"""
+        try:
+            if os.path.exists(self.config_path):
+                with open(self.config_path, 'r', encoding='utf-8') as f:
+                    self.config_data = yaml.safe_load(f)
+                print(f"✅ 已加载代理配置文件: {self.config_path}")
+            else:
+                print(f"⚠️  配置文件不存在: {self.config_path}")
+                self._create_default_config()
+        except Exception as e:
+            print(f"❌ 加载配置文件失败: {e}")
+            self._create_default_config()
+    
+    def _create_default_config(self):
+        """创建默认配置文件"""
+        default_config = {
+            "port": 7890,
+            "socks-port": 7891,
+            "allow-lan": True,
+            "mode": "rule",
+            "log-level": "info",
+            "external-controller": "127.0.0.1:9090",
+            "proxies": [],
+            "proxy-groups": [],
+            "rules": [
+                "DOMAIN-SUFFIX,google.com,Proxy",
+                "DOMAIN-SUFFIX,github.com,Proxy",
+                "DOMAIN-SUFFIX,githubusercontent.com,Proxy",
+                "DOMAIN-SUFFIX,openai.com,Proxy",
+                "DOMAIN-SUFFIX,anthropic.com,Proxy",
+                "DOMAIN-SUFFIX,claude.ai,Proxy",
+                "GEOIP,CN,DIRECT",
+                "MATCH,DIRECT"
+            ]
+        }
+        
+        try:
+            with open(self.config_path, 'w', encoding='utf-8') as f:
+                yaml.dump(default_config, f, default_flow_style=False, allow_unicode=True)
+            self.config_data = default_config
+            print(f"✅ 已创建默认配置文件: {self.config_path}")
+        except Exception as e:
+            print(f"❌ 创建默认配置文件失败: {e}")
+    
+    def start_proxy(self) -> bool:
+        """启动代理服务"""
+        if self.proxy_enabled:
+            print("✅ 代理服务已在运行")
+            return True
+            
+        try:
+            # 确保clash已安装
+            if not self.clash_binary_path:
+                if not self._install_clash():
+                    print("❌ Clash安装失败")
+                    return False
+            
+            # 启动clash进程
+            cmd = [self.clash_binary_path, "-f", self.config_path]
+            self.clash_process = subprocess.Popen(
+                cmd,
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                text=True
+            )
+            
+            # 等待服务启动
+            time.sleep(2)
+            
+            # 检查服务是否正常启动
+            if self._check_proxy_status():
+                self.proxy_enabled = True
+                print("✅ 代理服务启动成功")
+                self._set_system_proxy()
+                return True
+            else:
+                print("❌ 代理服务启动失败")
+                self.stop_proxy()
+                return False
+                
+        except Exception as e:
+            print(f"❌ 启动代理服务失败: {e}")
+            return False
+    
+    def stop_proxy(self):
+        """停止代理服务"""
+        if self.clash_process:
+            try:
+                self.clash_process.terminate()
+                self.clash_process.wait(timeout=5)
+            except subprocess.TimeoutExpired:
+                self.clash_process.kill()
+            finally:
+                self.clash_process = None
+        
+        self.proxy_enabled = False
+        self._unset_system_proxy()
+        print("✅ 代理服务已停止")
+    
+
+    
+    def _check_proxy_status(self) -> bool:
+        """检查代理服务状态"""
+        try:
+            # 检查HTTP代理
+            proxies = {
+                'http': 'http://127.0.0.1:7890',
+                'https': 'http://127.0.0.1:7890'
+            }
+            response = requests.get('http://httpbin.org/ip', 
+                                  proxies=proxies, timeout=5)
+            return response.status_code == 200
+        except:
+            return False
+    
+    def _set_system_proxy(self):
+        """设置系统代理"""
+        try:
+            if sys.platform == "win32":
+                # Windows系统代理设置
+                import winreg
+                
+                def set_key(name, value):
+                    try:
+                        winreg.CreateKey(winreg.HKEY_CURRENT_USER,
+                                       r"Software\Microsoft\Windows\CurrentVersion\Internet Settings")
+                        registry_key = winreg.OpenKey(winreg.HKEY_CURRENT_USER,
+                                                     r"Software\Microsoft\Windows\CurrentVersion\Internet Settings",
+                                                     0, winreg.KEY_WRITE)
+                        winreg.SetValueEx(registry_key, name, 0, winreg.REG_DWORD, value)
+                        winreg.CloseKey(registry_key)
+                        return True
+                    except WindowsError:
+                        return False
+                
+                set_key("ProxyEnable", 1)
+                set_key("ProxyServer", "127.0.0.1:7890")
+                
+            elif sys.platform == "darwin":
+                # macOS系统代理设置
+                os.system("networksetup -setwebproxy 'Wi-Fi' 127.0.0.1 7890")
+                os.system("networksetup -setsecurewebproxy 'Wi-Fi' 127.0.0.1 7890")
+                os.system("networksetup -setsocksfirewallproxy 'Wi-Fi' 127.0.0.1 7891")
+                
+            else:
+                # Linux系统代理设置
+                os.environ['HTTP_PROXY'] = 'http://127.0.0.1:7890'
+                os.environ['HTTPS_PROXY'] = 'http://127.0.0.1:7890'
+                os.environ['http_proxy'] = 'http://127.0.0.1:7890'
+                os.environ['https_proxy'] = 'http://127.0.0.1:7890'
+                
+        except Exception as e:
+            print(f"⚠️  设置系统代理失败: {e}")
+    
+    def _unset_system_proxy(self):
+        """取消系统代理设置"""
+        try:
+            if sys.platform == "win32":
+                import winreg
+                
+                def set_key(name, value):
+                    try:
+                        winreg.CreateKey(winreg.HKEY_CURRENT_USER,
+                                       r"Software\Microsoft\Windows\CurrentVersion\Internet Settings")
+                        registry_key = winreg.OpenKey(winreg.HKEY_CURRENT_USER,
+                                                     r"Software\Microsoft\Windows\CurrentVersion\Internet Settings",
+                                                     0, winreg.KEY_WRITE)
+                        winreg.SetValueEx(registry_key, name, 0, winreg.REG_DWORD, value)
+                        winreg.CloseKey(registry_key)
+                        return True
+                    except WindowsError:
+                        return False
+                
+                set_key("ProxyEnable", 0)
+                
+            elif sys.platform == "darwin":
+                os.system("networksetup -setwebproxystate 'Wi-Fi' off")
+                os.system("networksetup -setsecurewebproxystate 'Wi-Fi' off")
+                os.system("networksetup -setsocksfirewallproxystate 'Wi-Fi' off")
+                
+            else:
+                # Linux系统代理设置
+                if 'HTTP_PROXY' in os.environ:
+                    del os.environ['HTTP_PROXY']
+                if 'HTTPS_PROXY' in os.environ:
+                    del os.environ['HTTPS_PROXY']
+                if 'http_proxy' in os.environ:
+                    del os.environ['http_proxy']
+                if 'https_proxy' in os.environ:
+                    del os.environ['https_proxy']
+                    
+        except Exception as e:
+            print(f"⚠️  取消系统代理失败: {e}")
+    
+    def get_proxy_info(self) -> Dict[str, Any]:
+        """获取代理信息"""
+        return {
+            "enabled": self.proxy_enabled,
+            "config_path": self.config_path,
+            "clash_binary": self.clash_binary_path,
+            "clash_dir": self.clash_dir,
+            "http_proxy": "http://127.0.0.1:7890" if self.proxy_enabled else None,
+            "socks_proxy": "socks5://127.0.0.1:7891" if self.proxy_enabled else None
+        }
+    
+    def update_config(self, new_config: Dict[str, Any]):
+        """更新代理配置"""
+        try:
+            with open(self.config_path, 'w', encoding='utf-8') as f:
+                yaml.dump(new_config, f, default_flow_style=False, allow_unicode=True)
+            self.config_data = new_config
+            print("✅ 代理配置已更新")
+            
+            # 如果代理正在运行，重启服务
+            if self.proxy_enabled:
+                self.stop_proxy()
+                time.sleep(1)
+                self.start_proxy()
+                
+        except Exception as e:
+            print(f"❌ 更新代理配置失败: {e}")
+    
+    def cleanup(self):
+        """清理资源"""
+        self.stop_proxy()
+        # 可以选择是否删除clash二进制文件
+        # if self.clash_dir and os.path.exists(self.clash_dir):
+        #     import shutil
+        #     shutil.rmtree(self.clash_dir)
+
+# # 全局代理管理器实例
+proxy_manager = ProxyManager()
+
+def init_proxy():
+    """初始化代理服务"""
+    return proxy_manager.start_proxy()
+
+def stop_proxy():
+    """停止代理服务"""
+    proxy_manager.stop_proxy()
+
+def get_proxy_status():
+    """获取代理状态"""
+    return proxy_manager.get_proxy_info()
+
+def cleanup_proxy():
+    """清理代理资源"""
+    proxy_manager.cleanup() 

{ryry_cli-4.23 → ryry_cli-4.25}/ryry/ryry_service.py

@@ -130,7 +130,7 @@ class ryryDaemonThread(Thread):
     def __init__(self):
         super().__init__()
         self.name = f"ryryDaemonThread"
-        self.tik_time = 30.0
+        self.tik_time = 10.0
         self.start()    
     
     def run(self):
@@ -143,7 +143,9 @@ class ryryDaemonThread(Thread):
             try:
                 daemon_manager.sync_daemons_with_widget_map()
             except:
-                time.sleep(60)
+                pass
+            finally:
+                time.sleep(self.tik_time)
         try:
             print("Stopping daemon processes...")
             if daemon_manager.stop_all_daemons():

{ryry_cli-4.23 → ryry_cli-4.25}/ryry/store.py

@@ -155,7 +155,7 @@ def extend():
                 _genExtend()
             elif read_data["extend"].get("device_id", "") != read_data.get("deviceInfo", {}).get("device_id", ""):
                 _genExtend()
-            elif read_data["extend"].get("app", "") == "ryry-cli 4.23":
+            elif read_data["extend"].get("app", "") == "ryry-cli 4.25":
                 _genExtend()
         else:
             _genExtend()

ryry_cli-4.25/ryry/test_proxy.py

@@ -0,0 +1 @@
+ 

{ryry_cli-4.23 → ryry_cli-4.25/ryry_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ryry-cli
-Version: 4.23
+Version: 4.25
 Summary: ryry tools
 Home-page: https://github.com/dalipenMedia
 Author: dalipen

{ryry_cli-4.23 → ryry_cli-4.25}/ryry_cli.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ ryry/constant.py
 ryry/daemon_base.py
 ryry/daemon_manager.py
 ryry/main.py
+ryry/proxy_manager.py
 ryry/ryry_server_socket.py
 ryry/ryry_service.py
 ryry/ryry_webapi.py
@@ -15,6 +16,7 @@ ryry/shared_memory.py
 ryry/store.py
 ryry/task.py
 ryry/taskUtils.py
+ryry/test_proxy.py
 ryry/upload.py
 ryry/utils.py
 ryry/script_template/__init__.py

{ryry_cli-4.23 → ryry_cli-4.25}/setup.py

@@ -3,7 +3,7 @@ import os
 import subprocess
 import datetime
 
-ryry_version = "4.23"
+ryry_version = "4.25"
 cur_dir = os.path.dirname(os.path.abspath(__file__))
 constanspy = os.path.join(cur_dir, "ryry", "constant.py")
 try: