feat: 多项修复与代码简化

文件改动:

src/utils/utils.js:
- 修复非思考模型识别: isEnableThinking() 从 endsWith 改为 includes 匹配 -thinking
- 修复工具参数 Schema: EXCLUDED_KEYS 新增 anyOf/oneOf/allOf 等过滤
- convertOpenAIToolsToAntigravity() 确保顶层有 type 和 properties
- 新增 prepareImageRequest() 统一图片请求处理
- 移除 httpAgent/httpsAgent，DNS 优化移至 httpClient.js
- 简化 getDefaultIp() 遍历所有网卡

src/server/index.js:
- 修复工具调用流式响应: tool_calls 添加 index 字段符合 OpenAI schema
- 使用 prepareImageRequest() 简化图片模型处理
- 使用 registerMemoryPoolCleanup() 简化内存清理

src/utils/httpClient.js (新增):
- 统一 HTTP 请求和 DNS 解析优化 (IPv4 优先回退 IPv6)

public/app.js:
- 前端额度显示不取整: percentage 从 toFixed(0) 改为 toFixed(2)
- 重构 createTokenFormBody() 提取表单生成逻辑

src/api/client.js:
- 引入 httpClient 统一 HTTP 请求处理
- 简化代码结构

src/utils/memoryManager.js:
- 新增 registerMemoryPoolCleanup() 工具函数

src/config/config.js:
- 新增 getProxyConfig() 导出

src/utils/configReloader.js:
- 移除重复的 getProxyConfig()，改为从 config.js 导入
- 默认 thinking_budget 从 16000 改为 1024

src/constants/oauth.js:
- 新增 OAUTH_SCOPES 常量统一管理

src/routes/sd.js:
- 使用 prepareImageRequest() 简化图片请求处理

scripts/oauth-server.js, scripts/refresh-tokens.js:
- 简化代码减少冗余

API.md:
- thinking_budget 支持设为 0 关闭思考预算限制

README.md:
- 默认 thinkingBudget 从 16000 改为 1024

API.md

@@ -162,7 +162,7 @@ curl http://localhost:8045/v1/chat/completions \
 | `top_p` | number | ❌ | Top P 参数，默认 1 |
 | `top_k` | number | ❌ | Top K 参数，默认 50 |
 | `max_tokens` | number | ❌ | 最大 token 数，默认 32000 |
-| `thinking_budget` | number | ❌ | 思考预算（仅对思考模型生效），范围 1024-32000，默认 16000 |
+| `thinking_budget` | number | ❌ | 思考预算（仅对思考模型生效），可为 0 或 1024-32000，默认 16000（0 表示关闭思考预算限制） |
 | `reasoning_effort` | string | ❌ | 思维链强度（OpenAI 格式），可选值：`low`(1024)、`medium`(16000)、`high`(32000) |
 | `tools` | array | ❌ | 工具列表（Function Calling） |
 

README.md

@@ -357,7 +357,7 @@ curl http://localhost:8045/v1/chat/completions \
     "topP": 1,                 // 默认 top_p
     "topK": 50,                // 默认 top_k
     "maxTokens": 32000,        // 默认最大 token 数
