feat(NetworkMapScheduler): integrate network map scheduler functionality with API routes and frontend components for enhanced network monitoring
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 1m53s
Publish Fast Tabler Docker image / build-and-push-fast (push) Successful in 1m53s
This commit is contained in:
@@ -1155,4 +1155,5 @@ module.exports = {
|
||||
pingViaInterface,
|
||||
runPingViaRouter,
|
||||
speedTestViaTunnel,
|
||||
loadNetworkConfig,
|
||||
};
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
/**
|
||||
* Роуты планировщика карты сети: настройки, логи, ручной запуск, кеш.
|
||||
*/
|
||||
|
||||
const { sendError, sendOk } = require('../middleware/errorHandler');
|
||||
const { readS3TextObject, writeS3JsonObject } = require('../services/s3Service');
|
||||
const networkMapScheduler = require('../services/networkMapScheduler');
|
||||
|
||||
const UI_SETTINGS_KEY = 'bgp_data/rt_ui_settings.json';
|
||||
const NETWORK_MAP_CACHE_KEY = 'network-map-cache/latest.json';
|
||||
|
||||
const SCHEDULER_KEYS = [
|
||||
'networkMapSchedulerEnabled',
|
||||
'networkMapSchedulerIntervalMinutes',
|
||||
'networkMapSchedulerRunPing',
|
||||
'networkMapSchedulerRunSpeedTest',
|
||||
'networkMapSchedulerLogMaxLines',
|
||||
];
|
||||
|
||||
async function readUiSettings() {
|
||||
try {
|
||||
const data = await readS3TextObject(UI_SETTINGS_KEY).catch(() => ({ body: '{}' }));
|
||||
const parsed = JSON.parse(data?.body || '{}');
|
||||
return parsed && typeof parsed === 'object' ? parsed : {};
|
||||
} catch (_) {
|
||||
return {};
|
||||
}
|
||||
}
|
||||
|
||||
/** GET /api/scheduler/network-map/settings */
|
||||
async function getNetworkMapSchedulerSettings(req, res) {
|
||||
try {
|
||||
const ui = await readUiSettings();
|
||||
const settings = networkMapScheduler.getSettingsFromUiSettings(ui);
|
||||
return res.json(settings);
|
||||
} catch (e) {
|
||||
console.error('[scheduler] getSettings', e);
|
||||
return sendError(res, 500, 'Не удалось прочитать настройки', 'E_SCHEDULER');
|
||||
}
|
||||
}
|
||||
|
||||
/** PATCH /api/scheduler/network-map/settings — обновить только ключи планировщика в ui-settings */
|
||||
async function patchNetworkMapSchedulerSettings(req, res) {
|
||||
try {
|
||||
const body = req.body || {};
|
||||
const current = await readUiSettings();
|
||||
for (const key of SCHEDULER_KEYS) {
|
||||
if (Object.prototype.hasOwnProperty.call(body, key)) {
|
||||
current[key] = body[key];
|
||||
}
|
||||
}
|
||||
if (Object.prototype.hasOwnProperty.call(body, 'networkMapSchedulerLogMaxLines')) {
|
||||
networkMapScheduler.setLogMaxLines(body.networkMapSchedulerLogMaxLines);
|
||||
}
|
||||
await writeS3JsonObject(UI_SETTINGS_KEY, current);
|
||||
const settings = networkMapScheduler.getSettingsFromUiSettings(current);
|
||||
return res.json(settings);
|
||||
} catch (e) {
|
||||
console.error('[scheduler] patchSettings', e);
|
||||
return sendError(res, 500, 'Не удалось сохранить настройки', 'E_SCHEDULER');
|
||||
}
|
||||
}
|
||||
|
||||
/** GET /api/scheduler/network-map/logs */
|
||||
async function getNetworkMapSchedulerLogs(req, res) {
|
||||
try {
|
||||
const lines = networkMapScheduler.getLogs();
|
||||
return res.json({ lines });
|
||||
} catch (e) {
|
||||
console.error('[scheduler] getLogs', e);
|
||||
return sendError(res, 500, 'Не удалось прочитать логи', 'E_SCHEDULER');
|
||||
}
|
||||
}
|
||||
|
||||
/** POST /api/scheduler/network-map/run-now — один запуск по текущим настройкам */
|
||||
async function runNetworkMapSchedulerNow(req, res) {
|
||||
try {
|
||||
const port = Number(process.env.PORT) || 3001;
|
||||
const baseUrl = `http://127.0.0.1:${port}`;
|
||||
const ui = await readUiSettings();
|
||||
const settings = networkMapScheduler.getSettingsFromUiSettings(ui);
|
||||
|
||||
networkMapScheduler.runJob({
|
||||
baseUrl,
|
||||
runPing: settings.runPing,
|
||||
runSpeedTest: settings.runSpeedTest,
|
||||
}).catch((err) => {
|
||||
console.error('[scheduler] run-now failed', err);
|
||||
});
|
||||
|
||||
return sendOk(res, { message: 'Запуск выполняется в фоне' });
|
||||
} catch (e) {
|
||||
console.error('[scheduler] run-now', e);
|
||||
return sendError(res, 500, 'Не удалось запустить', 'E_SCHEDULER');
|
||||
}
|
||||
}
|
||||
|
||||
/** GET /api/network-map-cache — кеш пингов и скоростей для карты сети */
|
||||
async function getNetworkMapCache(req, res) {
|
||||
try {
|
||||
const data = await readS3TextObject(NETWORK_MAP_CACHE_KEY).catch(() => null);
|
||||
if (!data?.body) {
|
||||
return res.json({ pingMap: {}, speedMap: {}, updatedAt: null });
|
||||
}
|
||||
const parsed = JSON.parse(data.body);
|
||||
return res.json({
|
||||
pingMap: parsed.pingMap && typeof parsed.pingMap === 'object' ? parsed.pingMap : {},
|
||||
speedMap: parsed.speedMap && typeof parsed.speedMap === 'object' ? parsed.speedMap : {},
|
||||
updatedAt: typeof parsed.updatedAt === 'number' ? parsed.updatedAt : null,
|
||||
});
|
||||
} catch (e) {
|
||||
console.error('[network-map-cache] get', e);
|
||||
return res.json({ pingMap: {}, speedMap: {}, updatedAt: null });
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
getNetworkMapSchedulerSettings,
|
||||
patchNetworkMapSchedulerSettings,
|
||||
getNetworkMapSchedulerLogs,
|
||||
runNetworkMapSchedulerNow,
|
||||
getNetworkMapCache,
|
||||
};
|
||||
<|tool▁calls▁begin|><|tool▁call▁begin|>
|
||||
StrReplace
|
||||
Reference in New Issue
Block a user