@yawlabs/tailscale-mcp 0.10.4 → 0.10.5

package/dist/index.js

@@ -30113,6 +30113,9 @@ var StdioServerTransport = class {
   }
 };
 
+// src/cli.ts
+import { readFileSync } from "node:fs";
+
 // src/api.ts
 var BASE_URL = "https://api.tailscale.com/api/v2";
 var REQUEST_TIMEOUT_MS = 3e4;
@@ -30381,7 +30384,6 @@ async function apiDelete(path, options) {
 }
 
 // src/cli.ts
-import { readFileSync } from "node:fs";
 async function deployAcl(filePath) {
   let policy;
   try {
@@ -30463,6 +30465,85 @@ function filterTools(groups, options) {
   return result;
 }
 
+// src/server-wiring.ts
+function wrapToolHandler(tool) {
+  return async (input) => {
+    try {
+      const result = await tool.handler(input);
+      const response = result;
+      if (!response.ok) {
+        return {
+          content: [
+            {
+              type: "text",
+              text: `Error: ${response.error || "Unknown error"}`
+            }
+          ],
+          isError: true
+        };
+      }
+      const text = response.rawBody ?? JSON.stringify(response.data ?? { success: true }, null, 2);
+      return {
+        content: [{ type: "text", text }]
+      };
+    } catch (err) {
+      const message = err instanceof Error ? err.message : String(err);
+      return {
+        content: [{ type: "text", text: `Error: ${message}` }],
+        isError: true
+      };
+    }
+  };
+}
+async function tailnetStatusResource(uri) {
+  const [devicesRes, settingsRes] = await Promise.all([
+    apiGet(`/tailnet/${getTailnet()}/devices?fields=id`),
+    apiGet(`/tailnet/${getTailnet()}/settings`)
+  ]);
+  const data = {
+    tailnet: getTailnet(),
+    deviceCount: devicesRes.ok ? devicesRes.data?.devices?.length ?? 0 : 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 { contents: [{ uri: uri.href, text: JSON.stringify(data, null, 2), mimeType: "application/json" }] };
+}
+async function tailnetDevicesResource(uri) {
+  const res = await apiGet(`/tailnet/${getTailnet()}/devices`);
+  const text = res.ok ? JSON.stringify(res.data, null, 2) : JSON.stringify({ error: res.error ?? `HTTP ${res.status}` }, null, 2);
+  return { contents: [{ uri: uri.href, text, mimeType: "application/json" }] };
+}
+async function tailnetAclResource(uri) {
+  const res = await apiGet(`/tailnet/${getTailnet()}/acl`, { acceptRaw: true, accept: "application/hujson" });
+  const text = res.ok ? res.rawBody ?? "" : `// Error: ${res.error ?? `HTTP ${res.status}`}
+`;
+  return { contents: [{ uri: uri.href, text, mimeType: "application/hujson" }] };
+}
+async function tailnetDnsResource(uri) {
+  const [nameservers, searchPaths, splitDns, preferences] = await Promise.all([
+    apiGet(`/tailnet/${getTailnet()}/dns/nameservers`),
+    apiGet(`/tailnet/${getTailnet()}/dns/searchpaths`),
+    apiGet(`/tailnet/${getTailnet()}/dns/split-dns`),
+    apiGet(`/tailnet/${getTailnet()}/dns/preferences`)
+  ]);
+  const data = {
+    nameservers: nameservers.ok ? nameservers.data : null,
+    searchPaths: searchPaths.ok ? searchPaths.data : null,
+    splitDns: splitDns.ok ? splitDns.data : null,
+    preferences: preferences.ok ? preferences.data : null
+  };
+  const errors = {};
+  if (!nameservers.ok) errors.nameservers = nameservers.error ?? `HTTP ${nameservers.status}`;
+  if (!searchPaths.ok) errors.searchPaths = searchPaths.error ?? `HTTP ${searchPaths.status}`;
+  if (!splitDns.ok) errors.splitDns = splitDns.error ?? `HTTP ${splitDns.status}`;
+  if (!preferences.ok) errors.preferences = preferences.error ?? `HTTP ${preferences.status}`;
+  if (Object.keys(errors).length > 0) data.errors = errors;
+  return { contents: [{ uri: uri.href, text: JSON.stringify(data, null, 2), mimeType: "application/json" }] };
+}
+
 // src/tools/acl.ts
 var aclTools = [
   {
@@ -32519,7 +32600,7 @@ var webhookTools = [
 ];
 
 // src/index.ts
-var version2 = true ? "0.10.4" : (await null).createRequire(import.meta.url)("../package.json").version;
+var version2 = true ? "0.10.5" : (await null).createRequire(import.meta.url)("../package.json").version;
 var subcommand = process.argv[2];
 if (subcommand === "deploy-acl") {
   const filePath = process.argv[3];
@@ -32576,81 +32657,25 @@ var server = new McpServer({
   version: version2
 });
 for (const tool of allTools) {
-  server.tool(
-    tool.name,
-    tool.description,
-    tool.inputSchema.shape,
-    tool.annotations,
-    async (input) => {
-      try {
-        const result = await tool.handler(input);
-        const response = result;
-        if (!response.ok) {
-          return {
-            content: [
-              {
-                type: "text",
-                text: `Error: ${response.error || "Unknown error"}`
-              }
-            ],
-            isError: true
-          };
-        }
-        const text = response.rawBody ?? JSON.stringify(response.data ?? { success: true }, null, 2);
-        return {
-          content: [{ type: "text", text }]
-        };
-      } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        return {
-          content: [{ type: "text", text: `Error: ${message}` }],
-          isError: true
-        };
-      }
-    }
-  );
+  server.tool(tool.name, tool.description, tool.inputSchema.shape, tool.annotations, wrapToolHandler(tool));
 }
 server.resource(
   "tailnet-status",
   "tailscale://tailnet/status",
   { description: "Current tailnet status including device count and settings", mimeType: "application/json" },
-  async (uri) => {
-    const [devicesRes, settingsRes] = await Promise.all([
-      apiGet(`/tailnet/${getTailnet()}/devices?fields=id`),
-      apiGet(`/tailnet/${getTailnet()}/settings`)
-    ]);
-    const data = {
-      tailnet: getTailnet(),
-      deviceCount: devicesRes.ok ? devicesRes.data?.devices?.length ?? 0 : 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 { contents: [{ uri: uri.href, text: JSON.stringify(data, null, 2), mimeType: "application/json" }] };
-  }
+  tailnetStatusResource
 );
 server.resource(
   "tailnet-devices",
   "tailscale://tailnet/devices",
   { description: "List of all devices in the tailnet with their status", mimeType: "application/json" },
-  async (uri) => {
-    const res = await apiGet(`/tailnet/${getTailnet()}/devices`);
-    const text = res.ok ? JSON.stringify(res.data, null, 2) : JSON.stringify({ error: res.error ?? `HTTP ${res.status}` }, null, 2);
-    return { contents: [{ uri: uri.href, text, mimeType: "application/json" }] };
-  }
+  tailnetDevicesResource
 );
 server.resource(
   "tailnet-acl",
   "tailscale://tailnet/acl",
   { description: "Current ACL policy (HuJSON with comments preserved)", mimeType: "application/hujson" },
-  async (uri) => {
-    const res = await apiGet(`/tailnet/${getTailnet()}/acl`, { acceptRaw: true, accept: "application/hujson" });
-    const text = res.ok ? res.rawBody ?? "" : `// Error: ${res.error ?? `HTTP ${res.status}`}
-`;
-    return { contents: [{ uri: uri.href, text, mimeType: "application/hujson" }] };
-  }
+  tailnetAclResource
 );
 server.resource(
   "tailnet-dns",
@@ -32659,27 +32684,7 @@ server.resource(
     description: "DNS configuration including nameservers, search paths, split DNS, and MagicDNS status",
     mimeType: "application/json"
   },
-  async (uri) => {
-    const [nameservers, searchPaths, splitDns, preferences] = await Promise.all([
-      apiGet(`/tailnet/${getTailnet()}/dns/nameservers`),
-      apiGet(`/tailnet/${getTailnet()}/dns/searchpaths`),
-      apiGet(`/tailnet/${getTailnet()}/dns/split-dns`),
-      apiGet(`/tailnet/${getTailnet()}/dns/preferences`)
-    ]);
-    const data = {
-      nameservers: nameservers.ok ? nameservers.data : null,
-      searchPaths: searchPaths.ok ? searchPaths.data : null,
-      splitDns: splitDns.ok ? splitDns.data : null,
-      preferences: preferences.ok ? preferences.data : null
-    };
-    const errors = {};
-    if (!nameservers.ok) errors.nameservers = nameservers.error ?? `HTTP ${nameservers.status}`;
-    if (!searchPaths.ok) errors.searchPaths = searchPaths.error ?? `HTTP ${searchPaths.status}`;
-    if (!splitDns.ok) errors.splitDns = splitDns.error ?? `HTTP ${splitDns.status}`;
-    if (!preferences.ok) errors.preferences = preferences.error ?? `HTTP ${preferences.status}`;
-    if (Object.keys(errors).length > 0) data.errors = errors;
-    return { contents: [{ uri: uri.href, text: JSON.stringify(data, null, 2), mimeType: "application/json" }] };
-  }
+  tailnetDnsResource
 );
 var transport = new StdioServerTransport();
 await server.connect(transport);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yawlabs/tailscale-mcp",
-  "version": "0.10.4",
+  "version": "0.10.5",
   "description": "Tailscale MCP server for managing your tailnet from AI assistants",
   "license": "MIT",
   "author": "YawLabs <contact@yaw.sh>",