ваше сообщение коммита

backend/routes/auth.js

@@ -946,4 +946,25 @@ router.get('/check-tokens/:address', async (req, res) => {
   }
 });
 
+// Маршрут для получения уровня доступа пользователя
+router.get('/access-level/:address', async (req, res) => {
+  try {
+    const { address } = req.params;
+
+    // Получаем уровень доступа пользователя
+    const accessLevel = await authService.getUserAccessLevel(address);
+
+    res.json({
+      success: true,
+      data: accessLevel,
+    });
+  } catch (error) {
+    logger.error('Error getting user access level:', error);
+    res.status(500).json({
+      success: false,
+      error: 'Internal server error',
+    });
+  }
+});
+
 module.exports = router;

backend/routes/ollama.js

@@ -21,20 +21,28 @@ const { requireAuth } = require('../middleware/auth');
 // Проверка статуса подключения к Ollama
 router.get('/status', requireAuth, async (req, res) => {
   try {
-    // Проверяем, что контейнер Ollama запущен
-    const { stdout } = await execAsync('docker ps --filter "name=dapp-ollama" --format "{{.Names}}"');
-    const isContainerRunning = stdout.trim() === 'dapp-ollama';
+    const axios = require('axios');
+    const ollamaUrl = process.env.OLLAMA_BASE_URL || 'http://ollama:11434';
     
-    if (!isContainerRunning) {
-      return res.json({ connected: false, error: 'Ollama container not running' });
-    }
-
-    // Проверяем API Ollama
+    // Проверяем API Ollama через HTTP запрос
     try {
-      const { stdout: apiResponse } = await execAsync('docker exec dapp-ollama ollama list');
-      return res.json({ connected: true, message: 'Ollama is running' });
+      const response = await axios.get(`${ollamaUrl}/api/tags`, { 
+        timeout: 5000 // 5 секунд таймаут
+      });
+      
+      const models = response.data.models || [];
+      return res.json({ 
+        connected: true, 
+        message: 'Ollama is running',
+        models: models.length,
+        availableModels: models.map(m => m.name)
+      });
     } catch (apiError) {
-      return res.json({ connected: false, error: 'Ollama API not responding' });
+      logger.error('Ollama API error:', apiError.message);
+      return res.json({ 
+        connected: false, 
+        error: `Ollama API not responding: ${apiError.message}` 
+      });
     }
   } catch (error) {
     logger.error('Error checking Ollama status:', error);
@@ -45,21 +53,19 @@ router.get('/status', requireAuth, async (req, res) => {
 // Получение списка установленных моделей
 router.get('/models', requireAuth, async (req, res) => {
   try {
-    const { stdout } = await execAsync('docker exec dapp-ollama ollama list');
-    const lines = stdout.trim().split('\n').slice(1); // Пропускаем заголовок
+    const axios = require('axios');
+    const ollamaUrl = process.env.OLLAMA_BASE_URL || 'http://ollama:11434';
     
-    const models = lines.map(line => {
-      const parts = line.trim().split(/\s+/);
-      if (parts.length >= 4) {
-        return {
-          name: parts[0],
-          id: parts[1],
-          size: parseInt(parts[2]) || 0,
-          modified: parts.slice(3).join(' ')
-        };
-      }
-      return null;
-    }).filter(model => model !== null);
+    const response = await axios.get(`${ollamaUrl}/api/tags`, { 
+      timeout: 5000 
+    });
+    
+    const models = (response.data.models || []).map(model => ({
+      name: model.name,
+      id: model.model || model.name,
+      size: model.size || 0,
+      modified: model.modified_at || 'Unknown'
+    }));
 
     res.json({ models });
   } catch (error) {

backend/routes/settings.js

@@ -177,7 +177,7 @@ router.get('/auth-tokens', async (req, res, next) => {
     }
 
     const tokensResult = await db.getQuery()(
-      'SELECT id, min_balance, created_at, updated_at, decrypt_text(name_encrypted, $1) as name, decrypt_text(address_encrypted, $1) as address, decrypt_text(network_encrypted, $1) as network FROM auth_tokens',
+      'SELECT id, min_balance, readonly_threshold, editor_threshold, created_at, updated_at, decrypt_text(name_encrypted, $1) as name, decrypt_text(address_encrypted, $1) as address, decrypt_text(network_encrypted, $1) as network FROM auth_tokens',
       [encryptionKey]
     );
     const authTokens = tokensResult.rows;
@@ -218,11 +218,11 @@ router.post('/auth-tokens', requireAdmin, async (req, res, next) => {
 // Добавление/обновление одного токена
 router.post('/auth-token', requireAdmin, async (req, res, next) => {
   try {
-    const { name, address, network, minBalance } = req.body;
+    const { name, address, network, minBalance, readonlyThreshold, editorThreshold } = req.body;
     if (!name || !address || !network) {
       return res.status(400).json({ success: false, error: 'name, address и network обязательны' });
     }
-    await authTokenService.upsertAuthToken({ name, address, network, minBalance });
+    await authTokenService.upsertAuthToken({ name, address, network, minBalance, readonlyThreshold, editorThreshold });
     
     // Отправляем WebSocket уведомление о добавлении токена
     try {