@usex/mikrotik-mcp 3.20.0 → 3.21.0

package/dist/cli.js

@@ -617,7 +617,7 @@ class MikroTikMacTelnetClient {
       return false;
     }
   }
-  async run(command) {
+  async run(command, _opts = {}) {
     if (!this.console || !this.console.isReady) {
       throw new Error("Not connected to MikroTik device (MAC-Telnet)");
     }
@@ -694,7 +694,7 @@ class MikroTikSSHClient {
       }).connect(cfg);
     });
   }
-  run(command) {
+  run(command, opts = {}) {
     if (!this.client) {
       return Promise.reject(new Error("Not connected to MikroTik device"));
     }
@@ -707,11 +707,30 @@ class MikroTikSSHClient {
         }
         const stdout = [];
         const stderrBuf = [];
-        stream.on("close", () => {
+        let settled = false;
+        let timer;
+        const finish = () => {
+          if (settled)
+            return;
+          settled = true;
+          if (timer)
+            clearTimeout(timer);
           const out = decodeOutput(Buffer.concat(stdout));
           const error = decodeOutput(Buffer.concat(stderrBuf));
           resolve2(error && !out ? error : out);
-        }).on("data", (d) => stdout.push(d)).stderr.on("data", (d) => stderrBuf.push(d));
+        };
+        if (opts.maxMs && opts.maxMs > 0) {
+          timer = setTimeout(() => {
+            try {
+              stream.signal("INT");
+            } catch {}
+            try {
+              stream.close();
+            } catch {}
+            finish();
+          }, opts.maxMs);
+        }
+        stream.on("close", finish).on("data", (d) => stdout.push(d)).stderr.on("data", (d) => stderrBuf.push(d));
       });
     });
   }
@@ -1010,7 +1029,7 @@ function getSafeModeManager(deviceName) {
 }
 
 // src/core/connector.ts
