feat(mikrotikBackup): add endpoint and UI for manual backup execution
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 4m39s

This commit is contained in:
2026-02-09 19:50:29 +07:00
parent 5eecb8d070
commit 89d35cd7ef
3 changed files with 148 additions and 1 deletions
+115 -1
View File
@@ -12,8 +12,11 @@
*/
const crypto = require('crypto');
const { sendError } = require('../middleware/errorHandler');
const { sendError, sendOk } = require('../middleware/errorHandler');
const { writeS3TextObject, readS3TextObject, listS3Objects } = require('../services/s3Service');
const { readServersFromS3 } = require('./serversRoutes');
const { createRosClient } = require('../services/mikrotikApplyService');
const { decrypt } = require('../utils/encryption');
const BACKUP_PREFIX = 'backups/mikrotik';
@@ -194,11 +197,122 @@ async function diffBackups(req, res) {
}
}
/**
* Вспомогательная функция: получить MikroTik REST-клиент по serverId
*/
async function getMikrotikClientForServerId(serverId) {
const servers = await readServersFromS3();
const server = servers.find((s) => (s.id || s.dns || s.ip) === serverId);
if (!server || server.type !== 'jumphost') {
const err = new Error('Jumphost server not found');
err.code = 'E_NOT_FOUND';
throw err;
}
const host = server.mikrotikHost || server.ip || server.dns;
if (!host) {
const err = new Error('MikroTik host is not configured for this server');
err.code = 'E_HOST';
throw err;
}
let password = '';
if (server.encryptedMikrotikPassword) {
try {
password = decrypt(server.encryptedMikrotikPassword);
} catch (e) {
const err = new Error('Failed to decrypt MikroTik password');
err.code = 'E_CREDENTIALS';
throw err;
}
} else {
const err = new Error('MikroTik credentials not configured for this server');
err.code = 'E_CREDENTIALS';
throw err;
}
const port = server.mikrotikPort;
const restPort = port === 80 || port === 443 || port === 8443 ? port : 80;
const user = server.mikrotikUser || 'admin';
const creds = { host, port: restPort, user, password, secure: false };
return createRosClient(creds);
}
/**
* POST /api/mikrotik/backups/run
* Body: { serverId: string }
*
* Немедленно делает /rest/export compact на указанном MikroTik и сохраняет результат в S3.
*/
async function runBackupNow(req, res) {
try {
const { serverId } = req.body || {};
if (!serverId || typeof serverId !== 'string') {
return sendError(res, 400, 'serverId is required', 'E_BAD_REQUEST');
}
let client;
try {
client = await getMikrotikClientForServerId(serverId);
} catch (e) {
if (e.code === 'E_NOT_FOUND') {
return sendError(res, 400, e.message, e.code);
}
if (e.code === 'E_HOST' || e.code === 'E_CREDENTIALS') {
return sendError(res, 400, e.message, e.code);
}
throw e;
}
// /rest/export с compact, как в планировщике
const resp = await client.command('export', { compact: '' });
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 || '');
}
if (!config || !config.trim()) {
return sendError(res, 502, 'Empty export result from MikroTik', 'E_EMPTY_EXPORT');
}
const { key, createdAt, s3 } = await saveBackupForServer(serverId, config, {
source: 'manual',
comment: 'Manual backup from UI (/api/mikrotik/backups/run)',
});
return sendOk(res, {
ok: true,
key,
serverId,
createdAt,
s3,
});
} catch (error) {
console.error('runBackupNow error:', error);
const msg = error?.message || 'Error running backup now';
return sendError(res, 500, msg, 'E_BACKUP_RUN');
}
}
module.exports = {
createBackup,
listBackups,
getBackup,
diffBackups,
saveBackupForServer,
runBackupNow,
};
+1
View File
@@ -461,6 +461,7 @@ app.post('/api/mikrotik/backups', writeLimiter, mikrotikBackupRoutes.createBacku
app.get('/api/mikrotik/backups', mikrotikBackupRoutes.listBackups);
app.get('/api/mikrotik/backups/item', mikrotikBackupRoutes.getBackup);
app.post('/api/mikrotik/backups/diff', mikrotikBackupRoutes.diffBackups);
app.post('/api/mikrotik/backups/run', writeLimiter, mikrotikBackupRoutes.runBackupNow);
// === MIKROTIK VALIDATION ===
app.post('/api/mikrotik/validate', async (req, res) => {
+32
View File
@@ -268,6 +268,38 @@ function MikrotikBackupsManager() {
<IconRefresh size={16} className="me-1" />
Обновить список
</button>
<button
type="button"
className="btn btn-primary btn-sm d-inline-flex align-items-center"
onClick={async () => {
if (!selectedServer) return;
try {
const serverId = selectedServer.id || selectedServer.dns || selectedServer.ip;
if (!serverId) {
notify.error('У выбранного сервера нет id/dns/ip для идентификации');
return;
}
notify.info('Запуск ручного бэкапа MikroTik...');
const res = await api.post('/mikrotik/backups/run', { serverId });
if (res?.data?.ok) {
notify.success('Ручной бэкап успешно создан');
await fetchBackups(serverId);
} else {
notify.error(res?.data?.message || 'Не удалось выполнить ручной бэкап');
}
} catch (err) {
console.error('Error running manual backup:', err);
const msg =
err?.response?.data?.message ||
err?.response?.data ||
'Ошибка при выполнении ручного бэкапа';
notify.error(msg);
}
}}
disabled={!selectedServer || loadingBackups}
>
Создать бэкап сейчас
</button>
<Tooltip content="Выберите два бэкапа в таблице" position="top">
<button
type="button"