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

fix(wireless): CAPsMAN panel corrections from field testing (v0.22.1-beta)

Browse Source 
All five points raised on #94 after the reporter tested v0.22.0 against a live
CAPsMAN deployment. Two were regressions in that release.

Operating channel instead of a capability list (mine)
  current_channel was stored from /interface/wifi/radio's current-channels, which
  is every channel the radio supports rather than the one it is using. Measured on
  a wAP ax: 535 characters on the 2.4 GHz radio and 3037 on the 5 GHz one — the
  "two kilobytes of text" reported. /interface/wifi/monitor gives the operating
  channel (5500/ax/Ceeeeeee/D), and carries state, peer counts and TX power too,
  all now shown on the radio chip.

Client counts that were zero everywhere (mine)
  The panel read registered_clients from the CAP's own wireless_interfaces rows,
  which are empty when traffic is processed centrally by the controller.

  Monitor's registered-peers is not the fix either, and testing caught that before
  it shipped: clients register on the virtual AP carrying the SSID, not on the
  physical radio, so monitor on a physical radio reports zero on a busy access
  point. On the test AP, wifi1 and wifi2 both read 0 while wifi3-wifi6 held all ten
  clients.

  Counts now come from the registration table, with each entry attributed to its
  radio by following master-interface up to the interface owning a radio-mac. That
  field requires /interface/wifi/print detail — it is absent from the plain
  listing. Verified against real hardware: ten registrations, attributed 8 and 2
  across the two radios, none dropped.

"no network" on remote interfaces
  The Network column resolved from the AP's own bridge ports. A CAPsMAN-provisioned
  interface is not a local bridge port, so nothing matched and the UI asserted the
  interface had no network at all. It now falls back to the datapath — inline
  fields or a named/.id reference — and labels the source. Where the datapath names
  no bridge it says "via controller" rather than claiming no network.

Status labels
  "Serving Clients" claimed something the underlying field does not say: running
  means the radio is up, not that clients are connected. Now "Running" and
  "Enabled, not running".

Table title
  "SSIDs / Wireless Interfaces" conflated two different things; the table lists
  interfaces, virtual and physical. Now "Wireless Interfaces".

Guest WiFi on CAPsMAN-provisioned radios
  Raised by the reporter as an aside, and it was a real hazard already shipping.
  setupGuestNetwork created virtual APs locally on whatever physical radios it
  found, with no awareness that a controller might own them — the SSID would be
  ignored or overwritten on the next provision while the UI reported success.
  Provisioned radios are now skipped with an explanation, and if every radio is
  provisioned the setup is refused, pointing at the controller instead.

