update

.gitignore

@@ -1 +1,10 @@
+
+.env
+.venv
+__pycache__
+*.log
+
+tools/
+
 test.sh
+test.py

Dockerfile

@@ -1,7 +1,7 @@
 ARG API_KEY
 ARG SUBSCRIBE_URLS
 
-FROM ghcr.io/astral-sh/uv:python3.12-bookworm
+FROM python:3.12
 
 RUN apt-get update && apt-get install -y --no-install-recommends dumb-init
 
@@ -12,11 +12,9 @@ ENV PATH="/home/user/.local/bin:$PATH"
 WORKDIR /app
 
 COPY --chown=user ./requirements.txt requirements.txt
-RUN uv venv -p 3.12
-RUN uv pip install --no-cache-dir --upgrade -r requirements.txt
+RUN pip install --no-cache-dir --upgrade -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple
 
 COPY --chown=user . /app
 ENTRYPOINT ["/usr/bin/dumb-init", "--", "/bin/bash", "start.sh"]
 
 # CMD ["uv", "run", "uvicorn", "app:asgi_app", "--host", "0.0.0.0", "--port", "7860"]
-

app.py

@@ -1,15 +1,28 @@
 import os
 import re
-import sys
 import yaml
-import requests
-from flask import Flask, Response, request
-from urllib.parse import urlencode
-from asgiref.wsgi import WsgiToAsgi
-
-app = Flask(__name__)
+import httpx
+import base64
+from dotenv import load_dotenv
+from fastapi import FastAPI, Response, HTTPException, Request
+
+HEADERS = {
+    'accept':           'application/json, text/plain, */*',
+    'accept-language':  'zh-CN',
+    'pragma':           'no-cache',
+    'sec-ch-ua':        '"Not?A_Brand";v="8", "Chromium";v="108"',
+    'sec-ch-ua-mobile': '?0',
+    'sec-ch-ua-platform': '"Windows"',
+    'sec-fetch-dest':   'empty',
+    'sec-fetch-mode':   'cors',
+    'sec-fetch-site':   'cross-site',
+    'user-agent':       'ClashforWindows/0.20.39',
+}
+
+app = FastAPI()
 
 # 从环境变量中获取密钥
+load_dotenv()
 API_KEY = os.environ.get('API_KEY')
 SUBSCRIBE_URLS = os.environ.get('SUBSCRIBE_URLS')  # 存储真实URL的变量
 
@@ -21,15 +34,15 @@ def subscribe_mixin(content: str) -> str:
 
         my_auto_group_name = "AI Unrestrict"
         regex_list = [
-            re.compile(r"美国", re.IGNORECASE),     # 美国 (不区分大小写)
-            re.compile(r"america", re.IGNORECASE),  # america (不区分大小写)
-            re.compile(r"us", re.IGNORECASE),       # us (不区分大小写)
-            re.compile(r"新加坡", re.IGNORECASE),   # 新加坡 (不区分大小写)
-            re.compile(r"singapore", re.IGNORECASE),  # singapore (不区分大小写)
-            re.compile(r"sg", re.IGNORECASE),       # sg (不区分大小写)
-            re.compile(r"加拿大", re.IGNORECASE),   # 加拿大 (不区分大小写)
-            re.compile(r"canada", re.IGNORECASE),   # canada (不区分大小写)
-            re.compile(r"ca", re.IGNORECASE),       # ca (不区分大小写)
+            re.compile(r"美国",         re.IGNORECASE),     
+            re.compile(r"america",      re.IGNORECASE),  
+            re.compile(r"us",           re.IGNORECASE),       
+            re.compile(r"新加坡",       re.IGNORECASE),   
+            re.compile(r"singapore",    re.IGNORECASE),  
+            re.compile(r"sg",           re.IGNORECASE),       
+            re.compile(r"加拿大",       re.IGNORECASE),   
+            re.compile(r"canada",       re.IGNORECASE),   
+            re.compile(r"ca",           re.IGNORECASE),       
         ]
         matching_proxies = []  # 用于存储匹配的代理名称
 
@@ -38,9 +51,9 @@ def subscribe_mixin(content: str) -> str:
             for proxy in d["proxies"]:
                 if "name" in proxy:
                     for regex in regex_list:
-                        if regex.search(proxy["name"]):  # 使用 re.search
+                        if regex.search(proxy["name"]):
                             matching_proxies.append(proxy["name"])
