@yawlabs/caddy-mcp 2.5.0 → 2.5.2

package/dist/index.js

@@ -13,6 +13,7 @@ var RETRY_BASE_MS = 100;
 var RETRY_MAX_DELAY_MS = 2e3;
 var RETRY_MAX_JITTER_MS = 50;
 var RETRY_HARD_CAP = 5;
+var ADMIN_RESTART_SETTLE_MS = 250;
 var etagCache = /* @__PURE__ */ new Map();
 var MAX_ETAG_CACHE = 256;
 function setEtag(path, etag) {
@@ -136,45 +137,57 @@ async function caddyRequest(method, path, body, contentType, timeout, rawStringB
   }
   const maxRetries = getMaxRetries();
   let attempt = 0;
-  let res = await attemptRequest(method, path, body, contentType, timeout, rawStringBody);
-  while (isRetryableMethod(method, path) && isTransientFailure(res) && attempt < maxRetries) {
+  let { res, refused } = await attemptRequest(method, path, body, contentType, timeout, rawStringBody);
+  while (isTransientFailure(res) && (refused || isRetryableMethod(method, path)) && attempt < maxRetries) {
     attempt++;
     const backoff = Math.min(RETRY_BASE_MS * 2 ** (attempt - 1), RETRY_MAX_DELAY_MS);
     const delay = backoff + Math.random() * RETRY_MAX_JITTER_MS;
     await sleep(delay);
-    res = await attemptRequest(method, path, body, contentType, timeout, rawStringBody);
+    ({ res, refused } = await attemptRequest(method, path, body, contentType, timeout, rawStringBody));
   }
   return res;
 }
+function isConnectionRefused(err) {
+  let current = err;
+  for (let depth = 0; depth < 5 && current !== null && typeof current === "object"; depth++) {
+    const e = current;
+    if (e.code === "ECONNREFUSED") return true;
+    if (Array.isArray(e.errors) && e.errors.length > 0 && e.errors.every((inner) => inner?.code === "ECONNREFUSED")) {
+      return true;
+    }
+    current = e.cause;
+  }
+  return false;
+}
 function sendViaUnixSocket(socketPath, path, method, headers, body, timeoutMs) {
   return new Promise((resolve, reject) => {
-    const req = httpRequest({ socketPath, path, method, headers, signal: AbortSignal.timeout(timeoutMs) }, (res) => {
-      const chunks = [];
-      res.on("data", (chunk) => chunks.push(chunk));
-      res.on("error", reject);
-      res.on("end", () => {
-        const status = res.statusCode ?? 0;
-        const etag = res.headers.etag;
-        resolve({
-          ok: status >= 200 && status < 300,
-          status,
-          text: Buffer.concat(chunks).toString("utf8"),
-          etag: typeof etag === "string" ? etag : void 0
+    const req = httpRequest(
+      { socketPath, path, method, headers, agent: false, signal: AbortSignal.timeout(timeoutMs) },
+      (res) => {
+        const chunks = [];
+        res.on("data", (chunk) => chunks.push(chunk));
+        res.on("error", reject);
+        res.on("end", () => {
+          const status = res.statusCode ?? 0;
+          const etag = res.headers.etag;
+          resolve({
+            ok: status >= 200 && status < 300,
+            status,
+            text: Buffer.concat(chunks).toString("utf8"),
+            etag: typeof etag === "string" ? etag : void 0
+          });
         });
-      });
-    });
+      }
+    );
     req.on("error", reject);
     if (body !== void 0) req.write(body);
     req.end();
   });
 }
 async function sendViaFetch(url, method, headers, body, timeoutMs) {
-  const res = await fetch(url, {
-    method,
-    headers,
-    body,
-    signal: AbortSignal.timeout(timeoutMs)
-  });
+  const pending = fetch(url, { method, headers, body, signal: AbortSignal.timeout(timeoutMs) });
+  hookGlobalDispatcher();
+  const res = await pending;
   return {
     ok: res.ok,
     status: res.status,
@@ -182,7 +195,59 @@ async function sendViaFetch(url, method, headers, body, timeoutMs) {
     etag: res.headers.get("ETag") || void 0
   };
 }
+var GLOBAL_DISPATCHER_KEY = /* @__PURE__ */ Symbol.for("undici.globalDispatcher.1");
+var liveSockets = /* @__PURE__ */ new Map();
+var socketWaiters = /* @__PURE__ */ new Set();
+var dispatcherHooked = false;
+function hookGlobalDispatcher() {
+  if (dispatcherHooked) return;
+  const dispatcher = globalThis[GLOBAL_DISPATCHER_KEY];
+  if (!dispatcher || typeof dispatcher.on !== "function") return;
+  dispatcherHooked = true;
+  dispatcher.on("connect", (origin) => {
+    const key = originOf(origin);
+    if (key) liveSockets.set(key, (liveSockets.get(key) ?? 0) + 1);
+  });
+  dispatcher.on("disconnect", (origin) => {
+    const key = originOf(origin);
+    if (!key) return;
+    const left = Math.max(0, (liveSockets.get(key) ?? 0) - 1);
+    liveSockets.set(key, left);
+    if (left === 0) for (const wake of socketWaiters) wake();
+  });
+}
+function originOf(origin) {
+  try {
+    return new URL(String(origin)).origin;
+  } catch {
+    return void 0;
+  }
+}
+function settleAdminRestart(origin) {
+  if (!origin || !dispatcherHooked || (liveSockets.get(origin) ?? 0) === 0) return Promise.resolve();
+  return new Promise((resolve) => {
+    const timer = setTimeout(done, ADMIN_RESTART_SETTLE_MS);
+    function check() {
+      if ((liveSockets.get(origin) ?? 0) === 0) done();
+    }
+    function done() {
+      clearTimeout(timer);
+      socketWaiters.delete(check);
+      resolve();
+    }
+    socketWaiters.add(check);
+  });
+}
+function isConfigChange(method, path) {
+  if (method === "GET") return false;
+  return path === "/load" || path.startsWith("/config/") || path.startsWith("/id/");
+}
 async function attemptRequest(method, path, body, contentType, timeout, rawStringBody = false) {
+  const transport = { refused: false };
+  const res = await sendOnce(transport, method, path, body, contentType, timeout, rawStringBody);
+  return { res, refused: transport.refused };
+}
+async function sendOnce(transport, method, path, body, contentType, timeout, rawStringBody = false) {
   const socketPath = getUnixSocketPath();
   const url = `${getBaseUrl()}${path}`;
   const effectiveTimeout = timeout ?? getRequestTimeout();
@@ -197,6 +262,7 @@ async function attemptRequest(method, path, body, contentType, timeout, rawStrin
     }
     const serializedBody = hasBody ? rawStringBody && typeof body === "string" ? body : JSON.stringify(body) : void 0;
     const res = socketPath ? await sendViaUnixSocket(socketPath, path, method, headers, serializedBody, effectiveTimeout) : await sendViaFetch(url, method, headers, serializedBody, effectiveTimeout);
+    if (!socketPath && res.ok && isConfigChange(method, path)) await settleAdminRestart(getAdminOrigin());
     const text = res.text;
     const etag = res.etag;
     if (method === "GET" && etag && isConfigPath) {
@@ -238,6 +304,7 @@ async function attemptRequest(method, path, body, contentType, timeout, rawStrin
       return { ok: true, status: res.status, data: text, etag };
     }
   } catch (err) {
+    transport.refused = isConnectionRefused(err);
     const msg = err instanceof Error ? err.message : String(err);
     if (socketPath && msg.includes("ENOENT")) {
       return {

package/dist/server.js

@@ -11,6 +11,7 @@ var RETRY_BASE_MS = 100;
 var RETRY_MAX_DELAY_MS = 2e3;
 var RETRY_MAX_JITTER_MS = 50;
 var RETRY_HARD_CAP = 5;
+var ADMIN_RESTART_SETTLE_MS = 250;
 var etagCache = /* @__PURE__ */ new Map();
 var MAX_ETAG_CACHE = 256;
 function setEtag(path, etag) {
@@ -134,45 +135,57 @@ async function caddyRequest(method, path, body, contentType, timeout, rawStringB
   }
   const maxRetries = getMaxRetries();
   let attempt = 0;
-  let res = await attemptRequest(method, path, body, contentType, timeout, rawStringBody);
-  while (isRetryableMethod(method, path) && isTransientFailure(res) && attempt < maxRetries) {
+  let { res, refused } = await attemptRequest(method, path, body, contentType, timeout, rawStringBody);
+  while (isTransientFailure(res) && (refused || isRetryableMethod(method, path)) && attempt < maxRetries) {
     attempt++;
     const backoff = Math.min(RETRY_BASE_MS * 2 ** (attempt - 1), RETRY_MAX_DELAY_MS);
     const delay = backoff + Math.random() * RETRY_MAX_JITTER_MS;
     await sleep(delay);
-    res = await attemptRequest(method, path, body, contentType, timeout, rawStringBody);
+    ({ res, refused } = await attemptRequest(method, path, body, contentType, timeout, rawStringBody));
   }
   return res;
 }
+function isConnectionRefused(err) {
+  let current = err;
+  for (let depth = 0; depth < 5 && current !== null && typeof current === "object"; depth++) {
+    const e = current;
+    if (e.code === "ECONNREFUSED") return true;
+    if (Array.isArray(e.errors) && e.errors.length > 0 && e.errors.every((inner) => inner?.code === "ECONNREFUSED")) {
+      return true;
+    }
+    current = e.cause;
+  }
+  return false;
+}
 function sendViaUnixSocket(socketPath, path, method, headers, body, timeoutMs) {
   return new Promise((resolve, reject) => {
-    const req = httpRequest({ socketPath, path, method, headers, signal: AbortSignal.timeout(timeoutMs) }, (res) => {
-      const chunks = [];
-      res.on("data", (chunk) => chunks.push(chunk));
-      res.on("error", reject);
-      res.on("end", () => {
-        const status = res.statusCode ?? 0;
-        const etag = res.headers.etag;
-        resolve({
-          ok: status >= 200 && status < 300,
-          status,
-          text: Buffer.concat(chunks).toString("utf8"),
-          etag: typeof etag === "string" ? etag : void 0
+    const req = httpRequest(
+      { socketPath, path, method, headers, agent: false, signal: AbortSignal.timeout(timeoutMs) },
+      (res) => {
+        const chunks = [];
+        res.on("data", (chunk) => chunks.push(chunk));
+        res.on("error", reject);
+        res.on("end", () => {
+          const status = res.statusCode ?? 0;
+          const etag = res.headers.etag;
+          resolve({
+            ok: status >= 200 && status < 300,
+            status,
+            text: Buffer.concat(chunks).toString("utf8"),
+            etag: typeof etag === "string" ? etag : void 0
+          });
         });
-      });
-    });
+      }
+    );
     req.on("error", reject);
     if (body !== void 0) req.write(body);
     req.end();
   });
 }
 async function sendViaFetch(url, method, headers, body, timeoutMs) {
-  const res = await fetch(url, {
-    method,
-    headers,
-    body,
-    signal: AbortSignal.timeout(timeoutMs)
-  });
+  const pending = fetch(url, { method, headers, body, signal: AbortSignal.timeout(timeoutMs) });
+  hookGlobalDispatcher();
+  const res = await pending;
   return {
     ok: res.ok,
     status: res.status,
@@ -180,7 +193,59 @@ async function sendViaFetch(url, method, headers, body, timeoutMs) {
     etag: res.headers.get("ETag") || void 0
   };
 }
+var GLOBAL_DISPATCHER_KEY = /* @__PURE__ */ Symbol.for("undici.globalDispatcher.1");
+var liveSockets = /* @__PURE__ */ new Map();
+var socketWaiters = /* @__PURE__ */ new Set();
+var dispatcherHooked = false;
+function hookGlobalDispatcher() {
+  if (dispatcherHooked) return;
+  const dispatcher = globalThis[GLOBAL_DISPATCHER_KEY];
+  if (!dispatcher || typeof dispatcher.on !== "function") return;
+  dispatcherHooked = true;
+  dispatcher.on("connect", (origin) => {
+    const key = originOf(origin);
+    if (key) liveSockets.set(key, (liveSockets.get(key) ?? 0) + 1);
+  });
+  dispatcher.on("disconnect", (origin) => {
+    const key = originOf(origin);
+    if (!key) return;
+    const left = Math.max(0, (liveSockets.get(key) ?? 0) - 1);
+    liveSockets.set(key, left);
+    if (left === 0) for (const wake of socketWaiters) wake();
+  });
+}
+function originOf(origin) {
+  try {
+    return new URL(String(origin)).origin;
+  } catch {
+    return void 0;
+  }
+}
+function settleAdminRestart(origin) {
+  if (!origin || !dispatcherHooked || (liveSockets.get(origin) ?? 0) === 0) return Promise.resolve();
+  return new Promise((resolve) => {
+    const timer = setTimeout(done, ADMIN_RESTART_SETTLE_MS);
+    function check() {
+      if ((liveSockets.get(origin) ?? 0) === 0) done();
+    }
+    function done() {
+      clearTimeout(timer);
+      socketWaiters.delete(check);
+      resolve();
+    }
+    socketWaiters.add(check);
+  });
+}
+function isConfigChange(method, path) {
+  if (method === "GET") return false;
+  return path === "/load" || path.startsWith("/config/") || path.startsWith("/id/");
+}
 async function attemptRequest(method, path, body, contentType, timeout, rawStringBody = false) {
+  const transport = { refused: false };
+  const res = await sendOnce(transport, method, path, body, contentType, timeout, rawStringBody);
+  return { res, refused: transport.refused };
+}
+async function sendOnce(transport, method, path, body, contentType, timeout, rawStringBody = false) {
   const socketPath = getUnixSocketPath();
   const url = `${getBaseUrl()}${path}`;
   const effectiveTimeout = timeout ?? getRequestTimeout();
@@ -195,6 +260,7 @@ async function attemptRequest(method, path, body, contentType, timeout, rawStrin
     }
     const serializedBody = hasBody ? rawStringBody && typeof body === "string" ? body : JSON.stringify(body) : void 0;
     const res = socketPath ? await sendViaUnixSocket(socketPath, path, method, headers, serializedBody, effectiveTimeout) : await sendViaFetch(url, method, headers, serializedBody, effectiveTimeout);
+    if (!socketPath && res.ok && isConfigChange(method, path)) await settleAdminRestart(getAdminOrigin());
     const text = res.text;
     const etag = res.etag;
     if (method === "GET" && etag && isConfigPath) {
@@ -236,6 +302,7 @@ async function attemptRequest(method, path, body, contentType, timeout, rawStrin
       return { ok: true, status: res.status, data: text, etag };
     }
   } catch (err) {
+    transport.refused = isConnectionRefused(err);
     const msg = err instanceof Error ? err.message : String(err);
     if (socketPath && msg.includes("ENOENT")) {
       return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yawlabs/caddy-mcp",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "mcpName": "io.github.YawLabs/caddy-mcp",
   "description": "Caddy MCP server for Claude Code, Cursor, and any MCP client: admin API, config, routes, reverse proxy, TLS, PKI, metrics",
   "license": "MIT",
@@ -38,16 +38,16 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@modelcontextprotocol/sdk": "^1.30.0",
     "zod": "^4.3.6"
   },
   "overrides": {
-    "hono": "^4.12.21",
-    "@hono/node-server": "^1.19.13",
-    "postcss": "^8.5.10",
-    "ip-address": "^10.1.1",
-    "fast-uri": "^3.1.2",
-    "qs": "^6.15.2",
+    "hono": "^4.13.5",
+    "@hono/node-server": "^1.19.15",
+    "postcss": "^8.5.23",
+    "ip-address": "^10.3.1",
+    "fast-uri": "^3.1.6",
+    "qs": "^6.16.0",
     "esbuild": "^0.28.1"
   },
   "devDependencies": {
@@ -80,7 +80,8 @@
     "claude-code",
     "cursor",
     "devtools",
-    "ai"
+    "ai",
+    "ai-agents"
   ],
   "repository": {
     "type": "git",