@usex/mikrotik-mcp 3.35.0 → 3.37.0

package/dist/shared/{library-q35fq2gz.js → library-9pt0yeqy.js}

@@ -903,6 +903,29 @@ class MikroTikSSHClient {
       });
     });
   }
+  downloadFile(remotePath) {
+    if (!this.client) {
+      return Promise.reject(new Error("Not connected to MikroTik device"));
+    }
+    const openSftp = this.client.sftp.bind(this.client);
+    return new Promise((resolve2, reject) => {
+      openSftp((err, sftp) => {
+        if (err) {
+          reject(new Error(`SFTP subsystem unavailable: ${err.message}`));
+          return;
+        }
+        sftp.readFile(remotePath, (rerr, data) => {
+          try {
+            sftp.end();
+          } catch {}
+          if (rerr)
+            reject(new Error(`SFTP read failed: ${rerr.message}`));
+          else
+            resolve2(data);
+        });
+      });
+    });
+  }
   shell(opts = {}) {
     if (!this.client) {
       return Promise.reject(new Error("Not connected to MikroTik device"));
@@ -1048,16 +1071,7 @@ class SafeModeManager {
       if (dc.mac) {
         return "Error: Safe Mode is not supported for a MAC-Telnet device " + `('${this.deviceName}' is reached by MAC ${dc.mac}). ` + "Connect over SSH (configure host/credentials) to use Safe Mode.";
       }
-      const ssh = new MikroTikSSHClient({
-        host: dc.host,
-        username: dc.username,
-        password: dc.password,
-        keyFilename: dc.keyFilename,
-        privateKey: dc.privateKey,
-        keyPassphrase: dc.keyPassphrase,
-        port: dc.port,
-        timeoutMs: dc.timeoutMs
-      });
+      const ssh = new MikroTikSSHClient({ ...sshOptionsOf(dc), jump: resolveJump(dc) });
       if (!await ssh.connect()) {
         return "Error: Failed to connect to MikroTik device for safe mode session.";
       }
@@ -1251,16 +1265,7 @@ async function uploadFileToDevice(deviceName, remotePath, data) {
   if (isMacTelnetDevice(dc)) {
     throw new Error(`Cannot transfer a file to '${name}': it is reached over Layer-2 MAC-Telnet, which has no file ` + "transfer. Configure SSH (host + credentials) for this device, or have the router pull the file " + "itself with /tool fetch from a URL it can reach.");
   }
-  const ssh = new MikroTikSSHClient({
-    host: dc.host,
-    username: dc.username,
-    password: dc.password,
-    keyFilename: dc.keyFilename,
-    privateKey: dc.privateKey,
-    keyPassphrase: dc.keyPassphrase,
-    port: dc.port,
-    timeoutMs: dc.timeoutMs
-  });
+  const ssh = new MikroTikSSHClient({ ...sshOptionsOf(dc), jump: resolveJump(dc) });
   if (!await ssh.connect()) {
     throw new Error(connectErrorMessage(name, dc, ssh.lastError));
   }
@@ -1270,6 +1275,22 @@ async function uploadFileToDevice(deviceName, remotePath, data) {
     ssh.disconnect();
   }
 }
+async function downloadFileFromDevice(deviceName, remotePath) {
+  const name = resolveDeviceName(deviceName);
+  const dc = getDevice(deviceName);
+  if (isMacTelnetDevice(dc)) {
+    throw new Error(`Cannot download a file from '${name}': it is reached over Layer-2 MAC-Telnet, which has no ` + "file transfer. Configure SSH (host + credentials) for this device, or use a text export " + "(stdout mode) instead of a binary backup.");
+  }
+  const ssh = new MikroTikSSHClient({ ...sshOptionsOf(dc), jump: resolveJump(dc) });
+  if (!await ssh.connect()) {
+    throw new Error(connectErrorMessage(name, dc, ssh.lastError));
+  }
+  try {
+    return await ssh.downloadFile(remotePath);
+  } finally {
+    ssh.disconnect();
+  }
+}
 
 // src/core/registry.ts
 import { z as z2 } from "zod";
@@ -1483,6 +1504,67 @@ function parseCertExpiry(detail, nowMs) {
   }
   return out;
 }
+function parseSize(s) {
+  if (!s)
+    return;
+  const m = s.trim().match(/^([\d.]+)\s*([KMGT]i?B|B)?$/i);
+  if (!m)
+    return;
+  const val = Number.parseFloat(m[1]);
+  if (!Number.isFinite(val))
+    return;
+  const mult = {
+    B: 1,
+    KIB: 1024,
+    MIB: 1024 ** 2,
+    GIB: 1024 ** 3,
+    TIB: 1024 ** 4,
+    KB: 1000,
+    MB: 1e6,
+    GB: 1e9,
+    TB: 1000000000000
+  };
+  return val * (mult[(m[2] ?? "B").toUpperCase()] ?? 1);
+}
+function parsePercent(s) {
+  if (!s)
+    return;
+  const m = s.trim().match(/^([\d.]+)\s*%?$/);
+  if (!m)
+    return;
+  const v = Number.parseFloat(m[1]);
+  return Number.isFinite(v) ? v : undefined;
+}
+function usedPct(total, free) {
+  if (total == null || free == null || total <= 0)
+    return;
+  return Math.max(0, Math.min(100, (total - free) / total * 100));
+}
+function parseSystemResource(text) {
+  const r = parseKeyValues(text);
+  const totalMemory = parseSize(r["total-memory"]);
+  const freeMemory = parseSize(r["free-memory"]);
+  const totalHdd = parseSize(r["total-hdd-space"]);
+  const freeHdd = parseSize(r["free-hdd-space"]);
+  const cpuLoad = parsePercent(r["cpu-load"]);
+  const cpuCount = Number.parseInt(r["cpu-count"] ?? "", 10);
+  const out = {
+    version: r.version || undefined,
+    boardName: r["board-name"] || undefined,
+    architecture: r["architecture-name"] || undefined,
+    cpuCount: Number.isFinite(cpuCount) ? cpuCount : undefined,
+    cpuLoad,
+    freeMemory,
+    totalMemory,
+    memUsedPct: usedPct(totalMemory, freeMemory),
+    freeHdd,
+    totalHdd,
+    hddUsedPct: usedPct(totalHdd, freeHdd),
+    uptime: r.uptime || undefined
+  };
+  const gotMetric = out.cpuLoad != null || out.totalMemory != null || out.totalHdd != null || out.version != null || out.uptime != null;
+  return gotMetric ? out : null;
+}
 function parseFlagLegend(text) {
   const out = {};
   const line = text.split(`
@@ -2692,6 +2774,158 @@ ${rows.slice(0, 40).map((r) => `  \u2022 ${r.name ?? "?"} (${r.type ?? "?"})${r.
 // src/tools/backup.ts
 import { z as z5 } from "zod";
 
+// src/backups/disk-check.ts
+var DISK_THRESHOLD_PCT = 90;
+async function checkDiskSpace(ctx) {
+  try {
+    const raw = await executeMikrotikCommand("/system resource print", ctx);
+    const sys = parseSystemResource(raw);
+    if (!sys || sys.hddUsedPct == null) {
+      return { low: false };
+    }
+    return {
+      low: sys.hddUsedPct >= DISK_THRESHOLD_PCT,
+      usedPct: sys.hddUsedPct,
+      freeBytes: sys.freeHdd,
+      totalBytes: sys.totalHdd
+    };
+  } catch {
+    return { low: false };
+  }
+}
+
+// src/backups/vault.ts
+import {
+  existsSync as existsSync2,
+  mkdirSync,
+  readFileSync as readFileSync4,
+  readdirSync,
+  renameSync,
+  rmSync,
+  statSync,
+  writeFileSync
+} from "fs";
+import { basename, join as join4 } from "path";
+function backupDir() {
+  if (process.env.MIKROTIK_BACKUP_DIR)
+    return process.env.MIKROTIK_BACKUP_DIR;
+  try {
+    const dir = getConfig().backupDir;
+    if (dir)
+      return dir;
+  } catch {}
+  return DEFAULT_BACKUP_DIR;
+}
+function safeName(name) {
+  const base = basename(name);
+  if (base !== name || base === "." || base === ".." || !/^[A-Za-z0-9._-]+$/.test(base)) {
+    throw new Error(`invalid backup name: ${name}`);
+  }
+  return base;
+}
+function listBackups() {
+  const dir = backupDir();
+  if (!existsSync2(dir))
+    return [];
+  return readdirSync(dir).filter((f) => f.endsWith(".rsc") || f.endsWith(".backup")).map((f) => {
+    const st = statSync(join4(dir, f));
+    const us = f.indexOf("_");
+    return {
+      name: f,
+      bytes: st.size,
+      modified: st.mtimeMs,
+      device: us > 0 ? f.slice(0, us) : undefined,
+      type: f.endsWith(".backup") ? "backup" : "rsc"
+    };
+  }).sort((a, b) => b.modified - a.modified);
+}
+function readBackup(name) {
+  return readFileSync4(join4(backupDir(), safeName(name)), "utf8");
+}
+function writeBackup(name, content) {
+  const dir = backupDir();
+  mkdirSync(dir, { recursive: true });
+  let final = safeName(name);
+  if (existsSync2(join4(dir, final))) {
+    const dot = final.lastIndexOf(".");
+    const stem = dot > 0 ? final.slice(0, dot) : final;
+    const ext = dot > 0 ? final.slice(dot) : "";
+    let n = 2;
+    while (existsSync2(join4(dir, `${stem}_${n}${ext}`)))
+      n++;
+    final = `${stem}_${n}${ext}`;
+  }
+  writeFileSync(join4(dir, final), content, "utf8");
+  return final;
+}
+function writeBinaryBackup(name, data) {
+  const dir = backupDir();
+  mkdirSync(dir, { recursive: true });
+  let final = safeName(name);
+  if (existsSync2(join4(dir, final))) {
+    const dot = final.lastIndexOf(".");
+    const stem = dot > 0 ? final.slice(0, dot) : final;
+    const ext = dot > 0 ? final.slice(dot) : "";
+    let n = 2;
+    while (existsSync2(join4(dir, `${stem}_${n}${ext}`)))
+      n++;
+    final = `${stem}_${n}${ext}`;
+  }
+  writeFileSync(join4(dir, final), data);
+  return final;
+}
+function deleteBackup(name) {
+  const p = join4(backupDir(), safeName(name));
+  if (!existsSync2(p))
+    return false;
+  rmSync(p);
+  return true;
+}
+function renameBackup(oldName, newName) {
+  const dir = backupDir();
+  const from = join4(dir, safeName(oldName));
+  let to = safeName(newName);
+  if (!to.endsWith(".rsc"))
+    to += ".rsc";
+  const toPath = join4(dir, to);
+  if (!existsSync2(from))
+    throw new Error(`backup not found: ${oldName}`);
+  if (existsSync2(toPath))
+    throw new Error(`a backup named '${to}' already exists`);
+  renameSync(from, toPath);
+  return to;
+}
+function exportToCommands(text) {
+  const lines = [];
+  let buf = "";
+  for (const raw of text.split(`
+`)) {
+    const line = raw.replace(/\r$/, "");
+    buf = buf ? `${buf} ${line.trim()}` : line;
+    if (buf.trimEnd().endsWith("\\")) {
+      buf = buf.trimEnd().slice(0, -1).trimEnd();
+      continue;
+    }
+    lines.push(buf);
+    buf = "";
+  }
+  if (buf)
+    lines.push(buf);
+  const cmds = [];
+  let section = "";
+  for (const line of lines) {
+    const t = line.trim();
+    if (!t || t.startsWith("#"))
+      continue;
+    if (t.startsWith("/")) {
+      section = t;
+      continue;
+    }
+    cmds.push(section ? `${section} ${t}` : t);
+  }
+  return cmds;
+}
+
 // src/core/datestamp.ts
 var MONTHS2 = ["jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec"];
 function pad(n) {
@@ -2764,6 +2998,12 @@ async function deviceDateStamp(ctx) {
   return hostStamp(new Date);
 }
 
+// src/core/slug.ts
+function deviceSlug(name) {
+  const s = (name ?? "").replace(/[^A-Za-z0-9-]+/g, "-").replace(/^-+|-+$/g, "");
+  return s || "device";
+}
+
 // src/tools/backup.ts
 var backupTools = [
   defineTool({
@@ -2780,6 +3020,7 @@ var backupTools = [
     async handler(a, ctx) {
       const name = a.name || `backup_${await deviceDateStamp(ctx)}`;
       ctx.info(`Creating backup: name=${name}`);
+      const disk = await checkDiskSpace(ctx);
       const cmd = new Cmd("/system backup save").set("name", name);
       if (a.dont_encrypt)
         cmd.raw("dont-encrypt=yes");
@@ -2788,13 +3029,35 @@ var backupTools = [
       if (!a.include_password)
         cmd.raw("password-file=no");
       const result = await executeMikrotikCommand(cmd.build(), ctx);
-      if (result.includes("saved") || result.trim() === "") {
-        const fileDetails = await executeMikrotikCommand(`/file print detail where name=${name}.backup`, ctx);
-        return fileDetails ? `Backup created successfully:
+      if (!(result.includes("saved") || result.trim() === "")) {
+        if (disk.low) {
+          return `Failed to create backup (device disk is ${disk.usedPct?.toFixed(0)}% used): ${result}
 
-${fileDetails}` : `Backup '${name}.backup' created successfully.`;
+` + "Tip: use create_local_backup or create_export instead \u2014 text exports can be captured " + "directly to the local vault without using any device disk space.";
+        }
+        return `Failed to create backup: ${result}`;
+      }
+      if (disk.low) {
+        const dc = getDevice(ctx.device);
+        if (isMacTelnetDevice(dc)) {
+          return `Backup '${name}.backup' created on device, but disk is ${disk.usedPct?.toFixed(0)}% used. ` + "This is a MAC-Telnet device (no SFTP), so the file cannot be downloaded automatically. " + "Free disk space manually or use create_local_backup for a text export that bypasses device storage.";
+        }
+        const deviceFile = `${name}.backup`;
+        try {
+          ctx.info(`Low disk (${disk.usedPct?.toFixed(0)}%) \u2014 downloading backup to local vault`);
+          const data = await downloadFileFromDevice(ctx.device, deviceFile);
+          const device = resolveDeviceName(ctx.device);
+          const vaultName = writeBinaryBackup(`${deviceSlug(device)}_${deviceFile}`, data);
+          await executeMikrotikCommand(`/file remove ${deviceFile}`, ctx);
+          return `[LOW DISK \u2014 ${disk.usedPct?.toFixed(0)}% used] Backup '${deviceFile}' created, downloaded to ` + `local vault as '${vaultName}' (${data.length} bytes) at ${backupDir()}, and removed from ` + "the device to free disk space.";
+        } catch (e) {
+          return `Backup '${name}.backup' created on device, but the automatic download-and-cleanup ` + `failed: ${e instanceof Error ? e.message : String(e)}. The file is still on the device.`;
+        }
       }
-      return `Failed to create backup: ${result}`;
+      const fileDetails = await executeMikrotikCommand(`/file print detail where name=${name}.backup`, ctx);
+      return fileDetails ? `Backup created successfully:
+
+${fileDetails}` : `Backup '${name}.backup' created successfully.`;
     }
   }),
   defineTool({
@@ -2843,6 +3106,21 @@ ${result}`;
     async handler(a, ctx) {
       const name = a.name || `export_${await deviceDateStamp(ctx)}`;
       ctx.info(`Creating export: name=${name}, format=${a.file_format}`);
+      const disk = await checkDiskSpace(ctx);
+      if (disk.low) {
+        ctx.info(`Low disk (${disk.usedPct?.toFixed(0)}%) \u2014 redirecting export to local vault`);
+        const cmd2 = new Cmd("/export");
+        cmd2.raw(a.verbose ? "verbose" : null);
+        cmd2.raw(a.compact ? "compact" : null);
+        cmd2.raw(!a.hide_sensitive ? "show-sensitive" : null);
+        const body = await executeMikrotikCommand(cmd2.build(), ctx);
+        if (isEmpty(body) || looksLikeError(body)) {
+          return `Failed to create export: ${body}`;
+        }
+        const device = resolveDeviceName(ctx.device);
+        const vaultName = writeBackup(`${deviceSlug(device)}_${name}.rsc`, body);
+        return `[LOW DISK \u2014 ${disk.usedPct?.toFixed(0)}% used] Export saved to LOCAL VAULT as '${vaultName}' ` + `(${Buffer.byteLength(body)} bytes) at ${backupDir()} \u2014 no file was written to the device.`;
+      }
       const extension = a.file_format === "json" || a.file_format === "xml" ? a.file_format : "rsc";
       const fullName = `${name}.${extension}`;
       const cmd = new Cmd("/export");
@@ -2881,6 +3159,20 @@ ${fileDetails}` : `Export '${fullName}' created successfully.`;
         name = `export_${cleanSection}_${await deviceDateStamp(ctx)}`;
       }
       ctx.info(`Exporting section: section=${a.section}, name=${name}`);
+      const disk = await checkDiskSpace(ctx);
+      if (disk.low) {
+        ctx.info(`Low disk (${disk.usedPct?.toFixed(0)}%) \u2014 redirecting section export to local vault`);
+        const cmd2 = new Cmd(`/${a.section} export`);
+        cmd2.raw(!a.hide_sensitive ? "show-sensitive" : null);
+        cmd2.raw(a.compact ? "compact" : null);
+        const body = await executeMikrotikCommand(cmd2.build(), ctx);
+        if (isEmpty(body) || looksLikeError(body)) {
+          return `Failed to export section: ${body}`;
+        }
+        const device = resolveDeviceName(ctx.device);
+        const vaultName = writeBackup(`${deviceSlug(device)}_${name}.rsc`, body);
+        return `[LOW DISK \u2014 ${disk.usedPct?.toFixed(0)}% used] Section export saved to LOCAL VAULT as ` + `'${vaultName}' (${Buffer.byteLength(body)} bytes) at ${backupDir()} \u2014 no file was written ` + "to the device.";
+      }
       const cmd = new Cmd(`/${a.section} export`).set("file", name);
       cmd.raw(!a.hide_sensitive ? "show-sensitive" : null);
       cmd.raw(a.compact ? "compact" : null);
@@ -3031,127 +3323,6 @@ ${result}`;
 // src/tools/local-backup.ts
 import { z as z6 } from "zod";
 
-// src/core/slug.ts
-function deviceSlug(name) {
-  const s = (name ?? "").replace(/[^A-Za-z0-9-]+/g, "-").replace(/^-+|-+$/g, "");
-  return s || "device";
-}
-
-// src/backups/vault.ts
-import {
-  existsSync as existsSync2,
-  mkdirSync,
-  readFileSync as readFileSync4,
-  readdirSync,
-  renameSync,
-  rmSync,
-  statSync,
-  writeFileSync
-} from "fs";
-import { basename, join as join4 } from "path";
-function backupDir() {
-  if (process.env.MIKROTIK_BACKUP_DIR)
-    return process.env.MIKROTIK_BACKUP_DIR;
-  try {
-    const dir = getConfig().backupDir;
-    if (dir)
-      return dir;
-  } catch {}
-  return DEFAULT_BACKUP_DIR;
-}
-function safeName(name) {
-  const base = basename(name);
-  if (base !== name || base === "." || base === ".." || !/^[A-Za-z0-9._-]+$/.test(base)) {
-    throw new Error(`invalid backup name: ${name}`);
-  }
-  return base;
-}
-function listBackups() {
-  const dir = backupDir();
-  if (!existsSync2(dir))
-    return [];
-  return readdirSync(dir).filter((f) => f.endsWith(".rsc")).map((f) => {
-    const st = statSync(join4(dir, f));
-    const us = f.indexOf("_");
-    return {
-      name: f,
-      bytes: st.size,
-      modified: st.mtimeMs,
-      device: us > 0 ? f.slice(0, us) : undefined
-    };
-  }).sort((a, b) => b.modified - a.modified);
-}
-function readBackup(name) {
-  return readFileSync4(join4(backupDir(), safeName(name)), "utf8");
-}
-function writeBackup(name, content) {
-  const dir = backupDir();
-  mkdirSync(dir, { recursive: true });
-  let final = safeName(name);
-  if (existsSync2(join4(dir, final))) {
-    const dot = final.lastIndexOf(".");
-    const stem = dot > 0 ? final.slice(0, dot) : final;
-    const ext = dot > 0 ? final.slice(dot) : "";
-    let n = 2;
-    while (existsSync2(join4(dir, `${stem}_${n}${ext}`)))
-      n++;
-    final = `${stem}_${n}${ext}`;
-  }
-  writeFileSync(join4(dir, final), content, "utf8");
-  return final;
-}
-function deleteBackup(name) {
-  const p = join4(backupDir(), safeName(name));
-  if (!existsSync2(p))
-    return false;
-  rmSync(p);
-  return true;
-}
-function renameBackup(oldName, newName) {
-  const dir = backupDir();
-  const from = join4(dir, safeName(oldName));
-  let to = safeName(newName);
-  if (!to.endsWith(".rsc"))
-    to += ".rsc";
-  const toPath = join4(dir, to);
-  if (!existsSync2(from))
-    throw new Error(`backup not found: ${oldName}`);
-  if (existsSync2(toPath))
-    throw new Error(`a backup named '${to}' already exists`);
-  renameSync(from, toPath);
-  return to;
-}
-function exportToCommands(text) {
-  const lines = [];
-  let buf = "";
-  for (const raw of text.split(`
-`)) {
-    const line = raw.replace(/\r$/, "");
-    buf = buf ? `${buf} ${line.trim()}` : line;
-    if (buf.trimEnd().endsWith("\\")) {
-      buf = buf.trimEnd().slice(0, -1).trimEnd();
-      continue;
-    }
-    lines.push(buf);
-    buf = "";
-  }
-  if (buf)
-    lines.push(buf);
-  const cmds = [];
-  let section = "";
-  for (const line of lines) {
-    const t = line.trim();
-    if (!t || t.startsWith("#"))
-      continue;
-    if (t.startsWith("/")) {
-      section = t;
-      continue;
-    }
-    cmds.push(section ? `${section} ${t}` : t);
-  }
-  return cmds;
-}
-
 // src/backups/create.ts
 function labelSlug(label) {
   const s = (label ?? "").replace(/[^A-Za-z0-9-]+/g, "-").replace(/^-+|-+$/g, "").slice(0, 40);
@@ -5946,7 +6117,7 @@ var cache = null;
 async function gateway() {
   if (cache)
     return cache;
-  const { moduleCatalog } = await import("./library-ttqfk3a5.js");
+  const { moduleCatalog } = await import("./library-r6dx5hw2.js");
   const forIndex = [];
   const byName = new Map;
   for (const mod of moduleCatalog) {
@@ -13957,13 +14128,8 @@ var sshTestTools = [
       }
       ctx.info(`Testing SSH from MCP host to configured device '${name}' (${dc.host}:${dc.port})`);
       return probe({
-        host: dc.host,
-        port: dc.port,
-        username: dc.username,
-        password: dc.password,
-        keyFilename: dc.keyFilename,
-        privateKey: dc.privateKey,
-        keyPassphrase: dc.keyPassphrase,
+        ...sshOptionsOf(dc),
+        jump: resolveJump(dc),
         timeoutMs: Math.min(dc.timeoutMs ?? 1e4, 1e4)
       }, `'${name}' (${dc.host}:${dc.port})`, "/system identity print");
     }

package/dist/shared/{library-ttqfk3a5.js → library-r6dx5hw2.js}

@@ -4,7 +4,7 @@ import {
   allToolModules,
   moduleCatalog,
   selectToolModules
-} from "./library-q35fq2gz.js";
+} from "./library-9pt0yeqy.js";
 export {
   selectToolModules,
   moduleCatalog,