fix: change rate limit key

claim-db-worker/src/index.ts

@@ -30,10 +30,27 @@ function errorResponse(title: string, message: string, details?: string, status
 export default {
 	async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
 		// --- Rate limiting ---
-		const { success } = await env.CLAIM_DB_RATE_LIMITER.limit({ key: request.url });
+		// Use client IP for consistent rate limiting across environments
+		const clientIP = request.headers.get('x-agent') || request.headers.get('cf-connecting-ip');
+		const rayId = request.headers.get('cf-ray') || request.headers.get('x-ray-id') || 'unknown-ray-id';
+
+		const { success } = await env.CLAIM_DB_RATE_LIMITER.limit({ key: clientIP! });
 
 		if (!success) {
-			return errorResponse('Rate Limit Exceeded', "We're experiencing high demand. Please try again later.", '', 429);
+			console.log(`Rate limit exceeded for IP: ${clientIP}. Ray ID: ${rayId}. Request blocked to prevent abuse.`);
+			return new Response(
+				JSON.stringify({
+					error: 'Too Many Requests',
+					message: 'You have exceeded the allowed number of requests. Please wait before trying again.',
+					code: 429,
+					ip: clientIP,
+					rayId,
+				}),
+				{
+					status: 429,
+					headers: { 'Content-Type': 'application/json' },
+				},
+			);
 		}
 
 		async function sendPosthogEvent(event: string, properties: Record<string, any>) {

claim-db-worker/wrangler.jsonc

@@ -24,7 +24,7 @@
 				"type": "ratelimit",
 				"namespace_id": "1006",
 				"simple": {
-					"limit": 100,
+					"limit": 10,
 					"period": 60,
 				},
 			},

create-db-worker/src/index.ts

@@ -12,10 +12,29 @@ export { DeleteDbWorkflow };
 export default {
 	async fetch(request: Request, env: Env, ctx: ExecutionContext): Promise<Response> {
 		// --- Rate limiting ---
-		const { success } = await env.CREATE_DB_RATE_LIMITER.limit({ key: request.url });
+		// Use client IP for consistent rate limiting across environments
+		const clientIP = request.headers.get('x-agent') || request.headers.get('cf-connecting-ip');
+		const rayId = request.headers.get('cf-ray') || request.headers.get('x-ray-id') || 'unknown-ray-id';
+
+		console.log(`Client IP: ${clientIP} - Request URL: ${request.url}`);
+
+		const { success } = await env.CREATE_DB_RATE_LIMITER.limit({ key: clientIP! });
 
 		if (!success) {
-			return new Response(`429 Failure - rate limit exceeded for ${request.url}`, { status: 429 });
+			console.log(`Rate limit exceeded for IP: ${clientIP}. Ray ID: ${rayId}. Request blocked to prevent abuse.`);
+			return new Response(
+				JSON.stringify({
+					error: 'Too Many Requests',
+					message: 'You have exceeded the allowed number of requests. Please wait before trying again.',
+					code: 429,
+					ip: clientIP,
+					rayId,
+				}),
+				{
+					status: 429,
+					headers: { 'Content-Type': 'application/json' },
+				},
+			);
 		}
 
 		const url = new URL(request.url);
@@ -27,7 +46,7 @@ export default {
 					status: 'success',
 					service: 'create-db-worker',
 					timestamp: Date.now(),
-					message: 'Rate limit test endpoint - if you see this, rate limiting passed',
+					message: 'Rate limit test endpoint',
 				}),
 				{
 					status: 200,

create-db-worker/wrangler.jsonc

@@ -27,7 +27,7 @@
 				"type": "ratelimit",
 				"namespace_id": "1005",
 				"simple": {
-					"limit": 100,
+					"limit": 10,
 					"period": 60,
 				},
 			},

tests/test-rate-limits.sh

@@ -1,18 +1,21 @@
 #!/bin/bash
 
 # Test Rate Limits Script
-# Usage: ./tests/test-rate-limits.sh [test_count] [create_db_url] [claim_db_url]
+# Usage: ./tests/test-rate-limits.sh [test_count] [create_db_url] [claim_db_url] [agent_id]
 
 # Default values
 TEST_COUNT=${1:-110}
-CREATE_DB_URL=${2:-"http://127.0.0.1:8787"}
-CLAIM_DB_URL=${3:-"http://127.0.0.1:9999"}
+CREATE_DB_URL=${2:-"https://create-db-temp.prisma.io"}
+CLAIM_DB_URL=${3:-"https://create-db.prisma.io"}
+AGENT_ID=${4:-"meow"}
 
 echo "🧪 Testing Rate Limits"
 echo "======================"
 echo "Test Count: $TEST_COUNT"
 echo "Create DB URL: $CREATE_DB_URL"
 echo "Claim DB URL: $CLAIM_DB_URL"
+echo "Agent Header: X-Agent: $AGENT_ID"
+echo "User-Agent: prisma-rate-limit-test/$AGENT_ID"
 echo ""
 
 # Function to test a worker
@@ -32,8 +35,15 @@ test_worker() {
     for i in $(seq 1 $TEST_COUNT); do
         echo -n "Request $i/$TEST_COUNT: "
 
-        # Make the request and capture both response body and status code
-        response=$(curl -s -w "%{http_code}" -o /tmp/response_$i.json "$endpoint" 2>/dev/null)
+        # Make the request with unique agent headers and capture body + status code
+        response=$(curl -s \
+          -H "x-agent: $AGENT_ID" \
+          -H "x-Agent: $AGENT_ID" \
+          -H "User-Agent: prisma-rate-limit-test/$AGENT_ID" \
+          -w "%{http_code}" \
+          -o /tmp/response_$i.json \
+          "$endpoint" 2>/dev/null)
+
         status_code=${response: -3}
 
         case $status_code in
@@ -52,7 +62,7 @@ test_worker() {
         esac
 
         # Small delay between requests
-        sleep 0.1
+        #sleep 0.05
     done
 
     echo ""
@@ -76,4 +86,4 @@ echo "- Later requests should be rate limited (429)"
 echo "- This confirms rate limiting is working correctly"
 echo ""
 echo "💡 To test with your actual deployed URLs, run:"
-echo "   ./tests/test-rate-limits.sh 110 https://create-db-temp.prisma.io https://create-db.prisma.io" 
+echo "   ./tests/test-rate-limits.sh 110 https://create-db-temp.prisma.io https://create-db.prisma.io my-local-agent"