From 85988ced87fdf8c604a82a4091d4dba211fc045d Mon Sep 17 00:00:00 2001
From: MarSeventh <1193267292@qq.com>
Date: Fri, 29 Aug 2025 15:25:04 +0800
Subject: [PATCH] =?UTF-8?q?Feat:=E6=94=AF=E6=8C=81IOS=E7=AB=AF=E6=92=AD?=
 =?UTF-8?q?=E6=94=BEtelegram=E6=B8=A0=E9=81=93=E5=A4=A7=E4=BD=93=E7=A7=AF?=
 =?UTF-8?q?=E8=A7=86=E9=A2=91=EF=BC=8C=E6=94=AF=E6=8C=81=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 functions/file/[[path]].js  | 41 ++++++++++++---------------
 functions/file/fileTools.js | 55 ++++++++-----------------------------
 2 files changed, 28 insertions(+), 68 deletions(-)

diff --git a/functions/file/[[path]].js b/functions/file/[[path]].js
index d350d67..6d24522 100644
--- a/functions/file/[[path]].js
+++ b/functions/file/[[path]].js
@@ -175,9 +175,7 @@ async function handleTelegramChunkedFile(context, imgRecord, encodedFileName, fi
     const headers = new Headers();
     setCommonHeaders(headers, encodedFileName, fileType, Referer, url);
     headers.set('Content-Length', totalSize.toString());
-
-    headers.append('Vary', 'Range');
-
+    
     // 添加ETag支持
     const etag = `"${metadata.TimeStamp || Date.now()}-${totalSize}"`;
     headers.set('ETag', etag);
@@ -270,27 +268,22 @@ async function handleTelegramChunkedFile(context, imgRecord, encodedFileName, fi
             }
         });
         
-// 设置Range相关头部
-if (isRangeRequest) {
-setRangeHeaders(headers, rangeStart, rangeEnd, totalSize);
-
-    // 明确告诉浏览器/CF：支持分段请求
-    headers.set('Accept-Ranges', 'bytes'); 
-
-    return new Response(stream, {
-        status: 206, // Partial Content
-        headers,
-    });
-} else {
-    // 关键：避免首个 200 整段被缓存，导致后续 Range 请求直接命中 200
-    headers.set('Cache-Control', 'no-store');  // 或 'max-age=0, must-revalidate'
-
-    return new Response(stream, {
-        status: 200,
-        headers,
-    });
-}
-
+        // 设置Range相关头部
+        if (isRangeRequest) {
+            setRangeHeaders(headers, rangeStart, rangeEnd, totalSize);
+            
+            return new Response(stream, {
+                status: 206, // Partial Content
+                headers,
+            });
+        } else {
+            headers.set('Cache-Control', 'no-store'); // 不缓存完整文件，避免 CDN 不支持 Range 请求
+            
+            return new Response(stream, {
+                status: 200,
+                headers,
+            });
+        }
         
     } catch (error) {
         return new Response(`Error: Failed to reconstruct chunked file - ${error.message}`, { status: 500 });
diff --git a/functions/file/fileTools.js b/functions/file/fileTools.js
index 52ddff0..2d48301 100644
--- a/functions/file/fileTools.js
+++ b/functions/file/fileTools.js
@@ -35,8 +35,7 @@ export function setCommonHeaders(headers, encodedFileName, fileType, Referer, ur
     headers.set('Content-Disposition', `inline; filename="${encodedFileName}"; filename*=UTF-8''${encodedFileName}`);
     headers.set('Access-Control-Allow-Origin', '*');
     headers.set('Accept-Ranges', 'bytes');
-
-    headers.append('Vary', 'Range');
+    headers.set('Vary', 'Range');
     
     if (fileType) {
         headers.set('Content-Type', fileType);
@@ -83,57 +82,25 @@ export async function getFileContent(request, targetUrl, max_retries = 2) {
     let retries = 0;
     while (retries <= max_retries) {
         try {
-            // 复制请求头，确保 Range / If-None-Match 等关键头被透传
-            const fwdHeaders = new Headers(request.headers);
-
-            // 显式兜底：有些运行时需要手动 set 一下
-            const range = request.headers.get("Range");
-            if (range) fwdHeaders.set("Range", range);
-
-            // 只允许 GET/HEAD 转发
-            const method = request.method === "HEAD" ? "HEAD" : "GET";
-
-            const upstreamReq = new Request(targetUrl, {
-                method,
-                headers: fwdHeaders,
-                redirect: "follow",
+            const response = await fetch(targetUrl, {
+                method: request.method,
+                headers: request.headers,
+                body: request.body,
             });
-
-            const upstreamRes = await fetch(upstreamReq);
-
-            if (upstreamRes.ok || upstreamRes.status === 304) {
-                const headers = new Headers(upstreamRes.headers);
-
-                // 关键：让缓存区分是否带 Range
-                headers.append("Vary", "Range");
-
-                // 如果是 Range 请求但上游仍返回 200，这里兜底改成 206
-                if (range && upstreamRes.status === 200) {
-                    headers.set("Accept-Ranges", "bytes");
-                    return new Response(upstreamRes.body, {
-                        status: 206,
-                        headers,
-                    });
-                }
-
-                return new Response(upstreamRes.body, {
-                    status: upstreamRes.status,
-                    statusText: upstreamRes.statusText,
-                    headers,
-                });
-            } else if (upstreamRes.status === 404) {
-                return new Response("Error: Image Not Found", { status: 404 });
+            if (response.ok || response.status === 304) {
+                return response;
+            } else if (response.status === 404) {
+                return new Response('Error: Image Not Found', { status: 404 });
             } else {
                 retries++;
             }
-        } catch (_err) {
+        } catch (error) {
             retries++;
         }
     }
     return null;
 }
 
-
 export function isTgChannel(imgRecord) {
     return imgRecord.metadata?.Channel === 'Telegram' || imgRecord.metadata?.Channel === 'TelegramNew';
 }
@@ -242,4 +209,4 @@ export async function returnWhiteListImg(url) {
             },
         });
     }
-}
+}
\ No newline at end of file