1.3.9.04

【优化】
- 移除部分死代码

Author: UE-DND

src/services/github/RequestBatcher.ts

@@ -1,5 +1,4 @@
-import { logger, retry } from '@/utils';
-import type { RetryOptions } from '@/utils';
+import { logger } from '@/utils';
 import { createTimeWheel } from '@/utils/data-structures/TimeWheel';
 import type { TimeWheel } from '@/utils/data-structures/TimeWheel';
 
@@ -22,6 +21,17 @@ interface FingerprintData {
   hitCount: number;
 }
 
+/**
+ * 重试选项
+ */
+interface RetryOptions {
+  maxRetries: number;
+  backoff: (attempt: number) => number;
+  shouldRetry?: (error: unknown) => boolean;
+  onRetry?: (attempt: number, error: unknown) => void;
+  silent?: boolean;
+}
+
 /**
  * 请求批处理器类
  * 
@@ -60,6 +70,55 @@ export class RequestBatcher {
     return `${method}:${key}:${headerStr}`;
   }
 
+  /**
+   * 重试选项
+   */
+  private withRetry = async <T>(
+    fn: () => Promise<T>,
+    options: RetryOptions
+  ): Promise<T> => {
+    const {
+      maxRetries,
+      backoff,
+      shouldRetry = () => true,
+      onRetry,
+      silent = false
+    } = options;
+
+    let lastError: unknown = null;
+
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+      try {
+        const result = await fn();
+        if (attempt > 0) {
+          logger.debug(`操作在第 ${(attempt + 1).toString()} 次尝试后成功`);
+        }
+        return result;
+      } catch (error: unknown) {
+        lastError = error;
+
+        if (attempt < maxRetries && shouldRetry(error)) {
+          const delay = backoff(attempt);
+
+          if (onRetry !== undefined) {
+            onRetry(attempt, error);
+          }
+
+          if (!silent) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            logger.debug(`重试操作 (尝试 ${(attempt + 1).toString()}/${(maxRetries + 1).toString()})，延迟 ${delay.toString()}ms: ${errorMessage}`);
+          }
+
+          await new Promise(resolve => setTimeout(resolve, delay));
+        } else {
+          break;
+        }
+      }
+    }
+
+    throw lastError;
+  };
+
   /**
    * 将请求加入批处理队列
    * 
@@ -191,7 +250,7 @@ export class RequestBatcher {
 
     try {
       // 使用通用重试逻辑执行请求
-      const result = await retry.withRetry(executeRequest, retryOptions);
+      const result = await this.withRetry(executeRequest, retryOptions);
 
       // 缓存成功的请求结果
       if (!skipDeduplication) {

src/services/github/core/Auth.ts

@@ -1,10 +1,4 @@
 import { GitHubTokenManager } from '../TokenManager';
-import {
-  markProxyServiceFailed as proxyMarkServiceFailed,
-  getCurrentProxyService as proxyGetCurrentService,
-  resetFailedProxyServices as proxyResetFailedServices,
-  transformImageUrl as proxyTransformImageUrl
-} from '../proxy';
 import { ErrorManager } from '@/utils/error';
 import type { GitHubError } from '@/types/errors';
 import { shouldUseServerAPI } from '../config';
@@ -147,46 +141,6 @@ export function handleApiError(error: Response, endpoint: string, method = 'GET'
  * @param proxyUrl - 失败的代理服务URL
  * @returns void
  */
-export function markProxyServiceFailed(proxyUrl: string): void {
-  proxyMarkServiceFailed(proxyUrl);
-}
-
-/**
- * 获取当前使用的代理服务
- *
- * @returns 当前活跃的代理服务URL
- */
-export function getCurrentProxyService(): string {
-  return proxyGetCurrentService();
-}
-
-/**
- * 重置失败的代理服务记录
- *
- * 清除所有代理服务的失败标记，允许重新尝试使用。
- *
- * @returns void
- */
-export function resetFailedProxyServices(): void {
-  proxyResetFailedServices();
-}
-
-/**
- * 转换相对图片URL为绝对URL
- *
- * 将Markdown文件中的相对路径图片URL转换为可访问的绝对URL，
- * 根据useTokenMode决定是否使用代理服务。
- *
- * @param src - 原始图片URL（可能是相对路径）
- * @param markdownFilePath - Markdown文件的路径
- * @param useTokenMode - 是否使用Token模式
- * @param branch - 分支名称（可选）
- * @returns 转换后的绝对URL，如果输入为undefined则返回undefined
- */
-export function transformImageUrl(src: string | undefined, markdownFilePath: string, useTokenMode: boolean, branch?: string): string | undefined {
-  return proxyTransformImageUrl(src, markdownFilePath, useTokenMode, branch);
-}
-
 /**
  * 获取 Token 管理器实例
  *

src/services/github/core/StatsService.ts

@@ -1,6 +1,5 @@
 import { CacheManager } from '../cache';
-import { getProxyHealthStats } from '../proxy';
-import { resetFailedProxyServices } from './Auth';
+import { getProxyHealthStats, resetFailedProxyServices } from '../proxy';
 
 // GitHub统计服务，使用模块导出而非类
 
@@ -46,4 +45,3 @@ export async function getNetworkStats(): Promise<{
     cache: getCacheStats()
   };
 }
-

src/utils/data-structures/TimeWheel.ts

@@ -281,15 +281,6 @@ export class TimeWheel<T> {
     };
   }
 
-  /**
-   * 销毁时间轮
-   * 
-   * 停止时钟并清空所有数据。
-   */
-  destroy(): void {
-    this.stop();
-    this.clear();
-  }
 }
 
 /**
@@ -307,4 +298,3 @@ export function createTimeWheel<T>(options?: {
   wheel.start();
   return wheel;
 }
-

src/utils/index.ts

@@ -39,9 +39,6 @@ export const pdf = {
 };
 
 
-// 重试工具
-import * as retryUtils from './retry/retryUtils';
-export const retry = retryUtils;
 
 // 请求管理工具
 import { requestManager as requestManagerInstance } from './request/requestManager';
@@ -101,7 +98,6 @@ export const performance = {
 
 };
 
-export type { RetryOptions } from './retry/retryUtils';
 export type { SmartCacheOptions } from './cache/SmartCache';
 export type { RequestOptions } from './request/requestManager';
 export type { ErrorHandlerOptions } from './error/errorHandler';