feat: Оптимизация структуры server.js с модульным подходом, добавление новых маршрутов и улучшение обработки ошибок. Обновление валидаторов для MikroTik с использованием общих функций. Улучшение кода компонентов приложения для повышения читаемости и производительности.

2025-10-03 01:49:51 +07:00
parent cdf692a2aa
commit 6231b645b6
17 changed files with 5149 additions and 2295 deletions
@@ -0,0 +1,177 @@
+/**
+ * Роуты для управления конфигурациями серверов
+ */
+
+const { s3, BUCKET_NAME, writeS3TextObject, deleteS3Object, headMeta } = require('../services/s3Service');
+const { sendError, sendOk, checkIfNoneMatch } = require('../middleware/errorHandler');
+const { GetObjectCommand, HeadObjectCommand, DeleteObjectCommand } = require('@aws-sdk/client-s3');
+const { streamToString } = require('../services/s3Service');
+const { createJsonDataRoutes } = require('./jsonDataRoutes');
+
+// GET /api/server-configs (список серверов)
+const serverConfigsListRoutes = createJsonDataRoutes('server-configs.json', (server, i) => {
+  if (!server.id || !server.name) {
+    return `Server at index ${i} is missing required fields`;
+  }
+  return null;
+});
+
+// GET /api/server-configs/:serverId (конкретная конфигурация)
+async function getServerConfig(req, res) {
+  const { serverId } = req.params;
+  
+  try {
+    const head = await s3.send(new HeadObjectCommand({ 
+      Bucket: BUCKET_NAME, 
+      Key: `filter-manager/config-${serverId}.txt` 
+    })).catch(() => null);
+    
+    const etag = head?.ETag || null;
+    if (etag) res.set('ETag', String(etag));
+    if (head?.LastModified) res.set('Last-Modified', new Date(head.LastModified).toUTCString());
+    if (typeof head?.ContentLength === 'number') res.set('Content-Length-Source', String(head.ContentLength));
+    if (checkIfNoneMatch(req, res, etag)) return;
+
+    const data = await s3.send(new GetObjectCommand({ 
+      Bucket: BUCKET_NAME, 
+      Key: `filter-manager/config-${serverId}.txt` 
+    }));
+    const config = await streamToString(data.Body);
+    res.json({ config });
+  } catch (error) {
+    if (error.code === 'NoSuchKey' || error?.$metadata?.httpStatusCode === 404) {
+      res.json({ config: '// Конфигурация не найдена' });
+    } else {
+      console.error(error);
+      return sendError(res, 500, 'Error reading server config from S3', 'E_S3');
+    }
+  }
+}
+
+// POST /api/server-configs/:serverId (сохранить конфигурацию)
+async function postServerConfig(req, res) {
+  const { serverId } = req.params;
+  const { config } = req.body;
+  
+  if (!config) {
+    return sendError(res, 400, 'Config is required', 'E_BAD_REQUEST');
+  }
+
+  try {
+    const meta = await writeS3TextObject(`filter-manager/config-${serverId}.txt`, config);
+    return sendOk(res, meta);
+  } catch (error) {
+    console.error(error);
+    return sendError(res, 500, 'Error writing server config to S3', 'E_S3');
+  }
+}
+
+// DELETE /api/server-configs/:serverId (удалить только конфигурацию)
+async function deleteServerConfig(req, res) {
+  const { serverId } = req.params;
+  
+  try {
+    await deleteS3Object(`filter-manager/config-${serverId}.txt`);
+    const meta = await headMeta(`filter-manager/config-${serverId}.txt`);
+    return sendOk(res, meta);
+  } catch (error) {
+    console.error(error);
+    return sendError(res, 500, 'Error deleting server config from S3', 'E_S3');
+  }
+}
+
+// DELETE /api/server-configs/:serverId/complete (удалить конфигурацию и фильтры)
+async function deleteServerComplete(req, res) {
+  const { serverId } = req.params;
+  
+  try {
+    await Promise.allSettled([
+      deleteS3Object(`filter-manager/config-${serverId}.txt`),
+      deleteS3Object(`filter-manager/server-filters-${serverId}.json`)
+    ]);
+    
+    return res.json({ ok: true, etag: null, lastModified: null, contentLength: null });
+  } catch (error) {
+    console.error(error);
+    return sendError(res, 500, 'Error deleting server files from S3', 'E_S3');
+  }
+}
+
+// GET /api/server-filters/:serverId
+async function getServerFilters(req, res) {
+  const { serverId } = req.params;
+  
+  try {
+    const head = await s3.send(new HeadObjectCommand({ 
+      Bucket: BUCKET_NAME, 
+      Key: `filter-manager/server-filters-${serverId}.json` 
+    })).catch(() => null);
+    
+    const etag = head?.ETag || null;
+    if (etag) res.set('ETag', String(etag));
+    if (head?.LastModified) res.set('Last-Modified', new Date(head.LastModified).toUTCString());
+    if (typeof head?.ContentLength === 'number') res.set('Content-Length-Source', String(head.ContentLength));
+    if (checkIfNoneMatch(req, res, etag)) return;
+
+    const data = await s3.send(new GetObjectCommand({ 
+      Bucket: BUCKET_NAME, 
+      Key: `filter-manager/server-filters-${serverId}.json` 
+    }));
+    const fileContent = await streamToString(data.Body);
+    let filters = [];
+    
+    try {
+      filters = JSON.parse(fileContent);
+      if (!Array.isArray(filters)) filters = [];
+    } catch (parseError) {
+      console.error('Error parsing server filters:', parseError);
+      filters = [];
+    }
+    
+    res.json(filters);
+  } catch (error) {
+    if (error.code === 'NoSuchKey') {
+      res.json([]);
+    } else {
+      console.error(error);
+      return sendError(res, 500, 'Error reading server filters from S3', 'E_S3');
+    }
+  }
+}
+
+// POST /api/server-filters/:serverId
+async function postServerFilters(req, res) {
+  const { serverId } = req.params;
+  const { filters } = req.body;
+  
+  if (!Array.isArray(filters)) {
+    return sendError(res, 400, 'Filters must be an array', 'E_BAD_REQUEST');
+  }
+  
+  for (let i = 0; i < filters.length; i++) {
+    const filter = filters[i];
+    if (!filter.community || !filter.gateway) {
+      return sendError(res, 400, `Filter at index ${i} is missing required fields`, 'E_SCHEMA');
+    }
+  }
+
+  try {
+    const { writeS3JsonObject } = require('../services/s3Service');
+    const meta = await writeS3JsonObject(`filter-manager/server-filters-${serverId}.json`, filters);
+    return sendOk(res, meta);
+  } catch (error) {
+    console.error(error);
+    return sendError(res, 500, 'Error writing server filters to S3', 'E_S3');
+  }
+}
+
+module.exports = {
+  serverConfigsListRoutes,
+  getServerConfig,
+  postServerConfig,
+  deleteServerConfig,
+  deleteServerComplete,
+  getServerFilters,
+  postServerFilters,
+};
+