37 unit tests on the CAPsMAN module. No regression on a fleet without a
controller: local bridge-port resolution unchanged, roles still correct.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
2GT-Rich
2026-08-20 11:11:43 -07:00
co-authored by Claude Opus 5
parent 14bab24c7e
commit e15556b601
12 changed files with 362 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/mikrotik/DeviceCollector.ts
+81 -10
View File
@@ -9,7 +9,8 @@ import { buildServerArpMap } from '../../utils/serverArp';
import { aggregateBridgeVlans, portVlanMembership, expandVlanIds } from '../../utils/vlan';
import {
classifyWifiRole, isCapsmanManaged, parseCapsmanStatus, parseCapStatus,
normalizeRadios, lookupDeviceForMac, macIndexKeys,
normalizeRadios, lookupDeviceForMac, macIndexKeys, parseRadioMonitor, resolveDatapath,
clientsPerRadio,
type WifiRole,
} from './capsman';
import { BackupService } from '../BackupService';
@@ -1392,12 +1393,21 @@ export class DeviceCollector {
return;
}
const [radioRows, configRows, provRows] = await Promise.all([
const [radioRows, configRows, provRows, ifaceRows, regRows] = await Promise.all([
this.client.execute('/interface/wifi/radio/print').catch(() => null),
this.client.execute('/interface/wifi/configuration/print', { detail: '' }).catch(() => null),
this.client.execute('/interface/wifi/provisioning/print', { detail: '' }).catch(() => null),
// `detail` is required: master-interface, which links a virtual AP to its
// radio, is absent from the plain listing.
this.client.execute('/interface/wifi/print', { detail: '' }).catch(() => [] as Record<string, string>[]),
this.client.execute('/interface/wifi/registration-table/print').catch(() => [] as Record<string, string>[]),
]);
// Clients register on the virtual AP, not the physical radio, so monitor's
// registered-peers reads zero on a busy access point. Count from the
// registration table and attribute each entry to its owning radio instead.
const clientCounts = clientsPerRadio(ifaceRows, regRows);
// Fleet-wide MAC → device index, including a five-octet prefix key because a
// radio MAC often differs from the interface MAC in the final octet only.
const macRows = await query<{ device_id: number; mac_address: string }>(
@@ -1414,11 +1424,28 @@ export class DeviceCollector {
if (radioRows !== null) {
const radios = normalizeRadios(radioRows);
// `current-channels` from /interface/wifi/radio lists every channel the
// radio *supports* — kilobytes of text on a multi-band radio — not the one
// it is on. Monitor reports the operating channel, and it carries the peer
// counts too, which under CAPsMAN only the controller knows: the CAP's own
// registration table is empty when traffic is processed centrally.
const live = new Map<string, ReturnType<typeof parseRadioMonitor>>();
await Promise.all(radios.map(async (radio) => {
const iface = radio.interfaceName;
if (!iface) return;
const mon = await this.client
.execute('/interface/wifi/monitor', { '.id': iface, once: '' })
.catch(() => [] as Record<string, string>[]);
live.set(iface, parseRadioMonitor(mon[0]));
}));
const seen: string[] = [];
for (const radio of radios) {
if (!radio.radioMac) continue;
seen.push(radio.radioMac);
const capInfo = parseCapStatus(radio.raw);
const st = radio.interfaceName ? live.get(radio.interfaceName) : undefined;
const matched = radio.local
? this.device.id
: lookupDeviceForMac(radio.radioMac, macIndex);
@@ -1426,16 +1453,22 @@ export class DeviceCollector {
await query(
`INSERT INTO capsman_radios
(controller_device_id, radio_mac, interface_name, local, hw_type,
current_channel, remote_cap_name, matched_device_id, config_json, updated_at)
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,NOW())
current_channel, remote_cap_name, matched_device_id, config_json,
state, registered_peers, authorized_peers, tx_power, updated_at)
VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,$12,$13,NOW())
ON CONFLICT (controller_device_id, radio_mac) DO UPDATE SET
interface_name=$3, local=$4, hw_type=$5, current_channel=$6,
remote_cap_name=$7, matched_device_id=$8, config_json=$9, updated_at=NOW()`,
remote_cap_name=$7, matched_device_id=$8, config_json=$9,
state=$10, registered_peers=$11, authorized_peers=$12, tx_power=$13,
updated_at=NOW()`,
[
this.device.id, radio.radioMac, radio.interfaceName, radio.local,
radio.hwType, radio.currentChannel,
radio.hwType, st?.channel ?? null,
capInfo?.capMac ?? radio.raw['name'] ?? null,
matched, JSON.stringify(radio.raw),
st?.state ?? null,
clientCounts.get(radio.radioMac) ?? st?.registeredPeers ?? null,
st?.authorizedPeers ?? null, st?.txPower ?? null,
]
);
}
@@ -1946,11 +1979,14 @@ export class DeviceCollector {
const pkg = await this.detectWifiPackage();
if (pkg === 'none') return [];
const [rawIfaces, bridgePorts] = await Promise.all([
const [rawIfaces, bridgePorts, datapaths] = await Promise.all([
pkg === 'wifi'
? this.client.execute('/interface/wifi/print').catch(() => [] as Record<string, string>[])
: this.client.execute('/interface/wireless/print', { detail: '' }).catch(() => [] as Record<string, string>[]),
this.getBridgePorts(),
pkg === 'wifi'
? this.client.execute('/interface/wifi/datapath/print', { detail: '' }).catch(() => [] as Record<string, string>[])
: Promise.resolve([] as Record<string, string>[]),
]);
const rawNormalized = pkg === 'wifi'
@@ -1977,9 +2013,21 @@ export class DeviceCollector {
// Enrich each interface with its bridge port membership (if any)
const portByIface = new Map(bridgePorts.map(p => [p['interface'], p]));
return ifaces.map(iface => {
return ifaces.map((iface, i) => {
const port = portByIface.get(iface['name']);
if (!port) return iface;
if (!port) {
// A CAPsMAN-provisioned interface is not a local bridge port, so the port
// table has nothing for it and the UI would claim it has no network at all.
// The bridge and VLAN it actually lands on come from the datapath.
const dp = resolveDatapath(rawIfaces[i] ?? iface, datapaths);
if (!dp.bridge && !dp.vlanId) return iface;
return {
...iface,
...(dp.bridge ? { bridge: dp.bridge } : {}),
...(dp.vlanId ? { 'bridge-pvid': dp.vlanId } : {}),
network_source: 'capsman-datapath',
};
}
return {
...iface,
bridge: port['bridge'] || '',
@@ -2383,9 +2431,32 @@ export class DeviceCollector {
const raw = pkg === 'wifi'
? await this.client.execute('/interface/wifi/print').catch(() => [] as Record<string, string>[])
: await this.client.execute('/interface/wireless/print').catch(() => [] as Record<string, string>[]);
const physicals = raw.filter(r => !r['master-interface'] && r['name']);
let physicals = raw.filter(r => !r['master-interface'] && r['name']);
if (physicals.length === 0) throw new Error('No physical radios found to attach the guest SSID to');
// A CAPsMAN-provisioned radio is owned by the controller. Adding a local
// virtual AP to it does not reliably take effect and can be wiped or
// contradicted the next time the controller provisions the CAP — so skip
// those radios and say so, rather than reporting success for something that
// silently will not work. Raised by the reporter of issue #94.
const role = await this.detectWifiRole();
const managedRadios = physicals.filter(r => isCapsmanManaged(r, role));
if (managedRadios.length > 0) {
physicals = physicals.filter(r => !isCapsmanManaged(r, role));
const names = managedRadios.map(r => r['name']).join(', ');
if (physicals.length === 0) {
throw new Error(
`Every radio on this device (${names}) is provisioned by CAPsMAN, so a guest SSID `
+ `created here would be overwritten by the controller. Create the guest network on the `
+ `CAPsMAN controller instead, so it is provisioned to the access points.`
);
}
warnings.push(
`Skipped ${names}: provisioned by CAPsMAN, so a locally created SSID would be `
+ `overwritten by the controller. Add it to the controller's configuration instead.`
);
}
const existingBySsid = raw.filter(r =>
(r['ssid'] || r['configuration.ssid'] || '') === ssid.ssid && r['master-interface']);
if (existingBySsid.length > 0) {