@yawlabs/tailscale-mcp 0.12.2 → 0.12.4

package/dist/index.js

@@ -30958,7 +30958,7 @@ var MAX_429_RETRIES = 3;
 var DEFAULT_429_DELAY_MS = 1e3;
 var MAX_429_DELAY_MS = 3e4;
 var MAX_REQUEST_BUDGET_MS = 9e4;
-var RETRYABLE_METHODS = /* @__PURE__ */ new Set(["GET", "HEAD", "PUT", "DELETE"]);
+var RETRYABLE_METHODS = /* @__PURE__ */ new Set(["GET", "PUT", "DELETE"]);
 var oauthToken = null;
 var oauthRefreshPromise = null;
 function getAuthConfig() {
@@ -31188,7 +31188,8 @@ async function apiRequest(method, path, body, options) {
       if (res.status !== 429 || attempt === MAX_429_RETRIES || !isRetryable) break;
       const delay = compute429DelayMs(res.headers.get("retry-after"), attempt);
       const elapsed2 = Date.now() - startedAt;
-      if (elapsed2 + delay + REQUEST_TIMEOUT_MS > requestBudgetMs) {
+      const nextAttemptBudgetMs = requestBudgetMs - elapsed2 - delay;
+      if (nextAttemptBudgetMs <= 0) {
         debugLog(`  -> 429 (attempt ${attempt + 1}), giving up: budget exhausted (${elapsed2}ms + ${delay}ms)`);
         break;
       }
@@ -31285,6 +31286,9 @@ var PROFILES = {
   full: []
   // empty = all groups
 };
+function parseReadonlyFlag(value) {
+  return value === "1" || value === "true";
+}
 function filterTools(groups, options) {
   const validNames = new Set(Object.keys(groups));
   let profileGroups;
@@ -31305,7 +31309,7 @@ function filterTools(groups, options) {
   const effectiveGroups = explicitTools2 ?? profileGroups ?? null;
   const enabledGroups = effectiveGroups ? new Set(effectiveGroups) : null;
   const unknownGroups2 = enabledGroups ? [...enabledGroups].filter((g) => !validNames.has(g)) : [];
-  const readonly2 = options.readonly === "1" || options.readonly === "true";
+  const readonly2 = parseReadonlyFlag(options.readonly);
   const out = [];
   for (const [name, tools] of Object.entries(groups)) {
     if (enabledGroups && !enabledGroups.has(name)) continue;
@@ -31322,6 +31326,49 @@ function filterTools(groups, options) {
   return result;
 }
 
+// src/tools/status.ts
+function composeTailnetStatusData(devicesRes, settingsRes, extras = {}) {
+  const { deviceCount: _deviceCount, settings: _settings, errors: _errors, ...safeExtras } = extras;
+  const data = {
+    ...safeExtras,
+    deviceCount: devicesRes.ok ? devicesRes.data?.devices?.length ?? null : null,
+    settings: settingsRes.ok ? settingsRes.data : null
+  };
+  const errors = {};
+  if (!devicesRes.ok) errors.devices = devicesRes.error ?? `HTTP ${devicesRes.status}`;
+  if (!settingsRes.ok) errors.settings = settingsRes.error ?? `HTTP ${settingsRes.status}`;
+  if (Object.keys(errors).length > 0) data.errors = errors;
+  return data;
+}
+var statusTools = [
+  {
+    name: "tailscale_status",
+    description: "Check that the Tailscale API connection is working. Returns your tailnet name, device count, and confirms authentication is valid. Use this to verify setup.",
+    annotations: {
+      title: "Check API status",
+      readOnlyHint: true,
+      destructiveHint: false,
+      idempotentHint: true,
+      openWorldHint: true
+    },
+    inputSchema: external_exports.object({}),
+    handler: async () => {
+      const [devicesRes, settingsRes] = await Promise.all([
+        apiGet(`/tailnet/${getTailnet()}/devices?fields=id`),
+        apiGet(`/tailnet/${getTailnet()}/settings`)
+      ]);
+      if (!devicesRes.ok && !settingsRes.ok) {
+        return devicesRes;
+      }
+      const data = composeTailnetStatusData(devicesRes, settingsRes, {
+        connected: true,
+        tailnet: getTailnet()
+      });
+      return { ok: true, status: 200, data };
+    }
+  }
+];
+
 // src/server-wiring.ts
 function isLocalCliEnabled(env) {
   return env.TAILSCALE_LOCAL_CLI === "1" || env.TAILSCALE_LOCAL_CLI === "true";
@@ -31371,19 +31418,7 @@ async function tailnetStatusResource(uri) {
     apiGet(`/tailnet/${getTailnet()}/devices?fields=id`),
     apiGet(`/tailnet/${getTailnet()}/settings`)
   ]);
-  const data = {
-    tailnet: getTailnet(),
-    // `?? null` (not `?? 0`): the request succeeded but the body was missing
-    // a `devices` array (204 / empty content-length / unexpected shape).
-    // Reporting `0` in that case would be confidently wrong; null signals
-    // "unknown" so the caller doesn't conflate it with an actually-empty tailnet.
-    deviceCount: devicesRes.ok ? devicesRes.data?.devices?.length ?? null : null,
-    settings: settingsRes.ok ? settingsRes.data : null
-  };
-  const errors = {};
-  if (!devicesRes.ok) errors.devices = devicesRes.error ?? `HTTP ${devicesRes.status}`;
-  if (!settingsRes.ok) errors.settings = settingsRes.error ?? `HTTP ${settingsRes.status}`;
-  if (Object.keys(errors).length > 0) data.errors = errors;
+  const data = composeTailnetStatusData(devicesRes, settingsRes, { tailnet: getTailnet() });
   return { contents: [{ uri: uri.href, text: JSON.stringify(data, null, 2), mimeType: "application/json" }] };
 }
 async function tailnetDevicesResource(uri) {
@@ -31616,8 +31651,8 @@ function isCidr(s) {
   if (slash < 0) return false;
   const addr = s.slice(0, slash);
   const prefix = s.slice(slash + 1);
+  if (!/^\d+$/.test(prefix)) return false;
   const prefixN = Number(prefix);
-  if (!Number.isInteger(prefixN) || prefixN < 0) return false;
   if (net.isIPv4(addr)) return prefixN <= 32;
   if (net.isIPv6(addr)) return prefixN <= 128;
   return false;
@@ -32655,7 +32690,7 @@ async function runTailscaleCli(args, options = {}) {
 }
 
 // src/tools/local-cli.ts
-var HOSTNAME_LABEL = /^[a-zA-Z0-9_]([a-zA-Z0-9_-]*[a-zA-Z0-9_])?$/;
+var HOSTNAME_LABEL = /^[a-zA-Z0-9]([a-zA-Z0-9_-]*[a-zA-Z0-9])?$/;
 function isValidPingTarget(s) {
   if (s.length === 0 || s.length > 253) return false;
   if (net2.isIP(s)) return true;
@@ -33197,46 +33232,6 @@ var serviceTools = [
   }
 ];
 
-// src/tools/status.ts
-var statusTools = [
-  {
-    name: "tailscale_status",
-    description: "Check that the Tailscale API connection is working. Returns your tailnet name, device count, and confirms authentication is valid. Use this to verify setup.",
-    annotations: {
-      title: "Check API status",
-      readOnlyHint: true,
-      destructiveHint: false,
-      idempotentHint: true,
-      openWorldHint: true
-    },
-    inputSchema: external_exports.object({}),
-    handler: async () => {
-      const [devicesRes, settingsRes] = await Promise.all([
-        apiGet(`/tailnet/${getTailnet()}/devices?fields=id`),
-        apiGet(`/tailnet/${getTailnet()}/settings`)
-      ]);
-      if (!devicesRes.ok && !settingsRes.ok) {
-        return devicesRes;
-      }
-      const data = {
-        connected: true,
-        tailnet: getTailnet(),
-        // `?? null` (not `?? 0`): the request succeeded but the body was missing
-        // a `devices` array (204 / empty content-length / unexpected shape).
-        // Reporting `0` in that case would be confidently wrong; null signals
-        // "unknown" so the caller doesn't conflate it with an actually-empty tailnet.
-        deviceCount: devicesRes.ok ? devicesRes.data?.devices?.length ?? null : null,
-        settings: settingsRes.ok ? settingsRes.data : null
-      };
-      const errors = {};
-      if (!devicesRes.ok) errors.devices = devicesRes.error ?? `HTTP ${devicesRes.status}`;
-      if (!settingsRes.ok) errors.settings = settingsRes.error ?? `HTTP ${settingsRes.status}`;
-      if (Object.keys(errors).length > 0) data.errors = errors;
-      return { ok: true, status: 200, data };
-    }
-  }
-];
-
 // src/tools/tailnet.ts
 var tailnetTools = [
   {
@@ -33526,6 +33521,7 @@ function getAllowedWebhookEvents() {
   const extras = raw.split(",").map((s) => s.trim()).filter(Boolean);
   return /* @__PURE__ */ new Set([...STATIC_WEBHOOK_EVENT_TYPES, ...extras]);
 }
+var endpointUrlSchema = external_exports.string().url().refine((u) => u.startsWith("https://"), "endpointUrl must use https://");
 var webhookSubscriptionsSchema = external_exports.array(external_exports.string()).min(1).superRefine((arr, ctx) => {
   const allowed = getAllowedWebhookEvents();
   let knownEventsList = null;
@@ -33589,7 +33585,7 @@ var webhookTools = [
       openWorldHint: true
     },
     inputSchema: external_exports.object({
-      endpointUrl: external_exports.string().url().refine((u) => u.startsWith("https://"), "endpointUrl must use https://").describe("The HTTPS URL to send webhook events to"),
+      endpointUrl: endpointUrlSchema.describe("The HTTPS URL to send webhook events to"),
       subscriptions: webhookSubscriptionsSchema.describe("Event types to subscribe to (at least one)")
     }),
     handler: async (input) => {
@@ -33611,7 +33607,7 @@ var webhookTools = [
     },
     inputSchema: external_exports.object({
       webhookId: external_exports.string().describe("The webhook ID to update"),
-      endpointUrl: external_exports.string().url().refine((u) => u.startsWith("https://"), "endpointUrl must use https://").optional().describe("New HTTPS URL to send webhook events to"),
+      endpointUrl: endpointUrlSchema.optional().describe("New HTTPS URL to send webhook events to"),
       subscriptions: webhookSubscriptionsSchema.optional().describe("Updated list of event types to subscribe to (at least one)")
     }),
     handler: async (input) => {
@@ -33680,7 +33676,7 @@ var webhookTools = [
 ];
 
 // src/index.ts
-var version2 = true ? "0.12.2" : (await null).createRequire(import.meta.url)("../package.json").version;
+var version2 = true ? "0.12.4" : (await null).createRequire(import.meta.url)("../package.json").version;
 var subcommand = process.argv[2];
 if (subcommand === "deploy-acl") {
   const filePath = process.argv[3];
@@ -33774,7 +33770,7 @@ server.resource(
 );
 var transport = new StdioServerTransport();
 await server.connect(transport);
-var readonlyMode = process.env.TAILSCALE_READONLY === "1" || process.env.TAILSCALE_READONLY === "true";
+var readonlyMode = parseReadonlyFlag(process.env.TAILSCALE_READONLY);
 var filterSuffix = formatBannerFilterSuffix({
   unknownProfile,
   explicitTools,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yawlabs/tailscale-mcp",
-  "version": "0.12.2",
+  "version": "0.12.4",
   "mcpName": "io.github.YawLabs/tailscale-mcp",
   "description": "Tailscale MCP server for managing your tailnet from AI assistants",
   "license": "MIT",