@coffeerunhobby/mcp-ha-connect 2.4.7 → 2.5.0

package/dist/net/adapters/ruijie.js

@@ -0,0 +1,363 @@
+/**
+ * Ruijie / Reyee adapter for the vendor-neutral network model (src/net/model.ts), through the
+ * router's local eWeb API (src/ruijieClient). Mapped on a RG-EG105G-V3, ReyeeOS 2.324
+ * (2026-10-24). 2.5.0 READS ONLY: every change is refused (UNSUPPORTED) until the write
+ * phases (reservations and rules, then networks) are built and live-tested.
+ *
+ * What is read, and how it maps:
+ * - networks: devConfig.get network, `lan[]` (one entry per LAN interface: address, netmask,
+ *   VLAN id, DHCP). The default LAN carries Ruijie's internal VLAN 233, untagged on the LAN
+ *   ports; the id of a network is its interface name, "vlan<id>", which rules refer to.
+ * - clients: the devices the router sees on its LAN right now, from its ARP table (devSta.get
+ *   arp, interfaces "br-lan*", resolved MACs only), named by their address lease (devSta.get
+ *   dhcp_lease) when they have one. A lease alone is no online device (a switched-off laptop
+ *   keeps it until it expires); WAN-side ARP entries are the upstream network.
+ * - reservations: devConfig.get dhcp_static.
+ * - ports: devSta.get port_status. The router doesn't say which device is on which port, so
+ *   `seen` stays empty; the WAN port is the uplink and protected.
+ * - rules: devConfig.get access_ctrl (evaluated in list order). Anything the model can't say
+ *   faithfully (a source "anywhere", source ports, IPv6, user groups, schedules, a rule that
+ *   matches only some connection states) is listed as `foreign` with the reason.
+ * No Wi-Fi radio on this model, no switch port profiles, no mDNS repeater; groups (Ruijie's
+ * user groups are address ranges and users, not the model's address groups) come later.
+ */
+import { formatMac, normalizeMac } from '../../omadaClient/client.js';
+import { inSubnet, ipToNumber, parseCidr, subnetsOverlap } from '../../utils/ipv4.js';
+import { NetError, } from '../model.js';
+/** Ruijie's name for "all the time" in a rule's time setting (the default time group). */
+const ALL_TIME = new Set(['所有时段', 'everytime', 'All Time', '']);
+const READ_ONLY = 'The Ruijie adapter reads only in this version; changes through it (reservations and rules first, then networks) come in a later version.';
+const text = (value) => (typeof value === 'string' ? value : value === undefined || value === null ? '' : String(value));
+const list = (value) => (Array.isArray(value) ? value.filter((v) => v && typeof v === 'object') : []);
+/** "255.255.255.0" -> 24; undefined for a mask that isn't contiguous ones. */
+export function maskToPrefix(mask) {
+    let n;
+    try {
+        n = ipToNumber(mask);
+    }
+    catch {
+        return undefined;
+    }
+    let prefix = 0;
+    for (let bit = 31; bit >= 0; bit--) {
+        if (Math.floor(n / 2 ** bit) % 2 === 1)
+            prefix++;
+        else
+            break;
+    }
+    return n === (prefix === 0 ? 0 : (2 ** 32 - 2 ** (32 - prefix))) ? prefix : undefined;
+}
+const numberToIp = (n) => [24, 16, 8, 0].map((s) => Math.floor(n / 2 ** s) % 256).join('.');
+/** One `lan[]` entry as a model network (undefined when its address or mask can't be read). */
+export function toNetwork(raw, index, routerHost) {
+    const ip = text(raw.ipaddr);
+    const prefix = maskToPrefix(text(raw.netmask));
+    try {
+        ipToNumber(ip);
+    }
+    catch {
+        return undefined;
+    }
+    if (prefix === undefined)
+        return undefined;
+    const vlan = Number(text(raw.vlanid));
+    const gateway = `${ip}/${prefix}`;
+    const start = text(raw.ipstart);
+    const limit = Number(text(raw.limit));
+    let range;
+    try {
+        if (start && Number.isInteger(limit) && limit > 0)
+            range = { from: start, to: numberToIp(ipToNumber(start) + limit - 1) };
+    }
+    catch {
+        range = undefined;
+    }
+    const lease = Number(text(raw.leasetime));
+    let routerAddress;
+    try {
+        routerAddress = ipToNumber(routerHost);
+    }
+    catch {
+        routerAddress = undefined;
+    }
+    return {
+        id: `vlan${text(raw.vlanid)}`,
+        name: text(raw.desc) || text(raw.name) || (index === 0 ? 'LAN' : `VLAN ${text(raw.vlanid)}`),
+        purpose: 'normal',
+        vlan: Number.isInteger(vlan) ? vlan : 0,
+        gateway,
+        dhcp: {
+            enabled: text(raw.ignore) !== '1',
+            ...(range ? { range } : {}),
+            ...(Number.isInteger(lease) && lease > 0 ? { leaseMinutes: lease } : {}),
+        },
+        ipv6: false,
+        isolated: false,
+        // The first LAN is the router's own (its management address), and so is any LAN the
+        // router is reached through; neither may be cut off.
+        protected: index === 0 || (routerAddress !== undefined && inSubnet(routerAddress, gateway)),
+    };
+}
+const networkOf = (ip, networks) => {
+    let n;
+    try {
+        n = ipToNumber(ip);
+    }
+    catch {
+        return undefined;
+    }
+    return networks.find((net) => net.gateway && inSubnet(n, net.gateway));
+};
+const macOrUndefined = (value) => {
+    try {
+        return formatMac(text(value));
+    }
+    catch {
+        return undefined;
+    }
+};
+/** The devices the router sees on its LAN (ARP), once each, named by their lease (same MAC and address) when they have one. */
+export function toClients(leases, arp, networks) {
+    const names = new Map();
+    for (const l of leases) {
+        const mac = macOrUndefined(l.mac);
+        const name = text(l.hostname);
+        const key = `${mac}|${text(l.ip)}`;
+        if (mac && name && name !== '*' && !names.has(key))
+            names.set(key, name);
+    }
+    const clients = [];
+    const seen = new Set();
+    for (const a of arp) {
+        if (!text(a.intf).startsWith('br-lan'))
+            continue;
+        const mac = macOrUndefined(a.hardware);
+        // 00:00:00:00:00:00 = an address nobody answered for.
+        if (!mac || mac === '00-00-00-00-00-00' || seen.has(mac))
+            continue;
+        seen.add(mac);
+        const ip = text(a.address);
+        const network = networkOf(ip, networks);
+        const name = names.get(`${mac}|${ip}`);
+        clients.push({ mac, ...(name ? { name } : {}), ...(ip ? { ip } : {}), ...(network ? { network: { id: network.id } } : {}), online: true });
+    }
+    return clients;
+}
+export function toReservations(entries, networks) {
+    const out = [];
+    for (const e of entries) {
+        const mac = macOrUndefined(e.macaddr);
+        const ip = text(e.ipaddr);
+        if (!mac || !ip)
+            continue;
+        const network = networkOf(ip, networks);
+        out.push({ mac, ip, network: network ? { id: network.id } : { name: 'outside the router\'s networks' } });
+    }
+    return out;
+}
+export function toPorts(entries, routerMac) {
+    return entries.map((p) => {
+        const wan = text(p.name).toUpperCase() === 'WAN';
+        return {
+            device: { mac: routerMac },
+            port: Number(text(p.portId)),
+            ...(text(p.panel_name) ? { name: text(p.panel_name) } : {}),
+            seen: [],
+            uplink: wan,
+            ...(wan ? { protected: "it is the router's internet (WAN) port" } : {}),
+        };
+    });
+}
+/**
+ * A rule side (src or dest, with its addresses) as model selectors, or the reason it can't be one.
+ * The model's address selector carries no interface, so addresses are kept only where they imply
+ * the interface the rule names: inside the LANs (lan) or that VLAN (vlanX), outside every LAN
+ * (wan), or any interface (all). Anything else would overstate or misplace what the rule matches.
+ */
+function side(where, addresses, networks, isSource) {
+    if (addresses) {
+        const parts = addresses.split(',').map((a) => a.trim()).filter(Boolean);
+        if (parts.some((a) => a.includes('-')))
+            return `an address range (${addresses})`;
+        let ranges;
+        try {
+            ranges = parts.map((a) => parseCidr(a));
+        }
+        catch {
+            return `an address it can't read (${addresses})`;
+        }
+        const inside = (nets) => ranges.every((r) => nets.some((n) => n.gateway && r.network >= parseCidr(n.gateway).network && r.broadcast <= parseCidr(n.gateway).broadcast));
+        const lans = networks.filter((n) => n.gateway);
+        const implied = where === 'all' ||
+            (where === 'lan' && inside(lans)) ||
+            (where === 'wan' && parts.every((a) => !lans.some((n) => subnetsOverlap(a, n.gateway)))) ||
+            (where.startsWith('vlan') && inside(networks.filter((n) => n.id === where)));
+        if (!implied)
+            return `addresses (${addresses}) limited to the interface '${where}'`;
+        return [{ addresses: parts }];
+    }
+    if (where === 'wan')
+        return [{ internet: true }];
+    if (where === 'lan')
+        return networks.map((n) => ({ network: { id: n.id } }));
+    if (where === 'all')
+        return isSource ? 'traffic from anywhere, the internet included' : 'traffic to anywhere';
+    const network = networks.find((n) => n.id === where);
+    if (network)
+        return [{ network: { id: network.id } }];
+    return `the interface '${where}'`;
+}
+export function toRule(raw, index, networks) {
+    const reasons = [];
+    const target = text(raw.target).toUpperCase();
+    const action = target === 'ACCEPT' ? 'allow' : 'block';
+    if (!['ACCEPT', 'DROP', 'REJECT'].includes(target))
+        reasons.push(`an unknown action '${text(raw.target)}'`);
+    let from = [];
+    if (text(raw.by) === 'mac') {
+        const mac = macOrUndefined(raw.mac);
+        if (mac)
+            from = [{ device: mac }];
+        else
+            reasons.push('a device match without a readable MAC');
+        // The model's device match has no interface: only "any LAN" or "anywhere" say the same.
+        const where = text(raw.src);
+        if (where && where !== 'lan' && where !== 'all')
+            reasons.push(`a device match limited to the interface '${where}'`);
+    }
+    else {
+        const s = side(text(raw.src), text(raw.srcIP), networks, true);
+        if (typeof s === 'string')
+            reasons.push(s);
+        else
+            from = s;
+    }
+    let to = [];
+    const d = side(text(raw.dest), text(raw.destIP), networks, false);
+    if (typeof d === 'string')
+        reasons.push(d);
+    else
+        to = d;
+    const proto = text(raw.proto).toLowerCase();
+    let protocol = 'any';
+    if (proto === 'tcp' || proto === 'udp' || proto === 'icmp')
+        protocol = proto;
+    else if (proto === 'tcpudp' && !text(raw.destPort))
+        reasons.push('TCP and UDP together without ports');
+    else if (proto !== 'all' && proto !== '' && proto !== 'tcpudp')
+        reasons.push(`the protocol '${text(raw.proto)}'`);
+    if (text(raw.destPort)) {
+        // The model's ports mean TCP and UDP together; a rule for one of them only would be overstated.
+        if (proto === 'tcpudp')
+            protocol = { tcpUdpPorts: text(raw.destPort) };
+        else if (proto === 'tcp' || proto === 'udp')
+            reasons.push(`destination ports for ${proto} only (the model's ports mean TCP and UDP)`);
+        else
+            reasons.push('destination ports without TCP or UDP');
+    }
+    if (text(raw.srcPort))
+        reasons.push('source ports');
+    if (text(raw.netProto) && text(raw.netProto) !== 'ipv4')
+        reasons.push(`an ${text(raw.netProto)} rule`);
+    if (list(raw.user).length || list(raw.user_group_list).length || (Array.isArray(raw.userGroupList) && raw.userGroupList.length))
+        reasons.push('user groups');
+    if (!ALL_TIME.has(text(raw.tmngtName)))
+        reasons.push(`a schedule ('${text(raw.tmngtName)}')`);
+    // "0" = every connection state, replies included (the rule is not stateful).
+    const state = text(raw.state) || '0';
+    if (state !== '0')
+        reasons.push(`only some connection states (${state})`);
+    return {
+        id: text(raw.uuid) || text(raw.ruleid) || `rule-${index + 1}`,
+        name: text(raw.ruleName) || `rule ${index + 1}`,
+        action,
+        from,
+        to,
+        protocol,
+        replies: 'match',
+        schedule: { kind: 'always' },
+        enabled: text(raw.enable) === '1',
+        position: index + 1,
+        ...(reasons.length ? { foreign: { reason: `Read-only here: it uses ${reasons.join(', ')}.` } } : {}),
+    };
+}
+export class RuijieNetworkController {
+    client;
+    vendor = 'ruijie';
+    id;
+    constructor(client, options = {}) {
+        this.client = client;
+        this.id = options.id ?? `ruijie:${client.host}`;
+    }
+    async capabilities() {
+        return {
+            vendor: 'ruijie',
+            networks: { create: 'unsupported', isolation: 'unsupported', ipv6: 'unsupported', guestPurpose: 'unsupported' },
+            wifi: { create: 'unsupported', bands: [], security: [], pmf: 'unsupported', fastRoaming: 'unsupported', bandSteering: 'unsupported' },
+            ports: { profiles: 'unsupported', assign: 'unsupported' },
+            rules: { between: 'unsupported', toInternet: 'unsupported', deviceMatch: 'unsupported', wifiMatch: 'unsupported', stateful: 'unsupported', schedule: 'unsupported' },
+            groups: { address: 'unsupported', mac: 'unsupported' },
+            reservations: 'unsupported',
+            mdnsRepeater: 'unsupported',
+        };
+    }
+    async protectedResources() {
+        const networks = (await this.listNetworks()).filter((n) => n.protected);
+        const ports = (await this.listPorts()).filter((p) => p.protected);
+        return { networks: networks.map((n) => ({ id: n.id })), ports: ports.map((p) => ({ device: p.device, port: p.port })), devices: [] };
+    }
+    async listNetworks() {
+        const config = await this.client.config('network');
+        return list(config.lan)
+            .map((raw, i) => toNetwork(raw, i, this.client.host))
+            .filter((n) => n !== undefined);
+    }
+    async listWifi() {
+        return [];
+    }
+    async listPortProfiles() {
+        return [];
+    }
+    async listPorts(device) {
+        const info = await this.client.status('sysinfo');
+        const routerMac = macOrUndefined(info.sys_mac) ?? 'unknown';
+        if (device) {
+            const wanted = 'mac' in device ? device.mac : 'id' in device ? device.id : device.name;
+            const names = [routerMac, text(info.model), text(info.product_class), 'router'].map((v) => v.toLowerCase());
+            if (normalizeMac(wanted) !== normalizeMac(routerMac) && !names.includes(wanted.trim().toLowerCase())) {
+                throw new NetError('NOT_FOUND', `This Ruijie router (${text(info.model) || 'router'}, ${routerMac}) is the only device here; '${wanted}' is not it`);
+            }
+        }
+        const status = await this.client.status('port_status');
+        return toPorts(list(status.List), routerMac);
+    }
+    async listRules() {
+        const networks = await this.listNetworks();
+        const acl = await this.client.config('access_ctrl');
+        return list(acl.list).map((raw, i) => toRule(raw, i, networks));
+    }
+    async listGroups() {
+        return [];
+    }
+    async listReservations() {
+        const networks = await this.listNetworks();
+        const config = await this.client.config('dhcp_static');
+        return toReservations(list(config.dhcp_static), networks);
+    }
+    async listClients() {
+        const networks = await this.listNetworks();
+        const leases = await this.client.status('dhcp_lease');
+        const arp = await this.client.status('arp');
+        return toClients(list(leases.List), list(arp.arpList), networks);
+    }
+    async getMdnsRepeater() {
+        return { enabled: false, networks: [], foreign: { reason: 'This Ruijie router has no mDNS repeater the tools manage.' } };
+    }
+    async plan(change) {
+        throw new NetError('UNSUPPORTED', READ_ONLY, { capability: change.kind });
+    }
+    async apply() {
+        throw new NetError('UNSUPPORTED', READ_ONLY);
+    }
+}
+//# sourceMappingURL=ruijie.js.map

