Upload 4 files

app.py

@@ -1,61 +1,78 @@
 import os
 
 from fastapi import FastAPI, Request
-from fastapi.responses import StreamingResponse
+from fastapi.responses import Response, StreamingResponse
 import httpx
 
 # 内部真实 Bot API Server（telegram-bot-api）监听端口
 # 注意：外网端口必须是 7860（HF 会检查），但 Bot API 可以只跑在容器内部端口（默认 8081）
 UPSTREAM = f"http://127.0.0.1:{os.environ.get('TELEGRAM_UPSTREAM_PORT', '8081')}"
 app = FastAPI()
-
+
 @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}"
-
-    params = list(request.query_params.multi_items())
-
-    headers = dict(request.headers)
-    headers.pop("host", None)
-
-    async def iter_request_body():
-        async for chunk in request.stream():
-            yield chunk
-
-    async with httpx.AsyncClient(timeout=None, follow_redirects=True) as client:
-        async with client.stream(
-            request.method,
-            url,
-            params=params,
-            headers=headers,
-            content=iter_request_body(),
-        ) as r:
-
-            passthrough_headers = {}
-            for k, v in r.headers.items():
-                lk = k.lower()
-                if lk in [
-                    "content-type",
-                    "content-length",
-                    "content-disposition",
-                    "accept-ranges",
-                    "content-range",
-                    "etag",
-                    "cache-control",
-                    "last-modified",
-                ]:
-                    passthrough_headers[k] = v
-
-            async def iter_response():
-                async for chunk in r.aiter_bytes():
-                    yield chunk
-
-            return StreamingResponse(
-                iter_response(),
-                status_code=r.status_code,
-                headers=passthrough_headers,
-            )
+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}"
+
+    params = list(request.query_params.multi_items())
+
+    headers = dict(request.headers)
+    headers.pop("host", None)
+
+    async def iter_request_body():
+        async for chunk in request.stream():
+            yield chunk
+
+    # 关键修复：
+    # - Bot API 的 /bot... 响应是小 JSON（sendDocument/getFile/getMe），直接“读全量再返回”，避免流式上下文提前关闭导致空响应。
+    # - Bot API 的 /file/... 响应是大文件，才需要流式透传。
+    is_file_download = path.startswith("file/") or path.startswith("/file/")
+
+    passthrough_allow = {
+        "content-type",
+        "content-length",
+        "content-disposition",
+        "accept-ranges",
+        "content-range",
+        "etag",
+        "cache-control",
+        "last-modified",
+    }
+
+    async with httpx.AsyncClient(timeout=None, follow_redirects=True) as client:
+        if not is_file_download:
+            r = await client.request(
+                request.method,
+                url,
+                params=params,
+                headers=headers,
+                content=iter_request_body(),
+            )
+            resp_headers = {k: v for k, v in r.headers.items() if k.lower() in passthrough_allow}
+            return Response(content=r.content, status_code=r.status_code, headers=resp_headers)
+
+        # /file/...：流式回传，必须保证上游连接在迭代期间保持打开
+        req = client.build_request(
+            request.method,
+            url,
+            params=params,
+            headers=headers,
+            content=iter_request_body(),
+        )
+        r = await client.send(req, stream=True)
+        resp_headers = {k: v for k, v in r.headers.items() if k.lower() in passthrough_allow}
+
+        async def iter_response():
+            try:
+                async for chunk in r.aiter_bytes():
+                    yield chunk
+            finally:
+                try:
+                    await r.aclose()
+                except Exception:
+                    pass
+
+        return StreamingResponse(iter_response(), status_code=r.status_code, headers=resp_headers)

start.sh

@@ -6,19 +6,14 @@ if [ -z "${TELEGRAM_API_ID}" ] || [ -z "${TELEGRAM_API_HASH}" ]; then
   exit 1
 fi
 
-# Hugging Face 外网只会检查一个端口（README.md 里的 app_port，通常是 7860）。
-# 所以“对外服务”（FastAPI/Uvicorn）必须监听 7860（或 $PORT）。
-# telegram-bot-api 可以只在容器内部跑（例如 8081），不需要对外暴露。
 PUBLIC_PORT="${PORT:-7860}"
 UPSTREAM_PORT="${TELEGRAM_UPSTREAM_PORT:-8081}"
 
-# Hugging Face 容器里最稳妥的可写目录是 /tmp
-# 你说“不用持久化也行”，所以把 Bot API 的数据也放 /tmp，避免因为权限导致反复重启
 WORK_DIR="${TELEGRAM_WORK_DIR:-/tmp/telegram-bot-api-data}"
 TEMP_DIR="${TELEGRAM_TEMP_DIR:-/tmp/telegram-bot-api-tmp}"
 mkdir -p "$WORK_DIR" "$TEMP_DIR"
 
-VERBOSITY="${TELEGRAM_VERBOSITY:-4}"
+VERBOSITY="${TELEGRAM_VERBOSITY:-2}"
 
 telegram-bot-api \
   --api-id="${TELEGRAM_API_ID}" \