Update server.js

server.js

@@ -18,14 +18,11 @@ if (!ADMIN_PASSWORD) {
     process.exit(1);
 }
 
-// --- ИЗМЕНЕНИЕ ---
-// Путь к базе данных теперь указывает на папку '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;
@@ -41,6 +38,7 @@ const sequelize = new Sequelize({
     logging: false
 });
 
+// ... (Модели Sequelize остаются без изменений: GeminiKey, RequestLog, ServiceKey)
 const GeminiKey = sequelize.define('GeminiKey', {
     id: { type: DataTypes.INTEGER, primaryKey: true, autoIncrement: true },
     key: { type: DataTypes.STRING, allowNull: false, unique: true },
@@ -87,8 +85,8 @@ const GEMINI_DEFAULT_LIMITS = {
     'default': { rpm: 15, rpd: 1500, tpm: 1000000, tpd: 2000000 }
 };
 
+// ... (Функции getModelLimits, safeParseInt, selectBestGeminiKey остаются без изменений)
 function getModelLimits(model) {
-    // Ищем точное совпадение или совпадение по началу строки
     const foundModel = Object.keys(GEMINI_DEFAULT_LIMITS).find(k => model.startsWith(k));
     return GEMINI_DEFAULT_LIMITS[foundModel] || GEMINI_DEFAULT_LIMITS['default'];
 }
@@ -168,6 +166,26 @@ async function selectBestGeminiKey(model, attemptedKeys = new Set()) {
     return bestKey || activeKeys[0];
 }
 
+
+// --- ИЗМЕНЕНИЕ: Middleware для авторизации админа через query-параметр ---
+const adminAuth = (req, res, next) => {
+    const password = req.query.password;
+    if (!password || password !== ADMIN_PASSWORD) {
+        // Ответ в HTML для удобства, если заходят через браузер
+        return res.status(401).send(`
+            <div style="font-family: sans-serif; text-align: center; padding-top: 50px;">
+                <h1>401 Unauthorized</h1>
+                <p>Требуется валидный пароль администратора в параметре URL.</p>
+                <p>Пример: <code>/admin?password=ВАШ_ПАРОЛЬ</code></p>
+            </div>
+        `);
+    }
+    // Сохраняем пароль для использования в шаблонах и ссылках
+    res.locals.adminPassword = password;
+    next();
+};
+
+// ... (authenticateServiceKey middleware остается без изменений)
 const authenticateServiceKey = async (req, res, next) => {
     const authHeader = req.headers.authorization;
     if (!authHeader || !authHeader.startsWith('Bearer ')) {
@@ -222,14 +240,8 @@ const authenticateServiceKey = async (req, res, next) => {
     next();
 };
 
-const adminAuth = (req, res, next) => {
-    const authHeader = req.headers.authorization;
-    if (!authHeader || authHeader !== `Bearer ${ADMIN_PASSWORD}`) {
-        return res.status(401).send('Unauthorized: Invalid admin credentials.');
-    }
-    next();
-};
 
+// ... (Основной эндпоинт /v1/chat/completions остается без изменений)
 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.' });
@@ -256,7 +268,6 @@ app.post(['/v1/chat/completions', '/v1beta/chat/completions'], authenticateServi
         try {
             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,
@@ -279,7 +290,6 @@ app.post(['/v1/chat/completions', '/v1beta/chat/completions'], authenticateServi
 
             const geminiResponse = response.data;
             
-            // Gemini to OpenAI Translation
             const openAIResponse = {
                 id: `chatcmpl-${uuidv4()}`,
                 object: 'chat.completion',
@@ -371,7 +381,10 @@ app.post(['/v1/chat/completions', '/v1beta/chat/completions'], authenticateServi
     return res.status(lastStatusCode).json(finalError);
 });
 
+// --- ИЗМЕНЕНИЕ: Добавляем middleware adminAuth ко всем админским роутам ---
+// --- ИЗМЕНЕНИЕ: Обновляем HTML админки для использования query-параметра ---
 app.get('/admin', adminAuth, (req, res) => {
+    const adminPassword = res.locals.adminPassword; // Получаем пароль из middleware
     res.send(`
         <html>
             <head><title>Admin Panel</title><meta name="viewport" content="width=device-width, initial-scale=1"></head>
@@ -379,13 +392,13 @@ app.get('/admin', adminAuth, (req, res) => {
                 <h1>Gemini Proxy Admin Panel</h1>
                 <h2>Upload Gemini Keys</h2>
                 <p>Upload a .txt file with one Gemini API key per line.</p>
-                <form action="/admin/upload-keys" method="post" enctype="multipart/form-data">
+                <form action="/admin/upload-keys?password=${adminPassword}" method="post" enctype="multipart/form-data">
                     <input type="file" name="keysFile" accept=".txt" required>
                     <button type="submit">Upload</button>
                 </form>
                 <hr>
                 <h2>Manage Service Keys</h2>
-                <form action="/admin/service-keys" method="post" target="creation-result">
+                <form action="/admin/service-keys?password=${adminPassword}" method="post" target="creation-result">
                     <input type="text" name="owner" placeholder="Owner (e.g., user@example.com)" required style="width: 250px; padding: 5px;">
                     <button type="submit">Create New Service Key</button>
                 </form>
@@ -393,10 +406,10 @@ app.get('/admin', adminAuth, (req, res) => {
                 <hr>
                 <h2>Stats & Data</h2>
                 <ul>
-                    <li><a href="/admin/stats" target="_blank">View Stats (JSON)</a></li>
-                    <li><a href="/admin/download/geminikeys">Download GeminiKeys Table (JSON)</a></li>
-                    <li><a href="/admin/download/requestlogs">Download RequestLogs Table (JSON)</a></li>
-                    <li><a href="/admin/download/servicekeys">Download ServiceKeys Table (JSON)</a></li>
+                    <li><a href="/admin/stats?password=${adminPassword}" target="_blank">View Stats (JSON)</a></li>
+                    <li><a href="/admin/download/geminikeys?password=${adminPassword}">Download GeminiKeys Table (JSON)</a></li>
+                    <li><a href="/admin/download/requestlogs?password=${adminPassword}">Download RequestLogs Table (JSON)</a></li>
+                    <li><a href="/admin/download/servicekeys?password=${adminPassword}">Download ServiceKeys Table (JSON)</a></li>
                 </ul>
             </body>
         </html>
@@ -411,21 +424,16 @@ app.post('/admin/upload-keys', adminAuth, async (req, res) => {
     const keys = keysFile.data.toString('utf8').split(/\r?\n/).filter(key => key.trim() !== '');
 
     let newKeysCount = 0;
-    let failedKeys = [];
     for (const key of keys) {
         const trimmedKey = key.trim();
         if (!trimmedKey) continue;
-        try {
-            const [_, created] = await GeminiKey.findOrCreate({
-                where: { key: trimmedKey },
-                defaults: { key: trimmedKey }
-            });
-            if (created) newKeysCount++;
-        } catch (error) {
-            failedKeys.push(trimmedKey);
-        }
+        const [_, created] = await GeminiKey.findOrCreate({
+            where: { key: trimmedKey },
+            defaults: { key: trimmedKey }
+        });
+        if (created) newKeysCount++;
     }
-    res.send(`File processed successfully. Added ${newKeysCount} new unique keys. Failed to add ${failedKeys.length} keys (likely duplicates).`);
+    res.send(`File processed successfully. Added ${newKeysCount} new unique keys.`);
 });
 
 app.post('/admin/service-keys', adminAuth, async (req, res) => {
@@ -472,16 +480,14 @@ app.get('/admin/download/:table', adminAuth, async (req, res) => {
     const model = modelMap[table.toLowerCase()];
     if (!model) return res.status(404).send('Table not found');
 
-    try {
-        const data = await model.findAll({ order: [['createdAt', 'DESC']] });
-        res.header('Content-Type', 'application/json');
-        res.header('Content-Disposition', `attachment; filename=${table}.json`);
-        res.send(JSON.stringify(data, null, 2));
-    } catch (error) {
-        res.status(500).send(`Error fetching data for table ${table}: ${error.message}`);
-    }
+    const data = await model.findAll({ order: [['createdAt', 'DESC']] });
+    res.header('Content-Type', 'application/json');
+    res.header('Content-Disposition', `attachment; filename=${table}.json`);
+    res.send(JSON.stringify(data, null, 2));
 });
 
+
+// ... (Роуты для пользователей /user/dashboard, /user/stats, /v1/models остаются без изменений)
 app.get('/user/dashboard', authenticateServiceKey, async (req, res) => {
     const oneDayAgo = new Date(new Date().getTime() - 24 * 60 * 60 * 1000);
     const usageResult = await RequestLog.findOne({