package/dist/net/adapters/ruijie.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ruijie.js","sourceRoot":"","sources":["../../../src/net/adapters/ruijie.ts"],"names":[],"mappings":"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"}

package/dist/net/model.d.ts

@@ -26,7 +26,7 @@ export type Ipv4 = string;
 export type Clock = string;
 export declare const DAYS: readonly ["mon", "tue", "wed", "thu", "fri", "sat", "sun"];
 export type Day = (typeof DAYS)[number];
-export type Vendor = 'omada' | 'unifi' | 'mikrotik';
+export type Vendor = 'omada' | 'unifi' | 'mikrotik' | 'ruijie';
 export interface TimeWindow {
     days: Day[];
     from: Clock;
@@ -135,19 +135,47 @@ export interface PortRef {
     };
     port: number;
 }
+/** The networks a port carries: untagged (native) and tagged. */
+export interface PortNetworks {
+    /** Untagged network (the port's PVID); absent when the port carries no untagged traffic. */
+    native?: Ref;
+    /** Further untagged networks besides the native one (rare). */
+    untagged?: Ref[];
+    tagged: Ref[] | 'all' | 'none';
+}
 export interface PortProfile {
     id: string;
     name: string;
-    /** Untagged network (the port's PVID). */
-    native: Ref;
-    tagged: Ref[] | 'all' | 'none';
+    /** What a port following the profile carries; absent when the profile sets no networks (ports keep their own). */
+    networks?: PortNetworks;
     isolation: boolean;
 }
 export interface Port extends PortRef {
+    name?: string;
     profile?: Ref;
-    /** What the port carries right now (clients, an access point, the gateway uplink...). */
+    /** The networks the port carries right now. */
+    networks?: PortNetworks;
+    /** The port has its own settings instead of following its profile (Omada: profile override). */
+    customSettings?: boolean;
+    /** Online devices on the port right now. */
     seen: Client[];
+    /** The port links the switch to the network or to another network device (gateway, switch, access point). */
     uplink: boolean;
+    /** Why the port can't be reassigned through the tools (uplink, the controller's port...), when it can't. */
+    protected?: string;
+}
+/**
+ * Repeats mDNS (Bonjour) announcements between networks, so devices discover each other's
+ * services (AirPlay, Chromecast, HomeKit, printers) across VLANs. Discovery only: traffic
+ * still follows the rules.
+ */
+export interface MdnsRepeater {
+    enabled: boolean;
+    networks: Ref[];
+    /** Set when the controller's mDNS setup is more than the model can express (then it can't be changed here). */
+    foreign?: {
+        reason: string;
+    };
 }
 export interface Group {
     id: string;
@@ -293,7 +321,7 @@ export type Change = {
     op: 'assign';
     kind: 'port';
     port: PortRef;
-    profile: Ref;
+    networks: PortNetworks;
 } | {
     op: 'create';
     kind: 'rule';
@@ -331,7 +359,7 @@ export type Change = {
     op: 'set';
     kind: 'mdnsRepeater';
     enabled: boolean;
-    networks: Ref[];
+    networks?: Ref[];
 };
 /** One vendor-level step of a plan, in the order it will run. Never contains secrets. */
 export interface Step {
@@ -355,7 +383,7 @@ export interface Plan {
 export interface ApplyResult {
     applied: true;
     /** The neutral object after the change (redacted), when there is one. */
-    object?: Network | Wifi | PortProfile | Rule | Group | Reservation;
+    object?: Network | Wifi | PortProfile | Port | Rule | Group | Reservation | MdnsRepeater;
     /** Vendor objects created for this change; tagged so delete() removes them all again. */
     owned: Array<{
         object: string;
@@ -403,10 +431,7 @@ export interface NetworkController {
     listGroups(kind?: Group['kind']): Promise<Group[]>;
     listReservations(): Promise<Reservation[]>;
     listClients(): Promise<Client[]>;
-    getMdnsRepeater(): Promise<{
-        enabled: boolean;
-        networks: Ref[];
-    }>;
+    getMdnsRepeater(): Promise<MdnsRepeater>;
     /** Read-only: validates, resolves refs, checks protection, in-use and lock-out. Throws NetError. */
     plan(change: Change): Promise<Plan>;
     /** Runs a plan; re-checks `basis` first (CONFLICT) and lock-out (LOCKOUT unless allowLockout). */

package/dist/net/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/net/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAcH,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAU,CAAC;AA0Q/E,MAAM,OAAO,QAAS,SAAQ,KAAK;IAElB;IAEA;IAHb,YACa,IAAkB,EAC3B,OAAe,EACN,UAAyE,EAAE;QAEpF,KAAK,CAAC,OAAO,CAAC,CAAC;QAJN,SAAI,GAAJ,IAAI,CAAc;QAElB,YAAO,GAAP,OAAO,CAAoE;QAGpF,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IAC3B,CAAC;CACJ"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/net/model.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAcH,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,CAAU,CAAC;AAwS/E,MAAM,OAAO,QAAS,SAAQ,KAAK;IAElB;IAEA;IAHb,YACa,IAAkB,EAC3B,OAAe,EACN,UAAyE,EAAE;QAEpF,KAAK,CAAC,OAAO,CAAC,CAAC;QAJN,SAAI,GAAJ,IAAI,CAAc;QAElB,YAAO,GAAP,OAAO,CAAoE;QAGpF,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC;IAC3B,CAAC;CACJ"}

package/dist/omadaClient/accessControl.js

@@ -389,7 +389,7 @@ export class AccessControlOperations {
      */
     async refuseLanDestination(destinationType, destinationIds, siteId) {
         const remedy = 'Gateway ACLs made here only cover LAN to internet traffic, so a rule towards your own networks would never match anything. ' +
-            'Rules between networks come with the net_ rule tools (2.4.7); until then make them in the controller web UI (Gateway ACL, direction LAN -> LAN).';
+            'Rules between networks are made with net_createRule (stateful, LAN -> LAN), or in the controller web UI.';
         if (destinationType === DESTINATION_TYPES.network) {
             throw new Error(`A LAN network can't be the destination. ${remedy}`);
         }