gustavosantos/MIKROTIK-RMM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: RouterBOOT upgrade support, update UI overhaul, discovery fixes (v0.10.6 Beta)

Browse Source 
RouterOS vs RouterBOOT distinction:
- Rename "Firmware Updates" → "RouterOS Updates" everywhere (Config tab,
  dashboard banner, devices list tooltip) to accurately reflect what is
  being updated
- Add RouterBOOT bootloader upgrade support as a distinct operation:
  new DeviceCollector methods checkRouterboardUpgrade() and
  installRouterboardUpgrade() using /system/routerboard/print and
  /system/routerboard/upgrade
- New API endpoints: POST /api/devices/:id/check-routerboard and
  POST /api/devices/:id/install-routerboard
- Daily poller now also checks RouterBOOT upgrade status while already
  connected during firmware check cycle, with first-discovery alerts

Config tab update panel:
- Combine RouterOS and RouterBOOT into a single "Software & Firmware
  Updates" card with two subsections separated by a divider
- Pre-populate both sections from stored DB state on load — no longer
  requires a manual "Check" click to see a known pending update
- Enforce update order: when both are pending, show a blue info banner
  explaining RouterOS must be installed first, and disable the
  RouterBOOT "Upgrade & Reboot" button until the RouterOS update clears
- Fix GET /api/devices/:id to include firmware_update_available,
  latest_ros_version, routerboard_upgrade_available, upgrade_firmware_version
  (these were missing from the detail endpoint)

Dashboard & devices list:
- Combined amber banner now shows two distinct rows: RouterOS (N) with
  device links and RouterBOOT (N) with device links — one dismiss for both
- Devices list: amber ArrowUpCircle = RouterOS update, blue Cpu icon =
  RouterBOOT upgrade, each with distinct tooltips
- Fix GET /api/devices (list) to include routerboard_upgrade_available and
  upgrade_firmware_version (these were missing, causing RouterBOOT
  notifications to never appear on the dashboard)

DB migration:
- Add routerboard_upgrade_available BOOLEAN DEFAULT FALSE
- Add upgrade_firmware_version VARCHAR(20)

Discovery system fixes:
- Fix duplicate entries: replace single-key (mac || ip || identity) dedup
  with three cross-referenced indexes so a neighbor seen via LLDP by one
  device and via MNDP by another always merges into one row
- Fix offline devices persisting: handleDeviceFailure now deletes
  topology_links for the offline device (same pattern as clients)
- Add periodic stale-link sweep every 15 min that removes topology_links
  rows older than 20 min as a safety net for devices that go offline
  without cleanly triggering handleDeviceFailure
