Upload 4 files

app.py

@@ -1,4 +1,5 @@
 import os
+import os
 import json
 
 from fastapi import FastAPI, Request
@@ -10,13 +11,61 @@ import httpx
 UPSTREAM = f"http://127.0.0.1:{os.environ.get('TELEGRAM_UPSTREAM_PORT', '8081')}"
 app = FastAPI()
 
-@app.get("/")
+def _normalize_bot_api_file_path(raw_fp: str | None, token_enc: str | None) -> str:
+    if not raw_fp:
+        return ""
+
+    fp = str(raw_fp).replace("\\", "/").lstrip("/")
+
+    # 有些 Local Bot API Server 会把 token 段也带进 file_path，先把它裁掉
+    if token_enc:
+        marker = f"/{token_enc}/"
+        idx = fp.find(marker)
+        if idx >= 0:
+            fp = fp[idx + len(marker) :]
+        elif fp.startswith(f"{token_enc}/"):
+            fp = fp[len(token_enc) + 1 :]
+
+    parts = [p for p in fp.split("/") if p]
+    roots = {
+        "documents",
+        "photos",
+        "videos",
+        "video_notes",
+        "voice",
+        "audio",
+        "animation",
+        "animations",
+        "stickers",
+        "files",
+        "thumbnails",
+        "profile_photos",
+    }
+    for i, p in enumerate(parts):
+        if p in roots:
+            return "/".join(parts[i:])
+    return fp
+
+@app.get("/")
 async def root():
     return {"ok": True, "hint": "use /tg/ prefix, e.g. /tg/bot<TOKEN>/getMe"}
 
 @app.api_route("/tg/{path:path}", methods=["GET","POST","PUT","PATCH","DELETE","HEAD","OPTIONS"])
 async def proxy(path: str, request: Request):
-    url = f"{UPSTREAM}/{path}"
+    # 兜底：如果下游请求把 file_path 带成了“工作目录前缀”，这里直接改写成相对路径再转发给 telegram-bot-api
+    path_for_upstream = path.lstrip("/")
+    if path_for_upstream.startswith("file/"):
+        # 形如：file/bot<TOKEN>/<file_path>
+        # 我们只需要把 <file_path> 规范化成 documents/... 这种相对路径
+        rest = path_for_upstream[len("file/") :]
+        if rest.startswith("bot"):
+            token_enc = rest[3:].split("/", 1)[0] or None
+            after_bot = rest.split("/", 1)[1] if "/" in rest else ""
+            fixed = _normalize_bot_api_file_path(after_bot, token_enc)
+            if fixed:
+                path_for_upstream = f"file/bot{token_enc}/{fixed}"
+
+    url = f"{UPSTREAM}/{path_for_upstream}"
 
     params = list(request.query_params.multi_items())
 
@@ -30,8 +79,8 @@ async def proxy(path: str, request: Request):
     # 关键修复：
     # - Bot API 的 /bot... 响应是小 JSON（sendDocument/getFile/getMe），直接“读全量再返回”，避免流式上下文提前关闭导致空响应。
     # - Bot API 的 /file/... 响应是大文件，才需要流式透传。
-    is_file_download = path.startswith("file/") or path.startswith("/file/")
-    is_get_file = "/getFile" in ("/" + path)
+    is_file_download = path_for_upstream.startswith("file/")
+    is_get_file = "/getFile" in ("/" + path_for_upstream)
 
     passthrough_allow = {
         "content-type",
@@ -69,43 +118,19 @@ async def proxy(path: str, request: Request):
                     if isinstance(payload, dict) and payload.get("ok") is True and isinstance(payload.get("result"), dict):
                         result = payload.get("result") or {}
                         fp = result.get("file_path")
-                        if isinstance(fp, str) and fp:
-                            # 从 path 里提取 token（URL path 中是 url-encoded 的形式，正好能匹配 file_path 里的 token 段）
-                            token_enc = None
-                            p = path.lstrip("/")
-                            if p.startswith("bot"):
-                                token_enc = p[3:].split("/", 1)[0] or None
-
-                            raw_fp = fp.lstrip("/")
-                            # 优先用 “/<token>/” 作为分隔点，截掉前面的工作目录
-                            if token_enc:
-                                marker = f"/{token_enc}/"
-                                idx = raw_fp.find(marker)
-                                if idx >= 0:
-                                    raw_fp = raw_fp[idx + len(marker) :]
-                                elif raw_fp.startswith(f"{token_enc}/"):
-                                    raw_fp = raw_fp[len(token_enc) + 1 :]
-
-                            # 最终只保留常见的相对目录开头（documents/photos/videos/voice/audio/animations/stickers 等）
-                            for prefix in (
-                                "documents/",
-                                "photos/",
-                                "videos/",
-                                "video_notes/",
-                                "voice/",
-                                "audio/",
-                                "animations/",
-                                "stickers/",
-                                "profile_photos/",
-                                "thumbnails/",
-                            ):
-                                if raw_fp.startswith(prefix):
-                                    result["file_path"] = raw_fp
-                                    payload["result"] = result
-                                    body = json.dumps(payload, ensure_ascii=False).encode("utf-8")
-                                    # 确保 JSON 的 content-type 不被冲掉
-                                    resp_headers.setdefault("content-type", "application/json")
-                                    return Response(content=body, status_code=r.status_code, headers=resp_headers)
+                        token_enc = None
+                        p = path_for_upstream.lstrip("/")
+                        if p.startswith("bot"):
+                            token_enc = p[3:].split("/", 1)[0] or None
+
+                        fixed = _normalize_bot_api_file_path(fp if isinstance(fp, str) else None, token_enc)
+                        if fixed:
+                            result["file_path"] = fixed
+                            payload["result"] = result
+                            body = json.dumps(payload, ensure_ascii=False).encode("utf-8")
+                            # 确保 JSON 的 content-type 不被冲掉
+                            resp_headers.setdefault("content-type", "application/json")
+                            return Response(content=body, status_code=r.status_code, headers=resp_headers)
                 except Exception:
                     pass