2.1.2

【优化】
- 更改代理策略：下载与 Raw content 预览直连 proxy

Author: UE-DND

src/hooks/useDownload.ts

@@ -20,7 +20,7 @@ import {
   type FolderDownloadEntry,
   type ZipOutputSink,
 } from "@/utils/download/folderZipPipeline";
-import { getForceServerProxy } from "@/services/github/config/ProxyForceManager";
+import { ProxyUrlTransformer } from "@/services/github/proxy";
 import { useI18n } from "@/contexts/I18nContext";
 
 /** 下载状态初始值 */
@@ -112,6 +112,14 @@ export const useDownload = (
 
   const hasBeenCancelled = () => isCancelledRef.current;
 
+  const getDirectProxyDownloadUrl = (sourceUrl: string): string => {
+    const proxyService = GitHub.Proxy.getCurrentProxyService();
+    if (proxyService.trim() === "") {
+      return sourceUrl;
+    }
+    return ProxyUrlTransformer.applyProxyToUrl(sourceUrl, proxyService);
+  };
+
   // 取消下载
   const cancelDownload = () => {
     if (!isDownloading) {
@@ -152,26 +160,13 @@ export const useDownload = (
 
     isCancelledRef.current = false;
     dispatch({ type: "SET_DOWNLOADING_FILE", path: item.path });
-
-    // 创建新的AbortController
     abortControllerRef.current = new AbortController();
     const signal = abortControllerRef.current.signal;
 
     try {
-      // 使用代理URL获取文件
-      let downloadUrl = item.download_url;
-
-      // 如果是非开发环境或启用了令牌模式，使用服务端API代理
-      if (getForceServerProxy()) {
-        downloadUrl = GitHub.Content.getServerRepoFileProxyUrl(
-          item.path,
-          GitHub.Branch.getCurrentBranch(),
-        );
-      }
-
+      const downloadUrl = getDirectProxyDownloadUrl(item.download_url);
       const response = await fetch(downloadUrl, { signal });
 
-      // 检查是否已取消 (ref可在异步期间被cancelDownload修改)
       if (hasBeenCancelled()) {
         logger.info("文件下载已取消");
         return;
@@ -186,14 +181,12 @@ export const useDownload = (
 
       const blob = await response.blob();
 
-      // 再次检查是否已取消 (ref可在异步期间被cancelDownload修改)
       if (hasBeenCancelled()) {
         logger.info("文件下载已取消");
         return;
       }
 
       saveAs(blob, item.name);
-
       logger.info(`文件下载成功: ${item.path}`);
     } catch (e: unknown) {
       const error = e as Error;
@@ -243,14 +236,7 @@ export const useDownload = (
             continue;
           }
 
-          // 如果是非开发环境或启用了令牌模式，使用服务端API代理
-          let downloadUrl = item.download_url;
-          if (getForceServerProxy()) {
-            downloadUrl = GitHub.Content.getServerRepoFileProxyUrl(
-              item.path,
-              GitHub.Branch.getCurrentBranch(),
-            );
-          }
+          const downloadUrl = getDirectProxyDownloadUrl(item.download_url);
 
           fileList.push({
             path: relativePath,

src/hooks/useFilePreview.ts

@@ -20,7 +20,6 @@ import {
   updateUrlWithHistory,
   hasPreviewParam,
 } from "@/utils/routing/urlManager";
-import { getForceServerProxy } from "@/services/github/config/ProxyForceManager";
 import { useI18n } from "@/contexts/I18nContext";
 
 /** 预览状态初始值 */
@@ -206,11 +205,9 @@ export const useFilePreview = (
       dispatch({ type: "RESET_PREVIEW" });
 
       try {
-        const currentBranch = GitHub.Branch.getCurrentBranch();
-        const proxyUrl = getForceServerProxy()
-          ? GitHub.Content.getServerRepoFileProxyUrl(item.path, currentBranch)
-          : (GitHub.Proxy.transformImageUrl(item.download_url, item.path, useTokenMode) ??
-            item.download_url);
+        const proxyUrl =
+          GitHub.Proxy.transformImageUrl(item.download_url, item.path, useTokenMode) ??
+          item.download_url;
 
         const fileNameLower = item.name.toLowerCase();
         const isCurrentTarget = (): boolean => currentPreviewItemRef.current?.path === targetPath;
@@ -286,10 +283,7 @@ export const useFilePreview = (
           try {
             await pdf.openPDFPreview({
               fileName: item.name,
-              downloadUrl: item.download_url,
-              serverProxyUrl: getForceServerProxy()
-                ? GitHub.Content.getServerRepoFileProxyUrl(item.path, currentBranch)
-                : undefined,
+              downloadUrl: proxyUrl,
               theme: muiTheme,
               translations: {
                 loading: t("ui.pdf.loading"),

src/services/github/core/content/service.test.ts

@@ -2,8 +2,12 @@ import { beforeEach, describe, expect, it, vi } from "vite-plus/test";
 
 import { createAbortError } from "@/utils/network/abort";
 
-const { axiosGetMock } = vi.hoisted(() => ({
+const { axiosGetMock, getCurrentProxyServiceMock, applyProxyToUrlMock } = vi.hoisted(() => ({
   axiosGetMock: vi.fn(),
+  getCurrentProxyServiceMock: vi.fn(() => "https://proxy.example.com"),
+  applyProxyToUrlMock: vi.fn(
+    (url: string, proxyUrl: string) => `${proxyUrl}/${url.replace(/^https?:\/\//u, "")}`,
+  ),
 }));
 
 vi.mock("axios", () => ({
@@ -43,6 +47,13 @@ vi.mock("../../schemas", () => ({
   validateGitHubContentsArray: vi.fn(() => ({ isValid: true, invalidItems: [] })),
 }));
 
+vi.mock("../../proxy", () => ({
+  getCurrentProxyService: getCurrentProxyServiceMock,
+  ProxyUrlTransformer: {
+    applyProxyToUrl: applyProxyToUrlMock,
+  },
+}));
+
 vi.mock("./cacheState", () => ({
   ensureCacheInitialized: vi.fn(async () => {}),
   getCachedDirectoryContents: vi.fn(async () => null),
@@ -67,7 +78,7 @@ if (typeof window === "undefined") {
   vi.stubGlobal("window", globalThis);
 }
 
-import { shouldUseServerAPI } from "../../config";
+import { getForceServerProxy, shouldUseServerAPI } from "../../config";
 const { clearBatcherCache, getContents, getFileContent } = await import("./service");
 
 describe("content service abort handling", () => {
@@ -77,6 +88,11 @@ describe("content service abort handling", () => {
     vi.stubGlobal("window", globalThis);
     clearBatcherCache();
     vi.mocked(shouldUseServerAPI).mockReturnValue(false);
+    vi.mocked(getForceServerProxy).mockReturnValue(false);
+    getCurrentProxyServiceMock.mockReturnValue("https://proxy.example.com");
+    applyProxyToUrlMock.mockImplementation(
+      (url: string, proxyUrl: string) => `${proxyUrl}/${url.replace(/^https?:\/\//u, "")}`,
+    );
   });
 
   it("propagates abort to direct fetch requests", async () => {
@@ -176,4 +192,56 @@ describe("content service abort handling", () => {
     await expect(promise).rejects.toMatchObject({ name: "AbortError" });
     expect(fetchSignal?.aborted).toBe(true);
   });
+
+  it("prefers direct proxy URL for file content requests", async () => {
+    const fetchMock = vi.fn(async () => ({
+      ok: true,
+      status: 200,
+      statusText: "OK",
+      text: async () => "proxy content",
+    }));
+    vi.stubGlobal("fetch", fetchMock);
+
+    const content = await getFileContent(
+      "https://raw.githubusercontent.com/test-owner/test-repo/main/docs/readme.md",
+    );
+
+    expect(content).toBe("proxy content");
+    expect(fetchMock).toHaveBeenCalledTimes(1);
+    expect(fetchMock.mock.calls[0]?.[0]).toBe(
+      "https://proxy.example.com/raw.githubusercontent.com/test-owner/test-repo/main/docs/readme.md",
+    );
+  });
+
+  it("falls back to server API when direct proxy request fails in force mode", async () => {
+    vi.mocked(getForceServerProxy).mockReturnValue(true);
+    const fetchMock = vi
+      .fn()
+      .mockResolvedValueOnce({
+        ok: false,
+        status: 502,
+        statusText: "Bad Gateway",
+        text: async () => "",
+      })
+      .mockResolvedValueOnce({
+        ok: true,
+        status: 200,
+        statusText: "OK",
+        text: async () => "fallback content",
+      });
+    vi.stubGlobal("fetch", fetchMock);
+
+    const content = await getFileContent(
+      "https://raw.githubusercontent.com/test-owner/test-repo/main/docs/readme.md",
+    );
+
+    expect(content).toBe("fallback content");
+    expect(fetchMock).toHaveBeenCalledTimes(2);
+    expect(fetchMock.mock.calls[0]?.[0]).toBe(
+      "https://proxy.example.com/raw.githubusercontent.com/test-owner/test-repo/main/docs/readme.md",
+    );
+    expect(String(fetchMock.mock.calls[1]?.[0] ?? "")).toContain(
+      "/api/github?action=getGitHubAsset&url=",
+    );
+  });
 });

src/services/github/core/content/service.ts

@@ -13,7 +13,8 @@ import {
   validateGitHubContentsArray,
 } from "../../schemas";
 import { getAuthHeaders } from "../Auth";
-import { USE_TOKEN_MODE, getApiUrl, getCurrentBranch } from "../Config";
+import { getApiUrl, getCurrentBranch } from "../Config";
+import { getCurrentProxyService, ProxyUrlTransformer } from "../../proxy";
 import {
   ensureCacheInitialized,
   getCachedDirectoryContents,
@@ -198,33 +199,37 @@ export async function getFileContent(fileUrl: string, signal?: AbortSignal): Pro
   }
 
   try {
-    const response = await (async () => {
-      if (getForceServerProxy()) {
-        const serverApiUrl = buildServerApiUrlForGitHubResource(fileUrl, branch);
-        return fetch(serverApiUrl, {
-          signal,
-        });
+    const fetchTextByUrl = async (targetUrl: string): Promise<string> => {
+      const response = await fetch(targetUrl, { signal });
+      if (!response.ok) {
+        throw new Error(`HTTP ${response.status.toString()}: ${response.statusText}`);
       }
-
-      let proxyUrl: string;
-      if (fileUrl.includes("raw.githubusercontent.com")) {
-        proxyUrl = fileUrl.replace("https://raw.githubusercontent.com", "/github-raw");
-      } else {
-        proxyUrl = fileUrl;
+      return response.text();
+    };
+
+    const currentProxyService = getCurrentProxyService().trim();
+    const directProxyUrl =
+      currentProxyService === ""
+        ? fileUrl
+        : ProxyUrlTransformer.applyProxyToUrl(fileUrl, currentProxyService);
+
+    let content: string;
+    try {
+      content = await fetchTextByUrl(directProxyUrl);
+    } catch (directError) {
+      if (isAbortError(directError)) {
+        throw createAbortError("Request aborted");
       }
 
-      return fetch(proxyUrl, {
-        headers: USE_TOKEN_MODE ? getAuthHeaders() : {},
-        signal,
-      });
-    })();
+      if (!getForceServerProxy()) {
+        throw directError;
+      }
 
-    if (!response.ok) {
-      throw new Error(`HTTP ${response.status.toString()}: ${response.statusText}`);
+      const serverApiUrl = buildServerApiUrlForGitHubResource(fileUrl, branch);
+      logger.warn(`直连代理获取文件失败，回退服务端API: ${directProxyUrl}`);
+      content = await fetchTextByUrl(serverApiUrl);
     }
 
-    const content = await response.text();
-
     await storeFileContent(cacheKey, fileUrl, content);
 
     return content;

src/services/github/proxy/ProxyService.ts

@@ -1,10 +1,8 @@
 import { logger } from "@/utils";
 import { getProxyConfig, getRuntimeConfig } from "@/config";
 import { USE_TOKEN_MODE, PROXY_SERVICES } from "./ProxyConfig";
-import { getForceServerProxy } from "../config";
 import { proxyHealthManager } from "./ProxyHealthManager";
 import { ProxyUrlTransformer } from "./ProxyUrlTransformer";
-import { buildServerApiUrlForGitHubResource } from "../core/content/serverApiUrls";
 
 const proxyConfig = getProxyConfig();
 const runtimeConfig = getRuntimeConfig();
@@ -43,17 +41,12 @@ export async function getProxiedUrl(
     return url;
   }
 
-  // 优先使用服务端API代理
-  if (getForceServerProxy()) {
-    return buildServerApiUrlForGitHubResource(url);
-  }
-
   // 使用智能代理选择
   const bestProxy = proxyHealthManager.getBestProxy();
 
   if (bestProxy === "") {
-    logger.warn("没有可用代理，使用服务端API");
-    return buildServerApiUrlForGitHubResource(url);
+    logger.warn("没有可用代理，直接使用原始URL");
+    return url;
   }
 
   const proxiedUrl = ProxyUrlTransformer.applyProxyToUrl(url, bestProxy);
@@ -89,13 +82,9 @@ export function getProxiedUrlSync(url: string): string {
     return url;
   }
 
-  if (getForceServerProxy()) {
-    return buildServerApiUrlForGitHubResource(url);
-  }
-
   const bestProxy = proxyHealthManager.getBestProxy();
   if (bestProxy === "") {
-    return buildServerApiUrlForGitHubResource(url);
+    return url;
   }
 
   return ProxyUrlTransformer.applyProxyToUrl(url, bestProxy);

src/services/github/proxy/ProxyUrlTransformer.ts

@@ -1,8 +1,6 @@
 import { logger } from "@/utils";
 import { getGithubConfig, getRuntimeConfig } from "@/config";
 import { getCurrentBranch } from "../core/Config";
-import { getForceServerProxy } from "../config";
-import { buildGitHubAssetApiUrl } from "../core/content/serverApiUrls";
 
 const githubConfig = getGithubConfig();
 const runtimeConfig = getRuntimeConfig();
@@ -117,22 +115,6 @@ function transformImageUrl(
   try {
     const normalizedSrc = src.replace(/\\/g, "/");
 
-    if (getForceServerProxy() && normalizedSrc.startsWith("http")) {
-      try {
-        const host = new URL(normalizedSrc).hostname;
-        if (!isGithubHost(host)) {
-          logger.debug("强制模式下的非GitHub域名，直接返回原URL:", normalizedSrc);
-          return normalizedSrc;
-        }
-      } catch {
-        logger.warn("强制模式解析URL失败，按GitHub域名处理");
-      }
-
-      const proxyUrl = buildGitHubAssetApiUrl(normalizedSrc);
-      logger.debug("使用服务端API代理:", proxyUrl);
-      return proxyUrl;
-    }
-
     if (normalizedSrc.startsWith("http")) {
       try {
         const host = new URL(normalizedSrc).hostname;

src/utils/pdf/pdfPreviewHelper.ts

@@ -310,7 +310,7 @@ function createFallbackLink(downloadUrl: string): void {
  * ```
  */
 export async function openPDFPreview(options: PDFPreviewOptions): Promise<void> {
-  const { fileName, downloadUrl, serverProxyUrl, theme, translations, isDev = false } = options;
+  const { fileName, downloadUrl, serverProxyUrl, theme, translations } = options;
 
   // 初始化预览窗口
   const newTab = initializePDFWindow(fileName, theme, translations);
@@ -323,12 +323,8 @@ export async function openPDFPreview(options: PDFPreviewOptions): Promise<void>
 
   const themeColors = extractPDFThemeColors(theme);
 
-  // 根据环境选择下载 URL
-  const finalDownloadUrl =
-    serverProxyUrl ??
-    (isDev
-      ? downloadUrl
-      : `/api/github?action=getGitHubAsset&url=${encodeURIComponent(downloadUrl)}`);
+  // 优先使用显式代理URL，否则直接使用传入下载地址。
+  const finalDownloadUrl = serverProxyUrl ?? downloadUrl;
 
   // 下载并显示 PDF
   await downloadAndDisplayPDF(newTab, finalDownloadUrl, fileName, themeColors, translations);