@usex/mikrotik-mcp 4.20.0 → 4.22.0

package/dist/cli.js

@@ -11,6 +11,7 @@ import {
   LOGO_URL,
   MikrotikConfigSchema,
   PKG_META,
+  PROJECT_ROOT,
   PROMPTS_DIR,
   REDACTED,
   SERVER_DESCRIPTION,
@@ -124,7 +125,7 @@ import {
   updateAaaEntity,
   updateSummaryLine,
   writeBackup
-} from "./shared/cli-fa29149s.js";
+} from "./shared/cli-8ecncq7y.js";
 
 // src/cli.ts
 import { existsSync as existsSync2 } from "fs";
@@ -132,8 +133,8 @@ import { existsSync as existsSync2 } from "fs";
 // src/observability/dashboard.ts
 import { spawn } from "child_process";
 import { readFileSync as readFileSync3 } from "fs";
-import { homedir, networkInterfaces } from "os";
-import { dirname as dirname5, join as join3 } from "path";
+import { homedir as homedir2, networkInterfaces } from "os";
+import { dirname as dirname5, join as join4 } from "path";
 var {serve } = globalThis.Bun;
 import { z as z2 } from "zod";
 
@@ -815,6 +816,142 @@ function stopHealthChecks() {
   }
 }
 
+// src/observability/geo.ts
+import { lookup } from "dns/promises";
+var LOG_TAG2 = "mikrotik-mcp";
+var cache = new Map;
+var REFRESH_MS = 24 * 60 * 60000;
+var timer2 = null;
+var inFlight2 = false;
+function getDeviceGeo(name) {
+  return cache.get(name)?.geo ?? null;
+}
+var IPV4_RE = /^\d{1,3}(?:\.\d{1,3}){3}$/;
+var PRIVATE_RE = /^(?:10\.|127\.|0\.|169\.254\.|192\.168\.|172\.(?:1[6-9]|2\d|3[01])\.|100\.(?:6[4-9]|[7-9]\d|1[01]\d|12[0-7])\.|::1$|f[cd])/i;
+function isIpLiteral(host) {
+  return IPV4_RE.test(host) || host.includes(":");
+}
+async function publicIpOf(host) {
+  let ip = host;
+  if (!isIpLiteral(host)) {
+    try {
+      ip = (await lookup(host)).address;
+    } catch {
+      return null;
+    }
+  }
+  return PRIVATE_RE.test(ip) ? null : ip;
+}
+function toGeo(country, code, city) {
+  if (!code)
+    return null;
+  return { countryCode: code.toLowerCase(), country: country ?? code, city: city || undefined };
+}
+async function fetchIpkit(ip) {
+  const res = await fetch(`https://ipkit.ir/${ip}`, {
+    headers: { accept: "application/json" },
+    signal: AbortSignal.timeout(8000)
+  });
+  if (!res.ok)
+    throw new Error(`ipkit HTTP ${res.status}`);
+  const d = await res.json();
+  if (d.is_private)
+    return null;
+  return toGeo(d.country, d.country_code, d.city);
+}
+async function fetchIpquery(ip) {
+  const res = await fetch(`https://api.ipquery.io/${ip}`, { signal: AbortSignal.timeout(8000) });
+  if (!res.ok)
+    throw new Error(`ipquery HTTP ${res.status}`);
+  const d = await res.json();
+  return toGeo(d.location?.country, d.location?.country_code, d.location?.city);
+}
+async function fetchGeo(ip) {
+  try {
+    return await fetchIpkit(ip);
+  } catch (e) {
+    logger.warn(`[${LOG_TAG2}] ipkit geo failed for ${ip}, trying ipquery: ${e instanceof Error ? e.message : String(e)}`);
+  }
+  try {
+    return await fetchIpquery(ip);
+  } catch (e) {
+    logger.warn(`[${LOG_TAG2}] geo lookup failed for ${ip}: ${e instanceof Error ? e.message : String(e)}`);
+    return null;
+  }
+}
+async function resolveDevice(name, host) {
+  const ip = host ? await publicIpOf(host) : null;
+  const geo = ip ? await fetchGeo(ip) : null;
+  cache.set(name, { geo, at: Date.now() });
+}
+async function refreshGeo() {
+  if (inFlight2)
+    return;
+  inFlight2 = true;
+  try {
+    const now = Date.now();
+    await Promise.all(Object.entries(getConfig().devices).map(([name, dc]) => {
+      const c = cache.get(name);
+      if (c && now - c.at < REFRESH_MS)
+        return Promise.resolve();
+      return resolveDevice(name, dc.mac ? undefined : dc.host);
+    }));
+  } finally {
+    inFlight2 = false;
+  }
+}
+function startGeoLookups() {
+  refreshGeo();
+  timer2 = setInterval(() => void refreshGeo(), REFRESH_MS);
+}
+function stopGeoLookups() {
+  if (timer2) {
+    clearInterval(timer2);
+    timer2 = null;
+  }
+}
+
+// src/observability/flags.ts
+import { join as join3 } from "path";
+import { mkdir, readFile, writeFile } from "fs/promises";
+import { homedir } from "os";
+var LOG_TAG3 = "mikrotik-mcp";
+var CODE_RE = /^[a-z]{2}$/;
+var sourceUrl = (code) => `https://hatscripts.github.io/circle-flags/flags/${code}.svg`;
+var VENDOR_DIR = join3(PROJECT_ROOT, "assets", "flags");
+var CACHE_DIR = join3(homedir(), ".mikrotik-mcp", "flags");
+var mem = new Map;
+async function flagSvg(code) {
+  const c = code.toLowerCase();
+  if (!CODE_RE.test(c))
+    return null;
+  const cached = mem.get(c);
+  if (cached !== undefined)
+    return cached;
+  for (const file of [join3(VENDOR_DIR, `${c}.svg`), join3(CACHE_DIR, `${c}.svg`)]) {
+    try {
+      const svg = await readFile(file, "utf8");
+      mem.set(c, svg);
+      return svg;
+    } catch {}
+  }
+  try {
+    const res = await fetch(sourceUrl(c), { signal: AbortSignal.timeout(8000) });
+    if (!res.ok) {
+      if (res.status === 404)
+        mem.set(c, null);
+      return null;
+    }
+    const svg = await res.text();
+    mem.set(c, svg);
+    mkdir(CACHE_DIR, { recursive: true }).then(() => writeFile(join3(CACHE_DIR, `${c}.svg`), svg)).catch(() => {});
+    return svg;
+  } catch (e) {
+    logger.warn(`[${LOG_TAG3}] flag fetch failed for '${c}': ${e instanceof Error ? e.message : String(e)}`);
+    return null;
+  }
+}
+
 // src/observability/traffic-hub.ts
 var POLL_MS = 1000;
 var hubs = new Map;
