From 3a41cc394cffa5d6ec214084f3f638cdcd177944 Mon Sep 17 00:00:00 2001 From: shats Date: Tue, 14 Oct 2025 21:19:03 +0700 Subject: [PATCH] =?UTF-8?q?feat:=20=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=20createTextDataPOST=20=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA=D0=B8=20=D0=BD=D0=B5=D1=81?= =?UTF-8?q?=D0=BA=D0=BE=D0=BB=D1=8C=D0=BA=D0=B8=D1=85=20=D1=82=D0=B8=D0=BF?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=B2=D1=85=D0=BE=D0=B4=D0=BD=D1=8B=D1=85=20?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20(domains,=20ipRanges,=20?= =?UTF-8?q?items)=20=D1=81=20=D1=83=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?= =?UTF-8?q?=D0=BD=D0=BE=D0=B9=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B5=D0=B9=20=D0=B8=20=D0=BE=D0=B1=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=BE=D0=B9=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE?= =?UTF-8?q?=D0=BA.=20=D0=AD=D1=82=D0=BE=20=D1=83=D0=BB=D1=83=D1=87=D1=88?= =?UTF-8?q?=D0=B0=D0=B5=D1=82=20=D0=BE=D0=B1=D1=80=D0=B0=D1=82=D0=BD=D1=83?= =?UTF-8?q?=D1=8E=20=D1=81=D0=BE=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=B8=D0=BC?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20=D0=B8=20=D0=B3=D0=B8=D0=B1=D0=BA?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=8C=20API.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/routes/textDataRoutes.js | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/backend/routes/textDataRoutes.js b/backend/routes/textDataRoutes.js index ed8bd67..44b6dd0 100644 --- a/backend/routes/textDataRoutes.js +++ b/backend/routes/textDataRoutes.js @@ -100,22 +100,31 @@ function createTextDataGET(s3Key, mapLine, validate, cachePrefix) { */ function createTextDataPOST(s3Key, formatLine, validate, validateItem = null) { return async (req, res) => { - const { domains, etag } = req.body; // Используем 'domains' для обратной совместимости + const { domains, ipRanges, items, etag } = req.body; // 'domains' основной ключ, но поддерживаем и альтернативные - if (!Array.isArray(domains)) { + // Поддержка обратной совместимости: принимаем domains | ipRanges | items + const payload = Array.isArray(domains) + ? domains + : Array.isArray(ipRanges) + ? ipRanges + : Array.isArray(items) + ? items + : null; + + if (!Array.isArray(payload)) { return sendError(res, 400, 'Data must be an array', 'E_BAD_REQUEST'); } // Валидация с помощью AJV - if (!validate(domains || [])) { + if (!validate(payload || [])) { return sendError(res, 400, 'Invalid payload format', 'E_SCHEMA'); } // Дополнительная валидация элементов, если предоставлена if (validateItem) { const validationErrors = []; - for (let i = 0; i < domains.length; i++) { - const errors = validateItem(domains[i], i); + for (let i = 0; i < payload.length; i++) { + const errors = validateItem(payload[i], i); if (errors.length > 0) { validationErrors.push(...errors); } @@ -128,7 +137,7 @@ function createTextDataPOST(s3Key, formatLine, validate, validateItem = null) { } } - const fileContent = (domains || []).map(formatLine).filter(Boolean).join('\n'); + const fileContent = (payload || []).map(formatLine).filter(Boolean).join('\n'); try { // Проверка ETag для optimistic concurrency