-    "thinkingBudget": 16000    // 默认思考预算（仅对思考模型生效，范围 1024-32000）
+    "thinkingBudget": 1024     // 默认思考预算（仅对思考模型生效，范围 1024-32000）
   },
   "cache": {
     "modelListTTL": 3600000    // 模型列表缓存时间（毫秒），默认 1 小时

public/app.js

@@ -221,17 +221,26 @@ function showOAuthModal() {
     modal.onclick = (e) => { if (e.target === modal) modal.remove(); };
 }
 
-function showManualModal() {
-    const modal = document.createElement('div');
-    modal.className = 'modal form-modal';
-    modal.innerHTML = `
+function createTokenFormBody({
+    title,
+    showAccess = true,
+    showRefresh = true,
+    showExpires = true
+} = {}) {
+    const parts = [];
+    if (showAccess) {
+        parts.push('<input type="text" id="modalAccessToken" placeholder="Access Token (必填)">');
+    }
+    if (showRefresh) {
+        parts.push('<input type="text" id="modalRefreshToken" placeholder="Refresh Token (必填)">');
+    }
+    if (showExpires) {
+        parts.push('<input type="number" id="modalExpiresIn" placeholder="过期时间(秒)" value="3599">');
+    }
+    return `
         <div class="modal-content">
-            <div class="modal-title">✏️ 手动填入Token</div>
-            <div class="form-row">
-                <input type="text" id="modalAccessToken" placeholder="Access Token (必填)">
-                <input type="text" id="modalRefreshToken" placeholder="Refresh Token (必填)">
-                <input type="number" id="modalExpiresIn" placeholder="过期时间(秒)" value="3599">
-            </div>
+            <div class="modal-title">${title}</div>
+            <div class="form-row">${parts.join('')}</div>
             <p style="font-size: 0.8rem; color: var(--text-light); margin-bottom: 12px;">💡 过期时间默认3599秒(约1小时)</p>
             <div class="modal-actions">
                 <button class="btn btn-secondary" onclick="this.closest('.modal').remove()">取消</button>
@@ -239,6 +248,12 @@ function showManualModal() {
             </div>
         </div>
     `;
+}
+
+function showManualModal() {
+    const modal = document.createElement('div');
+    modal.className = 'modal form-modal';
+    modal.innerHTML = createTokenFormBody({ title: '✏️ 手动填入Token' });
     document.body.appendChild(modal);
     modal.onclick = (e) => { if (e.target === modal) modal.remove(); };
 }
@@ -554,7 +569,8 @@ function renderQuotaSummary(summaryEl, quotaData) {
         }
     });
     
-    const percentage = (minQuota.remaining * 100).toFixed(0);
+    const percentage = minQuota.remaining * 100;
+    const percentageText = `${percentage.toFixed(2)}%`;
     const shortName = minModel.replace('models/', '').replace('publishers/google/', '').split('/').pop();
     const barColor = percentage > 50 ? '#10b981' : percentage > 20 ? '#f59e0b' : '#ef4444';
     
@@ -563,7 +579,7 @@ function renderQuotaSummary(summaryEl, quotaData) {
         <span class="quota-summary-icon">📊</span>
         <span class="quota-summary-model" title="${minModel}">${shortName}</span>
         <span class="quota-summary-bar"><span style="width:${percentage}%;background:${barColor}"></span></span>
-        <span class="quota-summary-pct">${percentage}%</span>
+        <span class="quota-summary-pct">${percentageText}</span>
     `;
 }
 
@@ -628,7 +644,8 @@ async function loadQuotaDetail(cardId, refreshToken) {
                 if (items.length === 0) return '';
                 let groupHtml = '';
                 items.forEach(({ modelId, quota }) => {
-                    const percentage = (quota.remaining * 100).toFixed(0);
+                    const percentage = quota.remaining * 100;
+                    const percentageText = `${percentage.toFixed(2)}%`;
                     const barColor = percentage > 50 ? '#10b981' : percentage > 20 ? '#f59e0b' : '#ef4444';
                     const shortName = modelId.replace('models/', '').replace('publishers/google/', '').split('/').pop();
                     // 紧凑的一行显示
@@ -637,7 +654,7 @@ async function loadQuotaDetail(cardId, refreshToken) {
                             <span class="quota-detail-icon">${icon}</span>
                             <span class="quota-detail-name">${shortName}</span>
                             <span class="quota-detail-bar"><span style="width:${percentage}%;background:${barColor}"></span></span>
-                            <span class="quota-detail-pct">${percentage}%</span>
+                            <span class="quota-detail-pct">${percentageText}</span>
                         </div>
                     `;
                 });
@@ -1120,7 +1137,8 @@ function renderQuotaModal(quotaContent, quotaData) {
         if (items.length === 0) return '';
         let groupHtml = `<div class="quota-group-title">${title}</div><div class="quota-grid">`;
         items.forEach(({ modelId, quota }) => {
-            const percentage = (quota.remaining * 100).toFixed(0);
+            const percentage = quota.remaining * 100;
+            const percentageText = `${percentage.toFixed(2)}%`;
             const barColor = percentage > 50 ? '#10b981' : percentage > 20 ? '#f59e0b' : '#ef4444';
             const shortName = modelId.replace('models/', '').replace('publishers/google/', '');
             groupHtml += `
@@ -1131,7 +1149,7 @@ function renderQuotaModal(quotaContent, quotaData) {
                     </div>
                     <div class="quota-info-row">
                         <span class="quota-reset">重置: ${quota.resetTime}</span>
-                        <span class="quota-percentage">${percentage}%</span>
+                        <span class="quota-percentage">${percentageText}</span>
                     </div>
                 </div>
             `;
@@ -1275,7 +1293,10 @@ document.getElementById('configForm').addEventListener('submit', async (e) => {
             else if (key === 'DEFAULT_TOP_P') jsonConfig.defaults.topP = parseFloat(value) || undefined;
             else if (key === 'DEFAULT_TOP_K') jsonConfig.defaults.topK = parseInt(value) || undefined;
             else if (key === 'DEFAULT_MAX_TOKENS') jsonConfig.defaults.maxTokens = parseInt(value) || undefined;
-            else if (key === 'DEFAULT_THINKING_BUDGET') jsonConfig.defaults.thinkingBudget = parseInt(value) || undefined;
+            else if (key === 'DEFAULT_THINKING_BUDGET') {
+                const num = parseInt(value);
+                jsonConfig.defaults.thinkingBudget = Number.isNaN(num) ? undefined : num;
+            }
             else if (key === 'TIMEOUT') jsonConfig.other.timeout = parseInt(value) || undefined;
             else if (key === 'SKIP_PROJECT_ID_FETCH') jsonConfig.other.skipProjectIdFetch = value === 'true';
             else if (key === 'ROTATION_STRATEGY') jsonConfig.rotation.strategy = value || undefined;

scripts/oauth-server.js

@@ -4,75 +4,57 @@ import crypto from 'crypto';
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import log from '../src/utils/logger.js';
 import axios from 'axios';
+import log from '../src/utils/logger.js';
 import config from '../src/config/config.js';
 import { generateProjectId } from '../src/utils/idGenerator.js';
+import tokenManager from '../src/auth/token_manager.js';
+import { OAUTH_CONFIG, OAUTH_SCOPES } from '../src/constants/oauth.js';
+import { buildAxiosRequestConfig } from '../src/utils/httpClient.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
+// 账号文件路径保持不变，仅用于日志展示，具体读写交给 TokenManager 处理
 const ACCOUNTS_FILE = path.join(__dirname, '..', 'data', 'accounts.json');
-
-const CLIENT_ID = '1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com';
-const CLIENT_SECRET = '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';
 const STATE = crypto.randomUUID();
 
-const SCOPES = [
-  'https://www.googleapis.com/auth/cloud-platform',
-  'https://www.googleapis.com/auth/userinfo.email',
-  'https://www.googleapis.com/auth/userinfo.profile',
-  'https://www.googleapis.com/auth/cclog',
-  'https://www.googleapis.com/auth/experimentsandconfigs'
-];
+const SCOPES = OAUTH_SCOPES;
 
 function generateAuthUrl(port) {
   const params = new URLSearchParams({
     access_type: 'offline',
-    client_id: CLIENT_ID,
+    client_id: OAUTH_CONFIG.CLIENT_ID,
     prompt: 'consent',
     redirect_uri: `http://localhost:${port}/oauth-callback`,
     response_type: 'code',
     scope: SCOPES.join(' '),
     state: STATE
   });
-  return `https://accounts.google.com/o/oauth2/v2/auth?${params.toString()}`;
-}
-
-function getAxiosConfig() {
-  const axiosConfig = { timeout: config.timeout };
-  if (config.proxy) {
-    const proxyUrl = new URL(config.proxy);
-    axiosConfig.proxy = {
-      protocol: proxyUrl.protocol.replace(':', ''),
-      host: proxyUrl.hostname,
-      port: parseInt(proxyUrl.port)
-    };
-  }
-  return axiosConfig;
+  return `${OAUTH_CONFIG.AUTH_URL}?${params.toString()}`;
 }
 
 async function exchangeCodeForToken(code, port) {
   const postData = new URLSearchParams({
     code,
-    client_id: CLIENT_ID,
-    client_secret: CLIENT_SECRET,
+    client_id: OAUTH_CONFIG.CLIENT_ID,
+    client_secret: OAUTH_CONFIG.CLIENT_SECRET,
     redirect_uri: `http://localhost:${port}/oauth-callback`,
     grant_type: 'authorization_code'
   });
   
-  const response = await axios({
+  const response = await axios(buildAxiosRequestConfig({
     method: 'POST',
-    url: 'https://oauth2.googleapis.com/token',
+    url: OAUTH_CONFIG.TOKEN_URL,
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     data: postData.toString(),
-    ...getAxiosConfig()
-  });
+    timeout: config.timeout
+  }));
   
   return response.data;
 }
 
 async function fetchUserEmail(accessToken) {
-  const response = await axios({
+  const response = await axios(buildAxiosRequestConfig({
     method: 'GET',
     url: 'https://www.googleapis.com/oauth2/v2/userinfo',
     headers: {
@@ -81,28 +63,11 @@ async function fetchUserEmail(accessToken) {
       'Authorization': `Bearer ${accessToken}`,
       'Accept-Encoding': 'gzip'
     },
-    ...getAxiosConfig()
-  });
+    timeout: config.timeout
+  }));
   return response.data?.email;
 }
 
-async function fetchProjectId(accessToken) {
-  const response = await axios({
-    method: 'POST',
-    url: 'https://daily-cloudcode-pa.sandbox.googleapis.com/v1internal:loadCodeAssist',
-    headers: {
-      'Host': 'daily-cloudcode-pa.sandbox.googleapis.com',
-      'User-Agent': 'antigravity/1.11.9 windows/amd64',
-      'Authorization': `Bearer ${accessToken}`,
-      'Content-Type': 'application/json',
-      'Accept-Encoding': 'gzip'
-    },
-    data: JSON.stringify({ metadata: { ideType: 'ANTIGRAVITY' } }),
-    ...getAxiosConfig()
-  });
-  return response.data?.cloudaicompanionProject;
-}
-
 const server = http.createServer((req, res) => {
   const port = server.address().port;
   const url = new URL(req.url, `http://localhost:${port}`);
@@ -138,7 +103,7 @@ const server = http.createServer((req, res) => {
         } else {
           log.info('正在验证账号资格...');
           try {
-            const projectId = await fetchProjectId(account.access_token);
+            const projectId = await tokenManager.fetchProjectId({ access_token: account.access_token });
             if (projectId === undefined) {
               log.warn('该账号无资格使用（无法获取projectId），已跳过保存');
               res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
@@ -158,26 +123,13 @@ const server = http.createServer((req, res) => {
           }
         }
         
-        let accounts = [];
-        try {
-          if (fs.existsSync(ACCOUNTS_FILE)) {
-            accounts = JSON.parse(fs.readFileSync(ACCOUNTS_FILE, 'utf-8'));
-          }
-        } catch (err) {
-          log.warn('读取 accounts.json 失败，将创建新文件');
-        }
-        
-        accounts.push(account);
-        
-        const dir = path.dirname(ACCOUNTS_FILE);
-        if (!fs.existsSync(dir)) {
-          fs.mkdirSync(dir, { recursive: true });
+        const result = tokenManager.addToken(account);
+        if (result.success) {
+          log.info(`Token 已保存到 ${ACCOUNTS_FILE}`);
+        } else {
+          log.error('保存 Token 失败:', result.message);
         }
         
-        fs.writeFileSync(ACCOUNTS_FILE, JSON.stringify(accounts, null, 2));
-        
-        log.info(`Token 已保存到 ${ACCOUNTS_FILE}`);
-        
         res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
         res.end('<h1>授权成功！</h1><p>Token 已保存，可以关闭此页面。</p>');
         

scripts/refresh-tokens.js

@@ -1,84 +1,52 @@
-import fs from 'fs';
-import path from 'path';
 import { fileURLToPath } from 'url';
+import path from 'path';
 import log from '../src/utils/logger.js';
+import tokenManager from '../src/auth/token_manager.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 const ACCOUNTS_FILE = path.join(__dirname, '..', 'data', 'accounts.json');
 
-const CLIENT_ID = '1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com';
-const CLIENT_SECRET = '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';
-
-async function refreshToken(refreshToken) {
-  const body = new URLSearchParams({
-    client_id: CLIENT_ID,
-    client_secret: CLIENT_SECRET,
-    grant_type: 'refresh_token',
-    refresh_token: refreshToken
-  });
-
-  const response = await fetch('https://oauth2.googleapis.com/token', {
-    method: 'POST',
-    headers: {
-      'Host': 'oauth2.googleapis.com',
-      'User-Agent': 'Go-http-client/1.1',
-      'Content-Length': body.toString().length.toString(),
-      'Content-Type': 'application/x-www-form-urlencoded',
-      'Accept-Encoding': 'gzip'
-    },
-    body: body.toString()
-  });
-
-  if (!response.ok) {
-    throw new Error(`HTTP ${response.status}: ${await response.text()}`);
-  }
-
-  return await response.json();
-}
-
 async function refreshAllTokens() {
-  if (!fs.existsSync(ACCOUNTS_FILE)) {
-    log.error(`文件不存在: ${ACCOUNTS_FILE}`);
-    process.exit(1);
+  const tokens = tokenManager.getTokenList();
+  if (!tokens || tokens.length === 0) {
+    log.warn('未找到可刷新账号');
+    return;
   }
 
-  const accounts = JSON.parse(fs.readFileSync(ACCOUNTS_FILE, 'utf-8'));
-  log.info(`找到 ${accounts.length} 个账号`);
+  log.info(`找到 ${tokens.length} 个账号`);
 
   let successCount = 0;
   let failCount = 0;
 
-  for (let i = 0; i < accounts.length; i++) {
-    const account = accounts[i];
-    
-    if (account.enable === false) {
+  for (let i = 0; i < tokens.length; i++) {
+    const token = tokens[i];
+
+    if (token.enable === false) {
       log.warn(`账号 ${i + 1}: 已禁用，跳过`);
       continue;
     }
 
     try {
       log.info(`刷新账号 ${i + 1}...`);
-      const tokenData = await refreshToken(account.refresh_token);
-      account.access_token = tokenData.access_token;
-      account.expires_in = tokenData.expires_in;
-      account.timestamp = Date.now();
-      
+      await tokenManager.refreshToken(token);
       successCount++;
       log.info(`账号 ${i + 1}: 刷新成功`);
     } catch (error) {
       failCount++;
+      const statusCode = error.statusCode;
       log.error(`账号 ${i + 1}: 刷新失败 - ${error.message}`);
-      
-      if (error.message.includes('invalid_grant') || error.message.includes('400')) {
-        account.enable = false;
+
+      // 对于 400/403 之类错误，统一禁用该账号，行为与运行时一致
+      if (statusCode === 400 || statusCode === 403) {
+        tokenManager.disableToken(token);
         log.warn(`账号 ${i + 1}: Token 已失效或错误，已自动禁用该账号`);
       }
     }
   }
 
-  fs.writeFileSync(ACCOUNTS_FILE, JSON.stringify(accounts, null, 2));
   log.info(`刷新完成: 成功 ${successCount} 个, 失败 ${failCount} 个`);
+  log.info(`账号文件路径: ${ACCOUNTS_FILE}`);
 }
 
 refreshAllTokens().catch(err => {

src/api/client.js

@@ -5,8 +5,8 @@ import { generateToolCallId } from '../utils/idGenerator.js';
 import AntigravityRequester from '../AntigravityRequester.js';
 import { saveBase64Image } from '../utils/imageStorage.js';
 import logger from '../utils/logger.js';
-import { httpAgent, httpsAgent } from '../utils/utils.js';
-import memoryManager, { MemoryPressure } from '../utils/memoryManager.js';
+import memoryManager, { MemoryPressure, registerMemoryPoolCleanup } from '../utils/memoryManager.js';
+import { buildAxiosRequestConfig } from '../utils/httpClient.js';
 
 // 请求客户端：优先使用 AntigravityRequester，失败则降级到 axios
 let requester = null;
@@ -136,17 +136,11 @@ const releaseToolCallObject = (obj) => {
 
 // 注册内存清理回调
 function registerMemoryCleanup() {
+  // 使用通用池清理工具，避免重复 while-pop 逻辑
+  registerMemoryPoolCleanup(toolCallPool, () => memoryManager.getPoolSizes().toolCall);
+  registerMemoryPoolCleanup(lineBufferPool, () => memoryManager.getPoolSizes().lineBuffer);
+
   memoryManager.registerCleanup((pressure) => {
-    const poolSizes = memoryManager.getPoolSizes();
-    
-    // 根据压力缩减对象池
-    while (toolCallPool.length > poolSizes.toolCall) {
-      toolCallPool.pop();
-    }
-    while (lineBufferPool.length > poolSizes.lineBuffer) {
-      lineBufferPool.pop();
-    }
-    
     // 高压力或紧急时清理模型缓存
     if (pressure === MemoryPressure.HIGH || pressure === MemoryPressure.CRITICAL) {
       const ttl = getModelCacheTTL();
@@ -183,21 +177,12 @@ function buildHeaders(token) {
 }
 
 function buildAxiosConfig(url, headers, body = null) {
-  const axiosConfig = {
+  return buildAxiosRequestConfig({
     method: 'POST',
     url,
     headers,
-    timeout: config.timeout,
-    // 使用自定义 DNS 解析的 Agent（优先 IPv4，失败则 IPv6）
-    httpAgent,
-    httpsAgent,
-    proxy: config.proxy ? (() => {
-      const proxyUrl = new URL(config.proxy);
-      return { protocol: proxyUrl.protocol.replace(':', ''), host: proxyUrl.hostname, port: parseInt(proxyUrl.port) };
-    })() : false
-  };
-  if (body !== null) axiosConfig.data = body;
-  return axiosConfig;
+    data: body
+  });
 }
 
 function buildRequesterConfig(headers, body = null) {
@@ -251,10 +236,10 @@ function convertToToolCall(functionCall) {
 // 解析并发送流式响应片段（会修改 state 并触发 callback）
 // 支持 DeepSeek 格式：思维链内容通过 reasoning_content 字段输出
 function parseAndEmitStreamChunk(line, state, callback) {
-  if (!line.startsWith('data: ')) return;
+  if (!line.startsWith(DATA_PREFIX)) return;
   
   try {
-    const data = JSON.parse(line.slice(6));
+    const data = JSON.parse(line.slice(DATA_PREFIX_LEN));
     //console.log(JSON.stringify(data));
     const parts = data.response?.candidates?.[0]?.content?.parts;
     
@@ -361,12 +346,29 @@ export async function generateAssistantResponse(requestBody, token, callback) {
   }
 }
 
+// 内部工具：从远端拉取完整模型原始数据
+async function fetchRawModels(headers, token) {
+  try {
+    if (useAxios) {
+      const response = await axios(buildAxiosConfig(config.api.modelsUrl, headers, {}));
+      return response.data;
+    }
+    const response = await requester.antigravity_fetch(config.api.modelsUrl, buildRequesterConfig(headers, {}));
+    if (response.status !== 200) {
+      const errorBody = await response.text();
+      throw { status: response.status, message: errorBody };
+    }
+    return await response.json();
+  } catch (error) {
+    await handleApiError(error, token);
+  }
+}
+
 export async function getAvailableModels() {
   // 检查缓存是否有效（动态 TTL）
   const now = Date.now();
   const ttl = getModelCacheTTL();
   if (modelListCache && (now - modelListCacheTime) < ttl) {
-    logger.info(`使用缓存的模型列表 (剩余有效期: ${Math.round((ttl - (now - modelListCacheTime)) / 1000)}秒)`);
     return modelListCache;
   }
   
@@ -378,63 +380,45 @@ export async function getAvailableModels() {
   }
   
   const headers = buildHeaders(token);
+  const data = await fetchRawModels(headers, token);
+  if (!data) {
+    // fetchRawModels 里已经做了统一错误处理，这里兜底为默认列表
+    return getDefaultModelList();
+  }
+
+  const created = Math.floor(Date.now() / 1000);
+  const modelList = Object.keys(data.models || {}).map(id => ({
+    id,
+    object: 'model',
+    created,
+    owned_by: 'google'
+  }));
   
-  try {
-    let data;
-    if (useAxios) {
-      data = (await axios(buildAxiosConfig(config.api.modelsUrl, headers, {}))).data;
-    } else {
-      const response = await requester.antigravity_fetch(config.api.modelsUrl, buildRequesterConfig(headers, {}));
-      if (response.status !== 200) {
-        const errorBody = await response.text();
-        throw { status: response.status, message: errorBody };
-      }
-      data = await response.json();
-    }
-    //console.log(JSON.stringify(data,null,2));
-    const created = Math.floor(Date.now() / 1000);
-    const modelList = Object.keys(data.models || {}).map(id => ({
-        id,
+  // 添加默认模型（如果 API 返回的列表中没有）
+  const existingIds = new Set(modelList.map(m => m.id));
+  for (const defaultModel of DEFAULT_MODELS) {
+    if (!existingIds.has(defaultModel)) {
+      modelList.push({
+        id: defaultModel,
         object: 'model',
         created,
         owned_by: 'google'
-      }));
-    
-    // 添加默认模型（如果 API 返回的列表中没有）
-    const existingIds = new Set(modelList.map(m => m.id));
-    for (const defaultModel of DEFAULT_MODELS) {
-      if (!existingIds.has(defaultModel)) {
-        modelList.push({
-          id: defaultModel,
-          object: 'model',
-          created,
-          owned_by: 'google'
-        });
-      }
-    }
-    
-    const result = {
-      object: 'list',
-      data: modelList
-    };
-    
-    // 更新缓存
-    modelListCache = result;
-    modelListCacheTime = now;
-    const currentTTL = getModelCacheTTL();
-    logger.info(`模型列表已缓存 (有效期: ${currentTTL / 1000}秒, 模型数量: ${modelList.length})`);
-    
-    return result;
-  } catch (error) {
-    // 如果请求失败但有缓存，返回过期的缓存
-    if (modelListCache) {
-      logger.warn(`获取模型列表失败，使用过期缓存: ${error.message}`);
-      return modelListCache;
+      });
     }
-    // 没有缓存时返回默认模型列表
-    logger.warn(`获取模型列表失败，返回默认模型列表: ${error.message}`);
-    return getDefaultModelList();
   }
+  
+  const result = {
+    object: 'list',
+    data: modelList
+  };
+  
+  // 更新缓存
+  modelListCache = result;
+  modelListCacheTime = now;
+  const currentTTL = getModelCacheTTL();
+  logger.info(`模型列表已缓存 (有效期: ${currentTTL / 1000}秒, 模型数量: ${modelList.length})`);
+  
+  return result;
 }
 
 // 清除模型列表缓存（可用于手动刷新）
@@ -446,34 +430,20 @@ export function clearModelListCache() {
 
 export async function getModelsWithQuotas(token) {
   const headers = buildHeaders(token);
-  
-  try {
-    let data;
-    if (useAxios) {
-      data = (await axios(buildAxiosConfig(config.api.modelsUrl, headers, {}))).data;
-    } else {
-      const response = await requester.antigravity_fetch(config.api.modelsUrl, buildRequesterConfig(headers, {}));
-      if (response.status !== 200) {
-        const errorBody = await response.text();
-        throw { status: response.status, message: errorBody };
-      }
-      data = await response.json();
+  const data = await fetchRawModels(headers, token);
+  if (!data) return {};
+
+  const quotas = {};
+  Object.entries(data.models || {}).forEach(([modelId, modelData]) => {
+    if (modelData.quotaInfo) {
+      quotas[modelId] = {
+        r: modelData.quotaInfo.remainingFraction,
+        t: modelData.quotaInfo.resetTime
+      };
     }
-    
-    const quotas = {};
-    Object.entries(data.models || {}).forEach(([modelId, modelData]) => {
-      if (modelData.quotaInfo) {
-        quotas[modelId] = {
-          r: modelData.quotaInfo.remainingFraction,
-          t: modelData.quotaInfo.resetTime
-        };
-      }
-    });
-    
-    return quotas;
-  } catch (error) {
-    await handleApiError(error, token);
-  }
+  });
+  
+  return quotas;
 }
 
 export async function generateAssistantResponseNoStream(requestBody, token) {

src/auth/token_manager.js

@@ -6,6 +6,7 @@ import { log } from '../utils/logger.js';
 import { generateSessionId, generateProjectId } from '../utils/idGenerator.js';
 import config, { getConfigJson } from '../config/config.js';
 import { OAUTH_CONFIG } from '../constants/oauth.js';
+import { buildAxiosRequestConfig } from '../utils/httpClient.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -109,7 +110,7 @@ class TokenManager {
   }
 
   async fetchProjectId(token) {
-    const response = await axios({
+    const response = await axios(buildAxiosRequestConfig({
       method: 'POST',
       url: 'https://daily-cloudcode-pa.sandbox.googleapis.com/v1internal:loadCodeAssist',
       headers: {
@@ -119,13 +120,8 @@ class TokenManager {
         'Content-Type': 'application/json',
         'Accept-Encoding': 'gzip'
       },
-      data: JSON.stringify({ metadata: { ideType: 'ANTIGRAVITY' } }),
-      timeout: config.timeout,
-      proxy: config.proxy ? (() => {
-        const proxyUrl = new URL(config.proxy);
-        return { protocol: proxyUrl.protocol.replace(':', ''), host: proxyUrl.hostname, port: parseInt(proxyUrl.port) };
-      })() : false
-    });
+      data: JSON.stringify({ metadata: { ideType: 'ANTIGRAVITY' } })
+    }));
     return response.data?.cloudaicompanionProject;
   }
 
@@ -145,7 +141,7 @@ class TokenManager {
     });
 
     try {
-      const response = await axios({
+      const response = await axios(buildAxiosRequestConfig({
         method: 'POST',
         url: OAUTH_CONFIG.TOKEN_URL,
         headers: {
@@ -154,13 +150,8 @@ class TokenManager {
           'Content-Type': 'application/x-www-form-urlencoded',
           'Accept-Encoding': 'gzip'
         },
-        data: body.toString(),
-        timeout: config.timeout,
-        proxy: config.proxy ? (() => {
-          const proxyUrl = new URL(config.proxy);
-          return { protocol: proxyUrl.protocol.replace(':', ''), host: proxyUrl.hostname, port: parseInt(proxyUrl.port) };
-        })() : false
-      });
+        data: body.toString()
+      }));
 
       token.access_token = response.data.access_token;
       token.expires_in = response.data.expires_in;

src/config/config.js

@@ -28,7 +28,7 @@ if (fs.existsSync(configJsonPath)) {
 dotenv.config();
 
 // 获取代理配置：优先使用 PROXY，其次使用系统代理环境变量
-function getProxyConfig() {
+export function getProxyConfig() {
   // 优先使用显式配置的 PROXY
   if (process.env.PROXY) {
     return process.env.PROXY;
@@ -77,7 +77,7 @@ const config = {
     top_p: jsonConfig.defaults?.topP || 0.85,
     top_k: jsonConfig.defaults?.topK || 50,
     max_tokens: jsonConfig.defaults?.maxTokens || 32000,
-    thinking_budget: jsonConfig.defaults?.thinkingBudget || 16000
+    thinking_budget: jsonConfig.defaults?.thinkingBudget ?? 1024
   },
   security: {
     maxRequestSize: jsonConfig.server?.maxRequestSize || '50mb',

src/constants/oauth.js

@@ -1,9 +1,19 @@
 /**
- * Google OAuth 凭证
- * 统一管理，避免在多个文件中重复定义
+ * Google OAuth 配置
+ * 统一管理，避免在多个文件中重复定义和硬编码
  */
 export const OAUTH_CONFIG = {
   CLIENT_ID: '1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com',
   CLIENT_SECRET: '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',
-  TOKEN_URL: 'https://oauth2.googleapis.com/token'
+  TOKEN_URL: 'https://oauth2.googleapis.com/token',
+  AUTH_URL: 'https://accounts.google.com/o/oauth2/v2/auth'
 };
+
+// 服务器端使用的默认 OAuth Scope 列表
+export const OAUTH_SCOPES = [
+  'https://www.googleapis.com/auth/cloud-platform',
+  'https://www.googleapis.com/auth/userinfo.email',
+  'https://www.googleapis.com/auth/userinfo.profile',
+  'https://www.googleapis.com/auth/cclog',
+  'https://www.googleapis.com/auth/experimentsandconfigs'
+];

src/routes/sd.js

@@ -1,6 +1,6 @@
 import express from 'express';
 import { getAvailableModels, generateImageForSD } from '../api/client.js';
-import { generateRequestBody } from '../utils/utils.js';
+import { generateRequestBody, prepareImageRequest } from '../utils/utils.js';
 import tokenManager from '../auth/token_manager.js';
 import logger from '../utils/logger.js';
 
@@ -72,12 +72,7 @@ const SD_MOCK_DATA = {
 function buildImageRequestBody(prompt, token) {
   const messages = [{ role: 'user', content: prompt }];
   const requestBody = generateRequestBody(messages, 'gemini-3-pro-image', {}, null, token);
-  requestBody.request.generationConfig = { candidateCount: 1 };
-  requestBody.requestType = 'image_gen';
-  delete requestBody.request.systemInstruction;
-  delete requestBody.request.tools;
-  delete requestBody.request.toolConfig;
-  return requestBody;
+  return prepareImageRequest(requestBody);
 }
 
 // GET 路由
@@ -141,12 +136,9 @@ router.post('/img2img', async (req, res) => {
     }
     
     const messages = [{ role: 'user', content }];
-    const requestBody = generateRequestBody(messages, 'gemini-3-pro-image', {}, null, token);
-    requestBody.request.generationConfig = { candidateCount: 1 };
-    requestBody.requestType = 'image_gen';
-    delete requestBody.request.systemInstruction;
-    delete requestBody.request.tools;
-    delete requestBody.request.toolConfig;
+    const requestBody = prepareImageRequest(
+      generateRequestBody(messages, 'gemini-3-pro-image', {}, null, token)
+    );
     
     const images = await generateImageForSD(requestBody, token);
     

src/server/index.js

@@ -3,13 +3,13 @@ import cors from 'cors';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { generateAssistantResponse, generateAssistantResponseNoStream, getAvailableModels, generateImageForSD, closeRequester } from '../api/client.js';
-import { generateRequestBody } from '../utils/utils.js';
+import { generateRequestBody, prepareImageRequest } from '../utils/utils.js';
 import logger from '../utils/logger.js';
 import config from '../config/config.js';
 import tokenManager from '../auth/token_manager.js';
 import adminRouter from '../routes/admin.js';
 import sdRouter from '../routes/sd.js';
-import memoryManager, { MemoryPressure } from '../utils/memoryManager.js';
+import memoryManager, { MemoryPressure, registerMemoryPoolCleanup } from '../utils/memoryManager.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -65,14 +65,8 @@ const releaseChunkObject = (obj) => {
   if (chunkPool.length < maxSize) chunkPool.push(obj);
 };
 
-// 注册内存清理回调
-memoryManager.registerCleanup((pressure) => {
-  const poolSizes = memoryManager.getPoolSizes();
-  // 根据压力缩减对象池
-  while (chunkPool.length > poolSizes.chunk) {
-    chunkPool.pop();
-  }
-});
+// 注册内存清理回调（使用统一工具收缩对象池）
+registerMemoryPoolCleanup(chunkPool, () => memoryManager.getPoolSizes().chunk);
 
 // 启动内存管理器
 memoryManager.start(30000);
@@ -193,17 +187,7 @@ app.post('/v1/chat/completions', async (req, res) => {
     const isImageModel = model.includes('-image');
     const requestBody = generateRequestBody(messages, model, params, tools, token);
     if (isImageModel) {
-      requestBody.request.generationConfig={
-        candidateCount: 1,
-        // imageConfig:{
-        //   aspectRatio: "1:1"
-        // }
-      }
-      requestBody.requestType="image_gen";
-      //requestBody.request.systemInstruction.parts[0].text += "现在你作为绘画模型聚焦于帮助用户生成图片";
-      delete requestBody.request.systemInstruction;
-      delete requestBody.request.tools;
-      delete requestBody.request.toolConfig;
+      prepareImageRequest(requestBody);
     }
     //console.log(JSON.stringify(requestBody,null,2))
     
@@ -233,7 +217,12 @@ app.post('/v1/chat/completions', async (req, res) => {
               writeStreamData(res, createStreamChunk(id, created, model, delta));
             } else if (data.type === 'tool_calls') {
               hasToolCall = true;
-              const delta = { tool_calls: data.tool_calls };
+              // OpenAI 流式 schema 要求每个 tool_call 带有 index 字段
+              const toolCallsWithIndex = data.tool_calls.map((toolCall, index) => ({
+                index,
+                ...toolCall
+              }));
+              const delta = { tool_calls: toolCallsWithIndex };
               writeStreamData(res, createStreamChunk(id, created, model, delta));
             } else {
               const delta = { content: data.content };

src/utils/configReloader.js

@@ -1,4 +1,4 @@
-import config, { getConfigJson } from '../config/config.js';
+import config, { getConfigJson, getProxyConfig } from '../config/config.js';
 
 /**
  * 配置字段映射表：config对象路径 -> config.json路径 / 环境变量
@@ -10,7 +10,7 @@ const CONFIG_MAPPING = [
   { target: 'defaults.top_p', source: 'defaults.topP', default: 0.85 },
   { target: 'defaults.top_k', source: 'defaults.topK', default: 50 },
   { target: 'defaults.max_tokens', source: 'defaults.maxTokens', default: 32000 },
-  { target: 'defaults.thinking_budget', source: 'defaults.thinkingBudget', default: 16000 },
+  { target: 'defaults.thinking_budget', source: 'defaults.thinkingBudget', default: 1024 },
   { target: 'timeout', source: 'other.timeout', default: 300000 },
   { target: 'skipProjectIdFetch', source: 'other.skipProjectIdFetch', default: false, transform: v => v === true },
   { target: 'maxImages', source: 'other.maxImages', default: 10 },
@@ -22,25 +22,6 @@ const CONFIG_MAPPING = [
   { target: 'api.userAgent', source: 'api.userAgent', default: 'antigravity/1.11.3 windows/amd64' }
 ];
 
-/**
- * 获取代理配置：优先使用 PROXY，其次使用系统代理环境变量
- */
-function getProxyConfig() {
-  // 优先使用显式配置的 PROXY
-  if (process.env.PROXY) {
-    return process.env.PROXY;
-  }
-  
-  // 检查系统代理环境变量（按优先级）
-  return process.env.HTTPS_PROXY ||
-         process.env.https_proxy ||
-         process.env.HTTP_PROXY ||
-         process.env.http_proxy ||
-         process.env.ALL_PROXY ||
-         process.env.all_proxy ||
-         null;
-}
-
 const ENV_MAPPING = [
   { target: 'security.apiKey', env: 'API_KEY', default: null },
   { target: 'systemInstruction', env: 'SYSTEM_INSTRUCTION', default: '' }

src/utils/httpClient.js

@@ -0,0 +1,70 @@
+import axios from 'axios';
+import dns from 'dns';
+import http from 'http';
+import https from 'https';
+import config from '../config/config.js';
+
+// ==================== DNS & 代理统一配置 ====================
+
+// 自定义 DNS 解析：优先 IPv4，失败则回退 IPv6
+function customLookup(hostname, options, callback) {
+  dns.lookup(hostname, { ...options, family: 4 }, (err4, address4, family4) => {
+    if (!err4 && address4) {
+      return callback(null, address4, family4);
+    }
+    dns.lookup(hostname, { ...options, family: 6 }, (err6, address6, family6) => {
+      if (!err6 && address6) {
+        return callback(null, address6, family6);
+      }
+      callback(err4 || err6);
+    });
+  });
+}
+
+// 使用自定义 DNS 解析的 Agent（优先 IPv4，失败则 IPv6）
+const httpAgent = new http.Agent({
+  lookup: customLookup,
+  keepAlive: true
+});
+
+const httpsAgent = new https.Agent({
+  lookup: customLookup,
+  keepAlive: true
+});
+
+// 统一构建代理配置
+function buildProxyConfig() {
+  if (!config.proxy) return false;
+  try {
+    const proxyUrl = new URL(config.proxy);
+    return {
+      protocol: proxyUrl.protocol.replace(':', ''),
+      host: proxyUrl.hostname,
+      port: parseInt(proxyUrl.port, 10)
+    };
+  } catch {
+    return false;
+  }
+}
+
+// 为 axios 构建统一请求配置
+export function buildAxiosRequestConfig({ method = 'POST', url, headers, data = null, timeout = config.timeout }) {
+  const axiosConfig = {
+    method,
+    url,
+    headers,
+    timeout,
+    httpAgent,
+    httpsAgent,
+    proxy: buildProxyConfig()
+  };
+
+  if (data !== null) axiosConfig.data = data;
+  return axiosConfig;
+}
+
+// 简单封装 axios 调用，方便后续统一扩展（重试、打点等）
+export async function httpRequest(configOverrides) {
+  const axiosConfig = buildAxiosRequestConfig(configOverrides);
+  return axios(axiosConfig);
+}

src/utils/memoryManager.js

@@ -265,4 +265,14 @@ class MemoryManager {
 // 单例导出
 const memoryManager = new MemoryManager();
 export default memoryManager;
+
+// 统一封装注册清理回调，方便在各模块中保持一致风格
+export function registerMemoryPoolCleanup(pool, getMaxSize) {
+  memoryManager.registerCleanup(() => {
+    const maxSize = getMaxSize();
+    while (pool.length > maxSize) {
+      pool.pop();
+    }
+  });
+}
 export { MemoryPressure, THRESHOLDS };

src/utils/utils.js

@@ -2,43 +2,6 @@ import config from '../config/config.js';
 import tokenManager from '../auth/token_manager.js';
 import { generateRequestId } from './idGenerator.js';
 import os from 'os';
-import dns from 'dns';
-import http from 'http';
-import https from 'https';
-import logger from './logger.js';
-
-// ==================== DNS 解析优化 ====================
-// 自定义 DNS 解析：优先 IPv4，失败则回退 IPv6
-function customLookup(hostname, options, callback) {
-  // 先尝试 IPv4
-  dns.lookup(hostname, { ...options, family: 4 }, (err4, address4, family4) => {
-    if (!err4 && address4) {
-      // IPv4 成功
-      return callback(null, address4, family4);
-    }
-    // IPv4 失败，尝试 IPv6
-    dns.lookup(hostname, { ...options, family: 6 }, (err6, address6, family6) => {
-      if (!err6 && address6) {
-        // IPv6 成功
-        logger.debug(`DNS: ${hostname} IPv4 失败，使用 IPv6: ${address6}`);
-        return callback(null, address6, family6);
-      }
-      // 都失败，返回 IPv4 的错误
-      callback(err4 || err6);
-    });
-  });
-}
-
-// 创建使用自定义 DNS 解析的 HTTP/HTTPS Agent
-const httpAgent = new http.Agent({
-  lookup: customLookup,
-  keepAlive: true
-});
-
-const httpsAgent = new https.Agent({
-  lookup: customLookup,
-  keepAlive: true
-});
 
 function extractImagesFromContent(content) {
   const result = { text: '', images: [] };
@@ -224,7 +187,7 @@ function generateGenerationConfig(parameters, enableThinking, actualModelName){
   // 1. 优先使用 thinking_budget（直接数值）
   // 2. 其次使用 reasoning_effort（OpenAI 格式：low/medium/high）
   // 3. 最后使用配置默认值或硬编码默认值
-  const defaultThinkingBudget = config.defaults.thinking_budget ?? 16000;
+  const defaultThinkingBudget = config.defaults.thinking_budget ?? 1024;
   
   let thinkingBudget = 0;
   if (enableThinking) {
@@ -260,7 +223,30 @@ function generateGenerationConfig(parameters, enableThinking, actualModelName){
   }
   return generationConfig
 }
-const EXCLUDED_KEYS = new Set(['$schema', 'additionalProperties', 'minLength', 'maxLength', 'minItems', 'maxItems', 'uniqueItems']);
+// 不被 Google 工具参数 Schema 支持的字段，在这里统一过滤掉
+// 包括：
+// - JSON Schema 的元信息字段：$schema, additionalProperties
+// - 长度/数量约束：minLength, maxLength, minItems, maxItems, uniqueItems（不必传给后端）
+// - 严格上下界 / 常量：exclusiveMaximum, exclusiveMinimum, const（Google Schema 不支持）
+// - 组合约束：anyOf/oneOf/allOf 以及其非标准写法 any_of/one_of/all_of（为避免上游实现差异，这里一律去掉）
+const EXCLUDED_KEYS = new Set([
+  '$schema',
+  'additionalProperties',
+  'minLength',
+  'maxLength',
+  'minItems',
+  'maxItems',
+  'uniqueItems',
+  'exclusiveMaximum',
+  'exclusiveMinimum',
+  'const',
+  'anyOf',
+  'oneOf',
+  'allOf',
+  'any_of',
+  'one_of',
+  'all_of'
+]);
 
 function cleanParameters(obj) {
   if (!obj || typeof obj !== 'object') return obj;
@@ -269,7 +255,8 @@ function cleanParameters(obj) {
   
   for (const [key, value] of Object.entries(obj)) {
     if (EXCLUDED_KEYS.has(key)) continue;
-    cleaned[key] = (value && typeof value === 'object') ? cleanParameters(value) : value;
+    const cleanedValue = (value && typeof value === 'object') ? cleanParameters(value) : value;
+    cleaned[key] = cleanedValue;
   }
   
   return cleaned;
@@ -278,12 +265,26 @@ function cleanParameters(obj) {
 function convertOpenAIToolsToAntigravity(openaiTools){
   if (!openaiTools || openaiTools.length === 0) return [];
   return openaiTools.map((tool)=>{
+    // 先清洗一遍参数，过滤/规范化不兼容字段
+    const rawParams = tool.function?.parameters || {};
+    const cleanedParams = cleanParameters(rawParams) || {};
+
+    // 确保顶层是一个合法的 JSON Schema 对象
+    // 如果用户没显式指定 type，则默认按 OpenAI 习惯设为 object
+    if (cleanedParams.type === undefined) {
+      cleanedParams.type = 'object';
+    }
+    // 对于 object 类型，至少保证有 properties 字段
+    if (cleanedParams.type === 'object' && cleanedParams.properties === undefined) {
+      cleanedParams.properties = {};
+    }
+
     return {
       functionDeclarations: [
         {
           name: tool.function.name,
           description: tool.function.description,
-          parameters: cleanParameters(tool.function.parameters)
+          parameters: cleanedParams
         }
       ]
     }
@@ -302,11 +303,12 @@ function modelMapping(modelName){
 }
 
 function isEnableThinking(modelName){
-  return modelName.endsWith('-thinking') ||
+  // 只要模型名里包含 -thinking（例如 gemini-2.0-flash-thinking-exp），就认为支持思考配置
+  return modelName.includes('-thinking') ||
     modelName === 'gemini-2.5-pro' ||
     modelName.startsWith('gemini-3-pro-') ||
     modelName === "rev19-uic3-1p" ||
-    modelName === "gpt-oss-120b-medium"
+    modelName === "gpt-oss-120b-medium";
 }
 
 function generateRequestBody(openaiMessages,modelName,parameters,openaiTools,token){
@@ -356,17 +358,29 @@ function generateRequestBody(openaiMessages,modelName,parameters,openaiTools,tok
   
   return requestBody;
 }
+/**
+ * 将通用文本对话请求体转换为图片生成请求体
+ * 统一配置 image_gen 所需字段，避免在各处手动删除/覆盖字段
+ */
+function prepareImageRequest(requestBody) {
+  if (!requestBody || !requestBody.request) return requestBody;
+
+  requestBody.request.generationConfig = { candidateCount: 1 };
+  requestBody.requestType = 'image_gen';
+
+  // image_gen 模式下不需要这些字段
+  delete requestBody.request.systemInstruction;
+  delete requestBody.request.tools;
+  delete requestBody.request.toolConfig;
+
+  return requestBody;
+}
+
 function getDefaultIp(){
   const interfaces = os.networkInterfaces();
-  if (interfaces.WLAN){
-    for (const inter of interfaces.WLAN){
+  for (const iface of Object.values(interfaces)){
+    for (const inter of iface){
       if (inter.family === 'IPv4' && !inter.internal){
-          return inter.address;
-      }
-    }
-  } else if (interfaces.wlan2) {
-    for (const inter of interfaces.wlan2) {
-      if (inter.family === 'IPv4' && !inter.internal) {
         return inter.address;
       }
     }
@@ -376,7 +390,6 @@ function getDefaultIp(){
 export{
   generateRequestId,
   generateRequestBody,
-  getDefaultIp,
-  httpAgent,
-  httpsAgent
+  prepareImageRequest,
+  getDefaultIp
 }