zip-codes-mcp 1.0.1 → 1.0.2

package/README.md

@@ -23,17 +23,18 @@ Data comes from the public Zippopotam API.
 <!-- paywall -->
 ## Premium tools
 
-These tools need a license key:
+These tools need a licence key:
 
 * `reverse_geocode`
+* `address_search`
 
-Buy a key at https://mcp-marketplace.io/server/io-github-mrfentmen-zip-codes-mcp and set it in your MCP client config:
+The tool bodies run on our gateway, not inside this package, so the key is what buys access. Buy one at https://buy.polar.sh/polar_cl_mrO7rS5LZxpqM7oAFFEA10i9121J240U40IIj4JRZO4 and set it in your MCP client config:
 
 ```json
-"env": { "MCP_LICENSE_KEY": "mcp_live_..." }
+"env": { "MCP_LICENSE_KEY": "polar_..." }
 ```
 
-The key is checked against MCP Marketplace, cached for 24 hours, and keeps
-working offline once one check has succeeded. Every other tool on this server
+The gateway checks the key against Polar and gives every key 1,000 free premium
+calls a month before per-call billing starts. Every other tool on this server
 stays free.
 <!-- /paywall -->

package/dist/api.js

@@ -33,41 +33,32 @@ export async function cityLookup(args) {
     const zips = [...new Set(places.map((p) => p?.["post code"]).filter(Boolean))];
     return `${city[0].toUpperCase()}${city.slice(1)}, ${state.toUpperCase()}\nZip codes: ${zips.join(", ")}`;
 }
