解决普号错误projectId导致403的问题，同时为pro账号（进入pro组）提供随机的生成功能

.env.example

@@ -25,6 +25,7 @@ API_KEY=sk-text
 USE_NATIVE_AXIOS=false
 TIMEOUT=180000
 # PROXY=http://127.0.0.1:7897
+SKIP_PROJECT_ID_FETCH=false  # 跳过从API获取projectId，直接随机生成（适用于Pro订阅账号）
 
 # 系统提示词
 SYSTEM_INSTRUCTION=你是聊天机器人，名字叫萌萌，如同名字这般，你的性格是软软糯糯萌萌哒的，专门为用户提供聊天和情绪价值，协助进行小说创作或者角色扮演

README.md

@@ -12,6 +12,8 @@
 - ✅ API Key 认证
 - ✅ 思维链（Thinking）输出
 - ✅ 图片输入支持（Base64 编码）
+- ✅ 图片生成支持（大/小香蕉 模型）
+- ✅ Pro 账号随机 ProjectId 支持
 
 ## 环境要求
 
@@ -149,6 +151,21 @@ curl http://localhost:8045/v1/chat/completions \
 - GIF (`data:image/gif;base64,...`)
 - WebP (`data:image/webp;base64,...`)
 
+### 图片生成示例
+
+支持使用 大/小香蕉 模型生成图片，生成的图片会以 Markdown 格式返回：
+
+```bash
+curl http://localhost:8045/v1/chat/completions \
+  -H "Content-Type: application/json" \
+  -H "Authorization: Bearer sk-text" \
+  -d '{
+    "model": "gemimi-3.0-pro-image",
+    "messages": [{"role": "user", "content": "画一只可爱的猫"}],
+    "stream": false
+  }'
+```
+
 ## 多账号管理
 
 `data/accounts.json` 支持多个账号，服务会自动轮换使用：
@@ -190,10 +207,11 @@ curl http://localhost:8045/v1/chat/completions \
 | `DEFAULT_TOP_P` | 默认 top_p | 0.85 |
 | `DEFAULT_TOP_K` | 默认 top_k | 50 |
 | `DEFAULT_MAX_TOKENS` | 默认最大 token 数 | 8096 |
-| `USE_NATIVE_FETCH` | 使用原生 axios | false |
+| `USE_NATIVE_AXIOS` | 使用原生 axios | false |
 | `TIMEOUT` | 请求超时时间（毫秒） | 30000 |
 | `PROXY` | 代理地址 | - |
 | `SYSTEM_INSTRUCTION` | 系统提示词 | - |
+| `SKIP_PROJECT_ID_FETCH` | 跳过 API 获取 ProjectId，直接随机生成（Pro 账号可用） | false |
 
 完整配置示例请参考 `.env.example` 文件。
 
@@ -245,6 +263,21 @@ npm run login
 └── package.json            # 项目配置
 ```
 
+## Pro 账号随机 ProjectId
+
+对于 Pro 订阅账号，可以跳过 API 验证直接使用随机生成的 ProjectId：
+
+1. 在 `.env` 文件中设置：
+```env
+SKIP_PROJECT_ID_FETCH=true
+```
+
+2. 运行 `npm run login` 登录时会自动使用随机生成的 ProjectId
+
+3. 已有账号也会在使用时自动生成随机 ProjectId
+
+注意：此功能仅适用于 Pro 订阅账号。官方已修复免费账号使用随机 ProjectId 的漏洞。
+
 ## 注意事项
 
 1. 首次使用需要复制 `.env.example` 为 `.env` 并配置

scripts/oauth-server.js

@@ -1,11 +1,13 @@
 import http from 'http';
-import https from 'https';
 import { URL } from 'url';
 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 config from '../src/config/config.js';
+import { generateProjectId } from '../src/utils/idGenerator.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -36,47 +38,54 @@ function generateAuthUrl(port) {
   return `https://accounts.google.com/o/oauth2/v2/auth?${params.toString()}`;
 }
 
