@usex/mikrotik-mcp 3.30.0 → 3.31.0

package/dist/cli.js

@@ -626,10 +626,10 @@ class MikroTikMacTelnetClient {
       const explicitSourceMac = this.opts.sourceMac ? parseMac(this.opts.sourceMac) : undefined;
       const host = this.opts.host ?? DEFAULT_MAC_TELNET_BROADCAST;
       const askedDiscovery = host === DEFAULT_MAC_TELNET_BROADCAST && !explicitSourceMac;
-      if (askedDiscovery) {
-        const candidates = listBroadcastInterfaces();
-        logger.info(`[mac-telnet] discovery candidates: ${candidates.length ? candidates.map((i) => `${i.name}(${formatMac(i.mac)}\u2192${i.broadcast})`).join(", ") : "NONE \u2014 no usable non-internal IPv4 interface found"}`);
-      }
+      const candidates = askedDiscovery ? listBroadcastInterfaces() : [];
+      const candidatesText = candidates.length ? candidates.map((i) => `${i.name}(${formatMac(i.mac)}\u2192${i.broadcast})`).join(", ") : "NONE \u2014 no usable non-internal IPv4 interface found (is this host on the device's LAN?)";
+      if (askedDiscovery)
+        logger.info(`[mac-telnet] discovery candidates: ${candidatesText}`);
       logger.info(`[mac-telnet] resolving route to ${this.opts.mac}\u2026`);
       const route = await resolveMacTelnetRoute({
         destinationMac,
@@ -639,7 +639,7 @@ class MikroTikMacTelnetClient {
         explicitSourceMac
       });
       const discoveryFailed = askedDiscovery && route.host === DEFAULT_MAC_TELNET_BROADCAST;
-      this.routeHint = discoveryFailed ? "no local interface got a reply from the device during discovery \u2014 it is likely on a " + "different Layer-2 segment, mac-server is disabled on the facing interface, or a host " + "firewall is dropping the UDP 20561 reply. Pin the segment by setting `macHost` to the " + "device subnet's broadcast (e.g. 192.168.88.255) and, if needed, `sourceMac`." : undefined;
+      this.routeHint = discoveryFailed ? "no local interface got a reply from the device during discovery \u2014 MAC-Telnet is Layer-2 " + "only, so the machine running this MCP server MUST be on the SAME Ethernet/Wi-Fi segment as " + "the device (it cannot cross any router or the internet). Likely: this host is not on that " + "segment, mac-server is disabled on the device's facing interface (`/tool mac-server`), or a " + "host firewall is dropping the UDP 20561 reply. " + `Interfaces tried: ${candidatesText}. ` + "To pin it, set the device's `macHost` to the LAN's directed broadcast (e.g. 192.168.88.255) " + "and `sourceMac` to the real MAC of the interface on that LAN." : undefined;
       logger.info(`[mac-telnet] route: source ${formatMac(route.sourceMac)} \u2192 ${route.host} ` + `(${explicitSourceMac ? "explicit" : discoveryFailed ? "DISCOVERY FAILED \u2014 limited broadcast" : "discovered"})`);
       const transport = createUdpMacTelnetTransport({
         host: route.host,
@@ -692,6 +692,7 @@ class MikroTikMacTelnetClient {
 // src/ssh/client.ts
 import { readFileSync as readFileSync2 } from "fs";
 import { Client } from "ssh2";
+var RUN_IDLE_TIMEOUT_MS = 60000;
 function decodeOutput(data) {
   if (!data || data.length === 0)
     return "";
@@ -762,16 +763,43 @@ class MikroTikSSHClient {
         const stderrBuf = [];
         let settled = false;
         let timer;
+        let idleTimer;
+        const clearTimers = () => {
+          if (timer)
+            clearTimeout(timer);
+          if (idleTimer)
+            clearTimeout(idleTimer);
+        };
         const finish = () => {
           if (settled)
             return;
           settled = true;
-          if (timer)
-            clearTimeout(timer);
+          clearTimers();
           const out = decodeOutput(Buffer.concat(stdout));
           const error = decodeOutput(Buffer.concat(stderrBuf));
           resolve2(error && !out ? error : out);
         };
+        const fail = (e) => {
+          if (settled)
+            return;
+          settled = true;
+          clearTimers();
+          try {
+            stream.close();
+          } catch {}
+          reject(e);
+        };
+        const armIdle = () => {
+          if (idleTimer)
+            clearTimeout(idleTimer);
+          idleTimer = setTimeout(() => {
+            try {
+              stream.signal("INT");
+            } catch {}
+            fail(new Error(`MikroTik command produced no output for ${RUN_IDLE_TIMEOUT_MS / 1000}s and the SSH ` + "channel never closed \u2014 it appears wedged (often a malformed or unbalanced command). " + `Aborted to avoid hanging the connection. Command: ${command.slice(0, 120)}`));
+          }, RUN_IDLE_TIMEOUT_MS);
+        };
+        armIdle();
         if (opts.maxMs && opts.maxMs > 0) {
           timer = setTimeout(() => {
             try {
@@ -783,7 +811,13 @@ class MikroTikSSHClient {
             finish();
           }, opts.maxMs);
         }
-        stream.on("close", finish).on("data", (d) => stdout.push(d)).stderr.on("data", (d) => stderrBuf.push(d));
+        stream.on("close", finish).on("data", (d) => {
+          stdout.push(d);
+          armIdle();
+        }).stderr.on("data", (d) => {
+          stderrBuf.push(d);
+          armIdle();
+        });
       });
     });
   }
@@ -27075,7 +27109,7 @@ function registerPrompts(server) {
 // package.json
 var package_default = {
   name: "@usex/mikrotik-mcp",
-  version: "3.30.0",
+  version: "3.31.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",
@@ -27168,11 +27202,11 @@ var package_default = {
     "class-variance-authority": "^0.7.1",
     clsx: "^2.1.1",
     gsap: "^3.15.0",
-    prettier: "^3.8.4",
+    prettier: "^3.9.1",
     react: "^19.2.7",
     "react-dom": "^19.2.7",
     recharts: "^3.9.0",
-    "release-it": "^20.2.0",
+    "release-it": "^20.2.1",
     "tailwind-merge": "^3.6.0",
     tailwindcss: "^4.3.1",
     vite: "npm:@voidzero-dev/vite-plus-core@latest",

package/dist/index.js

@@ -618,10 +618,10 @@ class MikroTikMacTelnetClient {
       const explicitSourceMac = this.opts.sourceMac ? parseMac(this.opts.sourceMac) : undefined;
       const host = this.opts.host ?? DEFAULT_MAC_TELNET_BROADCAST;
       const askedDiscovery = host === DEFAULT_MAC_TELNET_BROADCAST && !explicitSourceMac;
-      if (askedDiscovery) {
-        const candidates = listBroadcastInterfaces();
-        logger.info(`[mac-telnet] discovery candidates: ${candidates.length ? candidates.map((i) => `${i.name}(${formatMac(i.mac)}\u2192${i.broadcast})`).join(", ") : "NONE \u2014 no usable non-internal IPv4 interface found"}`);
-      }
+      const candidates = askedDiscovery ? listBroadcastInterfaces() : [];
+      const candidatesText = candidates.length ? candidates.map((i) => `${i.name}(${formatMac(i.mac)}\u2192${i.broadcast})`).join(", ") : "NONE \u2014 no usable non-internal IPv4 interface found (is this host on the device's LAN?)";
+      if (askedDiscovery)
+        logger.info(`[mac-telnet] discovery candidates: ${candidatesText}`);
       logger.info(`[mac-telnet] resolving route to ${this.opts.mac}\u2026`);
       const route = await resolveMacTelnetRoute({
         destinationMac,
@@ -631,7 +631,7 @@ class MikroTikMacTelnetClient {
         explicitSourceMac
       });
       const discoveryFailed = askedDiscovery && route.host === DEFAULT_MAC_TELNET_BROADCAST;
-      this.routeHint = discoveryFailed ? "no local interface got a reply from the device during discovery \u2014 it is likely on a " + "different Layer-2 segment, mac-server is disabled on the facing interface, or a host " + "firewall is dropping the UDP 20561 reply. Pin the segment by setting `macHost` to the " + "device subnet's broadcast (e.g. 192.168.88.255) and, if needed, `sourceMac`." : undefined;
+      this.routeHint = discoveryFailed ? "no local interface got a reply from the device during discovery \u2014 MAC-Telnet is Layer-2 " + "only, so the machine running this MCP server MUST be on the SAME Ethernet/Wi-Fi segment as " + "the device (it cannot cross any router or the internet). Likely: this host is not on that " + "segment, mac-server is disabled on the device's facing interface (`/tool mac-server`), or a " + "host firewall is dropping the UDP 20561 reply. " + `Interfaces tried: ${candidatesText}. ` + "To pin it, set the device's `macHost` to the LAN's directed broadcast (e.g. 192.168.88.255) " + "and `sourceMac` to the real MAC of the interface on that LAN." : undefined;
       logger.info(`[mac-telnet] route: source ${formatMac(route.sourceMac)} \u2192 ${route.host} ` + `(${explicitSourceMac ? "explicit" : discoveryFailed ? "DISCOVERY FAILED \u2014 limited broadcast" : "discovered"})`);
       const transport = createUdpMacTelnetTransport({
         host: route.host,
@@ -684,6 +684,7 @@ class MikroTikMacTelnetClient {
 // src/ssh/client.ts
 import { readFileSync as readFileSync2 } from "fs";
 import { Client } from "ssh2";
+var RUN_IDLE_TIMEOUT_MS = 60000;
 function decodeOutput(data) {
   if (!data || data.length === 0)
     return "";
@@ -754,16 +755,43 @@ class MikroTikSSHClient {
         const stderrBuf = [];
         let settled = false;
         let timer;
+        let idleTimer;
+        const clearTimers = () => {
+          if (timer)
+            clearTimeout(timer);
+          if (idleTimer)
+            clearTimeout(idleTimer);
+        };
         const finish = () => {
           if (settled)
             return;
           settled = true;
-          if (timer)
-            clearTimeout(timer);
+          clearTimers();
           const out = decodeOutput(Buffer.concat(stdout));
           const error = decodeOutput(Buffer.concat(stderrBuf));
           resolve2(error && !out ? error : out);
         };
+        const fail = (e) => {
+          if (settled)
+            return;
+          settled = true;
+          clearTimers();
+          try {
+            stream.close();
+          } catch {}
+          reject(e);
+        };
+        const armIdle = () => {
+          if (idleTimer)
+            clearTimeout(idleTimer);
+          idleTimer = setTimeout(() => {
+            try {
+              stream.signal("INT");
+            } catch {}
+            fail(new Error(`MikroTik command produced no output for ${RUN_IDLE_TIMEOUT_MS / 1000}s and the SSH ` + "channel never closed \u2014 it appears wedged (often a malformed or unbalanced command). " + `Aborted to avoid hanging the connection. Command: ${command.slice(0, 120)}`));
+          }, RUN_IDLE_TIMEOUT_MS);
+        };
+        armIdle();
         if (opts.maxMs && opts.maxMs > 0) {
           timer = setTimeout(() => {
             try {
@@ -775,7 +803,13 @@ class MikroTikSSHClient {
             finish();
           }, opts.maxMs);
         }
-        stream.on("close", finish).on("data", (d) => stdout.push(d)).stderr.on("data", (d) => stderrBuf.push(d));
+        stream.on("close", finish).on("data", (d) => {
+          stdout.push(d);
+          armIdle();
+        }).stderr.on("data", (d) => {
+          stderrBuf.push(d);
+          armIdle();
+        });
       });
     });
   }
@@ -25053,7 +25087,7 @@ function selectToolModules(filter = {}, catalog = moduleCatalog) {
 // package.json
 var package_default = {
   name: "@usex/mikrotik-mcp",
-  version: "3.30.0",
+  version: "3.31.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",
@@ -25146,11 +25180,11 @@ var package_default = {
     "class-variance-authority": "^0.7.1",
     clsx: "^2.1.1",
     gsap: "^3.15.0",
-    prettier: "^3.8.4",
+    prettier: "^3.9.1",
     react: "^19.2.7",
     "react-dom": "^19.2.7",
     recharts: "^3.9.0",
-    "release-it": "^20.2.0",
+    "release-it": "^20.2.1",
     "tailwind-merge": "^3.6.0",
     tailwindcss: "^4.3.1",
     vite: "npm:@voidzero-dev/vite-plus-core@latest",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@usex/mikrotik-mcp",
-  "version": "3.30.0",
+  "version": "3.31.0",
   "description": "MCP server for MikroTik RouterOS — 660+ tools over SSH for firewall, NAT, routing, DHCP, DNS, WireGuard, wireless, QoS and more.",
   "keywords": [
     "ai",
@@ -93,11 +93,11 @@
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
     "gsap": "^3.15.0",
-    "prettier": "^3.8.4",
+    "prettier": "^3.9.1",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
     "recharts": "^3.9.0",
-    "release-it": "^20.2.0",
+    "release-it": "^20.2.1",
     "tailwind-merge": "^3.6.0",
     "tailwindcss": "^4.3.1",
     "vite": "npm:@voidzero-dev/vite-plus-core@latest",