@usex/mikrotik-mcp 4.18.0 → 4.20.0

package/dist/cli.js

@@ -40,6 +40,7 @@ import {
   captureSnapshot,
   checkForUpdate,
   closeAll,
+  closeDevice,
   closeMemoryStore,
   commandUnsupported,
   configureRecorder,
@@ -123,7 +124,7 @@ import {
   updateAaaEntity,
   updateSummaryLine,
   writeBackup
-} from "./shared/cli-dv2kmsh2.js";
+} from "./shared/cli-fa29149s.js";
 
 // src/cli.ts
 import { existsSync as existsSync2 } from "fs";
@@ -2997,6 +2998,17 @@ async function runDashboard(cfg, transportLabel) {
         ...devicesPayload(db)
       });
     }
+    if ((url.pathname === "/api/devices/test" || url.pathname === "/api/devices/reconnect") && req.method === "POST") {
+      const b = await readJson(req);
+      const name = typeof b?.device === "string" ? b.device : "";
+      const cfg2 = getConfig();
+      if (!(name in cfg2.devices))
+        return json3({ error: `unknown device: ${name}` }, 404);
+      if (url.pathname === "/api/devices/reconnect")
+        closeDevice(name);
+      const status = await probeDevice(name, cfg2.devices[name]);
+      return json3({ ok: true, status, ...devicesPayload(db) });
+    }
     if (url.pathname === "/api/topology") {
       return json3(topologyPayload());
     }

package/dist/index.d.ts

