Update server.js

server.js

@@ -5,7 +5,7 @@ import { v4 as uuidv4 } from 'uuid';
 import fileUpload from 'express-fileupload';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import fs from 'fs'; // Import the fs module
+import fs from 'fs';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -18,10 +18,15 @@ if (!ADMIN_PASSWORD) {
     process.exit(1);
 }
 
-// Define the directory for the database
-const DB_DIR = path.join(__dirname, 'data');
-// Define the full path to the database file
-const DB_PATH = path.join(DB_DIR, 'database.sqlite');
+// --- ИЗМЕНЕНИЕ ---
+// Путь к базе данных теперь указывает на папку 'data'
+const dataDir = path.join(__dirname, 'data');
+if (!fs.existsSync(dataDir)) {
+    fs.mkdirSync(dataDir, { recursive: true });
+}
+const DB_PATH = path.join(dataDir, 'database.sqlite');
+// --- КОНЕЦ ИЗМЕНЕНИЯ ---
+
 const KEY_DEACTIVATION_THRESHOLD = 5;
 const KEY_COOLDOWN_SECONDS = 60;
 
@@ -30,11 +35,6 @@ app.use(express.json({ limit: '10mb' }));
 app.use(express.urlencoded({ extended: true }));
 app.use(fileUpload());
 
