@usex/mikrotik-mcp 3.25.0 → 3.26.0

package/dist/cli.js

@@ -24328,7 +24328,7 @@ function selectToolModules(filter = {}, catalog = moduleCatalog) {
 // src/observability/dashboard.ts
 import { readFileSync as readFileSync6 } from "fs";
 import { homedir as homedir2, networkInterfaces } from "os";
-import { join as join6 } from "path";
+import { dirname as dirname6, join as join6 } from "path";
 var {serve } = globalThis.Bun;
 import { z as z114 } from "zod";
 
@@ -24975,6 +24975,219 @@ async function openSqliteStore(path) {
   return new SqliteEventStore(db);
 }
 
+// src/observability/usage-store.ts
+import { mkdirSync as mkdirSync6 } from "fs";
+import { dirname as dirname5 } from "path";
+function dayOf(ts) {
+  return new Date(ts).toISOString().slice(0, 10);
+}
+function dailyUsageFromSamples(samples) {
+  const byDay = new Map;
+  for (let i = 1;i < samples.length; i++) {
+    const prev = samples[i - 1];
+    const cur = samples[i];
+    const dRx = cur.rx >= prev.rx ? cur.rx - prev.rx : cur.rx;
+    const dTx = cur.tx >= prev.tx ? cur.tx - prev.tx : cur.tx;
+    const day = dayOf(cur.ts);
+    const acc = byDay.get(day) ?? { rx: 0, tx: 0 };
+    acc.rx += dRx;
+    acc.tx += dTx;
+    byDay.set(day, acc);
+  }
+  return [...byDay.entries()].map(([day, v]) => ({ day, rx: v.rx, tx: v.tx })).sort((a, b) => a.day.localeCompare(b.day));
+}
+var SCHEMA_STATEMENTS3 = [
+  `CREATE TABLE IF NOT EXISTS usage_samples (
+     device TEXT NOT NULL,
+     subject TEXT NOT NULL,
+     ts INTEGER NOT NULL,
+     rx INTEGER NOT NULL,
+     tx INTEGER NOT NULL
+   )`,
+  "CREATE INDEX IF NOT EXISTS idx_usage_sub ON usage_samples(device, subject, ts)",
+  "CREATE INDEX IF NOT EXISTS idx_usage_ts ON usage_samples(ts)",
+  `CREATE TABLE IF NOT EXISTS vpn_sessions (
+     device TEXT NOT NULL,
+     session_id TEXT NOT NULL,
+     user TEXT NOT NULL,
+     service TEXT,
+     nas TEXT,
+     started INTEGER NOT NULL,
+     day TEXT NOT NULL,
+     rx INTEGER NOT NULL,
+     tx INTEGER NOT NULL,
+     PRIMARY KEY (device, session_id)
+   )`,
+  "CREATE INDEX IF NOT EXISTS idx_sess_user ON vpn_sessions(device, user, day)",
+  "CREATE INDEX IF NOT EXISTS idx_sess_day ON vpn_sessions(device, day)"
+];
+
+class SqliteUsageStore {
+  db;
+  constructor(db) {
+    this.db = db;
+    db.run("PRAGMA journal_mode = WAL");
+    db.run("PRAGMA synchronous = NORMAL");
+    for (const stmt of SCHEMA_STATEMENTS3)
+      db.run(stmt);
+  }
+  recordClientSamples(device, ts, samples) {
+    if (samples.length === 0)
+      return;
+    const insert = this.db.query("INSERT INTO usage_samples (device, subject, ts, rx, tx) VALUES ($d,$s,$ts,$rx,$tx)");
+    const tx = this.db.transaction((rows) => {
+      for (const r of rows) {
+        insert.run({ $d: device, $s: r.ip, $ts: ts, $rx: r.rx, $tx: r.tx });
+      }
+    });
+    tx(samples);
+  }
+  upsertSessions(device, sessions) {
+    if (sessions.length === 0)
+      return 0;
+    const stmt = this.db.query(`INSERT INTO vpn_sessions (device, session_id, user, service, nas, started, day, rx, tx)
+       VALUES ($d,$id,$u,$svc,$nas,$st,$day,$rx,$tx)
+       ON CONFLICT(device, session_id) DO UPDATE SET rx=excluded.rx, tx=excluded.tx`);
+    let n = 0;
+    const tx = this.db.transaction((rows) => {
+      for (const s of rows) {
+        stmt.run({
+          $d: device,
+          $id: s.sessionId,
+          $u: s.user,
+          $svc: s.service ?? null,
+          $nas: s.nas ?? null,
+          $st: s.started,
+          $day: dayOf(s.started),
+          $rx: s.rx,
+          $tx: s.tx
+        });
+        n++;
+      }
+    });
+    tx(sessions);
+    return n;
+  }
+  clientDailyUsage(device, ip, sinceTs) {
+    const rows = this.db.query("SELECT ts, rx, tx FROM usage_samples WHERE device=$d AND subject=$s AND ts>=$since ORDER BY ts ASC").all({ $d: device, $s: ip, $since: sinceTs });
+    return dailyUsageFromSamples(rows);
+  }
+  umUserDailyUsage(device, user, sinceTs) {
+    const rows = this.db.query(`SELECT day, SUM(rx) AS rx, SUM(tx) AS tx FROM vpn_sessions
+         WHERE device=$d AND user=$u AND started>=$since GROUP BY day ORDER BY day ASC`).all({ $d: device, $u: user, $since: sinceTs });
+    return rows.map((r) => ({ day: r.day, rx: Number(r.rx), tx: Number(r.tx) }));
+  }
+  umUsers(device) {
+    const rows = this.db.query("SELECT DISTINCT user FROM vpn_sessions WHERE device=$d ORDER BY user ASC").all({ $d: device });
+    return rows.map((r) => r.user);
+  }
+  heatmap(device, user, sinceTs) {
+    const sinceDay = dayOf(sinceTs);
+    const rows = user ? this.db.query("SELECT day, COUNT(*) AS count FROM vpn_sessions WHERE device=$d AND user=$u AND day>=$since GROUP BY day").all({ $d: device, $u: user, $since: sinceDay }) : this.db.query("SELECT day, COUNT(*) AS count FROM vpn_sessions WHERE device=$d AND day>=$since GROUP BY day").all({ $d: device, $since: sinceDay });
+    return rows.map((r) => ({ day: r.day, count: Number(r.count) }));
+  }
+  pruneSamples(olderThanTs) {
+    const res = this.db.query("DELETE FROM usage_samples WHERE ts < $t").run({ $t: olderThanTs });
+    return Number(res.changes ?? 0);
+  }
+  close() {
+    this.db.close();
+  }
+}
+async function openUsageStore(path) {
+  if (path !== ":memory:") {
+    try {
+      mkdirSync6(dirname5(path), { recursive: true });
+    } catch {}
+  }
+  const { Database } = await import("bun:sqlite");
+  const db = new Database(path, { create: true });
+  return new SqliteUsageStore(db);
+}
+
+// src/observability/usage-sampler.ts
+var SERVER_TAG = "mikrotik-mcp";
+var USAGE_RETENTION_MS = 93 * 24 * 60 * 60 * 1000;
+var timer2 = null;
+var inFlight2 = false;
+function bytesOf(v) {
+  return parseSize(v) ?? parseLeadingNumber(v) ?? 0;
+}
+function ipOf(target) {
+  return (target ?? "").split("/")[0]?.trim() ?? "";
+}
+async function sampleClients(store2, device, ts) {
+  const ctx = createContext(undefined, device);
+  const out = await executeMikrotikCommand("/queue simple print stats detail", ctx);
+  if (isEmpty(out) || looksLikeError(out) || commandUnsupported(out))
+    return;
+  const samples = [];
+  for (const row of parseRecords(out).rows) {
+    const ip = ipOf(row.target ?? "");
+    if (!ip)
+      continue;
+    const [tx, rx] = (row.bytes ?? "0/0").split("/");
+    samples.push({ ip, rx: bytesOf(rx), tx: bytesOf(tx) });
+  }
+  store2.recordClientSamples(device, ts, samples);
+}
+async function ingestSessions(store2, device) {
+  const ctx = createContext(undefined, device);
+  const out = await executeMikrotikCommand("/user-manager session print detail", ctx);
+  if (isEmpty(out) || looksLikeError(out) || commandUnsupported(out))
+    return;
+  const sessions = [];
+  for (const row of parseRecords(out).rows) {
+    const user = row.user ?? "";
+    const started = parseRouterosDate(row.started ?? row["start-time"]);
+    if (!user || started == null)
+      continue;
+    const sessionId = row["acct-session-id"] || `${user}|${started}|${row["calling-station-id"] ?? row["nas-port-id"] ?? ""}`;
+    sessions.push({
+      sessionId,
+      user,
+      service: row.service,
+      nas: row["nas-ip-address"] ?? row["nas-port-id"],
+      started,
+      rx: bytesOf(row.download),
+      tx: bytesOf(row.upload)
+    });
+  }
+  store2.upsertSessions(device, sessions);
+}
+async function sampleUsageOnce(store2) {
+  if (inFlight2)
+    return;
+  inFlight2 = true;
+  const ts = Date.now();
+  try {
+    const cfg = getConfig();
+    await Promise.all(Object.entries(cfg.devices).map(async ([name, dc]) => {
+      if (dc.mac)
+        return;
+      try {
+        await sampleClients(store2, name, ts);
+        await ingestSessions(store2, name);
+      } catch (e) {
+        logger.warn(`[${SERVER_TAG}] usage sample failed for '${name}': ${String(e)}`);
+      }
+    }));
+    store2.pruneSamples(ts - USAGE_RETENTION_MS);
+  } finally {
+    inFlight2 = false;
+  }
+}
+function startUsageSampler(store2, intervalMs = 10 * 60000) {
+  sampleUsageOnce(store2);
+  timer2 = setInterval(() => void sampleUsageOnce(store2), intervalMs);
+}
+function stopUsageSampler() {
+  if (timer2) {
+    clearInterval(timer2);
+    timer2 = null;
+  }
+}
+
 // src/observability/stats.ts
 function percentile(values, p) {
   if (values.length === 0)
@@ -25069,7 +25282,7 @@ function computeStats(events, opts) {
 }
 
 // src/observability/dashboard.ts
-var SERVER_TAG = "mikrotik-mcp";
+var SERVER_TAG2 = "mikrotik-mcp";
 var JSON_HEADERS = { "content-type": "application/json; charset=utf-8" };
 function json(body, status = 200) {
   return new Response(JSON.stringify(body), { status, headers: JSON_HEADERS });
@@ -25170,7 +25383,7 @@ function devicesPayload(store2) {
       avgMs: 0
     }
   }));
