@mountainpass/addressr-mcp 0.1.0 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mountainpass/addressr-mcp",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "MCP server for Australian address search and validation via Addressr",
   "author": {
     "name": "Mountain Pass",
@@ -22,10 +22,12 @@
     "test": "node --test test/server.test.mjs",
     "lint": "eslint .",
     "pre-commit": "lint-staged",
-    "push:watch": "bash scripts/push-and-watch.sh"
+    "push:watch": "bash scripts/push-and-watch.sh",
+    "release:watch": "bash scripts/release-watch.sh"
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.29.0",
+    "@windyroad/fetch-link": "^3.1.0",
     "zod": "^4.3.0"
   },
   "devDependencies": {

package/src/server.mjs

@@ -1,22 +1,14 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
+import { glowUpFetchWithLinks } from '@windyroad/fetch-link';
 import { z } from 'zod';
 
+const API_URL =
+  process.env.ADDRESSR_API_URL || 'https://addressr.p.rapidapi.com/';
 const API_HOST = process.env.RAPIDAPI_HOST || 'addressr.p.rapidapi.com';
-const API_BASE = `https://${API_HOST}`;
 
-async function apiCall(path, key) {
-  const response = await fetch(`${API_BASE}${path}`, {
-    headers: {
-      'x-rapidapi-key': key,
-      'x-rapidapi-host': API_HOST,
-    },
-  });
-  if (!response.ok) {
-    throw new Error(`API error: ${response.status} ${response.statusText}`);
-  }
-  return response.json();
-}
+const SEARCH_REL = 'https://addressr.io/rels/address-search';
+const HEALTH_REL = 'https://addressr.io/rels/health';
 
 export function createServer() {
   const key = process.env.RAPIDAPI_KEY;
@@ -27,6 +19,28 @@ export function createServer() {
     process.exit(1);
   }
 
+  const headers = {
+    'x-rapidapi-key': key,
+    'x-rapidapi-host': API_HOST,
+  };
+
+  // Create a fetch-link instance with RapidAPI auth headers baked in
+  const fetchLink = glowUpFetchWithLinks((url, init) =>
+    fetch(url, { ...init, headers: { ...headers, ...init?.headers } }),
+  );
+
+  // Cache the API root discovery (1 week cache-control)
+  let rootPromise;
+  function getRoot() {
+    if (!rootPromise) {
+      rootPromise = fetchLink(API_URL).catch((err) => {
+        rootPromise = undefined;
+        throw err;
+      });
+    }
+    return rootPromise;
+  }
+
   const server = new McpServer({
     name: 'addressr',
     version: '0.1.0',
@@ -47,9 +61,15 @@ export function createServer() {
         .describe('Page number for paginated results (default: first page)'),
     },
     async ({ q, page }) => {
-      const params = new URLSearchParams({ q });
-      if (page !== undefined) params.set('page', String(page));
-      const data = await apiCall(`/addresses?${params}`, key);
+      const root = await getRoot();
+      const params = { q };
+      if (page !== undefined) params.page = String(page);
+      const searchLinks = root.links(SEARCH_REL, params);
+      if (!searchLinks.length) {
+        throw new Error('Search link relation not found in API root');
+      }
+      const response = await fetchLink(searchLinks[0]);
+      const data = await response.json();
       return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
     },
   );
@@ -65,7 +85,17 @@ export function createServer() {
         ),
     },
     async ({ addressId }) => {
-      const data = await apiCall(`/addresses/${encodeURIComponent(addressId)}`, key);
+      // Follow the canonical link pattern from search results
+      // The search response includes canonical links: </addresses/{pid}>; rel=canonical
+      // We construct the same URL and follow it via fetchLink
+      const root = await getRoot();
+      const baseUrl = new URL(root.url);
+      const addressUrl = new URL(
+        `/addresses/${encodeURIComponent(addressId)}`,
+        baseUrl,
+      );
+      const response = await fetchLink(addressUrl.toString());
+      const data = await response.json();
       return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
     },
   );
@@ -75,7 +105,20 @@ export function createServer() {
     'Check API service status. Returns version, timestamp, and health status.',
     {},
     async () => {
-      const data = await apiCall('/health', key);
+      const root = await getRoot();
+      const healthLinks = root.links(HEALTH_REL);
+      if (healthLinks.length && healthLinks[0].uri !== 'undefined') {
+        const response = await fetchLink(healthLinks[0]);
+        const data = await response.json();
+        return {
+          content: [{ type: 'text', text: JSON.stringify(data, null, 2) }],
+        };
+      }
+      // Fallback: health link URI is currently broken in production (returns "undefined")
+      const baseUrl = new URL(root.url);
+      const healthUrl = new URL('/health', baseUrl);
+      const response = await fetchLink(healthUrl.toString());
+      const data = await response.json();
       return { content: [{ type: 'text', text: JSON.stringify(data, null, 2) }] };
     },
   );