-// Ensure the database directory exists before initializing Sequelize
-if (!fs.existsSync(DB_DIR)) {
-    fs.mkdirSync(DB_DIR, { recursive: true });
-}
-
 const sequelize = new Sequelize({
     dialect: 'sqlite',
     storage: DB_PATH,
@@ -81,21 +81,16 @@ GeminiKey.hasMany(RequestLog, { foreignKey: 'gemini_key_id' });
 RequestLog.belongsTo(GeminiKey, { foreignKey: 'gemini_key_id' });
 
 const GEMINI_DEFAULT_LIMITS = {
-    'gemini-2.5-flash-preview-05-20': { rpm: 10, rpd: 500, tpm: 250000, tpd: 500000 },
-    'gemini-2.5-flash-preview-tts': { rpm: 3, rpd: 15, tpm: 10000, tpd: 20000 },
-    'gemini-2.5-pro-experimental-03-25': { rpm: 5, rpd: 25, tpm: 250000, tpd: 1000000 },
-    'gemini-2.0-flash': { rpm: 15, rpd: 1500, tpm: 1000000, tpd: 2000000 },
-    'gemini-2.0-flash-experimental': { rpm: 10, rpd: 1000, tpm: 250000, tpd: 500000 },
-    'gemini-2.0-flash-lite': { rpm: 30, rpd: 1500, tpm: 1000000, tpd: 2000000 },
-    'gemini-1.5-flash': { rpm: 15, rpd: 500, tpm: 250000, tpd: 500000 },
-    'gemini-1.5-flash-8b': { rpm: 15, rpd: 500, tpm: 250000, tpd: 500000 },
-    'gemma-3': { rpm: 30, rpd: 14400, tpm: 15000, tpd: 360000 },
-    'gemma-3n': { rpm: 30, rpd: 14400, tpm: 15000, tpd: 360000 },
+    'gemini-1.5-flash-latest': { rpm: 15, rpd: 500, tpm: 250000, tpd: 500000 },
+    'gemini-1.5-pro-latest': { rpm: 5, rpd: 25, tpm: 250000, tpd: 1000000 },
+    'gemini-1.0-pro': { rpm: 15, rpd: 1500, tpm: 1000000, tpd: 2000000 },
     'default': { rpm: 15, rpd: 1500, tpm: 1000000, tpd: 2000000 }
 };
 
 function getModelLimits(model) {
-    return GEMINI_DEFAULT_LIMITS[model] || GEMINI_DEFAULT_LIMITS['default'];
+    // Ищем точное совпадение или совпадение по началу строки
+    const foundModel = Object.keys(GEMINI_DEFAULT_LIMITS).find(k => model.startsWith(k));
+    return GEMINI_DEFAULT_LIMITS[foundModel] || GEMINI_DEFAULT_LIMITS['default'];
 }
 
 function safeParseInt(value, defaultValue = 0) {
@@ -235,7 +230,7 @@ const adminAuth = (req, res, next) => {
     next();
 };
 
-app.post('/v1/chat/completions', authenticateServiceKey, async (req, res) => {
+app.post(['/v1/chat/completions', '/v1beta/chat/completions'], authenticateServiceKey, async (req, res) => {
     if (!req.body || typeof req.body !== 'object') {
         return res.status(400).json({ error: 'Request body must be a valid JSON object.' });
     }
@@ -259,16 +254,52 @@ app.post('/v1/chat/completions', authenticateServiceKey, async (req, res) => {
         attemptedKeys.add(geminiKey.id);
 
         try {
-            const geminiApiUrl = `https://generativelanguage.googleapis.com/v1beta/openai/chat/completions`;
-            const response = await axios.post(geminiApiUrl, req.body, {
+            const geminiApiUrl = `https://generativelanguage.googleapis.com/v1beta/models/${model}:generateContent`;
+            
+            // OpenAI to Gemini Translation
+            const geminiRequestBody = {
+                contents: req.body.messages.map(msg => ({
+                    role: msg.role === 'assistant' ? 'model' : msg.role,
+                    parts: [{ text: msg.content }]
+                })),
+                generationConfig: {
+                    temperature: req.body.temperature,
+                    topP: req.body.top_p,
+                    maxOutputTokens: req.body.max_tokens,
+                }
+            };
+            
+            const response = await axios.post(geminiApiUrl, geminiRequestBody, {
                 headers: {
                     'Content-Type': 'application/json',
-                    'Authorization': `Bearer ${geminiKey.key}`
+                    'x-goog-api-key': geminiKey.key
                 },
                 timeout: 45000
             });
 
-            const responseData = response.data;
+            const geminiResponse = response.data;
+            
+            // Gemini to OpenAI Translation
+            const openAIResponse = {
+                id: `chatcmpl-${uuidv4()}`,
+                object: 'chat.completion',
+                created: Math.floor(Date.now() / 1000),
+                model: model,
+                choices: geminiResponse.candidates.map((candidate, index) => ({
+                    index: index,
+                    message: {
+                        role: 'assistant',
+                        content: candidate.content.parts[0].text
+                    },
+                    finish_reason: candidate.finishReason.toLowerCase()
+                })),
+                usage: {
+                    prompt_tokens: geminiResponse.usageMetadata?.promptTokenCount || 0,
+                    completion_tokens: geminiResponse.usageMetadata?.candidatesTokenCount || 0,
+                    total_tokens: geminiResponse.usageMetadata?.totalTokenCount || 0
+                }
+            };
+            
             geminiKey.error_count = 0;
             geminiKey.cooldown_until = null;
             geminiKey.last_used_at = new Date();
@@ -279,16 +310,16 @@ app.post('/v1/chat/completions', authenticateServiceKey, async (req, res) => {
                 service_key_id: req.serviceKey.key,
                 model_requested: model,
                 request_body: JSON.stringify(req.body),
-                response_body: JSON.stringify(responseData),
+                response_body: JSON.stringify(openAIResponse),
                 status_code: response.status,
                 is_success: true,
                 processing_time_ms: Date.now() - startTime,
-                prompt_tokens: responseData.usage?.prompt_tokens || 0,
-                completion_tokens: responseData.usage?.completion_tokens || 0,
-                total_tokens: responseData.usage?.total_tokens || 0,
+                prompt_tokens: openAIResponse.usage.prompt_tokens,
+                completion_tokens: openAIResponse.usage.completion_tokens,
+                total_tokens: openAIResponse.usage.total_tokens,
             });
 
-            return res.status(response.status).json(responseData);
+            return res.status(response.status).json(openAIResponse);
 
         } catch (error) {
             const isTimeout = error.code === 'ECONNABORTED';
@@ -453,19 +484,21 @@ app.get('/admin/download/:table', adminAuth, async (req, res) => {
 
 app.get('/user/dashboard', authenticateServiceKey, async (req, res) => {
     const oneDayAgo = new Date(new Date().getTime() - 24 * 60 * 60 * 1000);
-    const usage = await RequestLog.findOne({
+    const usageResult = await RequestLog.findOne({
         attributes: [
             [sequelize.fn('COUNT', sequelize.col('id')), 'requests'],
             [sequelize.fn('SUM', sequelize.col('total_tokens')), 'tokens']
         ],
         where: {
             service_key_id: req.serviceKey.key,
-            createdAt: { [Op.gte]: oneDayAgo }
-        }
+            createdAt: { [Op.gte]: oneDayAgo },
+            is_success: true
+        },
+        raw: true
     });
 
-    const requestsLastDay = usage?.get('requests') || 0;
-    const tokensLastDay = usage?.get('tokens') || 0;
+    const requestsLastDay = safeParseInt(usageResult.requests);
+    const tokensLastDay = safeParseInt(usageResult.tokens);
 
     res.send(`
         <html>
@@ -485,13 +518,12 @@ app.get('/user/dashboard', authenticateServiceKey, async (req, res) => {
                     <li><b>Tokens per day:</b> ${req.serviceKey.tpd_limit}</li>
                 </ul>
                 <hr>
-                <h3>API Usage</h3>
-                <p>Use this service key in your requests:</p>
-                <pre style="background: #f5f5f5; padding: 10px; border-radius: 4px; overflow-x: auto;">curl "http://localhost:7860/v1/chat/completions" \\
+                <h3>API Usage Example</h3>
+                <pre style="background: #f5f5f5; padding: 10px; border-radius: 4px; overflow-x: auto;">curl "YOUR_SPACE_URL/v1/chat/completions" \\
 -H "Content-Type: application/json" \\
 -H "Authorization: Bearer ${req.serviceKey.key}" \\
 -d '{
-    "model": "gemini-2.0-flash",
+    "model": "gemini-1.5-flash-latest",
     "messages": [
         {"role": "user", "content": "Hello!"}
     ]
@@ -515,7 +547,8 @@ app.get('/user/stats', authenticateServiceKey, async (req, res) => {
         ],
         where: {
             service_key_id: req.serviceKey.key,
-            createdAt: { [Op.gte]: oneDayAgo }
+            createdAt: { [Op.gte]: oneDayAgo },
+            is_success: true,
         },
         replacements: { oneMinuteAgo, oneDayAgo }
     });
@@ -546,11 +579,11 @@ app.get('/user/stats', authenticateServiceKey, async (req, res) => {
     });
 });
 
-app.get('/v1/models', authenticateServiceKey, async (req, res) => {
+app.get(['/v1/models', '/v1beta/models'], authenticateServiceKey, async (req, res) => {
     const models = Object.keys(GEMINI_DEFAULT_LIMITS).filter(model => model !== 'default').map(model => ({
         id: model,
         object: "model",
-        created: 1677649963,
+        created: Math.floor(Date.now() / 1000),
         owned_by: "google"
     }));
     
@@ -562,10 +595,8 @@ app.get('/v1/models', authenticateServiceKey, async (req, res) => {
 
 sequelize.sync({ force: false }).then(() => {
     console.log('Database initialized successfully.');
-    app.listen(PORT, () => {
+    app.listen(PORT, '0.0.0.0', () => {
         console.log(`Gemini Proxy Rotator running on port ${PORT}`);
-        console.log(`Admin panel: http://localhost:${PORT}/admin`);
-        console.log(`Set ADMIN_PASSWORD environment variable for admin access`);
     });
 }).catch(error => {
     console.error('Failed to initialize database:', error);