-// ---- muxB tools:
-const NOMINATIM = "https://nominatim.openstreetmap.org/reverse";
-export async function reverseGeocode(args) {
-    const lat = Number(args.latitude);
-    const lon = Number(args.longitude);
-    if (!Number.isFinite(lat) || lat < -90 || lat > 90)
-        throw new ZipError("Provide a latitude between -90 and 90");
-    if (!Number.isFinite(lon) || lon < -180 || lon > 180)
-        throw new ZipError("Provide a longitude between -180 and 180");
-    const params = new URLSearchParams({ format: "jsonv2", lat: String(lat), lon: String(lon), zoom: "14" });
-    const res = await fetch(`${NOMINATIM}?${params.toString()}`, {
-        headers: { "User-Agent": UA, Accept: "application/json" },
-        signal: AbortSignal.timeout(25000),
-    });
-    if (res.status === 429)
-        throw new ZipError("Reverse geocoder rate limit hit, wait and retry");
+// ---- gap4c4 tools:
+export async function nearbyPostcodes(args) {
+    const lat = Number(args.latitude), lon = Number(args.longitude);
+    if (!Number.isFinite(lat) || lat < -90 || lat > 90 || !Number.isFinite(lon) || lon < -180 || lon > 180)
+        throw new ZipError('Provide valid latitude and longitude.');
+    const radius = Math.max(100, Math.min(Math.round(args.radius ?? 5000), 10000)), limit = Math.max(1, Math.min(Math.round(args.limit ?? 10), 100));
+    const res = await fetch(`https://api.postcodes.io/postcodes?lon=${lon}&lat=${lat}&radius=${radius}&limit=${limit}`, { headers: { 'User-Agent': UA, Accept: 'application/json' }, signal: AbortSignal.timeout(20000) });
+    if (!res.ok)
+        throw new ZipError(`postcodes.io returned ${res.status}`);
+    const d = await res.json();
+    const rows = d.result ?? [];
+    if (!rows.length)
+        return `No postcodes reported near ${lat},${lon}.`;
+    return `Postcodes within ${radius}m of ${lat},${lon}:\n` + rows.slice(0, limit).map((r, i) => `${i + 1}. ${r.postcode ?? '?'} | ${r.distance != null ? `${Math.round(r.distance)}m` : 'distance not reported'} | ${r.admin_district ?? 'not reported'}, ${r.country ?? 'not reported'} | ${r.latitude ?? '?'},${r.longitude ?? '?'}`).join('\n');
+}
+export async function postcodeAutocomplete(args) {
+    const postcode = (args.postcode ?? '').trim();
+    if (!postcode)
+        throw new ZipError('Provide a postcode prefix.');
+    const limit = Math.max(1, Math.min(Math.round(args.limit ?? 10), 20));
+    const res = await fetch(`https://api.postcodes.io/postcodes/${encodeURIComponent(postcode)}/autocomplete?limit=${limit}`, { headers: { 'User-Agent': UA, Accept: 'application/json' }, signal: AbortSignal.timeout(20000) });
     if (!res.ok)
-        throw new ZipError(`Reverse geocoder error ${res.status}`);
-    const d = (await res.json());
-    const a = d.address ?? {};
-    const field = (keys) => {
-        for (const k of keys) {
-            const v = a[k];
-            if (v)
-                return v;
-        }
-        return "not reported";
-    };
-    return [
-        `Reverse geocode of ${lat}, ${lon} (OpenStreetMap Nominatim)`,
-        `Post code: ${field(["postcode"])}`,
-        `City or town: ${field(["city", "town", "village", "municipality", "hamlet", "suburb"])}`,
-        `State or region: ${field(["state", "region", "province"])}`,
-        `Country: ${field(["country"])} (${field(["country_code"])})`,
-        `Matched feature: ${d.type ?? "not reported"}`,
-        `Full address: ${d.display_name ?? "not reported"}`,
-    ].join("\n");
+        throw new ZipError(`postcodes.io returned ${res.status}`);
+    const d = await res.json();
+    const rows = d.result ?? [];
+    if (!rows.length)
+        return `No postcode completions for "${postcode}".`;
+    return `Postcode completions for "${postcode}":\n` + rows.slice(0, limit).join('\n');
 }

package/dist/gateway.js

@@ -0,0 +1,85 @@
+/**
+ * Thin client for the premium gateway.
+ *
+ * The premium tools do not run in this package any more. Their bodies live on
+ * the gateway, which checks a Polar licence key before it does any work, so
+ * deleting anything here buys nothing: the answer only exists behind the gate.
+ *
+ * Set `MCP_LICENSE_KEY` to a Polar licence key. `MCP_GATEWAY_URL` overrides the
+ * endpoint, which is only useful for testing.
+ */
+const DEFAULT_GATEWAY_URL = 'https://mcp-gateway.contactae2000.workers.dev/mcp';
+const DEFAULT_TIMEOUT_MS = 25000;
+const USER_AGENT = 'mrfentmen-mcp/1.0';
+/** Raised when a premium call cannot be completed. `message` is safe to show. */
+export class GatewayError extends Error {
+    refused;
+    constructor(message, refused) {
+        super(message);
+        this.refused = refused;
+        this.name = 'GatewayError';
+    }
+}
+export async function premiumTool(tool, args) {
+    const key = (process.env.MCP_LICENSE_KEY ?? '').trim();
+    if (!key) {
+        throw new GatewayError(`"${tool}" is a premium tool and no licence key is set. Set MCP_LICENSE_KEY in your MCP client config.`, true);
+    }
+    const url = (process.env.MCP_GATEWAY_URL ?? DEFAULT_GATEWAY_URL).trim();
+    const controller = new AbortController();
+    const timer = setTimeout(() => controller.abort(), DEFAULT_TIMEOUT_MS);
+    let response;
+    try {
+        response = await fetch(url, {
+            method: 'POST',
+            headers: {
+                'content-type': 'application/json',
+                accept: 'application/json',
+                'user-agent': USER_AGENT,
+                authorization: `Bearer ${key}`,
+            },
+            body: JSON.stringify({
+                jsonrpc: '2.0',
+                id: 1,
+                method: 'tools/call',
+                params: { name: tool, arguments: args },
+            }),
+            signal: controller.signal,
+        });
+    }
+    catch {
+        throw new GatewayError(`"${tool}" could not reach the licence gateway. Check your connection and try again.`, false);
+    }
+    finally {
+        clearTimeout(timer);
+    }
+    if (!response.ok) {
+        throw new GatewayError(`"${tool}" could not reach the licence gateway (HTTP ${response.status}).`, false);
+    }
+    let body;
+    try {
+        body = (await response.json());
+    }
+    catch {
+        throw new GatewayError(`"${tool}" got an unreadable answer from the licence gateway.`, false);
+    }
+    if (body.error) {
+        throw new GatewayError(`"${tool}" was refused by the licence gateway: ${body.error.message ?? 'unknown error'}`, false);
+    }
+    const result = body.result ?? {};
+    const text = (result.content ?? [])
+        .map((part) => part.text ?? '')
+        .join('\n')
+        .trim();
+    if (result.isError) {
+        // The gateway marks a licence refusal structurally, so a missing or rejected
+        // key is told apart from a tool that failed after the gate let it through.
+        if (result.structuredContent?.licenceRefusal) {
+            throw new GatewayError(text || `"${tool}" needs a valid licence key.`, true);
+        }
+        throw new GatewayError(text || `"${tool}" failed on the licence gateway.`, false);
+    }
+    if (!text)
+        throw new GatewayError(`"${tool}" returned no data.`, false);
+    return text;
+}

package/dist/server.js

@@ -1,8 +1,7 @@
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { z } from "zod";
-import { cityLookup } from "./api.js";
-import { zipLookup, reverseGeocode } from "./api.js";
-import { premiumRequired } from "./license.js";
+import { cityLookup, zipLookup, nearbyPostcodes, postcodeAutocomplete } from "./api.js";
+import { premiumTool } from "./gateway.js";
 const text = (value) => ({ content: [{ type: "text", text: value }] });
 const textError = (t) => ({ content: [{ type: "text", text: t }], isError: true });
 const READ_ONLY = { readOnlyHint: true, openWorldHint: true };
@@ -42,12 +41,52 @@ export function createServer() {
         annotations: READ_ONLY,
     }, async (args) => {
         // ---- paywall: reverse_geocode ----
-        const paywallMessage = await premiumRequired("reverse_geocode");
-        if (paywallMessage)
-            return { content: [{ type: "text", text: paywallMessage }], isError: true };
+        // The body runs on the gateway, behind the licence gate.
         // ---- paywall: end ----
         try {
-            return text(await reverseGeocode(args));
+            return text(await premiumTool("mcp_zip_codes_reverse_geocode", args));
+        }
+        catch (e) {
+            return textError(error(e));
+        }
+    });
+    server.registerTool("address_search", {
+        title: "Address search",
+        description: "Search worldwide addresses and places through OpenStreetMap Nominatim.",
+        inputSchema: z.object({ query: z.string().describe("Address or place query."), limit: z.number().optional().describe("Results, 1-10; default 5.") }),
+        annotations: READ_ONLY,
+    }, async (args) => {
+        // ---- paywall: address_search ----
+        // The body runs on the gateway, behind the licence gate.
+        // ---- paywall: end ----
+        try {
+            return text(await premiumTool("mcp_zip_codes_address_search", args));
+        }
+        catch (e) {
+            return textError(error(e));
+        }
+    });
+    server.registerTool("nearby_postcodes", {
+        title: "Nearby postcodes",
+        description: "Find UK postcodes near coordinates through postcodes.io.",
+        inputSchema: z.object({ latitude: z.number().describe("Latitude."), longitude: z.number().describe("Longitude."), radius: z.number().optional().describe("Radius in metres, 100-10000; default 5000."), limit: z.number().optional().describe("Results, 1-100; default 10.") }),
+        annotations: READ_ONLY,
+    }, async (args) => {
+        try {
+            return text(await nearbyPostcodes(args));
+        }
+        catch (e) {
+            return textError(error(e));
+        }
+    });
+    server.registerTool("postcode_autocomplete", {
+        title: "Postcode autocomplete",
+        description: "Complete a UK postcode prefix through postcodes.io.",
+        inputSchema: z.object({ postcode: z.string().describe("Postcode or prefix, e.g. SW1A."), limit: z.number().optional().describe("Completions, 1-20; default 10.") }),
+        annotations: READ_ONLY,
+    }, async (args) => {
+        try {
+            return text(await postcodeAutocomplete(args));
         }
         catch (e) {
             return textError(error(e));

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.1",
+  "version": "1.0.2",
   "type": "module",
   "repository": {
     "type": "git",

package/dist/license.js

@@ -1,78 +0,0 @@
-// Premium tools on this server need a license key bought from MCP Marketplace.
-// Buyers put the key in their MCP client config as MCP_LICENSE_KEY. Every tool
-// that is not listed in PREMIUM keeps working without a key.
-const SLUG = "zip-codes-mcp";
-// Tools that need a key. Everything else is free.
-const PREMIUM = new Set([
-    "reverse_geocode",
-]);
-const BUY_URL = `https://mcp-marketplace.io/server/io-github-mrfentmen-${SLUG}`;
-// The license check calls the marketplace's verify endpoint directly instead of
-// using @mcp_marketplace/license. That SDK sends no `apikey` header, so every
-// check it makes is rejected by Supabase before it reaches the function. The
-// publishable key below is public by design - it ships in mcp-marketplace.io's
-// own JavaScript and only ever reaches their licence check.
-const DEFAULT_VERIFY_URL = "https://virupvwhtkpkjsiskckg.supabase.co/functions/v1/verify-key";
-const PUBLISHABLE_KEY = "sb_publishable_BuqlW96Ke8C_zzJG-LQv1Q_YHi_r_4h";
-const OK_CACHE_MS = 60 * 60 * 1000;
-const BAD_CACHE_MS = 60 * 1000;
-const seen = new Map();
-const REASONS = {
-    missing_key: "no key is set",
-    invalid_format: "that key is not a valid MCP Marketplace key",
-    not_found: "that key was not found",
-    revoked: "that key has been revoked",
-    rotated: "that key was rotated, use your new one",
-    expired: "that key has expired, renew it",
-    rate_limited: "there were too many checks just now, try again shortly",
-    network_error: "the license server could not be reached",
-};
-function blocked(tool, reason) {
-    const why = REASONS[reason] ?? `the license server answered "${reason}"`;
-    return `"${tool}" needs a license key, but ${why}. ` +
-        `Set MCP_LICENSE_KEY in your MCP client config. Get a key: ${BUY_URL}`;
-}
-async function verify(key) {
-    const res = await fetch(process.env.MCP_LICENSE_VERIFY_URL || DEFAULT_VERIFY_URL, {
-        method: "POST",
-        headers: {
-            apikey: PUBLISHABLE_KEY,
-            Authorization: `Bearer ${PUBLISHABLE_KEY}`,
-            "Content-Type": "application/json",
-        },
-        body: JSON.stringify({ key, slug: SLUG }),
-        // an unusable key answers 400 with a JSON body, so read the body either way
-        signal: AbortSignal.timeout(15000),
-    });
-    const data = (await res.json());
-    if (typeof data?.valid !== "boolean")
-        return { valid: false, reason: "unexpected_response" };
-    return data;
-}
-/**
- * Returns null when the caller may run the tool, or a short message telling
- * them how to get a key.
- *
- * A good key is remembered for an hour, so a busy session does not hit the
- * license server on every call and keeps working through a brief outage.
- */
-export async function premiumRequired(tool) {
-    if (!PREMIUM.has(tool))
-        return null;
-    const key = process.env.MCP_LICENSE_KEY;
-    if (!key)
-        return blocked(tool, "missing_key");
-    const hit = seen.get(key);
-    if (hit && Date.now() - hit.at < (hit.valid ? OK_CACHE_MS : BAD_CACHE_MS)) {
-        return hit.valid ? null : blocked(tool, hit.reason ?? "invalid");
-    }
-    let result;
-    try {
-        result = await verify(key);
-    }
-    catch {
-        result = { valid: false, reason: "network_error" };
-    }
-    seen.set(key, { ...result, at: Date.now() });
-    return result.valid ? null : blocked(tool, result.reason ?? "invalid");
-}