-                            break  # 匹配到一个 regex 就跳出循环，避免重复添加
+                            break
 
         # 2. 创建新的 proxy-group 对象
         new_proxy_group = {
@@ -58,56 +71,85 @@ def subscribe_mixin(content: str) -> str:
             # 4. 将 myAutoGroupName 添加到第一个 proxy-group 的 "proxies" 列表的最前面
             if d["proxy-groups"] and len(d["proxy-groups"]) > 0 and \
                "proxies" in d["proxy-groups"][0] and isinstance(d["proxy-groups"][0]["proxies"], list):
-                d["proxy-groups"][0]["proxies"].insert(0, my_auto_group_name)  # 使用 insert(0, ...)
+                d["proxy-groups"][0]["proxies"].insert(0, my_auto_group_name)
         else:
-            d["proxy-groups"] = [new_proxy_group]  # 如果 proxy-groups 不存在，则创建
+            d["proxy-groups"] = [new_proxy_group]
 
-        # 将修改后的字典转换回 YAML 字符串
-        modified_yaml = yaml.dump(d, allow_unicode=True, indent=2)  # 使用 yaml.dump
+        d.pop('socks-port', None)
+        modified_yaml = yaml.dump(d, allow_unicode=True, indent=2)
 
         return modified_yaml
 
     except yaml.YAMLError as e:
         print(f"YAML 解析错误：{e}")
-        return ""  # 或者抛出异常，根据你的需求
+        return ""
     except Exception as e:
         print(f"其他错误：{e}")
         return ""
 
 @app.get("/getsub")
-def read_subscribe():
+async def read_subscribe(request: Request, key: str):
     # 验证API Key
-    key = request.args.get('key')
     if key != API_KEY:
-        return {"error": "Unauthorized"}, 401
+        raise HTTPException(status_code=401, detail="Unauthorized")
 
     # 从环境变量获取URL列表
     if not SUBSCRIBE_URLS:
-        return {"error": "SUBSCRIBE_URLS not configured"}, 500
+        raise HTTPException(status_code=500, detail="SUBSCRIBE_URLS not configured")
     
     urls = SUBSCRIBE_URLS.split('\n')
-    cleaned_urls = [url.strip() for url in urls]
-    new_url = '|'.join(cleaned_urls)
-    encoded_url = urlencode({
+    proxy_urls = [
+        f'{request.base_url}proxy?encoded_url={base64.b64encode(url.encode()).decode()}' 
+        for url in urls 
+        if url.strip()
+    ]
+    merged_urls: str = '|'.join(proxy_urls)
+    args = {
         'target': 'clash',
-        'url': new_url
-    }) # Correct way to encode the URL
-    
-    target_url = f"http://127.0.0.1:25500/sub?{encoded_url}"
+        'url': merged_urls
+    }
     
+    async with httpx.AsyncClient() as client:
+        try:
+            resp = await client.get('http://127.0.0.1:25500/sub', params=args, headers=HEADERS)
+            resp.raise_for_status()
+            data = resp.text
+            data = subscribe_mixin(data)
+            return Response(content=data, media_type='text/yaml')
+        except httpx.RequestError as e:
+            raise HTTPException(status_code=500, detail=str(e))
+        except Exception as e:
+            raise HTTPException(status_code=500, detail=str(e))
+
+@app.get("/proxy")
+async def proxy_url(encoded_url: str):
+    '''
+    有一些订阅地址, 需要检测请求头. 
+    然而 tindy2013/subconverter 项目并不支持请求头配置.
+    所以将请求重定向到本服务中, 然后通过自定义请求头绕过.
+    '''
     try:
-        resp = requests.get(target_url)
-        resp.raise_for_status()  # Raise HTTPError for bad responses (4xx or 5xx)
-        data = resp.text
-        data = subscribe_mixin(data)
-        return Response(data, mimetype='text/yaml')
-    except requests.exceptions.RequestException as e:
-        return {"error": str(e)}, 500  # Handle request errors and return an error response
-
+        try:
+            decoded_bytes = base64.b64decode(encoded_url)
+            target_url = decoded_bytes.decode('utf-8')
+        except Exception as e:
+            raise HTTPException(status_code=400, detail="Invalid base64 encoding")
+
+        async with httpx.AsyncClient() as client:
+            response = await client.get(target_url, headers=HEADERS)
+            
+            return Response(
+                content=response.content,
+                status_code=response.status_code,
+                headers=dict(response.headers),
+                media_type=response.headers.get("content-type")
+            )
+            
+    except httpx.RequestError as e:
+        raise HTTPException(status_code=500, detail=f"Request failed: {str(e)}")
+    except Exception as e:
+        raise HTTPException(status_code=500, detail=f"Error: {str(e)}")
 
 @app.get("/")
-def read_root():
+async def read_root():
     return {"hello": 'world'}
-
-
-asgi_app = WsgiToAsgi(app)

requirements.txt

@@ -1,6 +1,7 @@
 
-flask
+httpx
+pydantic
+python-dotenv
 pyyaml
-asgiref
-requests
-uvicorn[standard]==0.17.*
+fastapi
+uvicorn[standard]

start.sh

@@ -1,11 +1,15 @@
 #!/bin/bash
 
+# 获取当前脚本所在的绝对路径
+SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
+
 # 后台运行 tail 进程
-cd /app/tools && tar -xf subconverter_linux64.tar.gz
-cd /app/tools/subconverter && ./subconverter >> /app/subconverter.log 2>&1 &
+cd "${SCRIPT_DIR}/tools" && tar -xf subconverter_linux64.tar.gz
+cd "${SCRIPT_DIR}/tools/subconverter" && ./subconverter >> "${SCRIPT_DIR}/subconverter.log" 2>&1 &
 
 # 运行 uvicorn 应用
-cd /app && uv run uvicorn app:asgi_app --host 0.0.0.0 --port 7860
+cd "${SCRIPT_DIR}"
+uvicorn app:app --host 0.0.0.0 --port 7860
 
 # (可选) 等待 tail 进程结束，但它通常不会结束
 # wait $!