@@ -1140,8 +1277,8 @@ var CAPSMAN_RETENTION_MS = 30 * 24 * 60 * 60 * 1000;
 var DEFAULT_CAPSMAN_INTERVAL_MS = 5 * 60000;
 var MIN_CAPSMAN_INTERVAL_MS = 60000;
 var MAX_CAPSMAN_INTERVAL_MS = 6 * 60 * 60000;
-var timer2 = null;
-var inFlight2 = false;
+var timer3 = null;
+var inFlight3 = false;
 var noCapsman = new Set;
 function clampInterval(ms) {
   if (!Number.isFinite(ms))
@@ -1168,9 +1305,9 @@ async function sampleDevice(store, device, ts) {
   store.recordRadioSamples(device, ts, samples);
 }
 async function sampleCapsmanOnce(store) {
-  if (inFlight2)
+  if (inFlight3)
     return;
-  inFlight2 = true;
+  inFlight3 = true;
   const ts = Date.now();
   try {
     const cfg = getConfig();
@@ -1185,18 +1322,18 @@ async function sampleCapsmanOnce(store) {
     }));
     store.pruneSamples(ts - CAPSMAN_RETENTION_MS);
   } finally {
-    inFlight2 = false;
+    inFlight3 = false;
   }
 }
 function startCapsmanSampler(store, intervalMs = DEFAULT_CAPSMAN_INTERVAL_MS) {
   const ms = clampInterval(intervalMs);
   sampleCapsmanOnce(store);
-  timer2 = setInterval(() => void sampleCapsmanOnce(store), ms);
+  timer3 = setInterval(() => void sampleCapsmanOnce(store), ms);
 }
 function stopCapsmanSampler() {
-  if (timer2) {
-    clearInterval(timer2);
-    timer2 = null;
+  if (timer3) {
+    clearInterval(timer3);
+    timer3 = null;
   }
 }
 
@@ -1336,8 +1473,8 @@ var USAGE_RETENTION_MS = 93 * 24 * 60 * 60 * 1000;
 var DEFAULT_USAGE_INTERVAL_MS = 60000;
 var MIN_USAGE_INTERVAL_MS = 30000;
 var MAX_USAGE_INTERVAL_MS = 6 * 60 * 60000;
-var timer3 = null;
-var inFlight3 = false;
+var timer4 = null;
+var inFlight4 = false;
 var currentStore = null;
 var currentIntervalMs = DEFAULT_USAGE_INTERVAL_MS;
 function clampInterval2(ms) {
@@ -1398,9 +1535,9 @@ async function ingestSessions(store, device) {
   store.upsertSessions(device, sessions);
 }
 async function sampleUsageOnce(store) {
-  if (inFlight3)
+  if (inFlight4)
     return;
-  inFlight3 = true;
+  inFlight4 = true;
   const ts = Date.now();
   try {
     const cfg = getConfig();
@@ -1416,32 +1553,32 @@ async function sampleUsageOnce(store) {
     }));
     store.pruneSamples(ts - USAGE_RETENTION_MS);
   } finally {
-    inFlight3 = false;
+    inFlight4 = false;
   }
 }
 function startUsageSampler(store, intervalMs = DEFAULT_USAGE_INTERVAL_MS) {
   currentStore = store;
   currentIntervalMs = clampInterval2(intervalMs);
   sampleUsageOnce(store);
-  timer3 = setInterval(() => void sampleUsageOnce(store), currentIntervalMs);
+  timer4 = setInterval(() => void sampleUsageOnce(store), currentIntervalMs);
 }
 function getUsageSamplerInterval() {
   return currentIntervalMs;
 }
 function setUsageSamplerInterval(intervalMs) {
   currentIntervalMs = clampInterval2(intervalMs);
-  if (timer3)
-    clearInterval(timer3);
+  if (timer4)
+    clearInterval(timer4);
   if (currentStore) {
     const store = currentStore;
-    timer3 = setInterval(() => void sampleUsageOnce(store), currentIntervalMs);
+    timer4 = setInterval(() => void sampleUsageOnce(store), currentIntervalMs);
   }
   return currentIntervalMs;
 }
 function stopUsageSampler() {
-  if (timer3) {
-    clearInterval(timer3);
-    timer3 = null;
+  if (timer4) {
+    clearInterval(timer4);
+    timer4 = null;
   }
   currentStore = null;
 }
@@ -1834,7 +1971,7 @@ function runUpgrade(spec) {
       env: process.env,
       stdio: ["ignore", "pipe", "pipe"]
     });