-async function runOnce(command, deviceName) {
+async function runOnce(command, deviceName, opts) {
   const name = resolveDeviceName(deviceName);
   const dc = getDevice(deviceName);
   const client = createDeviceClient(dc);
@@ -1018,12 +1037,12 @@ async function runOnce(command, deviceName) {
     if (!await client.connect()) {
       throw new Error(connectErrorMessage(name, dc, client.lastError));
     }
-    return await client.run(command);
+    return await client.run(command, opts);
   } finally {
     client.disconnect();
   }
 }
-async function executeMikrotikCommand(command, ctx) {
+async function executeMikrotikCommand(command, ctx, opts) {
   const deviceName = resolveDeviceName(ctx.device);
   const safe = getSafeModeManager(deviceName);
   if (safe.isActive) {
@@ -1031,7 +1050,7 @@ async function executeMikrotikCommand(command, ctx) {
     return safe.execute(command);
   }
   ctx.info(`[${deviceName}] Executing MikroTik command: ${command}`);
-  return runOnce(command, ctx.device);
+  return runOnce(command, ctx.device, opts);
 }
 
 // src/core/registry.ts
@@ -1124,6 +1143,16 @@ function isEmpty(result) {
   const t = result.trim();
   return t === "" || t === "no such item" || t === "no such item (4)";
 }
+function flattenLiveOutput(text) {
+  return text.split(`
+`).map((line) => {
+    const segs = line.split("\r").filter((s) => s.trim() !== "");
+    return segs.length ? segs[segs.length - 1] : "";
+  }).join(`
+`).replace(/\n{3,}/g, `
+
+`).trim();
+}
 function extractCreatedId(output) {
   const star = output.match(/\*[0-9A-Fa-f]+/);
   if (star)
@@ -11406,7 +11435,7 @@ var networkToolTools = [
     async handler(a, ctx) {
       ctx.info(`Pinging ${a.address} (count=${a.count})`);
       const cmd = new Cmd(`/ping ${a.address}`).set("count", a.count).opt("interface", a.interface).opt("src-address", a.src_address).opt("size", a.size).build();
-      const result = await executeMikrotikCommand(cmd, ctx);
+      const result = flattenLiveOutput(await executeMikrotikCommand(cmd, ctx, { maxMs: a.count * 1500 + 6000 }));
       if (looksLikeError(result))
         return `Failed to ping ${a.address}: ${result}`;
       return isEmpty(result) ? `No response from ${a.address}.` : `PING ${a.address}:
@@ -11427,7 +11456,7 @@ ${result}`;
     async handler(a, ctx) {
       ctx.info(`Tracerouting ${a.address} (count=${a.count})`);
       const cmd = new Cmd(`/tool traceroute ${a.address}`).set("count", a.count).flag("use-dns", a.use_dns).build();
-      const result = await executeMikrotikCommand(cmd, ctx);
+      const result = flattenLiveOutput(await executeMikrotikCommand(cmd, ctx, { maxMs: 30000 + a.count * 3000 }));
       if (looksLikeError(result))
         return `Failed to traceroute ${a.address}: ${result}`;
       return isEmpty(result) ? `No route information for ${a.address}.` : `TRACEROUTE ${a.address}:
@@ -11451,7 +11480,7 @@ ${result}`;
     async handler(a, ctx) {
       ctx.info(`Bandwidth test to ${a.address} (duration=${a.duration}s, direction=${a.direction})`);
       const cmd = new Cmd(`/tool bandwidth-test ${a.address}`).set("duration", `${a.duration}s`).set("direction", a.direction).set("protocol", a.protocol).opt("user", a.user).opt("password", a.password).build();
-      const result = await executeMikrotikCommand(cmd, ctx);
+      const result = flattenLiveOutput(await executeMikrotikCommand(cmd, ctx, { maxMs: a.duration * 1000 + 12000 }));
       if (looksLikeError(result))
         return `Failed to run bandwidth test to ${a.address}: ${result}`;
       return isEmpty(result) ? `No bandwidth test results for ${a.address}.` : `BANDWIDTH TEST:
@@ -12103,7 +12132,7 @@ var floodPingTools = [
     async handler(a, ctx) {
       ctx.info(`Flood-pinging ${a.address} (count=${a.count})`);
       const cmd = new Cmd(`/tool flood-ping ${a.address}`).set("count", a.count).opt("size", a.size).opt("interface", a.interface).opt("src-address", a.src_address).build();
-      const result = await executeMikrotikCommand(cmd, ctx);
+      const result = flattenLiveOutput(await executeMikrotikCommand(cmd, ctx, { maxMs: 30000 }));
       if (looksLikeError(result))
         return `Failed to flood-ping ${a.address}: ${result}`;
       return isEmpty(result) ? `No response from ${a.address}.` : `FLOOD PING ${a.address}:
@@ -12767,7 +12796,7 @@ var speedTestTools = [
     async handler(a, ctx) {
       ctx.info(`Speed test to ${a.address} (duration=${a.duration}s, direction=${a.direction})`);
       const cmd = new Cmd(`/tool speed-test address=${a.address}`).set("duration", `${a.duration}s`).set("direction", a.direction).opt("tcp-connection-count", a.tcp_connection_count).opt("user", a.user).opt("password", a.password).build();
-      const result = await executeMikrotikCommand(cmd, ctx);
+      const result = flattenLiveOutput(await executeMikrotikCommand(cmd, ctx, { maxMs: a.duration * 1000 + 15000 }));
       if (looksLikeError(result))
         return `Failed to run speed test to ${a.address}: ${result}`;
       return isEmpty(result) ? `No speed-test results for ${a.address}.` : `SPEED TEST:
@@ -23922,7 +23951,7 @@ function registerPrompts(server) {
 // package.json
 var package_default = {
   name: "@usex/mikrotik-mcp",
-  version: "3.20.0",
+  version: "3.21.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.d.ts

@@ -26,8 +26,12 @@ type SendLog = (level: "info" | "error", message: string) => void;
 *
 * @param command  Fully-formed RouterOS CLI command (e.g. `/ip address print`).
 * @param ctx      Per-call context carrying the target device.
+* @param opts     `maxMs` caps the one-shot read for interactive/streaming
+*                 commands (ping, bandwidth-test) so they can't hang the tool.
 */
-declare function executeMikrotikCommand(command: string, ctx: ToolContext): Promise<string>;
+declare function executeMikrotikCommand(command: string, ctx: ToolContext, opts?: {
+	maxMs?: number;
+}): Promise<string>;
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { ToolAnnotations } from "@modelcontextprotocol/sdk/types.js";
 import { ZodRawShape } from "zod";
@@ -147,7 +151,9 @@ declare class MikroTikSSHClient {
 	/** Establish the SSH connection. Resolves `true` on success, `false` on failure. */
 	connect(): Promise<boolean>;
 	/** Run a single command on a fresh SSH channel and return its decoded output. */
-	run(command: string): Promise<string>;
+	run(command: string, opts?: {
+		maxMs?: number;
+	}): Promise<string>;
 	/** Open a persistent interactive shell channel (used by Safe Mode). */
 	shell(opts?: {
 		term?: string;

package/dist/index.js

@@ -609,7 +609,7 @@ class MikroTikMacTelnetClient {
       return false;
     }
   }
-  async run(command) {
+  async run(command, _opts = {}) {
     if (!this.console || !this.console.isReady) {
       throw new Error("Not connected to MikroTik device (MAC-Telnet)");
     }
@@ -686,7 +686,7 @@ class MikroTikSSHClient {
       }).connect(cfg);
     });
   }
-  run(command) {
+  run(command, opts = {}) {
     if (!this.client) {
       return Promise.reject(new Error("Not connected to MikroTik device"));
     }
@@ -699,11 +699,30 @@ class MikroTikSSHClient {
         }
         const stdout = [];
         const stderrBuf = [];
-        stream.on("close", () => {
+        let settled = false;
+        let timer;
+        const finish = () => {
+          if (settled)
+            return;
+          settled = true;
+          if (timer)
+            clearTimeout(timer);
           const out = decodeOutput(Buffer.concat(stdout));
           const error = decodeOutput(Buffer.concat(stderrBuf));
           resolve2(error && !out ? error : out);
-        }).on("data", (d) => stdout.push(d)).stderr.on("data", (d) => stderrBuf.push(d));
+        };
+        if (opts.maxMs && opts.maxMs > 0) {
+          timer = setTimeout(() => {
+            try {
+              stream.signal("INT");
+            } catch {}
+            try {
+              stream.close();
+            } catch {}
+            finish();
+          }, opts.maxMs);
+        }
+        stream.on("close", finish).on("data", (d) => stdout.push(d)).stderr.on("data", (d) => stderrBuf.push(d));
       });
     });
   }
@@ -996,7 +1015,7 @@ function getSafeModeManager(deviceName) {
 }
 
 // src/core/connector.ts
-async function runOnce(command, deviceName) {
+async function runOnce(command, deviceName, opts) {
   const name = resolveDeviceName(deviceName);
   const dc = getDevice(deviceName);
   const client = createDeviceClient(dc);
@@ -1004,12 +1023,12 @@ async function runOnce(command, deviceName) {
     if (!await client.connect()) {
       throw new Error(connectErrorMessage(name, dc, client.lastError));
     }
-    return await client.run(command);
+    return await client.run(command, opts);
   } finally {
     client.disconnect();
   }
 }
-async function executeMikrotikCommand(command, ctx) {
+async function executeMikrotikCommand(command, ctx, opts) {
   const deviceName = resolveDeviceName(ctx.device);
   const safe = getSafeModeManager(deviceName);
   if (safe.isActive) {
@@ -1017,7 +1036,7 @@ async function executeMikrotikCommand(command, ctx) {
     return safe.execute(command);
   }
   ctx.info(`[${deviceName}] Executing MikroTik command: ${command}`);
-  return runOnce(command, ctx.device);
+  return runOnce(command, ctx.device, opts);
 }
 // src/core/registry.ts
 import { z as z2 } from "zod";
@@ -1109,6 +1128,16 @@ function isEmpty(result) {
   const t = result.trim();
   return t === "" || t === "no such item" || t === "no such item (4)";
 }
+function flattenLiveOutput(text) {
+  return text.split(`
+`).map((line) => {
+    const segs = line.split("\r").filter((s) => s.trim() !== "");
+    return segs.length ? segs[segs.length - 1] : "";
+  }).join(`
+`).replace(/\n{3,}/g, `
+
+`).trim();
+}
 function extractCreatedId(output) {
   const star = output.match(/\*[0-9A-Fa-f]+/);
   if (star)
@@ -11418,7 +11447,7 @@ var networkToolTools = [
     async handler(a, ctx) {
       ctx.info(`Pinging ${a.address} (count=${a.count})`);
       const cmd = new Cmd(`/ping ${a.address}`).set("count", a.count).opt("interface", a.interface).opt("src-address", a.src_address).opt("size", a.size).build();
-      const result = await executeMikrotikCommand(cmd, ctx);
+      const result = flattenLiveOutput(await executeMikrotikCommand(cmd, ctx, { maxMs: a.count * 1500 + 6000 }));
       if (looksLikeError(result))
         return `Failed to ping ${a.address}: ${result}`;
       return isEmpty(result) ? `No response from ${a.address}.` : `PING ${a.address}:
@@ -11439,7 +11468,7 @@ ${result}`;
     async handler(a, ctx) {
       ctx.info(`Tracerouting ${a.address} (count=${a.count})`);
       const cmd = new Cmd(`/tool traceroute ${a.address}`).set("count", a.count).flag("use-dns", a.use_dns).build();
-      const result = await executeMikrotikCommand(cmd, ctx);
+      const result = flattenLiveOutput(await executeMikrotikCommand(cmd, ctx, { maxMs: 30000 + a.count * 3000 }));
       if (looksLikeError(result))
         return `Failed to traceroute ${a.address}: ${result}`;
       return isEmpty(result) ? `No route information for ${a.address}.` : `TRACEROUTE ${a.address}:
@@ -11463,7 +11492,7 @@ ${result}`;
     async handler(a, ctx) {
       ctx.info(`Bandwidth test to ${a.address} (duration=${a.duration}s, direction=${a.direction})`);
       const cmd = new Cmd(`/tool bandwidth-test ${a.address}`).set("duration", `${a.duration}s`).set("direction", a.direction).set("protocol", a.protocol).opt("user", a.user).opt("password", a.password).build();
-      const result = await executeMikrotikCommand(cmd, ctx);
+      const result = flattenLiveOutput(await executeMikrotikCommand(cmd, ctx, { maxMs: a.duration * 1000 + 12000 }));
       if (looksLikeError(result))
         return `Failed to run bandwidth test to ${a.address}: ${result}`;
       return isEmpty(result) ? `No bandwidth test results for ${a.address}.` : `BANDWIDTH TEST:
@@ -12115,7 +12144,7 @@ var floodPingTools = [
     async handler(a, ctx) {
       ctx.info(`Flood-pinging ${a.address} (count=${a.count})`);
       const cmd = new Cmd(`/tool flood-ping ${a.address}`).set("count", a.count).opt("size", a.size).opt("interface", a.interface).opt("src-address", a.src_address).build();
-      const result = await executeMikrotikCommand(cmd, ctx);
+      const result = flattenLiveOutput(await executeMikrotikCommand(cmd, ctx, { maxMs: 30000 }));
       if (looksLikeError(result))
         return `Failed to flood-ping ${a.address}: ${result}`;
       return isEmpty(result) ? `No response from ${a.address}.` : `FLOOD PING ${a.address}:
@@ -12779,7 +12808,7 @@ var speedTestTools = [
     async handler(a, ctx) {
       ctx.info(`Speed test to ${a.address} (duration=${a.duration}s, direction=${a.direction})`);
       const cmd = new Cmd(`/tool speed-test address=${a.address}`).set("duration", `${a.duration}s`).set("direction", a.direction).opt("tcp-connection-count", a.tcp_connection_count).opt("user", a.user).opt("password", a.password).build();
-      const result = await executeMikrotikCommand(cmd, ctx);
+      const result = flattenLiveOutput(await executeMikrotikCommand(cmd, ctx, { maxMs: a.duration * 1000 + 15000 }));
       if (looksLikeError(result))
         return `Failed to run speed test to ${a.address}: ${result}`;
       return isEmpty(result) ? `No speed-test results for ${a.address}.` : `SPEED TEST:
@@ -22322,7 +22351,7 @@ function selectToolModules(filter = {}, catalog = moduleCatalog) {
 // package.json
 var package_default = {
   name: "@usex/mikrotik-mcp",
-  version: "3.20.0",
+  version: "3.21.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usex/mikrotik-mcp",
-  "version": "3.20.0",
+  "version": "3.21.0",
   "description": "MCP server for MikroTik RouterOS — 660+ tools over SSH for firewall, NAT, routing, DHCP, DNS, WireGuard, wireless, QoS and more.",
   "keywords": [
     "ai",