添加复用id机制，修复潜在的问题，添加npm run refresh刷新所有token的功能

package.json

@@ -7,6 +7,7 @@
   "scripts": {
     "start": "node src/server/index.js",
     "login": "node scripts/oauth-server.js",
+    "refresh": "node scripts/refresh-tokens.js",
     "dev": "node --watch src/server/index.js"
   },
   "keywords": ["antigravity", "openai", "api", "proxy"],

scripts/refresh-tokens.js

@@ -0,0 +1,87 @@
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import log from '../src/utils/logger.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 accounts = JSON.parse(fs.readFileSync(ACCOUNTS_FILE, 'utf-8'));
+  log.info(`找到 ${accounts.length} 个账号`);
+
+  let successCount = 0;
+  let failCount = 0;
+
+  for (let i = 0; i < accounts.length; i++) {
+    const account = accounts[i];
+    
+    if (account.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();
+      
+      successCount++;
+      log.info(`账号 ${i + 1}: 刷新成功`);
+    } catch (error) {
+      failCount++;
+      log.error(`账号 ${i + 1}: 刷新失败 - ${error.message}`);
+      
+      if (error.message.includes('invalid_grant') || error.message.includes('400')) {
+        account.enable = false;
+        log.warn(`账号 ${i + 1}: Token 已失效或错误，已自动禁用该账号`);
+      }
+    }
+  }
+
+  fs.writeFileSync(ACCOUNTS_FILE, JSON.stringify(accounts, null, 2));
+  log.info(`刷新完成: 成功 ${successCount} 个, 失败 ${failCount} 个`);
+}
+
+refreshAllTokens().catch(err => {
+  log.error('刷新失败:', err.message);
+  process.exit(1);
+});

src/auth/token_manager.js

@@ -2,6 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
 import { log } from '../utils/logger.js';
+import { generateProjectId, generateSessionId } from '../utils/idGenerator.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -14,19 +15,36 @@ class TokenManager {
     this.filePath = filePath;
     this.tokens = [];
     this.currentIndex = 0;
-    this.loadTokens();
+    this.initialize();
   }
 
