Merge pull request #5 from xiaoti12/fix_base_url

fix: gemini base url未生效

Author: Wing900

services/llm/gemini/apiExecutor.ts

@@ -1,30 +1,6 @@
 import { GoogleGenAI, GenerateContentResponse } from "@google/genai";
 import { KeyManager } from '../../keyManager';
 
-/**
- * 将请求URL转换为代理URL（如果有配置）
- */
-function getProxiedUrl(urlString: string, apiEndpoint?: string): string {
-    if (!apiEndpoint?.trim()) return urlString;
-
-    try {
-        const proxyUrl = new URL(apiEndpoint);
-        if (urlString.includes('generativelanguage.googleapis.com')) {
-            const originalUrl = new URL(urlString);
-            const finalProxyUrl = new URL(proxyUrl);
-
-            const newPathname = (finalProxyUrl.pathname.replace(/\/$/, '') + originalUrl.pathname).replace(/\/\//g, '/');
-            finalProxyUrl.pathname = newPathname;
-            finalProxyUrl.search = originalUrl.search;
-
-            return finalProxyUrl.toString();
-        }
-    } catch (e) {
-        console.error("提供的 API Base URL 无效:", apiEndpoint, e);
-    }
-    return urlString;
-}
-
 /**
  * 打印400错误的详细分析
  */
@@ -81,7 +57,10 @@ export async function executeWithKeyRotation<T>(
         if (!key) continue;
 
         try {
-            const ai = new GoogleGenAI({ apiKey: key });
+            const ai = new GoogleGenAI({
+                apiKey: key,
+                httpOptions: trimmedApiEndpoint ? { baseUrl: trimmedApiEndpoint } : undefined
+            });
             const result = await operation(ai);
             keyManager.saveSuccessIndex();
             return result;
@@ -118,14 +97,19 @@ export async function* executeStreamWithKeyRotation<T extends GenerateContentRes
         return;
     }
 
+    const trimmedApiEndpoint = apiEndpoint?.trim();
+
     let lastError: unknown = null;
     let success = false;
     for (let i = 0; i < keyManager.getTotalKeys(); i++) {
         const { key } = keyManager.getNextKey();
         if (!key) continue;
 
         try {
-            const ai = new GoogleGenAI({ apiKey: key });
+            const ai = new GoogleGenAI({
+                apiKey: key,
+                httpOptions: trimmedApiEndpoint ? { baseUrl: trimmedApiEndpoint } : undefined
+            });
             const stream = await operation(ai);
             keyManager.saveSuccessIndex();
             yield* stream;