-function exchangeCodeForToken(code, port) {
-  return new Promise((resolve, reject) => {
-    const postData = new URLSearchParams({
-      code: code,
-      client_id: CLIENT_ID,
-      redirect_uri: `http://localhost:${port}/oauth-callback`,
-      grant_type: 'authorization_code'
-    });
-    
-    if (CLIENT_SECRET) {
-      postData.append('client_secret', CLIENT_SECRET);
-    }
-    
-    const data = postData.toString();
-    
-    const options = {
-      hostname: 'oauth2.googleapis.com',
-      path: '/token',
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/x-www-form-urlencoded',
-        'Content-Length': Buffer.byteLength(data)
-      }
+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)
     };
-    
-    const req = https.request(options, (res) => {
-      let body = '';
-      res.on('data', chunk => body += chunk);
-      res.on('end', () => {
-        if (res.statusCode === 200) {
-          resolve(JSON.parse(body));
-        } else {
-          reject(new Error(`HTTP ${res.statusCode}: ${body}`));
-        }
-      });
-    });
-    
-    req.on('error', reject);
-    req.write(data);
-    req.end();
+  }
+  return axiosConfig;
+}
+
+async function exchangeCodeForToken(code, port) {
+  const postData = new URLSearchParams({
+    code,
+    client_id: CLIENT_ID,
+    client_secret: CLIENT_SECRET,
+    redirect_uri: `http://localhost:${port}/oauth-callback`,
+    grant_type: 'authorization_code'
+  });
+  
+  const response = await axios({
+    method: 'POST',
+    url: 'https://oauth2.googleapis.com/token',
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+    data: postData.toString(),
+    ...getAxiosConfig()
+  });
+  
+  return response.data;
+}
+
+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) => {
@@ -89,7 +98,7 @@ const server = http.createServer((req, res) => {
     
     if (code) {
       log.info('收到授权码，正在交换 Token...');
-      exchangeCodeForToken(code, port).then(tokenData => {
+      exchangeCodeForToken(code, port).then(async (tokenData) => {
         const account = {
           access_token: tokenData.access_token,
           refresh_token: tokenData.refresh_token,
@@ -97,6 +106,33 @@ const server = http.createServer((req, res) => {
           timestamp: Date.now()
         };
         
+        if (config.skipProjectIdFetch) {
+          account.projectId = generateProjectId();
+          account.enable = true;
+          log.info('已跳过API验证，使用随机生成的projectId: ' + account.projectId);
+        } else {
+          log.info('正在验证账号资格...');
+          try {
+            const projectId = await fetchProjectId(account.access_token);
+            if (projectId === undefined) {
+              log.warn('该账号无资格使用（无法获取projectId），已跳过保存');
+              res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+              res.end('<h1>账号无资格</h1><p>该账号无法获取projectId，未保存。</p>');
+              setTimeout(() => server.close(), 1000);
+              return;
+            }
+            account.projectId = projectId;
+            account.enable = true;
+            log.info('账号验证通过');
+          } catch (err) {
+            log.error('验证账号资格失败:', err.message);
+            res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+            res.end('<h1>验证失败</h1><p>无法验证账号资格，请查看控制台。</p>');
+            setTimeout(() => server.close(), 1000);
+            return;
+          }
+        }
+        
         let accounts = [];
         try {
           if (fs.existsSync(ACCOUNTS_FILE)) {
@@ -116,7 +152,6 @@ const server = http.createServer((req, res) => {
         fs.writeFileSync(ACCOUNTS_FILE, JSON.stringify(accounts, null, 2));
         
         log.info(`Token 已保存到 ${ACCOUNTS_FILE}`);
-        //log.info(`过期时间: ${account.expires_in}秒`);
         
         res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
         res.end('<h1>授权成功！</h1><p>Token 已保存，可以关闭此页面。</p>');

src/auth/token_manager.js

@@ -3,7 +3,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import axios from 'axios';
 import { log } from '../utils/logger.js';
-import { generateProjectId, generateSessionId } from '../utils/idGenerator.js';
+import { generateSessionId, generateProjectId } from '../utils/idGenerator.js';
 import config from '../config/config.js';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -20,29 +20,17 @@ class TokenManager {
     this.initialize();
   }
 
-  initialize() {
+  async initialize() {
     try {
       log.info('正在初始化token管理器...');
       const data = fs.readFileSync(this.filePath, 'utf8');
       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) {
@@ -51,6 +39,27 @@ class TokenManager {
     }
   }
 
+  async fetchProjectId(token) {
+    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 ${token.access_token}`,
+        '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
+    });
+    return response.data?.cloudaicompanionProject;
+  }
+
   isExpired(token) {
     if (!token.timestamp || !token.expires_in) return true;
     const expiresAt = token.timestamp + (token.expires_in * 1000);
@@ -124,7 +133,7 @@ class TokenManager {
   async getToken() {
     if (this.tokens.length === 0) return null;
 
-    const startIndex = this.currentIndex;
+    //const startIndex = this.currentIndex;
     const totalTokens = this.tokens.length;
 
     for (let i = 0; i < totalTokens; i++) {
@@ -134,16 +143,38 @@ class TokenManager {
         if (this.isExpired(token)) {
           await this.refreshToken(token);
         }
+        if (!token.projectId) {
+          if (config.skipProjectIdFetch) {
+            token.projectId = generateProjectId();
+            this.saveToFile();
+            log.info(`...${token.access_token.slice(-8)}: 使用随机生成的projectId: ${token.projectId}`);
+          } else {
+            try {
+              const projectId = await this.fetchProjectId(token);
+              if (projectId === undefined) {
+                log.warn(`...${token.access_token.slice(-8)}: 无资格获取projectId，跳过保存`);
+                this.disableToken(token);
+                if (this.tokens.length === 0) return null;
+                continue;
+              }
+              token.projectId = projectId;
+              this.saveToFile();
+            } catch (error) {
+              log.error(`...${token.access_token.slice(-8)}: 获取projectId失败:`, error.message);
+              this.currentIndex = (this.currentIndex + 1) % this.tokens.length;
+              continue;
+            }
+          }
+        }
         this.currentIndex = (this.currentIndex + 1) % this.tokens.length;
         return token;
       } catch (error) {
         if (error.statusCode === 403 || error.statusCode === 400) {
-          const accountNum = this.currentIndex + 1;
-          log.warn(`账号 ${accountNum}: Token 已失效或错误，已自动禁用该账号`);
+          log.warn(`...${token.access_token.slice(-8)}: Token 已失效或错误，已自动禁用该账号`);
           this.disableToken(token);
           if (this.tokens.length === 0) return null;
         } else {
-          log.error(`Token ${this.currentIndex + 1} 刷新失败:`, error.message);
+          log.error(`...${token.access_token.slice(-8)} 刷新失败:`, error.message);
           this.currentIndex = (this.currentIndex + 1) % this.tokens.length;
         }
       }

src/config/config.js

@@ -70,7 +70,8 @@ const config = {
   useNativeAxios: process.env.USE_NATIVE_AXIOS !== 'false',
   timeout: parseInt(process.env.TIMEOUT) || 30000,
   proxy: process.env.PROXY || null,
-  systemInstruction: process.env.SYSTEM_INSTRUCTION || '你是聊天机器人，名字叫萌萌，如同名字这般，你的性格是软软糯糯萌萌哒的，专门为用户提供聊天和情绪价值，协助进行小说创作或者角色扮演'
+  systemInstruction: process.env.SYSTEM_INSTRUCTION || '你是聊天机器人，名字叫萌萌，如同名字这般，你的性格是软软糯糯萌萌哒的，专门为用户提供聊天和情绪价值，协助进行小说创作或者角色扮演',
+  skipProjectIdFetch: process.env.SKIP_PROJECT_ID_FETCH === 'true'
 };
 
 log.info('✓ 配置加载成功');