@daemonitor/plugins 1.1.17 → 1.1.19

package/dist/plugins/index.js

@@ -9,6 +9,7 @@ import { createLogWatchPlugin } from "./monitoring/LogWatchPlugin";
 import { createNetScanPlugin } from "./monitoring/NetScanPlugin";
 import { createSnmpPlugin } from "./monitoring/SnmpPlugin";
 import { createThreeCXPlugin } from "./monitoring/ThreeCXPlugin";
+import { createTplinkPlugin } from "./monitoring/TplinkPlugin";
 // In future, implement other plugin factory functions using the same pattern
 // import { createOSPlugin } from "./monitoring/OSPlugin"
 // import { createMongoDBPlugin } from "./monitoring/MongoDBPlugin"
@@ -29,6 +30,7 @@ export default {
     Netscan: createNetScanPlugin,
     Snmp: createSnmpPlugin,
     ThreeCX: createThreeCXPlugin,
+    Tplink: createTplinkPlugin,
     // CloudflarePlugin: createCloudflarePlugin,
     // EwelinkPlugin: createEwelinkPlugin,
     // MongoDBPlugin: createMongoDBPlugin,

package/dist/plugins/monitoring/SnmpPlugin.js

@@ -28,6 +28,7 @@ const SYS = {
     name: "1.3.6.1.2.1.1.5.0", // sysName
     ifOper: "1.3.6.1.2.1.2.2.1.8", // ifOperStatus (walk): 1=up 2=down
     ifAdmin: "1.3.6.1.2.1.2.2.1.7", // ifAdminStatus (walk): 1=up (enabled)
+    ifName: "1.3.6.1.2.1.31.1.1.1.1", // ifName (walk) — eth0/eth1/itf0/...
     ifHCIn: "1.3.6.1.2.1.31.1.1.1.6", // ifHCInOctets (walk, Counter64)
     ifHCOut: "1.3.6.1.2.1.31.1.1.1.10", // ifHCOutOctets (walk, Counter64)
 };
@@ -45,9 +46,9 @@ const UCD = {
     memCached: "1.3.6.1.4.1.2021.4.15.0", // memCached (KB)
     hrProcLoad: "1.3.6.1.2.1.25.3.3.1.2", // hrProcessorLoad (walk, per-core %) — CPU fallback
 };
-// Per-target previous interface-octet sample, for throughput (bps) rate calc
-// across polls. Module-level: one collectDevice call per target per cycle.
-const netPrev = {};
+// Previous cumulative octet counters PER INTERFACE (target ip -> ifIndex), for
+// per-link throughput rates across polls.
+const netPrevIf = {};
 // QNAP enterprise MIB (NAS-MIB, 1.3.6.1.4.1.24681.1.2). A full walk of this
 // subtree times out on QTS, so everything here is fetched by exact OID.
 const QNAP = {
@@ -189,10 +190,11 @@ async function collectDevice(t) {
     // CPU / RAM / load / network — best-effort UCD-SNMP + IF-MIB counters. Absent
     // on gear without the UCD MIB (returns "No Such Object" fast → null), so every
     // field is optional and simply omitted when unsupported.
-    const [cpuIdle, load1, load5, load15, memTotal, memAvail, memBuffer, memCached, procLoads, hcIn, hcOut] = await Promise.all([
+    const [cpuIdle, load1, load5, load15, memTotal, memAvail, memBuffer, memCached, procLoads, ifNames, hcInIdx, hcOutIdx] = await Promise.all([
         snmpGet(t, UCD.cpuIdle), snmpGet(t, UCD.load1), snmpGet(t, UCD.load5), snmpGet(t, UCD.load15),
         snmpGet(t, UCD.memTotal), snmpGet(t, UCD.memAvail), snmpGet(t, UCD.memBuffer), snmpGet(t, UCD.memCached),
-        snmpWalk(t, UCD.hrProcLoad), snmpWalk(t, SYS.ifHCIn), snmpWalk(t, SYS.ifHCOut),
+        snmpWalk(t, UCD.hrProcLoad), snmpWalkIndexed(t, SYS.ifName),
+        snmpWalkIndexed(t, SYS.ifHCIn), snmpWalkIndexed(t, SYS.ifHCOut),
     ]);
     // CPU %: prefer ssCpuIdle (100 - idle); fall back to avg per-core hrProcessorLoad.
     let cpuPct;
@@ -216,24 +218,57 @@ async function collectDevice(t) {
         memPct = Math.round((usedKb / mTot) * 100);
         memTotalMB = Math.round(mTot / 1024);
     }
-    // Network throughput (aggregate bytes/sec, to match the OS plugin's NET
-    // metric): delta of summed HC octets vs the prior poll. First poll (or a
-    // counter reset) yields no rate.
-    let netIn, netOut;
-    const sumIn = hcIn.map(Number).filter((n) => !isNaN(n)).reduce((a, b) => a + b, 0);
-    const sumOut = hcOut.map(Number).filter((n) => !isNaN(n)).reduce((a, b) => a + b, 0);
-    if (hcIn.length || hcOut.length) {
-        const now = Date.now();
-        const prev = netPrev[t.ip];
-        if (prev && sumIn >= prev.in && sumOut >= prev.out && now > prev.ts) {
-            const dt = (now - prev.ts) / 1000;
+    // Network throughput, PER INTERFACE (bytes/sec).
+    //
+    // Summing every interface is meaningless on a router: a transiting packet is
+    // counted once arriving on the WAN and again leaving on the LAN, so
+    // sum(in) === sum(out) by construction — and vendors add aggregate pseudo
+    // interfaces (EdgeOS `itf0`) that mirror the whole load a second time. The
+    // observed effect was ~5x inflation with in/out identical to the eye.
+    //
+    // So: rate each interface separately, skip loopback/pseudo, and let the target
+    // name its WAN (`wanInterface`) to headline the figure that actually means
+    // "internet traffic". Without one, the headline is left undefined rather than
+    // reporting a number we know to be wrong.
+    const PSEUDO = /^(lo|imq\d*|itf\d*|ifb\d*|sit\d*|gre\d*|teql\d*|tunl\d*)$/i;
+    const idxOf = (rows) => {
+        const m = {};
+        for (const r of rows)
+            m[r.idx] = r.val;
+        return m;
+    };
+    const nameByIdx = idxOf(ifNames);
+    const inByIdx = idxOf(hcInIdx);
+    const outByIdx = idxOf(hcOutIdx);
+    const now = Date.now();
+    const prevIf = netPrevIf[t.ip] || {};
+    const nextIf = {};
+    const interfaces = [];
+    for (const idx of Object.keys(inByIdx)) {
+        const name = (nameByIdx[idx] || `if${idx}`).replace(/^"|"$/g, "");
+        const cin = Number(inByIdx[idx]), cout = Number(outByIdx[idx]);
+        if (isNaN(cin) || isNaN(cout))
+            continue;
+        nextIf[idx] = { in: cin, out: cout, ts: now };
+        if (PSEUDO.test(name))
+            continue;
+        const p = prevIf[idx];
+        let inBps, outBps;
+        if (p && cin >= p.in && cout >= p.out && now > p.ts) {
+            const dt = (now - p.ts) / 1000;
             if (dt > 0) {
-                netIn = Math.round((sumIn - prev.in) / dt);
-                netOut = Math.round((sumOut - prev.out) / dt);
+                inBps = Math.round((cin - p.in) / dt);
+                outBps = Math.round((cout - p.out) / dt);
             }
         }
-        netPrev[t.ip] = { in: sumIn, out: sumOut, ts: now };
+        interfaces.push({ name, inBps, outBps });
     }
+    netPrevIf[t.ip] = nextIf;
+    // Headline = the WAN link when the target names one.
+    const wanName = t.wanInterface;
+    const wan = wanName ? interfaces.find((i) => i.name === wanName) : undefined;
+    const netIn = wan?.inBps;
+    const netOut = wan?.outBps;
     return {
         name: t.name,
         ip: t.ip,
@@ -252,6 +287,11 @@ async function collectDevice(t) {
         memTotalMB,
         netIn,
         netOut,
+        wanInterface: wanName,
+        // Per-link rates (loopback/pseudo excluded), busiest first.
+        interfaces: interfaces
+            .slice()
+            .sort((a, b) => ((b.inBps || 0) + (b.outBps || 0)) - ((a.inBps || 0) + (a.outBps || 0))),
     };
 }
 // Walk that keeps each row's index (numeric OID suffix) — needed to resolve the

package/dist/plugins/monitoring/TplinkPlugin.js

@@ -0,0 +1,151 @@
+import crypto from "node:crypto";
+import { createMonitoringPlugin } from "../../lib/MonitoringPlugin";
+// Live sessions per device IP — re-used across polls, rebuilt when they lapse.
+const sessions = {};
+function slug(s) {
+    return s.replace(/[^a-zA-Z0-9_.-]+/g, "-").replace(/^-+|-+$/g, "").toLowerCase();
+}
+const b64u = (hex) => Buffer.from(hex, "hex").toString("base64").replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+function headers(ip, page, cookie) {
+    return {
+        "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
+        Referer: `http://${ip}/webpages/${page}`,
+        "X-Requested-With": "XMLHttpRequest",
+        ...(cookie ? { Cookie: `sysauth=${cookie}` } : {}),
+    };
+}
+async function post(url, hdrs, body, timeout) {
+    const res = await fetch(url, { method: "POST", headers: hdrs, body, signal: AbortSignal.timeout(timeout) });
+    return await res.json();
+}
+/** TP-Link RSA login → { stok, sysauth }. Throws on bad credentials. */
+async function login(d, timeout) {
+    const base = `http://${d.ip}/cgi-bin/luci/;stok=`;
+    const keyRes = await post(`${base}/login?form=login`, headers(d.ip, "login.html"), "operation=read", timeout);
+    const pair = keyRes?.data?.password;
+    if (!Array.isArray(pair) || pair.length < 2)
+        throw new Error("no RSA key from login form");
+    const pub = crypto.createPublicKey({
+        key: { kty: "RSA", n: b64u(pair[0]), e: b64u(pair[1]) },
+        format: "jwk",
+    });
+    const enc = crypto
+        .publicEncrypt({ key: pub, padding: crypto.constants.RSA_PKCS1_PADDING }, Buffer.from(d.password))
+        .toString("hex");
+    const res = await fetch(`${base}/login?form=login`, {
+        method: "POST",
+        headers: headers(d.ip, "login.html"),
+        body: `operation=login&password=${enc}`,
+        signal: AbortSignal.timeout(timeout),
+    });
+    const setCookie = res.headers.get("set-cookie") || "";
+    const body = await res.json();
+    const stok = body?.data?.stok;
+    const sysauth = (setCookie.match(/sysauth=([^;]+)/) || [])[1];
+    if (!stok || !sysauth) {
+        throw new Error(body?.errorcode === "login failed" ? "login failed (bad password?)" : "login rejected");
+    }
+    return { stok, sysauth };
+}
+/** Authenticated read, re-logging in once if the session has lapsed. */
+async function read(d, endpoint, timeout) {
+    const call = async (s) => post(`http://${d.ip}/cgi-bin/luci/;stok=${s.stok}/${endpoint}`, headers(d.ip, "index.html", s.sysauth), "operation=read", timeout);
+    let s = sessions[d.ip];
+    if (s) {
+        try {
+            const out = await call(s);
+            if (out?.success)
+                return out.data;
+        }
+        catch {
+            /* fall through to re-login */
+        }
+    }
+    s = await login(d, timeout);
+    sessions[d.ip] = s;
+    const out = await call(s);
+    if (!out?.success)
+        throw new Error(out?.errorcode || "read failed");
+    return out.data;
+}
+async function collect(d, timeout) {
+    try {
+        const status = await read(d, "admin/status?form=ap_status", timeout);
+        // Firmware is static — nice for drift, but never fail the poll over it.
+        let fw = {};
+        try {
+            fw = (await read(d, "admin/firmware?form=upgrade", timeout)) || {};
+        }
+        catch {
+            /* non-fatal */
+        }
+        const grid = status?.wirelessGrid;
+        const clients = Array.isArray(grid)
+            ? grid.map((c) => ({
+                name: c.name || c.hostname || "device",
+                mac: c.mac || "",
+                band: c.type || "",
+            }))
+            : [];
+        const radio2g = String(status?.wireless_2g_enable ?? "") === "on";
+        const radio5g = String(status?.wireless_5g_enable ?? "") === "on";
+        return {
+            name: d.name,
+            ip: d.ip,
+            kind: "extender",
+            reachable: true,
+            // The uplink — an extender with this down still pings but serves nobody.
+            internetStatus: status?.internet_status ?? undefined,
+            uplinkUp: status?.internet_status === "connected",
+            phyconn: status?.phyconn ?? undefined,
+            radio2g,
+            radio5g,
+            clientCount: typeof status?.wirelessCount === "number" ? status.wirelessCount : clients.length,
+            clients,
+            model: fw.model || undefined,
+            hardwareVersion: fw.hardware_version || undefined,
+            firmware: fw.firmware_version || undefined,
+        };
+    }
+    catch (e) {
+        delete sessions[d.ip]; // force a fresh login next pass
+        return {
+            name: d.name,
+            ip: d.ip,
+            kind: "extender",
+            reachable: false,
+            error: String(e?.message || e).slice(0, 160),
+        };
+    }
+}
+export function createTplinkPlugin() {
+    let refreshTimer = null;
+    const devicesOf = (plugin) => {
+        const cfg = (plugin.config || {});
+        return (Array.isArray(cfg.devices) ? cfg.devices : []).filter((d) => d?.ip && d?.password);
+    };
+    const refreshFn = async (plugin) => {
+        const cfg = (plugin.config || {});
+        const timeout = cfg.timeout || 8000;
+        await Promise.all(devicesOf(plugin).map(async (d) => {
+            const uid = d.uniqueId || `tplink-${slug(d.name || d.ip)}`;
+            try {
+                await plugin.send(await collect(d, timeout), uid);
+            }
+            catch (e) {
+                await plugin.send({ name: d.name, ip: d.ip, kind: "extender", reachable: false, error: String(e?.message || e).slice(0, 160) }, uid);
+            }
+        }));
+    };
+    const monitorFn = async (plugin) => {
+        await refreshFn(plugin);
+        refreshTimer = setInterval(() => refreshFn(plugin), plugin.config?.refreshInterval || 120000);
+    };
+    const teardownFn = async () => {
+        if (refreshTimer)
+            clearInterval(refreshTimer);
+        refreshTimer = null;
+    };
+    return createMonitoringPlugin("tplink", "tplink", "TP-Link extender/AP monitor (uplink, radios, clients, firmware)", async () => { }, monitorFn, refreshFn, teardownFn);
+}
+export default createTplinkPlugin;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@daemonitor/plugins",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "description": "daemonitor plugins",
   "types": "types/index.d.ts",
   "main": "dist/index.js",