This commit is contained in:
2GT-Rich
2026-04-23 13:46:20 -07:00
parent 138d7a935b
commit 68d88d0306
16 changed files with 454 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/routes/devices.ts
+78 -8
View File
@@ -61,6 +61,7 @@ router.get('/', async (_req: Request, res: Response) => {
const devices = await query(
`SELECT id, name, ip_address, api_port, api_username, model, serial_number,
firmware_version, ros_version, latest_ros_version, firmware_update_available,
routerboard_upgrade_available, upgrade_firmware_version,
device_type, status, last_seen, notes,
location_address, location_lat::float8 AS location_lat, location_lng::float8 AS location_lng,
rack_name, rack_slot, created_at
@@ -139,18 +140,41 @@ router.get('/discovered', async (_req: Request, res: Response) => {
const nameToDevice = new Map<string, { id: number; name: string }>();
for (const r of managedByName) nameToDevice.set(r.name.toLowerCase(), { id: r.id, name: r.name });
// Deduplicate by MAC (most reliable), fallback to IP, then identity
// Deduplicate across all three identifiers so that a neighbor seen by multiple managed
// devices — some via LLDP (has MAC), others via MNDP (no MAC) — merges into one entry.
// Three indexes cross-reference mac/ip/identity to the canonical dedup key.
const seen = new Map<string, typeof rows[0] & { seen_by_list: string[] }>();
const macIdx = new Map<string, string>(); // normalised-mac → canonical key
const ipIdx = new Map<string, string>(); // ip → canonical key
const nameIdx = new Map<string, string>(); // lower-identity → canonical key
for (const row of rows) {
const key = row.neighbor_mac || row.neighbor_address || row.neighbor_identity || '';
if (!key) continue;
if (seen.has(key)) {
const existing = seen.get(key)!;
if (!existing.seen_by_list.includes(row.seen_by)) {
const mac = (row.neighbor_mac || '').toLowerCase();
const ip = row.neighbor_address || '';
const identity = (row.neighbor_identity || '').toLowerCase();
// Find whether any identifier matches something already in the map
const existingKey =
(mac && macIdx.get(mac)) ||
(ip && ipIdx.get(ip)) ||
(identity && nameIdx.get(identity));
if (existingKey) {
const existing = seen.get(existingKey)!;
if (row.seen_by && !existing.seen_by_list.includes(row.seen_by)) {
existing.seen_by_list.push(row.seen_by);
}
// Register any newly-learned identifiers against the same key
if (mac && !macIdx.has(mac)) macIdx.set(mac, existingKey);
if (ip && !ipIdx.has(ip)) ipIdx.set(ip, existingKey);
if (identity && !nameIdx.has(identity)) nameIdx.set(identity, existingKey);
} else {
seen.set(key, { ...row, seen_by_list: [row.seen_by] });
const key = mac || ip || identity;
if (!key) continue;
seen.set(key, { ...row, seen_by_list: row.seen_by ? [row.seen_by] : [] });
if (mac) macIdx.set(mac, key);
if (ip) ipIdx.set(ip, key);
if (identity) nameIdx.set(identity, key);
}
}
@@ -249,7 +273,9 @@ router.get('/bulk-add/jobs/:jobId', requireWrite, async (req: Request, res: Resp
router.get('/:id', async (req: Request, res: Response) => {
const device = await queryOne(
`SELECT id, name, ip_address, api_port, api_username, ssh_port, ssh_username, model,
serial_number, firmware_version, ros_version, device_type, status, last_seen,
serial_number, firmware_version, ros_version, latest_ros_version,
firmware_update_available, routerboard_upgrade_available, upgrade_firmware_version,
device_type, status, last_seen,
notes, location_address,
location_lat::float8 AS location_lat,
location_lng::float8 AS location_lng,
@@ -923,6 +949,50 @@ router.post('/:id/install-update', requireWrite, async (req: Request, res: Respo
}
});
// POST /api/devices/:id/check-routerboard
router.post('/:id/check-routerboard', async (req: Request, res: Response) => {
const deviceRow = await queryOne<any>(
`SELECT id, ip_address, api_port, api_username, api_password_encrypted FROM devices WHERE id = $1`,
[req.params.id]
);
if (!deviceRow) return res.status(404).json({ error: 'Device not found' });
const collector = new DeviceCollector(deviceRow);
try {
await collector.connect();
const info = await collector.checkRouterboardUpgrade();
await query(
`UPDATE devices SET routerboard_upgrade_available = $1, upgrade_firmware_version = $2, updated_at = NOW() WHERE id = $3`,
[info.upgradeAvailable, info.upgradeFirmware || null, deviceRow.id]
);
return res.json(info);
} finally {
collector.disconnect();
}
});
// POST /api/devices/:id/install-routerboard
router.post('/:id/install-routerboard', requireWrite, async (req: Request, res: Response) => {
const deviceRow = await queryOne<any>(
`SELECT id, ip_address, api_port, api_username, api_password_encrypted FROM devices WHERE id = $1`,
[req.params.id]
);
if (!deviceRow) return res.status(404).json({ error: 'Device not found' });
const collector = new DeviceCollector(deviceRow);
try {
await collector.connect();
await collector.installRouterboardUpgrade();
await query(
`UPDATE devices SET routerboard_upgrade_available = FALSE, updated_at = NOW() WHERE id = $1`,
[deviceRow.id]
);
return res.json({ message: 'RouterBOOT upgrade initiated. Device will reboot.' });
} finally {
collector.disconnect();
}
});
// POST /api/devices/:id/reboot
router.post('/:id/reboot', requireWrite, async (req: Request, res: Response) => {
const deviceRow = await queryOne<any>(