-    const timer4 = setTimeout(() => {
+    const timer5 = setTimeout(() => {
       child.kill();
       resolve({ ok: false, log: `${out}
 (timed out after 180s)` });
@@ -1842,19 +1979,19 @@ function runUpgrade(spec) {
     child.stdout?.on("data", (d) => out += d.toString());
     child.stderr?.on("data", (d) => out += d.toString());
     child.on("error", (e) => {
-      clearTimeout(timer4);
+      clearTimeout(timer5);
       resolve({ ok: false, log: `${out}
 spawn error: ${String(e)}` });
     });
     child.on("exit", (code) => {
-      clearTimeout(timer4);
+      clearTimeout(timer5);
       resolve({ ok: code === 0, log: out.trim() || `(exit ${code})` });
     });
   });
 }
 function dashboardHtml() {
   try {
-    return readFileSync3(join3(UI_DIST_DIR, "observability.html"), "utf8");
+    return readFileSync3(join4(UI_DIST_DIR, "observability.html"), "utf8");
   } catch {
     return `<!doctype html><meta charset=utf-8><body style="font:14px system-ui;padding:24px;background:#0b0d10;color:#e8eaed">
 <h2>MikroTik MCP \u2014 Observability Dashboard</h2>
@@ -1948,6 +2085,7 @@ function devicesPayload(store) {
       jumpVia: dc.jumpVia,
       jumpHost: dc.jumpHost ? { host: dc.jumpHost.host, port: dc.jumpHost.port } : undefined,
       status: getDeviceStatus(name),
+      geo: getDeviceGeo(name),
       history: getDeviceHistory(name),
       activity: activity.get(name) ?? {
         calls: 0,
@@ -2733,7 +2871,7 @@ async function featureRoutes(req, url) {
     const raw = b?.dir?.trim();
     if (!raw)
       return json3({ error: "dir required" }, 400);
-    const dir = raw === "~" || raw.startsWith("~/") ? join3(homedir(), raw.slice(1)) : raw;
+    const dir = raw === "~" || raw.startsWith("~/") ? join4(homedir2(), raw.slice(1)) : raw;
     const next = { ...getConfig(), backupDir: dir };
     setConfig(next);
     try {
@@ -2840,14 +2978,15 @@ async function runDashboard(cfg, transportLabel) {
     transport: transportLabel
   });
   startHealthChecks(30000);
+  startGeoLookups();
   try {
-    usageStore = await openUsageStore(join3(dirname5(cfg.dbPath), "usage.db"));
+    usageStore = await openUsageStore(join4(dirname5(cfg.dbPath), "usage.db"));
     startUsageSampler(usageStore);
   } catch (e) {
     logger.warn(`[${SERVER_TAG3}] usage history disabled: ${String(e)}`);
   }
   try {
-    capsmanStore = await openCapsmanStore(join3(dirname5(cfg.dbPath), "capsman.db"));
+    capsmanStore = await openCapsmanStore(join4(dirname5(cfg.dbPath), "capsman.db"));
     startCapsmanSampler(capsmanStore);
   } catch (e) {
     logger.warn(`[${SERVER_TAG3}] capsman trends disabled: ${String(e)}`);
@@ -2959,6 +3098,18 @@ async function runDashboard(cfg, transportLabel) {
         devices: ps
       });
     }
+    if (url.pathname.startsWith("/api/flag/")) {
+      const code = url.pathname.slice("/api/flag/".length).replace(/\.svg$/, "");
+      const svg = await flagSvg(code);
+      if (!svg)
+        return new Response("flag not found", { status: 404 });
+      return new Response(svg, {
+        headers: {
+          "content-type": "image/svg+xml; charset=utf-8",
+          "cache-control": "public, max-age=86400"
+        }
+      });
+    }
     if (url.pathname === "/api/devices") {
       return json3(devicesPayload(db));
     }
@@ -3169,6 +3320,7 @@ async function runDashboard(cfg, transportLabel) {
     store,
     stop() {
       stopHealthChecks();
+      stopGeoLookups();
       stopUsageSampler();
       stopCapsmanSampler();
       server.stop(true);
@@ -3359,18 +3511,18 @@ function installToolPagination(server, pageSize) {
   const sdkHandler = low._requestHandlers?.get("tools/list");
   if (typeof sdkHandler !== "function")
     return;
-  let cache = null;
+  let cache2 = null;
   server.server.setRequestHandler(ListToolsRequestSchema, async (request, extra) => {
-    if (!cache)
-      cache = (await sdkHandler(request, extra)).tools ?? [];
-    const total = cache.length;
+    if (!cache2)
+      cache2 = (await sdkHandler(request, extra)).tools ?? [];
+    const total = cache2.length;
     const cursor = request.params?.cursor;
     let start = 0;
     if (typeof cursor === "string") {
       const n = Number.parseInt(cursor, 10);
       start = Number.isFinite(n) && n > 0 ? Math.min(n, total) : 0;
     }
-    const tools = cache.slice(start, start + pageSize);
+    const tools = cache2.slice(start, start + pageSize);
     const end = start + tools.length;
     return end < total ? { tools, nextCursor: String(end) } : { tools };
   });

package/dist/index.js

@@ -29,7 +29,7 @@ import {
   selectToolModules,
   setConfig,
   updateSummaryLine
-} from "./shared/library-ypdm9bkx.js";
+} from "./shared/library-v21pwa2g.js";
 // src/server.ts
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { ListToolsRequestSchema } from "@modelcontextprotocol/sdk/types.js";

package/dist/shared/{cli-cdxrs0vz.js → cli-73c3hn9f.js}

@@ -4,7 +4,7 @@ import {
   allToolModules,
   moduleCatalog,
   selectToolModules
-} from "./cli-fa29149s.js";
+} from "./cli-8ecncq7y.js";
 export {
   selectToolModules,
   moduleCatalog,