refactor(mikrotikBackupRoutes, mikrotikBackupScheduler, mikrotikApplyService): replace direct export command with file-based export method for improved reliability and error handling
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 3m59s
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 3m59s
This commit is contained in:
@@ -15,7 +15,7 @@ const crypto = require('crypto');
|
||||
const { sendError, sendOk } = require('../middleware/errorHandler');
|
||||
const { writeS3TextObject, readS3TextObject, listS3Objects } = require('../services/s3Service');
|
||||
const { readServersFromS3 } = require('./serversRoutes');
|
||||
const { createRosClient } = require('../services/mikrotikApplyService');
|
||||
const { createRosClient, fetchExportViaFile } = require('../services/mikrotikApplyService');
|
||||
const { decrypt } = require('../utils/encryption');
|
||||
|
||||
const BACKUP_PREFIX = 'backups/mikrotik';
|
||||
@@ -261,29 +261,8 @@ async function runBackupNow(req, res) {
|
||||
throw e;
|
||||
}
|
||||
|
||||
// /rest/execute с командой "/export compact terse", как в планировщике
|
||||
const resp = await client.command('execute', { script: '/export compact terse' });
|
||||
const data = resp && resp.data;
|
||||
let config = '';
|
||||
if (typeof data === 'string') config = data;
|
||||
else if (Array.isArray(data)) {
|
||||
config = data
|
||||
.map((line) => {
|
||||
if (typeof line === 'string') return line;
|
||||
if (line && typeof line === 'object') {
|
||||
if (line.rsc) return String(line.rsc);
|
||||
if (line.config) return String(line.config);
|
||||
return JSON.stringify(line);
|
||||
}
|
||||
return String(line ?? '');
|
||||
})
|
||||
.join('\n');
|
||||
} else if (data && typeof data === 'object') {
|
||||
config = JSON.stringify(data, null, 2);
|
||||
} else {
|
||||
config = String(data || '');
|
||||
}
|
||||
|
||||
// API не возвращает текст /export напрямую — экспортируем в файл, читаем, удаляем
|
||||
const config = await fetchExportViaFile(client);
|
||||
if (!config || !config.trim()) {
|
||||
return sendError(res, 502, 'Empty export result from MikroTik', 'E_EMPTY_EXPORT');
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user