@@ -280,6 +280,14 @@ declare class SafeModeManager {
 	private ssh;
 	private channel;
 	private active;
+	/**
+	* Set when the persistent shell drops WHILE Safe Mode was active — i.e. the
+	* session died before an explicit commit, so RouterOS has already auto-reverted
+	* every staged change. Distinguishes "never enabled / cleanly closed" from
+	* "died with your changes still pending" so commit/status can report the revert
+	* instead of a reassuring false success. Cleared on the next enable().
+	*/
+	private droppedUnexpectedly;
 	/** Serializes channel access so concurrent tool calls don't interleave I/O. */
 	private queue;
 	/** The device this Safe Mode session belongs to (a configured device name). */
@@ -308,6 +316,15 @@ declare class SafeModeManager {
 	rollback(): Promise<string>;
 	status(): string;
 	/**
+	* Fired by the persistent shell's `close`/`error` events. Arrow-bound so the
+	* same reference is used for add/removeListener. Acts ONLY when we still think
+	* Safe Mode is active — a drop then means the session died with staged changes
+	* pending, which RouterOS has auto-reverted, so we flag it and tear the zombie
+	* handles down. A close during our own cleanup() (which clears `active` first)
+	* is a no-op: it is an intentional teardown, not a lost session.
+	*/
+	private readonly handleUnexpectedDrop;
+	/**
 	* Read from the channel until `isDone(cleaned)` is satisfied or the shell goes
 	* SILENT. Defaults to "any RouterOS prompt appeared". Mode transitions pass a
 	* stricter predicate so they wait for the prompt that reflects the NEW state

package/dist/index.js

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

package/dist/shared/{cli-7jxnfmp0.js → cli-cdxrs0vz.js}

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

package/dist/shared/{cli-dv2kmsh2.js → cli-fa29149s.js}

@@ -1219,6 +1219,9 @@ function closeAll() {
     removeEntry(name);
   }
 }
+function closeDevice(deviceName) {
+  removeEntry(deviceName);
+}
 function poolStatus() {
   return Array.from(entries, ([name, e]) => ({
     device: name,
@@ -1258,6 +1261,7 @@ class SafeModeManager {
   ssh = null;
   channel = null;
   active = false;
+  droppedUnexpectedly = false;
   queue = Promise.resolve();
   constructor(deviceName) {
     this.deviceName = deviceName;
@@ -1278,6 +1282,7 @@ class SafeModeManager {
     return this.lock(async () => {
       if (this.active)
         return "Safe mode is already active.";
+      this.droppedUnexpectedly = false;
       const dc = getDevice(this.deviceName);
       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.";
@@ -1288,6 +1293,8 @@ class SafeModeManager {
       }
       this.ssh = ssh;
       this.channel = await ssh.shell({ term: "dumb", cols: 220, rows: 50 });
+      this.channel.on("close", this.handleUnexpectedDrop);
+      this.channel.on("error", this.handleUnexpectedDrop);
       const initial = (await this.readUntilPrompt(20000)).text;
       if (!PROMPT_RE.test(initial)) {
         this.cleanup();
@@ -1305,6 +1312,9 @@ class SafeModeManager {
   }
   execute(command) {
     return this.lock(async () => {
+      if (this.droppedUnexpectedly) {
+        throw new Error("Safe Mode session dropped \u2014 RouterOS auto-reverted every staged change; nothing " + "was saved. Re-enable Safe Mode and re-apply, or apply the change directly.");
+      }
       if (!this.active || !this.channel) {
         throw new Error("Safe mode session is not active.");
       }
@@ -1319,6 +1329,13 @@ class SafeModeManager {
   }
   commit() {
     return this.lock(async () => {
+      if (this.droppedUnexpectedly) {
+        this.droppedUnexpectedly = false;
+        return {
+          ok: false,
+          message: "Commit FAILED \u2014 the Safe Mode session dropped before this commit, so RouterOS " + "automatically reverted ALL staged changes and NOTHING was saved. Re-enable Safe Mode " + "and re-apply the changes (or apply them directly and verify each with a read)."
+        };
+      }
       if (!this.active || !this.channel) {
         return { ok: true, message: "Safe mode is not active. Nothing to commit." };
       }
@@ -1357,6 +1374,10 @@ class SafeModeManager {
   }
   rollback() {
     return this.lock(async () => {
+      if (this.droppedUnexpectedly) {
+        this.droppedUnexpectedly = false;
+        return "Safe Mode session had already dropped \u2014 RouterOS auto-reverted all staged changes; " + "nothing was left to roll back.";
+      }
       if (!this.active)
         return "Safe mode is not active. Nothing to roll back.";
       this.cleanup();
@@ -1364,8 +1385,17 @@ class SafeModeManager {
     });
   }
   status() {
+    if (this.droppedUnexpectedly) {
+      return "Safe mode session DROPPED unexpectedly \u2014 RouterOS auto-reverted all staged changes; they " + "were NOT saved. Re-enable Safe Mode and re-apply, or apply changes directly (verify each with a read).";
+    }
     return this.active ? "Safe mode is ACTIVE. Changes are pending \u2014 they are NOT yet persisted. " + "Call commit_safe_mode to persist or rollback_safe_mode to revert." : "Safe mode is NOT active. Changes take effect and persist immediately.";
   }
+  handleUnexpectedDrop = () => {
+    if (!this.active)
+      return;
+    this.droppedUnexpectedly = true;
+    this.cleanup();
+  };
   readUntilPrompt(idleMs = IDLE_TIMEOUT_MS, isDone = (c) => PROMPT_RE.test(c), hardCapMs = HARD_CAP_MS) {
     const channel = this.channel;
     if (!channel)
@@ -9029,7 +9059,7 @@ var cache = null;
 async function gateway() {
   if (cache)
     return cache;
-  const { moduleCatalog } = await import("./cli-7jxnfmp0.js");
+  const { moduleCatalog } = await import("./cli-cdxrs0vz.js");
   const forIndex = [];
   const byName = new Map;
   for (const mod of moduleCatalog) {
@@ -33305,4 +33335,4 @@ function selectToolModules(filter = {}, catalog = moduleCatalog) {
   }).map((m) => m.tools);
 }
 
-export { __require, DEFAULT_SNAPSHOT_DB, DEFAULT_CONFIG_HISTORY_DIR, DeviceConfigSchema, ToolFilterSchema, MikrotikConfigSchema, getConfigSource, loadConfig, logger, setConfig, getConfig, listDevices, deviceLabels, resolveDeviceName, deviceDirectory, isMacTelnetDevice, createDeviceClient, describeTransport, isPoolEnabled, closeAll, poolStatus, getMemoryStore, closeMemoryStore, reopenMemoryStore, executeMikrotikCommand, createContext, Cmd, isEmpty, looksLikeError, commandUnsupported, parseKeyValues, parseRouterosDate, parseSize, parseSystemResource, parseRecords, parseLeadingNumber, parseDisks, riskOf, REDACTED, redact, configureRecorder, getEventStore, subscribe, subscriberCount, registerTools, fetchDevices, sampleDeviceTraffic, sampleAllTraffic, setDeviceLimits, blockDevice, allowDevice, makeDeviceStatic, setDeviceIp, setDeviceLabel, removeDeviceLease, devicesView, PROMPTS_DIR, UI_DIST_DIR, registerUiResources, backupDir, listBackups, readBackup, writeBackup, deleteBackup, renameBackup, createLocalBackup, restoreLocalBackup, isS3Configured, getS3Client, presignExpiresIn, s3Target, splitCommands, buildChangePlan, renderPlan, diffLines, normalizeExport, analyzeDrift, attributeChanges, openSnapshotStore, applyWritesSafely, captureSnapshot, DEFAULT_TZSP_PORT, capture2 as capture, AAA_ENTITIES, listAaaEntity, addAaaEntity, updateAaaEntity, removeAaaEntity, toggleAaaEntity, getRadiusIncoming, setRadiusIncoming, resetRadiusCounters, getUmSettings, setUmSettings, VERSION, WEBSITE_URL, LOGO_URL, SERVER_TITLE, SERVER_DESCRIPTION, SERVER_NAME, PKG_META, loadFileCacheSync, fetchLatestRelease, checkForUpdate, updateSummaryLine, fetchAllReleases, buildChannelPlanCommands, reportWeakClients, runCapsmanAudit, steerAlreadyPresent, buildSteerCommands, loadBalancePlan, buildLoadBalanceCommands, buildFtCommands, buildHaCommands, haGuidance, capsmanOverview, fetchCapsmanState, moduleCatalog, allToolModules, ALWAYS_ON_MODULES, selectToolModules };
+export { __require, DEFAULT_SNAPSHOT_DB, DEFAULT_CONFIG_HISTORY_DIR, DeviceConfigSchema, ToolFilterSchema, MikrotikConfigSchema, getConfigSource, loadConfig, logger, setConfig, getConfig, listDevices, deviceLabels, resolveDeviceName, deviceDirectory, isMacTelnetDevice, createDeviceClient, describeTransport, isPoolEnabled, closeAll, closeDevice, poolStatus, getMemoryStore, closeMemoryStore, reopenMemoryStore, executeMikrotikCommand, createContext, Cmd, isEmpty, looksLikeError, commandUnsupported, parseKeyValues, parseRouterosDate, parseSize, parseSystemResource, parseRecords, parseLeadingNumber, parseDisks, riskOf, REDACTED, redact, configureRecorder, getEventStore, subscribe, subscriberCount, registerTools, fetchDevices, sampleDeviceTraffic, sampleAllTraffic, setDeviceLimits, blockDevice, allowDevice, makeDeviceStatic, setDeviceIp, setDeviceLabel, removeDeviceLease, devicesView, PROMPTS_DIR, UI_DIST_DIR, registerUiResources, backupDir, listBackups, readBackup, writeBackup, deleteBackup, renameBackup, createLocalBackup, restoreLocalBackup, isS3Configured, getS3Client, presignExpiresIn, s3Target, splitCommands, buildChangePlan, renderPlan, diffLines, normalizeExport, analyzeDrift, attributeChanges, openSnapshotStore, applyWritesSafely, captureSnapshot, DEFAULT_TZSP_PORT, capture2 as capture, AAA_ENTITIES, listAaaEntity, addAaaEntity, updateAaaEntity, removeAaaEntity, toggleAaaEntity, getRadiusIncoming, setRadiusIncoming, resetRadiusCounters, getUmSettings, setUmSettings, VERSION, WEBSITE_URL, LOGO_URL, SERVER_TITLE, SERVER_DESCRIPTION, SERVER_NAME, PKG_META, loadFileCacheSync, fetchLatestRelease, checkForUpdate, updateSummaryLine, fetchAllReleases, buildChannelPlanCommands, reportWeakClients, runCapsmanAudit, steerAlreadyPresent, buildSteerCommands, loadBalancePlan, buildLoadBalanceCommands, buildFtCommands, buildHaCommands, haGuidance, capsmanOverview, fetchCapsmanState, moduleCatalog, allToolModules, ALWAYS_ON_MODULES, selectToolModules };

package/dist/shared/{library-77r1j24d.js → library-g5p25m9e.js}

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

package/dist/shared/{library-7m2c1g1y.js → library-ypdm9bkx.js}

@@ -1239,6 +1239,7 @@ class SafeModeManager {
   ssh = null;
   channel = null;
   active = false;
+  droppedUnexpectedly = false;
   queue = Promise.resolve();
   constructor(deviceName) {
     this.deviceName = deviceName;
@@ -1259,6 +1260,7 @@ class SafeModeManager {
     return this.lock(async () => {
       if (this.active)
         return "Safe mode is already active.";
+      this.droppedUnexpectedly = false;
       const dc = getDevice(this.deviceName);
       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.";
@@ -1269,6 +1271,8 @@ class SafeModeManager {
       }
       this.ssh = ssh;
       this.channel = await ssh.shell({ term: "dumb", cols: 220, rows: 50 });
+      this.channel.on("close", this.handleUnexpectedDrop);
+      this.channel.on("error", this.handleUnexpectedDrop);
       const initial = (await this.readUntilPrompt(20000)).text;
       if (!PROMPT_RE.test(initial)) {
         this.cleanup();
@@ -1286,6 +1290,9 @@ class SafeModeManager {
   }
   execute(command) {
     return this.lock(async () => {
+      if (this.droppedUnexpectedly) {
+        throw new Error("Safe Mode session dropped \u2014 RouterOS auto-reverted every staged change; nothing " + "was saved. Re-enable Safe Mode and re-apply, or apply the change directly.");
+      }
       if (!this.active || !this.channel) {
         throw new Error("Safe mode session is not active.");
       }
@@ -1300,6 +1307,13 @@ class SafeModeManager {
   }
   commit() {
     return this.lock(async () => {
+      if (this.droppedUnexpectedly) {
+        this.droppedUnexpectedly = false;
+        return {
+          ok: false,
+          message: "Commit FAILED \u2014 the Safe Mode session dropped before this commit, so RouterOS " + "automatically reverted ALL staged changes and NOTHING was saved. Re-enable Safe Mode " + "and re-apply the changes (or apply them directly and verify each with a read)."
+        };
+      }
       if (!this.active || !this.channel) {
         return { ok: true, message: "Safe mode is not active. Nothing to commit." };
       }
@@ -1338,6 +1352,10 @@ class SafeModeManager {
   }
   rollback() {
     return this.lock(async () => {
+      if (this.droppedUnexpectedly) {
+        this.droppedUnexpectedly = false;
+        return "Safe Mode session had already dropped \u2014 RouterOS auto-reverted all staged changes; " + "nothing was left to roll back.";
+      }
       if (!this.active)
         return "Safe mode is not active. Nothing to roll back.";
       this.cleanup();
@@ -1345,8 +1363,17 @@ class SafeModeManager {
     });
   }
   status() {
+    if (this.droppedUnexpectedly) {
+      return "Safe mode session DROPPED unexpectedly \u2014 RouterOS auto-reverted all staged changes; they " + "were NOT saved. Re-enable Safe Mode and re-apply, or apply changes directly (verify each with a read).";
+    }
     return this.active ? "Safe mode is ACTIVE. Changes are pending \u2014 they are NOT yet persisted. " + "Call commit_safe_mode to persist or rollback_safe_mode to revert." : "Safe mode is NOT active. Changes take effect and persist immediately.";
   }
+  handleUnexpectedDrop = () => {
+    if (!this.active)
+      return;
+    this.droppedUnexpectedly = true;
+    this.cleanup();
+  };
   readUntilPrompt(idleMs = IDLE_TIMEOUT_MS, isDone = (c) => PROMPT_RE.test(c), hardCapMs = HARD_CAP_MS) {
     const channel = this.channel;
     if (!channel)
@@ -8811,7 +8838,7 @@ var cache = null;
 async function gateway() {
   if (cache)
     return cache;
-  const { moduleCatalog } = await import("./library-77r1j24d.js");
+  const { moduleCatalog } = await import("./library-g5p25m9e.js");
   const forIndex = [];
   const byName = new Map;
   for (const mod of moduleCatalog) {