@yawlabs/caddy-mcp 1.2.5 → 1.2.7

package/README.md

@@ -80,7 +80,7 @@ That's it. Now ask your AI assistant:
 |---|---|---|
 | `CADDY_ADMIN_URL` | `http://localhost:2019` | Caddy admin API URL. Set to `http://caddy:2019` inside Docker, or an https URL for remote admin. |
 | `CADDY_API_TOKEN` | (none) | Optional Bearer token for authenticated admin endpoints. Only needed if you've configured Caddy with auth. |
-| `CADDY_MAX_RETRIES` | `2` | Number of retries on transient failures (5xx, network errors). 4xx and 412 never retry. POSTs to `/config/*` and `/id/*` also skip retry (non-idempotent appends/creates -- retrying could duplicate routes or 409 a half-applied create). POSTs to `/load`, `/adapt`, `/stop` still retry. Hard-capped at 5. Set to `0` to disable. |
+| `CADDY_MAX_RETRIES` | `2` | Number of retries on transient failures (5xx, network errors). 4xx and 412 never retry. POSTs to `/config/*` and `/id/*` also skip retry (non-idempotent appends/creates -- retrying could duplicate routes or 409 a half-applied create). POSTs to `/load`, `/adapt`, `/stop` still retry. Hard-capped at 5; values above the cap log a one-time stderr notice so the clamp is visible. Set to `0` to disable. |
 | `CADDY_LOAD_TIMEOUT` | `60000` | Timeout in ms for the `/load` endpoint; raise for ACME-heavy bring-ups where provisioning many certificates can exceed the default. Non-numeric, `<= 0`, or fractional values below 1ms fall back to the default. |
 
 **Alternate MCP clients:**
@@ -234,7 +234,7 @@ npm install
 npm run lint       # Biome check
 npm run lint:fix   # Auto-fix
 npm run build      # tsup bundle
