Update app.py

app.py

@@ -1,10 +1,11 @@
 import os
+import requests
 import urllib.parse
-from flask import Flask, render_template, request, redirect, url_for, flash, jsonify
+from flask import Flask, render_template, request, redirect, url_for, flash, jsonify, Response
 from flask_login import LoginManager, UserMixin, login_user, logout_user, login_required, current_user
 from werkzeug.security import check_password_hash, generate_password_hash
 from dotenv import load_dotenv
-from converter import converter  # 导入自定义转换器
+import time
 
 # 加载环境变量
 load_dotenv()
@@ -37,6 +38,25 @@ users = {
     )
 }
 
+# 检查 subconverter 是否启动
+def check_subconverter():
+    max_retries = 10
+    for i in range(max_retries):
+        try:
+            response = requests.get('http://localhost:25500/version', timeout=2)
+            if response.status_code == 200:
+                print(f"Subconverter 服务已启动: {response.text}")
+                return True
+        except:
+            pass
+        print(f"等待 Subconverter 服务启动... ({i+1}/{max_retries})")
+        time.sleep(2)
+    print("警告: Subconverter 服务可能未正常启动")
+    return False
+
+# 应用启动时检查 subconverter 服务
+check_subconverter()
+
 @login_manager.user_loader
 def load_user(user_id):
     return users.get(user_id)
@@ -78,69 +98,60 @@ def convert():
     if not original_url:
         return jsonify({"status": "error", "message": "订阅链接不能为空"})
     
-    # 使用自定义转换器处理（处理整个转换逻辑）
     try:
-        # 使用本地转换器进行转换
-        result = converter.convert(original_url, target, backend_url)
+        # 检查subconverter服务是否可用
+        try:
+            version_check = requests.get('http://localhost:25500/version', timeout=2)
+            if version_check.status_code != 200:
+                return jsonify({"status": "error", "message": "订阅转换服务暂时不可用，请稍后再试"})
+        except:
+            return jsonify({"status": "error", "message": "订阅转换服务暂时不可用，请稍后再试"})
+        
+        # 构建转换请求参数
+        params = {
+            'target': target,
+            'url': original_url,
+            'insert': 'false',
+            'config': backend_url,
+            'emoji': 'true',
+            'list': 'false',
+            'xudp': 'false',
+            'udp': 'false',
+            'tfo': 'false',
+            'expand': 'true',
+            'scv': 'false',
+            'fdn': 'false',
+            'new_name': 'true'
+        }
+        
+        # 通过URL参数构建转换链接
+        base_url = request.host_url.rstrip('/')
+        convert_url = f"{base_url}/api/sub?{urllib.parse.urlencode(params)}"
+        
+        return jsonify({"status": "success", "result": convert_url})
         
-        # 如果转换失败
-        if result.get('status') == 'error':
-            return jsonify(result)
-            
-        # 如果返回的是字符串，说明是配置内容，我们需要将它放入临时文件并提供下载链接
-        # 但是在HF Space中，我们可以直接通过API返回内容
-        if isinstance(result.get('result'), str):
-            # 这里我们直接返回配置文件内容的下载链接
-            # 实际部署时，我们会添加一个下载路由
-            response_data = {
-                "status": "success", 
-                "message": "转换成功",
-                "result": f"/download?target={target}&token={_generate_download_token(original_url)}"
-            }
-            # 保存转换结果到会话中，用于下载
-            if not hasattr(current_user, 'conversion_results'):
-                current_user.conversion_results = {}
-            current_user.conversion_results[_generate_download_token(original_url)] = {
-                'content': result.get('result'),
-                'target': target
-            }
-            return jsonify(response_data)
-            
-        # 否则返回结果
-        return jsonify(result)
-            
     except Exception as e:
         return jsonify({"status": "error", "message": f"处理失败: {str(e)}"})
 
-def _generate_download_token(url):
-    """生成下载令牌，简单实现"""
-    import hashlib
-    import time
-    token = hashlib.md5(f"{url}:{time.time()}".encode()).hexdigest()
-    return token
-
-@app.route('/download')
-@login_required
-def download():
-    target = request.args.get('target', 'clash')
-    token = request.args.get('token', '')
-    
-    # 获取保存的转换结果
-    if not hasattr(current_user, 'conversion_results') or token not in current_user.conversion_results:
-        return "配置文件不存在或已过期", 404
+@app.route('/api/sub')
+def subscribe_api():
+    """代理 subconverter 的转换请求"""
+    try:
+        # 获取所有URL参数
+        params = request.args.to_dict()
         
-    result = current_user.conversion_results[token]
-    content = result['content']
-    
-    # 根据目标类型���置合适的文件名和MIME类型
-    filename = f"config_{target}.yaml" if target == 'clash' else f"config_{target}.txt"
-    mimetype = 'application/x-yaml' if target == 'clash' else 'text/plain'
-    
-    # 返回文件下载
-    from flask import Response
-    response = Response(content, mimetype=mimetype)
-    response.headers['Content-Disposition'] = f'attachment; filename="{filename}"'
-    return response
+        # 调用本地 subconverter 服务
+        sub_url = f"http://localhost:25500/sub?{urllib.parse.urlencode(params)}"
+        response = requests.get(sub_url, timeout=30)
+        
+        # 返回原始响应
+        return Response(
+            response.content,
+            status=response.status_code,
+            content_type=response.headers.get('Content-Type', 'text/plain')
+        )
+    except Exception as e:
+        return f"转换失败: {str(e)}", 500
 
 # 不要在这里调用 app.run()
 # 让 Hugging Face 的 WSGI 服务器来运行应用