Upload 16 files

app/clash_manager.py

@@ -47,7 +47,26 @@ class ClashManager:
         
         # 确保配置文件存在
         if not os.path.exists(self.config_path):
-            raise FileNotFoundError(f"Clash配置文件未找到: {self.config_path}")
+            # 检查目录是否存在
+            config_dir = os.path.dirname(self.config_path)
+            if not os.path.exists(config_dir):
+                try:
+                    os.makedirs(config_dir, exist_ok=True)
+                    logger.info(f"创建了配置目录: {config_dir}")
+                except Exception as e:
+                    logger.error(f"无法创建配置目录: {str(e)}")
+            
+            # 如果目录存在但文件不存在，尝试创建一个基础配置
+            try:
+                with open(self.config_path, "w", encoding="utf-8") as f:
+                    f.write(self._get_base_config())
+                logger.info(f"创建了基础配置文件: {self.config_path}")
+            except Exception as e:
+                logger.error(f"无法创建配置文件: {str(e)}")
+                raise FileNotFoundError(f"Clash配置文件未找到且无法创建: {self.config_path}")
+        
+        # 验证配置文件内容
+        self._validate_config_file()
         
         # 设置Clash命令行参数 (兼容Clash Meta)
         cmd = [
@@ -203,4 +222,83 @@ class ClashManager:
     
     def __del__(self):
         """析构函数，确保进程在对象销毁时被终止"""
-        self.stop_clash() 
+        self.stop_clash()
+    
+    def _validate_config_file(self):
+        """验证配置文件内容，确保基本配置存在"""
+        try:
+            with open(self.config_path, "r", encoding="utf-8") as f:
+                content = f.read()
+            
+            # 检查文件大小
+            if len(content) < 10:
+                logger.warning(f"配置文件内容过短: {len(content)} 字节")
+                # 尝试使用基础配置替换
+                with open(self.config_path, "w", encoding="utf-8") as f:
+                    f.write(self._get_base_config())
+                logger.info("已使用基础配置替换")
+                return
+            
+            # 检查基本配置是否存在 (非严格YAML解析，简单文本检查)
+            missing_configs = []
+            if "mixed-port:" not in content and "port:" not in content:
+                missing_configs.append("端口配置")
+            
+            if "proxies:" not in content:
+                missing_configs.append("代理配置")
+            
+            if missing_configs:
+                logger.warning(f"配置文件缺少: {', '.join(missing_configs)}")
+                # 如果缺少关键配置，尝试修复
+                has_patch = False
+                
+                if "mixed-port:" not in content and "port:" not in content:
+                    content = f"mixed-port: {self.proxy_port}\n" + content
+                    has_patch = True
+                
+                if "external-controller:" not in content:
+                    content = f"external-controller: 127.0.0.1:{self.api_port}\n" + content
+                    has_patch = True
+                
+                if "proxies:" not in content:
+                    content += "\nproxies:\n  - name: DIRECT\n    type: Direct\n"
+                    has_patch = True
+                
+                if has_patch:
+                    with open(self.config_path, "w", encoding="utf-8") as f:
+                        f.write(content)
+                    logger.info("已修补配置文件")
+        
+        except Exception as e:
+            logger.error(f"验证配置文件时出错: {str(e)}")
+            # 如果验证失败，尝试使用基础配置
+            try:
+                with open(self.config_path, "w", encoding="utf-8") as f:
+                    f.write(self._get_base_config())
+                logger.info("已使用基础配置替换")
+            except Exception as write_err:
+                logger.error(f"无法写入基础配置: {str(write_err)}")
+    
+    def _get_base_config(self):
+        """返回基础Clash配置"""
+        return f"""# 基础Clash配置
+mixed-port: {self.proxy_port}
+allow-lan: true
+mode: Rule
+log-level: info
+external-controller: 127.0.0.1:{self.api_port}
+secret: ""
+
+proxies:
+  - name: DIRECT
+    type: Direct
+
+proxy-groups:
+  - name: GLOBAL
+    type: select
+    proxies:
+      - DIRECT
+
+rules:
+  - MATCH,DIRECT
+""" 

app/main.py

@@ -33,11 +33,12 @@ app = Flask(__name__)
 # 初始化管理器
 clash_manager = None
 sub_manager = None
+initialization_error = None
 
 @app.before_first_request
 def initialize():
     """应用首次请求前的初始化"""
-    global clash_manager, sub_manager
+    global clash_manager, sub_manager, initialization_error
     
     logger.info("正在初始化应用...")
     
@@ -52,8 +53,10 @@ def initialize():
         sub_manager.load_and_convert_sub()
         logger.info("成功加载并转换订阅")
     except Exception as e:
-        logger.error(f"加载订阅失败: {str(e)}")
-        raise
+        err_msg = f"加载订阅失败: {str(e)}"
+        logger.error(err_msg)
+        initialization_error = err_msg
+        return # 继续初始化，但不启动Clash
     
     # 初始化Clash管理器
     clash_manager = ClashManager(
@@ -68,13 +71,22 @@ def initialize():
         clash_manager.start_clash()
         logger.info("成功启动Clash Core")
     except Exception as e:
-        logger.error(f"启动Clash Core失败: {str(e)}")
-        raise
+        err_msg = f"启动Clash Core失败: {str(e)}"
+        logger.error(err_msg)
+        initialization_error = err_msg
 
 @app.route("/api/nodes", methods=["GET"])
 @authenticate
 def get_nodes():
     """获取可用节点列表"""
+    global clash_manager, initialization_error
+    
+    if clash_manager is None:
+        return jsonify({
+            "success": False, 
+            "error": f"Clash未启动: {initialization_error or '未知错误'}"
+        }), 503
+    
     try:
         nodes = clash_manager.get_nodes()
         return jsonify({"success": True, "nodes": nodes})
@@ -86,6 +98,14 @@ def get_nodes():
 @authenticate
 def switch_node():
     """切换到指定节点"""
+    global clash_manager, initialization_error
+    
+    if clash_manager is None:
+        return jsonify({
+            "success": False, 
+            "error": f"Clash未启动: {initialization_error or '未知错误'}"
+        }), 503
+    
     data = request.get_json()
     if not data or "node" not in data:
         return jsonify({"success": False, "error": "缺少'node'参数"}), 400
@@ -102,6 +122,14 @@ def switch_node():
 @authenticate
 def get_current_node():
     """获取当前使用的节点"""
+    global clash_manager, initialization_error
+    
+    if clash_manager is None:
+        return jsonify({
+            "success": False, 
+            "error": f"Clash未启动: {initialization_error or '未知错误'}"
+        }), 503
+    
     try:
         current_node = clash_manager.get_current_node()
         return jsonify({"success": True, "current_node": current_node})
@@ -113,13 +141,40 @@ def get_current_node():
 @authenticate
 def refresh_subscription():
     """刷新订阅并重新加载Clash配置"""
+    global clash_manager, sub_manager, initialization_error
+    
     try:
+        # 尝试重新加载订阅
+        if sub_manager is None:
+            # 如果订阅管理器未初始化，重新创建它
+            sub_manager = SubscriptionManager(
+                sub_url=SUB_URL,
+                config_path=os.path.join(os.path.dirname(os.path.dirname(__file__)), "data", "config.yaml")
+            )
+        
         sub_manager.load_and_convert_sub()
-        clash_manager.restart_clash()
-        return jsonify({"success": True, "message": "订阅已刷新，Clash已重启"})
+        
+        # 如果Clash未启动，尝试启动它
+        if clash_manager is None:
+            clash_manager = ClashManager(
+                config_path=os.path.join(os.path.dirname(os.path.dirname(__file__)), "data", "config.yaml"),
+                clash_path=os.path.join(os.path.dirname(os.path.dirname(__file__)), "clash_core", "clash.meta-linux-amd64"),
+                api_port=CLASH_API_PORT,
+                proxy_port=CLASH_PROXY_PORT
+            )
+            clash_manager.start_clash()
+            initialization_error = None
+            return jsonify({"success": True, "message": "订阅已刷新，Clash已启动"})
+        else:
+            # 如果Clash已经启动，重启它
+            clash_manager.restart_clash()
+            initialization_error = None
+            return jsonify({"success": True, "message": "订阅已刷新，Clash已重启"})
     except Exception as e:
-        logger.error(f"刷新订阅失败: {str(e)}")
-        return jsonify({"success": False, "error": str(e)}), 500
+        error_msg = f"刷新订阅失败: {str(e)}"
+        logger.error(error_msg)
+        initialization_error = error_msg
+        return jsonify({"success": False, "error": error_msg}), 500
 
 @app.route("/health", methods=["GET"])
 def health_check():
@@ -130,6 +185,14 @@ def health_check():
 @app.route('/proxy/<path:path>', methods=['GET', 'POST', 'PUT', 'DELETE', 'OPTIONS', 'HEAD', 'PATCH'])
 def proxy_request(path):
     """代理请求转发到Clash Core"""
+    global clash_manager, initialization_error
+    
+    if clash_manager is None:
+        return jsonify({
+            "success": False, 
+            "error": f"Clash代理未启动: {initialization_error or '未知错误'}"
+        }), 503
+    
     target_url = f"http://127.0.0.1:{CLASH_PROXY_PORT}/{path}"
     logger.debug(f"转发请求到: {target_url}")
     
@@ -165,15 +228,42 @@ def proxy_root():
 @app.route('/', methods=['GET'])
 def index():
     """首页 - 提供简单说明"""
-    return """
+    global initialization_error
+    
+    status = "运行中" if initialization_error is None else "初始化失败"
+    error_msg = "" if initialization_error is None else f"<p style='color:red'>错误: {initialization_error}</p>"
+    
+    return f"""
     <html>
-        <head><title>Simple Clash Relay</title></head>
+        <head>
+            <title>Simple Clash Relay</title>
+            <style>
+                body {{ font-family: Arial, sans-serif; padding: 20px; }}
+                h1 {{ color: #333; }}
+                .status {{ padding: 10px; border-radius: 5px; display: inline-block; }}
+                .running {{ background-color: #dff0d8; color: #3c763d; }}
+                .error {{ background-color: #f2dede; color: #a94442; }}
+                .container {{ max-width: 800px; margin: 0 auto; }}
+            </style>
+        </head>
         <body>
-            <h1>Simple Clash Relay</h1>
-            <p>状态: 运行中</p>
-            <p>API端点: /api/*</p>
-            <p>代理端点: /proxy</p>
-            <p>更多信息请查看文档。</p>
+            <div class='container'>
+                <h1>Simple Clash Relay</h1>
+                <p>状态: <span class='status {"running" if initialization_error is None else "error"}'>{status}</span></p>
+                {error_msg}
+                <h2>功能</h2>
+                <ul>
+                    <li>API端点: /api/* (需要认证)</li>
+                    <li>代理端点: /proxy</li>
+                    <li>健康检查: /health</li>
+                </ul>
+                <h2>操作</h2>
+                <p><a href='/api/refresh'>刷新订阅</a> (需要认证)</p>
+                <p><a href='/api/nodes'>查看可用节点</a> (需要认证)</p>
+                <p><a href='/api/current'>查看当前节点</a> (需要认证)</p>
+                <h2>帮助</h2>
+                <p>更多信息请查看 <a href='https://github.com/yourusername/simple-clash-relay'>文档</a>。</p>
+            </div>
         </body>
     </html>
     """

app/sub_manager.py

@@ -117,6 +117,16 @@ class SubscriptionManager:
             RuntimeError: 如果转换失败
         """
         logger.info(f"正在将订阅转换为Clash配置")
+        logger.info(f"输入文件: {input_file}, 配置路径: {self.config_path}")
+        
+        # 确保数据目录存在
+        data_dir = os.path.dirname(self.config_path)
+        if not os.path.exists(data_dir):
+            logger.info(f"创建数据目录: {data_dir}")
+            try:
+                os.makedirs(data_dir, exist_ok=True)
+            except Exception as e:
+                logger.error(f"创建数据目录失败: {str(e)}")
         
         # 准备subconverter命令
         cmd = [
@@ -128,13 +138,25 @@ class SubscriptionManager:
             "--include-remarks", ".*"  # 包含所有节点
         ]
         
+        logger.info(f"执行命令: {' '.join(cmd)}")
+        
         # 如果subconverter不存在或执行出错，我们就尝试直接使用订阅内容
         if not os.path.exists(self.subconverter_path):
             logger.warning("subconverter不存在，尝试直接使用订阅内容")
-            with open(input_file, "r", encoding="utf-8") as f:
-                content = f.read()
-            with open(self.config_path, "w", encoding="utf-8") as f:
-                f.write(content)
+            try:
+                with open(input_file, "r", encoding="utf-8") as f:
+                    content = f.read()
+                with open(self.config_path, "w", encoding="utf-8") as f:
+                    f.write(content)
+                logger.info(f"已将订阅内容直接写入到: {self.config_path}")
+                # 验证文件是否成功写入
+                if os.path.exists(self.config_path):
+                    logger.info(f"文件已成功写入，大小: {os.path.getsize(self.config_path)} 字节")
+                else:
+                    logger.error(f"文件写入失败，{self.config_path} 不存在")
+            except Exception as e:
+                logger.error(f"直接使用订阅内容时出错: {str(e)}")
+                raise RuntimeError(f"写入配置文件失败: {str(e)}")
             return
         
         try:
@@ -147,16 +169,56 @@ class SubscriptionManager:
             )
             stdout, stderr = process.communicate(timeout=30)
             
+            logger.info(f"subconverter输出: {stdout[:200]}...") # 限制日志长度
+            
             if process.returncode != 0:
                 logger.error(f"subconverter执行失败: {stderr}")
                 # 错误处理：尝试直接使用订阅内容
-                with open(input_file, "r", encoding="utf-8") as f:
-                    content = f.read()
-                with open(self.config_path, "w", encoding="utf-8") as f:
-                    f.write(content)
-                logger.warning("尝试直接使用订阅内容作为配置文件")
+                try:
+                    with open(input_file, "r", encoding="utf-8") as f:
+                        content = f.read()
+                    with open(self.config_path, "w", encoding="utf-8") as f:
+                        f.write(content)
+                    logger.warning("尝试直接使用订阅内容作为配置文件")
+                    # 验证文件是否成功写入
+                    if os.path.exists(self.config_path):
+                        logger.info(f"文件已成功写入，大小: {os.path.getsize(self.config_path)} 字节")
+                    else:
+                        logger.error(f"文件写入失败，{self.config_path} 不存在")
+                except Exception as e:
+                    logger.error(f"使用订阅内容作为配置文件时出错: {str(e)}")
+                    raise RuntimeError(f"写入配置文件失败: {str(e)}")
             else:
                 logger.info("成功转换配置")
+                # 验证输出文件是否存在
+                if os.path.exists(self.config_path):
+                    logger.info(f"配置文件已生成，路径: {self.config_path}，大小: {os.path.getsize(self.config_path)} 字节")
+                else:
+                    # 如果文件不存在但subconverter返回成功，尝试查找配置文件
+                    logger.warning(f"subconverter声称成功但配置文件不存在: {self.config_path}")
+                    # 查找当前目录下可能生成的配置文件
+                    possible_files = [f for f in os.listdir('.') if f.endswith('.yaml') or f.endswith('.yml')]
+                    if possible_files:
+                        logger.info(f"找到可能的配置文件: {possible_files}")
+                        # 尝试复制找到的第一个文件
+                        try:
+                            import shutil
+                            shutil.copy(possible_files[0], self.config_path)
+                            logger.info(f"已复制 {possible_files[0]} 到 {self.config_path}")
+                        except Exception as e:
+                            logger.error(f"复制文件失败: {str(e)}")
+                    else:
+                        logger.error("未找到任何可能的配置文件")
+                        # 尝试使用原始订阅内容作为配置
+                        try:
+                            with open(input_file, "r", encoding="utf-8") as f:
+                                content = f.read()
+                            with open(self.config_path, "w", encoding="utf-8") as f:
+                                f.write(content)
+                            logger.warning("使用订阅内容作为配置文件")
+                        except Exception as e:
+                            logger.error(f"使用订阅内容时出错: {str(e)}")
+                            raise RuntimeError(f"写入配置文件失败: {str(e)}")
         
         except (subprocess.SubprocessError, OSError) as e:
             logger.error(f"执行subconverter时出错: {str(e)}")

subconverter/base/clash.yaml

@@ -0,0 +1,30 @@
+port: 7890
+socks-port: 7891
+mixed-port: 7890
+allow-lan: true
+mode: Rule
+log-level: info
+external-controller: 127.0.0.1:9090
+secret: ""
+dns:
+  enable: true
+  listen: 0.0.0.0:53
+  default-nameserver:
+    - 223.5.5.5
+    - 119.29.29.29
+  nameserver:
+    - 223.5.5.5
+    - 119.29.29.29
+  fallback: []
+  fake-ip-range: 198.18.0.1/16
+  use-hosts: true
+proxies:
+# 此处将被节点内容替换
+proxy-groups:
+  - name: GLOBAL
+    type: select
+    proxies:
+      - DIRECT
+# 此处将被策略组替换
+rules:
+# 此处将被规则替换 

subconverter/templates/clash/config.yaml

@@ -0,0 +1,28 @@
+{% if request.target == "clash" or request.target == "clashr" %}
+port: {{ default(local.clash.http_port, "7890") }}
+socks-port: {{ default(local.clash.socks_port, "7891") }}
+mixed-port: {{ default(local.clash.mixed_port, "7890") }}
+allow-lan: {{ default(local.clash.allow_lan, "true") }}
+mode: Rule
+log-level: {{ default(local.clash.log_level, "info") }}
+external-controller: {{ default(local.clash.api_port, "0.0.0.0:9090") }}
+secret: {{ default(local.clash.api_secret, "") }}
+
+{% if local.clash.new_field_name == "true" %}
+dns:
+  enable: {{ default(local.clash.dns, "true") }}
+  listen: 0.0.0.0:53
+  nameserver:
+    - 223.5.5.5
+    - 119.29.29.29
+  fallback:
+    - 8.8.8.8
+    - 8.8.4.4
+{% endif %}
+
+proxies: ~
+
+proxy-groups: ~
+
+rules: ~
+{% endif %} 

subconverter/templates/clash/surge.yaml

@@ -0,0 +1,17 @@
+{% if request.target == "surge" %}
+[General]
+loglevel = notify
+bypass-system = true
+skip-proxy = 127.0.0.1,192.168.0.0/16,10.0.0.0/8,172.16.0.0/12,100.64.0.0/10,localhost,*.local,e.crashlytics.com,captive.apple.com,::ffff:0:0:0:0/1,::ffff:128:0:0:0/1
+bypass-tun = 192.168.0.0/16,10.0.0.0/8,172.16.0.0/12
+dns-server = 119.29.29.29,223.5.5.5
+
+[Proxy]
+{{ getClashNodes(nodes) }}
+
+[Proxy Group]
+{{ getSurgeProxyGroups(groups) }}
+
+[Rule]
+{{ getSurgeRules(rules) }}
+{% endif %}