-npm test           # Vitest (182 unit tests; +8 live-Caddy integration tests gated by CADDY_MCP_INTEGRATION=1)
+npm test           # Vitest (188 unit tests; +8 live-Caddy integration tests gated by CADDY_MCP_INTEGRATION=1)
 npm run typecheck  # tsc --noEmit
 ```
 

package/dist/index.js

@@ -21,6 +21,23 @@ function setEtag(path, etag) {
   }
   etagCache.set(path, etag);
 }
+function invalidateRelated(path) {
+  etagCache.delete(path);
+  for (const key of Array.from(etagCache.keys())) {
+    if (key === path) continue;
+    if (path.startsWith(`${key}/`) || key.startsWith(`${path}/`)) {
+      etagCache.delete(key);
+    }
+  }
+  const isIdWrite = path.startsWith("/id/");
+  const isConfigWrite = path.startsWith("/config/");
+  if (isIdWrite || isConfigWrite) {
+    const otherNamespace = isIdWrite ? "/config/" : "/id/";
+    for (const key of Array.from(etagCache.keys())) {
+      if (key.startsWith(otherNamespace)) etagCache.delete(key);
+    }
+  }
+}
 function getBaseUrl() {
   return (process.env.CADDY_ADMIN_URL || DEFAULT_URL).replace(/\/+$/, "");
 }
@@ -107,14 +124,9 @@ async function attemptRequest(method, path, body, contentType, timeout) {
       setEtag(path, etag);
     }
     if (isWrite && res.ok && isConfigPath) {
-      if (method === "PATCH" || method === "PUT") {
-        if (etag) {
-          setEtag(path, etag);
-        } else {
-          etagCache.delete(path);
-        }
-      } else {
-        etagCache.delete(path);
+      invalidateRelated(path);
+      if ((method === "PATCH" || method === "PUT") && etag) {
+        setEtag(path, etag);
       }
     }
     if (!res.ok) {
@@ -428,7 +440,7 @@ function registerResources(server) {
       contents: [
         {
           uri: "caddy://config",
-          mimeType: "application/json",
+          mimeType: res.ok ? "application/json" : "text/plain",
           text: res.ok ? JSON.stringify(res.data, null, 2) : `Error: ${res.error}`
         }
       ]
@@ -444,7 +456,7 @@ function registerResources(server) {
         contents: [
           {
             uri: "caddy://upstreams",
-            mimeType: "application/json",
+            mimeType: res.ok ? "application/json" : "text/plain",
             text: res.ok ? JSON.stringify(res.data, null, 2) : `Error: ${res.error}`
           }
         ]
@@ -492,7 +504,7 @@ function registerResources(server) {
         contents: [
           {
             uri: "caddy://servers",
-            mimeType: "application/json",
+            mimeType: res.ok ? "application/json" : "text/plain",
             text: res.ok ? JSON.stringify(res.data ?? {}, null, 2) : `Error: ${res.error}`
           }
         ]
@@ -842,9 +854,6 @@ function registerRouteTools(server) {
               ]
             };
           }
-          if (isParentMissing(putRes)) {
-            return serverNotFoundError(srv);
-          }
           return formatResult(putRes);
         }
         if (!isUnknownId(existing)) {

package/dist/server.js

@@ -19,6 +19,23 @@ function setEtag(path, etag) {
   }
   etagCache.set(path, etag);
 }
+function invalidateRelated(path) {
+  etagCache.delete(path);
+  for (const key of Array.from(etagCache.keys())) {
+    if (key === path) continue;
+    if (path.startsWith(`${key}/`) || key.startsWith(`${path}/`)) {
+      etagCache.delete(key);
+    }
+  }
+  const isIdWrite = path.startsWith("/id/");
+  const isConfigWrite = path.startsWith("/config/");
+  if (isIdWrite || isConfigWrite) {
+    const otherNamespace = isIdWrite ? "/config/" : "/id/";
+    for (const key of Array.from(etagCache.keys())) {
+      if (key.startsWith(otherNamespace)) etagCache.delete(key);
+    }
+  }
+}
 function getBaseUrl() {
   return (process.env.CADDY_ADMIN_URL || DEFAULT_URL).replace(/\/+$/, "");
 }
@@ -105,14 +122,9 @@ async function attemptRequest(method, path, body, contentType, timeout) {
       setEtag(path, etag);
     }
     if (isWrite && res.ok && isConfigPath) {
-      if (method === "PATCH" || method === "PUT") {
-        if (etag) {
-          setEtag(path, etag);
-        } else {
-          etagCache.delete(path);
-        }
-      } else {
-        etagCache.delete(path);
+      invalidateRelated(path);
+      if ((method === "PATCH" || method === "PUT") && etag) {
+        setEtag(path, etag);
       }
     }
     if (!res.ok) {
@@ -426,7 +438,7 @@ function registerResources(server) {
       contents: [
         {
           uri: "caddy://config",
-          mimeType: "application/json",
+          mimeType: res.ok ? "application/json" : "text/plain",
           text: res.ok ? JSON.stringify(res.data, null, 2) : `Error: ${res.error}`
         }
       ]
@@ -442,7 +454,7 @@ function registerResources(server) {
         contents: [
           {
             uri: "caddy://upstreams",
-            mimeType: "application/json",
+            mimeType: res.ok ? "application/json" : "text/plain",
             text: res.ok ? JSON.stringify(res.data, null, 2) : `Error: ${res.error}`
           }
         ]
@@ -490,7 +502,7 @@ function registerResources(server) {
         contents: [
           {
             uri: "caddy://servers",
-            mimeType: "application/json",
+            mimeType: res.ok ? "application/json" : "text/plain",
             text: res.ok ? JSON.stringify(res.data ?? {}, null, 2) : `Error: ${res.error}`
           }
         ]
@@ -840,9 +852,6 @@ function registerRouteTools(server) {
               ]
             };
           }
-          if (isParentMissing(putRes)) {
-            return serverNotFoundError(srv);
-          }
           return formatResult(putRes);
         }
         if (!isUnknownId(existing)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yawlabs/caddy-mcp",
-  "version": "1.2.5",
+  "version": "1.2.7",
   "mcpName": "io.github.YawLabs/caddy-mcp",
   "description": "MCP server for managing Caddy web servers via the admin API",
   "license": "MIT",