-  return { server: SERVER_TAG, defaultDevice: cfg.defaultDevice, devices };
+  return { server: SERVER_TAG2, defaultDevice: cfg.defaultDevice, devices };
 }
 function topologyPayload() {
   const cfg = getConfig();
@@ -25183,7 +25396,7 @@ function topologyPayload() {
   for (const { name } of devices)
     neighborsByDevice[name] = getDeviceNeighbors(name);
   return {
-    server: SERVER_TAG,
+    server: SERVER_TAG2,
     defaultDevice: cfg.defaultDevice,
     generatedAt: Date.now(),
     ...buildTopology({ devices, neighborsByDevice })
@@ -25528,6 +25741,54 @@ async function aaaRoutes(req, url) {
   }
   return null;
 }
+var usageStore = null;
+function daysParam(url, fallback, max) {
+  const n = Number(url.searchParams.get("days"));
+  return Number.isFinite(n) && n > 0 ? Math.min(n, max) : fallback;
+}
+function usageRoutes(req, url) {
+  const p = url.pathname;
+  if (!p.startsWith("/api/usage"))
+    return null;
+  if (req.method !== "GET")
+    return null;
+  if (!usageStore)
+    return json({ error: "usage store not active" }, 503);
+  const device = resolveDeviceName(url.searchParams.get("device") ?? undefined);
+  const sinceTs = (days) => Date.now() - days * 86400000;
+  if (p === "/api/usage/um-users") {
+    return json({ users: usageStore.umUsers(device) });
+  }
+  if (p === "/api/usage/client") {
+    const ip = url.searchParams.get("ip");
+    if (!ip)
+      return json({ error: "ip required" }, 400);
+    const series = usageStore.clientDailyUsage(device, ip, sinceTs(daysParam(url, 90, 400)));
+    return json(withTotals(series));
+  }
+  if (p === "/api/usage/um-user") {
+    const user = url.searchParams.get("user");
+    if (!user)
+      return json({ error: "user required" }, 400);
+    const series = usageStore.umUserDailyUsage(device, user, sinceTs(daysParam(url, 90, 400)));
+    return json(withTotals(series));
+  }
+  if (p === "/api/usage/heatmap") {
+    const user = url.searchParams.get("user");
+    const days = usageStore.heatmap(device, user || null, sinceTs(daysParam(url, 371, 400)));
+    const total = days.reduce((s, d) => s + d.count, 0);
+    const max = days.reduce((m, d) => Math.max(m, d.count), 0);
+    return json({ days, total, max });
+  }
+  return null;
+}
+function withTotals(series) {
+  return {
+    series,
+    totalRx: series.reduce((s, d) => s + d.rx, 0),
+    totalTx: series.reduce((s, d) => s + d.tx, 0)
+  };
+}
 var snapStorePromise = null;
 function snapStore() {
   if (!snapStorePromise)
@@ -25746,11 +26007,17 @@ async function runDashboard(cfg, transportLabel) {
     transport: transportLabel
   });
   startHealthChecks(30000);
+  try {
+    usageStore = await openUsageStore(join6(dirname6(cfg.dbPath), "usage.db"));
+    startUsageSampler(usageStore);
+  } catch (e) {
+    logger.warn(`[${SERVER_TAG2}] usage history disabled: ${String(e)}`);
+  }
   try {
     if (isEmpty2())
       recordVersion(getConfig(), "auto", Date.now(), "baseline");
   } catch (e) {
-    logger.warn(`[${SERVER_TAG}] could not seed config history baseline: ${String(e)}`);
+    logger.warn(`[${SERVER_TAG2}] could not seed config history baseline: ${String(e)}`);
   }
   const configAdmin = createConfigAdmin({
     getConfig,
@@ -25808,6 +26075,9 @@ async function runDashboard(cfg, transportLabel) {
       const aaaResp = await aaaRoutes(req, url);
       if (aaaResp)
         return aaaResp;
+      const usageResp = usageRoutes(req, url);
+      if (usageResp)
+        return usageResp;
       const featureResp = await featureRoutes(req, url);
       if (featureResp)
         return featureResp;
@@ -25894,8 +26164,11 @@ async function runDashboard(cfg, transportLabel) {
     store: store2,
     stop() {
       stopHealthChecks();
+      stopUsageSampler();
       server.stop(true);
       store2.close();
+      usageStore?.close();
+      usageStore = null;
     }
   };
 }
@@ -26052,7 +26325,7 @@ function registerPrompts(server) {
 // package.json
 var package_default = {
   name: "@usex/mikrotik-mcp",
-  version: "3.25.0",
+  version: "3.26.0",
   description: "MCP server for MikroTik RouterOS \u2014 660+ tools over SSH for firewall, NAT, routing, DHCP, DNS, WireGuard, wireless, QoS and more.",
   keywords: [
     "ai",

package/dist/index.js

@@ -24339,7 +24339,7 @@ function selectToolModules(filter = {}, catalog = moduleCatalog) {
 // package.json
 var package_default = {
   name: "@usex/mikrotik-mcp",
-  version: "3.25.0",
+  version: "3.26.0",
   description: "MCP server for MikroTik RouterOS \u2014 660+ tools over SSH for firewall, NAT, routing, DHCP, DNS, WireGuard, wireless, QoS and more.",
   keywords: [
     "ai",