-  loadTokens() {
+  initialize() {
     try {
-      log.info('正在加载token...');
+      log.info('正在初始化token管理器...');
       const data = fs.readFileSync(this.filePath, 'utf8');
-      const tokenArray = JSON.parse(data);
-      this.tokens = tokenArray.filter(token => token.enable !== false);
+      let tokenArray = JSON.parse(data);
+      let needSave = false;
+      
+      tokenArray = tokenArray.map(token => {
+        if (!token.projectId) {
+          token.projectId = generateProjectId();
+          needSave = true;
+        }
+        return token;
+      });
+      
+      if (needSave) {
+        fs.writeFileSync(this.filePath, JSON.stringify(tokenArray, null, 2), 'utf8');
+      }
+      
+      this.tokens = tokenArray.filter(token => token.enable !== false).map(token => ({
+        ...token,
+        sessionId: generateSessionId()
+      }));
       this.currentIndex = 0;
       log.info(`成功加载 ${this.tokens.length} 个可用token`);
     } catch (error) {
-      log.error('加载token失败:', error.message);
+      log.error('初始化token失败:', error.message);
       this.tokens = [];
     }
   }
@@ -77,7 +95,10 @@ class TokenManager {
       
       this.tokens.forEach(memToken => {
         const index = allTokens.findIndex(t => t.refresh_token === memToken.refresh_token);
-        if (index !== -1) allTokens[index] = memToken;
+        if (index !== -1) {
+          const { sessionId, ...tokenToSave } = memToken;
+          allTokens[index] = tokenToSave;
+        }
       });
       
       fs.writeFileSync(this.filePath, JSON.stringify(allTokens, null, 2), 'utf8');
@@ -90,7 +111,8 @@ class TokenManager {
     log.warn(`禁用token`)
     token.enable = false;
     this.saveToFile();
-    this.loadTokens();
+    this.tokens = this.tokens.filter(t => t.refresh_token !== token.refresh_token);
+    this.currentIndex = this.currentIndex % Math.max(this.tokens.length, 1);
   }
 
   async getToken() {
@@ -106,8 +128,9 @@ class TokenManager {
         this.currentIndex = (this.currentIndex + 1) % this.tokens.length;
         return token;
       } catch (error) {
-        if (error.statusCode === 403) {
-          log.warn(`Token ${this.currentIndex} 刷新失败(403)，禁用并尝试下一个`);
+        if (error.statusCode === 403 || error.statusCode === 400) {
+          const accountNum = this.currentIndex + 1;
+          log.warn(`账号 ${accountNum}: Token 已失效或错误，已自动禁用该账号`);
           this.disableToken(token);
         } else {
           log.error(`Token ${this.currentIndex} 刷新失败:`, error.message);
@@ -126,29 +149,6 @@ class TokenManager {
       this.disableToken(found);
     }
   }
-
-  async handleRequestError(error, currentAccessToken) {
-    if (error.statusCode === 403) {
-      log.warn('请求遇到403错误，尝试刷新token');
-      const currentToken = this.tokens[this.currentIndex];
-      if (currentToken && currentToken.access_token === currentAccessToken) {
-        try {
-          await this.refreshToken(currentToken);
-          log.info('Token刷新成功，返回新token');
-          return currentToken;
-        } catch (refreshError) {
-          if (refreshError.statusCode === 403) {
-            log.warn('刷新token也遇到403，禁用并切换到下一个');
-            this.disableToken(currentToken);
-            return await this.getToken();
-          }
-          log.error('刷新token失败:', refreshError.message);
-        }
-      }
-      return await this.getToken();
-    }
-    return null;
-  }
 }
 const tokenManager = new TokenManager();
 export default tokenManager;

src/server/index.js

@@ -56,7 +56,7 @@ app.post('/v1/chat/completions', async (req, res) => {
       return res.status(400).json({ error: 'messages is required' });
     }
     
-    const requestBody = generateRequestBody(messages, model, params, tools);
+    const requestBody = await generateRequestBody(messages, model, params, tools);
     //console.log(JSON.stringify(requestBody,null,2));
     
     if (stream) {

src/utils/idGenerator.js

@@ -0,0 +1,23 @@
+import { randomUUID } from 'crypto';
+
+function generateRequestId() {
+  return `agent-${randomUUID()}`;
+}
+
+function generateSessionId() {
+  return String(-Math.floor(Math.random() * 9e18));
+}
+
+function generateProjectId() {
+  const adjectives = ['useful', 'bright', 'swift', 'calm', 'bold'];
+  const nouns = ['fuze', 'wave', 'spark', 'flow', 'core'];
+  const randomAdj = adjectives[Math.floor(Math.random() * adjectives.length)];
+  const randomNoun = nouns[Math.floor(Math.random() * nouns.length)];
+  const randomNum = Math.random().toString(36).substring(2, 7);
+  return `${randomAdj}-${randomNoun}-${randomNum}`;
+}
+export {
+    generateProjectId,
+    generateSessionId,
+    generateRequestId
+}

src/utils/utils.js

@@ -1,22 +1,7 @@
-import { randomUUID } from 'crypto';
 import config from '../config/config.js';
+import tokenManager from '../auth/token_manager.js';
+import { generateRequestId } from './idGenerator.js';
 
-function generateRequestId() {
-  return `agent-${randomUUID()}`;
-}
-
-function generateSessionId() {
-  return String(-Math.floor(Math.random() * 9e18));
-}
-
-function generateProjectId() {
-  const adjectives = ['useful', 'bright', 'swift', 'calm', 'bold'];
-  const nouns = ['fuze', 'wave', 'spark', 'flow', 'core'];
-  const randomAdj = adjectives[Math.floor(Math.random() * adjectives.length)];
-  const randomNoun = nouns[Math.floor(Math.random() * nouns.length)];
-  const randomNum = Math.random().toString(36).substring(2, 7);
-  return `${randomAdj}-${randomNoun}-${randomNum}`;
-}
 function extractImagesFromContent(content) {
   const result = { text: '', images: [] };
 
@@ -183,7 +168,12 @@ function convertOpenAIToolsToAntigravity(openaiTools){
     }
   })
 }
-function generateRequestBody(openaiMessages,modelName,parameters,openaiTools){
+async function generateRequestBody(openaiMessages,modelName,parameters,openaiTools){
+  const token = await tokenManager.getToken();
+  if (!token) {
+    throw new Error('没有可用的token，请运行 npm run login 获取token');
+  }
+  
   const enableThinking = modelName.endsWith('-thinking') || 
     modelName === 'gemini-2.5-pro' || 
     modelName.startsWith('gemini-3-pro-') ||
@@ -192,7 +182,7 @@ function generateRequestBody(openaiMessages,modelName,parameters,openaiTools){
   const actualModelName = modelName.endsWith('-thinking') ? modelName.slice(0, -9) : modelName;
   
   return{
-    project: generateProjectId(),
+    project: token.projectId,
     requestId: generateRequestId(),
     request: {
       contents: openaiMessageToAntigravity(openaiMessages),
@@ -207,7 +197,7 @@ function generateRequestBody(openaiMessages,modelName,parameters,openaiTools){
         }
       },
       generationConfig: generateGenerationConfig(parameters, enableThinking, actualModelName),
-      sessionId: generateSessionId()
+      sessionId: token.sessionId
     },
     model: actualModelName,
     userAgent: "antigravity"
@@ -215,7 +205,5 @@ function generateRequestBody(openaiMessages,modelName,parameters,openaiTools){
 }
 export{
   generateRequestId,
-  generateSessionId,
-  generateProjectId,
   generateRequestBody
 }