Merge pull request #11 from supabase-community/feat/test-closest-region

feat: test closest region logic

Author: gregnr

packages/mcp-server-supabase/src/regions.test.ts

@@ -2,9 +2,15 @@ import { describe, expect, it } from 'vitest';
 import {
   EARTH_RADIUS,
   getClosestAwsRegion,
+  getCountryCode,
   getCountryCoordinates,
   getDistance,
+  TRACE_URL,
 } from './regions.js';
+import { http, HttpResponse } from 'msw';
+import { setupServer } from 'msw/node';
+
+const COUNTRY_CODE = 'US';
 
 describe('getDistance', () => {
   it('should return 0 for the same coordinates', () => {
@@ -61,37 +67,55 @@ describe('getDistance', () => {
 });
 
 describe('getClosestRegion', () => {
-  it('should find the closest AWS region to a specific location', async () => {
+  it('should find the closest AWS region to a specific location', () => {
     const tokyo = { lat: 35.6762, lng: 139.6503 };
-    const result = await getClosestAwsRegion(tokyo);
+    const result = getClosestAwsRegion(tokyo);
     expect(result.code).toBe('ap-northeast-1'); // Tokyo region
   });
 
-  it('should find the correct AWS region for European location', async () => {
+  it('should find the correct AWS region for European location', () => {
     const london = { lat: 51.5074, lng: -0.1278 };
-    const result = await getClosestAwsRegion(london);
+    const result = getClosestAwsRegion(london);
     expect(result.code).toBe('eu-west-2'); // London region
   });
 
-  it('should find the correct AWS region for US West Coast location', async () => {
+  it('should find the correct AWS region for US West Coast location', () => {
     const sanFrancisco = { lat: 37.7749, lng: -122.4194 };
-    const result = await getClosestAwsRegion(sanFrancisco);
+    const result = getClosestAwsRegion(sanFrancisco);
     expect(result.code).toBe('us-west-1'); // North California region
   });
 
-  it('should find the correct AWS region for Sydney location', async () => {
+  it('should find the correct AWS region for Sydney location', () => {
     const sydney = { lat: -33.8688, lng: 151.2093 };
-    const result = await getClosestAwsRegion(sydney);
+    const result = getClosestAwsRegion(sydney);
     expect(result.code).toBe('ap-southeast-2'); // Sydney region
   });
 
-  it('should find the correct AWS region for a location in South America', async () => {
+  it('should find the correct AWS region for a location in South America', () => {
     const saoPaulo = { lat: -23.5505, lng: -46.6333 };
-    const result = await getClosestAwsRegion(saoPaulo);
+    const result = getClosestAwsRegion(saoPaulo);
     expect(result.code).toBe('sa-east-1'); // São Paulo region
   });
 });
 
+describe('getCountryCode', () => {
+  const handlers = [
+    http.get(TRACE_URL, () => {
+      return HttpResponse.text(
+        `fl=123abc\nvisit_scheme=https\nloc=${COUNTRY_CODE}\ntls=TLSv1.3\nhttp=http/2`
+      );
+    }),
+  ];
+
+  const server = setupServer(...handlers);
+  server.listen({ onUnhandledRequest: 'error' });
+
+  it('should return the correct country code for a given location', async () => {
+    const code = await getCountryCode();
+    expect(code).toEqual(COUNTRY_CODE);
+  });
+});
+
 describe('getCountryCoordinates', () => {
   it('should throw an error for an invalid country code', async () => {
     const invalidCountryCode = 'INVALID_CODE';

packages/mcp-server-supabase/src/regions.ts

@@ -12,6 +12,7 @@ export type Location = {
 };
 
 export const EARTH_RADIUS = 6371; // in kilometers
+export const TRACE_URL = 'https://www.cloudflare.com/cdn-cgi/trace';
 
 export const COUNTRY_COORDINATES = {
   AF: { lat: 33, lng: 65 },
@@ -387,7 +388,7 @@ export function getClosestAwsRegion(location: Location) {
  * Fetches the user's country code based on their IP address.
  */
 export async function getCountryCode() {
-  const response = await fetch('https://www.cloudflare.com/cdn-cgi/trace');
+  const response = await fetch(TRACE_URL);
   const data = await response.text();
   const info = parseKeyValueList(data);
   const countryCode = info['loc'];

packages/mcp-server-supabase/src/server.test.ts

@@ -12,6 +12,7 @@ import { beforeEach, describe, expect, test } from 'vitest';
 import { z } from 'zod';
 import { version } from '../package.json';
 import type { components } from './management-api/types';
+import { TRACE_URL } from './regions.js';
 import { createSupabaseMcpServer } from './server.js';
 
 type Project = components['schemas']['V1ProjectWithDatabaseResponse'];
@@ -23,6 +24,8 @@ const MCP_SERVER_VERSION = version;
 const MCP_CLIENT_NAME = 'test-client';
 const MCP_CLIENT_VERSION = '0.1.0';
 const ACCESS_TOKEN = 'dummy-token';
+const COUNTRY_CODE = 'US';
+const CLOSEST_REGION = 'us-east-2';
 
 const mockOrgs: Organization[] = [
   { id: 'org-1', name: 'Org 1' },
@@ -91,6 +94,12 @@ beforeEach(() => {
 
   // Mock the management API
   const handlers = [
+    http.get(TRACE_URL, () => {
+      return HttpResponse.text(
+        `fl=123abc\nvisit_scheme=https\nloc=${COUNTRY_CODE}\ntls=TLSv1.3\nhttp=http/2`
+      );
+    }),
+
     http.all('*', ({ request }) => {
       const authHeader = request.headers.get('Authorization');
 
@@ -230,14 +239,7 @@ beforeEach(() => {
   ];
 
   const server = setupServer(...handlers);
-
-  server.listen({
-    onUnhandledRequest: (request) => {
-      throw new Error(
-        `No request handler found for ${request.method} ${request.url}`
-      );
-    },
-  });
+  server.listen({ onUnhandledRequest: 'error' });
 });
 
 type SetupOptions = {
@@ -387,6 +389,33 @@ describe('tools', () => {
     });
   });
 
+  test('create project chooses closest region when undefined', async () => {
+    const { callTool } = await setup();
+
+    const newProject = {
+      name: 'New Project',
+      organization_id: mockOrgs[0]!.id,
+      db_pass: 'dummy-password',
+    };
+
+    const result = await callTool({
+      name: 'create_project',
+      arguments: newProject,
+    });
+
+    const { db_pass, ...projectInfo } = newProject;
+
+    expect(result).toEqual({
+      ...projectInfo,
+      id: expect.stringMatching(/^project-\d+$/),
+      created_at: expect.stringMatching(
+        /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?Z$/
+      ),
+      status: 'UNKNOWN',
+      region: CLOSEST_REGION,
+    });
+  });
+
   test('get project url', async () => {
     const { callTool } = await setup();
     const project = mockProjects[0]!;