create-db 1.0.3-pr48-DC-4894-posthog-fix-17267509345.0 → 1.0.3-pr48-DC-4894-posthog-fix-17269833204.0

package/index.js

@@ -6,13 +6,101 @@ dotenv.config();
 import { select, spinner, intro, outro, log, cancel } from "@clack/prompts";
 import chalk from "chalk";
 import terminalLink from "terminal-link";
-import { analytics } from "./analytics.js";
+
+async function sendAnalyticsToWorker(eventName, properties = {}) {
+  try {
+    const response = await fetch(`${CREATE_DB_WORKER_URL}/analytics`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ eventName, properties }),
+    });
+
+    if (!response.ok) {
+      throw new Error(
+        `Analytics request failed: ${response.status} ${response.statusText}`
+      );
+    }
+
+    const result = await response.json();
+    if (result.status === "success") {
+    } else {
+    }
+  } catch (error) {}
+}
 
 const CREATE_DB_WORKER_URL =
   process.env.CREATE_DB_WORKER_URL || "https://create-db-temp.prisma.io";
 const CLAIM_DB_WORKER_URL =
   process.env.CLAIM_DB_WORKER_URL || "https://create-db.prisma.io";
 
+async function detectUserLocation() {
+  try {
+    const response = await fetch("https://ipapi.co/json/", {
+      method: "GET",
+      headers: {
+        "User-Agent": "create-db-cli/1.0",
+      },
+    });
+
+    if (!response.ok) {
+      throw new Error(`Failed to fetch location data: ${response.status}`);
+    }
+
+    const data = await response.json();
+    return {
+      country: data.country_code,
+      continent: data.continent_code,
+      city: data.city,
+      region: data.region,
+      latitude: data.latitude,
+      longitude: data.longitude,
+    };
+  } catch (error) {
+    return null;
+  }
+}
+
+// Region coordinates (latitude, longitude)
+const REGION_COORDINATES = {
+  "ap-southeast-1": { lat: 1.3521, lng: 103.8198 }, // Singapore
+  "ap-northeast-1": { lat: 35.6762, lng: 139.6503 }, // Tokyo
+  "eu-central-1": { lat: 50.1109, lng: 8.6821 }, // Frankfurt
+  "eu-west-3": { lat: 48.8566, lng: 2.3522 }, // Paris
+  "us-east-1": { lat: 38.9072, lng: -77.0369 }, // N. Virginia
+  "us-west-1": { lat: 37.7749, lng: -122.4194 }, // N. California
+};
+
+function getRegionClosestToLocation(userLocation) {
+  if (!userLocation) return null;
+
+  const userLat = parseFloat(userLocation.latitude);
+  const userLng = parseFloat(userLocation.longitude);
+
+  let closestRegion = null;
+  let minDistance = Infinity;
+
+  for (const [region, coordinates] of Object.entries(REGION_COORDINATES)) {
+    // Simple distance calculation using Haversine formula
+    const latDiff = ((userLat - coordinates.lat) * Math.PI) / 180;
+    const lngDiff = ((userLng - coordinates.lng) * Math.PI) / 180;
+    const a =
+      Math.sin(latDiff / 2) * Math.sin(latDiff / 2) +
+      Math.cos((userLat * Math.PI) / 180) *
+        Math.cos((coordinates.lat * Math.PI) / 180) *
+        Math.sin(lngDiff / 2) *
+        Math.sin(lngDiff / 2);
+    const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+    const distance = 6371 * c; // Earth radius in km
+
+    if (distance < minDistance) {
+      minDistance = distance;
+      closestRegion = region;
+    }
+  }
+
+  return closestRegion;
+}
+
 async function listRegions() {
   try {
     const regions = await getRegions();
@@ -264,14 +352,12 @@ async function promptForRegion(defaultRegion) {
   }
 
   try {
-    await analytics.capture("create_db:region_selected", {
+    await sendAnalyticsToWorker("create_db:region_selected", {
       command: CLI_NAME,
       region: region,
       "selection-method": "interactive",
     });
-  } catch (error) {
-    console.error("Failed to send region_selected analytics :", error.message);
-  }
+  } catch (error) {}
 
   return region;
 }
@@ -286,7 +372,19 @@ async function createDatabase(name, region, returnJson = false) {
   const resp = await fetch(`${CREATE_DB_WORKER_URL}/create`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ region, name, utm_source: CLI_NAME }),
+    body: JSON.stringify({
+      region,
+      name,
+      utm_source: CLI_NAME,
+      analytics: {
+        eventName: "create_db:database_created",
+        properties: {
+          command: CLI_NAME,
+          region: region,
+          utm_source: CLI_NAME,
+        },
+      },
+    }),
   });
 
   if (resp.status === 429) {
@@ -306,18 +404,13 @@ async function createDatabase(name, region, returnJson = false) {
     }
 
     try {
-      await analytics.capture("create_db:database_creation_failed", {
+      await sendAnalyticsToWorker("create_db:database_creation_failed", {
         command: CLI_NAME,
         region: region,
         "error-type": "rate_limit",
         "status-code": 429,
       });
-    } catch (error) {
-      console.error(
-        "Failed to send database_creation_failed analytics:",
-        error.message
-      );
-    }
+    } catch (error) {}
 
     process.exit(1);
   }
@@ -340,18 +433,13 @@ async function createDatabase(name, region, returnJson = false) {
       s.stop("Unexpected response from create service.");
     }
     try {
-      await analytics.capture("create_db:database_creation_failed", {
+      await sendAnalyticsToWorker("create_db:database_creation_failed", {
         command: CLI_NAME,
         region,
         "error-type": "invalid_json",
         "status-code": resp.status,
       });
-    } catch (error) {
-      console.error(
-        "Failed to send database_creation_failed analytics:",
-        error.message
-      );
-    }
+    } catch (error) {}
     process.exit(1);
   }
 
@@ -409,18 +497,13 @@ async function createDatabase(name, region, returnJson = false) {
     }
 
     try {
-      await analytics.capture("create_db:database_creation_failed", {
+      await sendAnalyticsToWorker("create_db:database_creation_failed", {
         command: CLI_NAME,
         region: region,
         "error-type": "api_error",
         "error-message": result.error.message,
       });
-    } catch (error) {
-      console.error(
-        "Failed to send database_creation_failed analytics:",
-        error.message
-      );
-    }
+    } catch (error) {}
     process.exit(1);
   }
 
@@ -477,7 +560,7 @@ async function main() {
   try {
     const rawArgs = process.argv.slice(2);
     try {
-      await analytics.capture("create_db:cli_command_ran", {
+      await sendAnalyticsToWorker("create_db:cli_command_ran", {
         command: CLI_NAME,
         "full-command": `${CLI_NAME} ${rawArgs.join(" ")}`.trim(),
         "has-region-flag":
@@ -491,9 +574,7 @@ async function main() {
         platform: process.platform,
         arch: process.arch,
       });
-    } catch (error) {
-      console.error("Failed to send cli_command_ran analytics:", error.message);
-    }
+    } catch (error) {}
 
     const { flags } = await parseArgs();
 
@@ -502,7 +583,8 @@ async function main() {
     }
 
     let name = new Date().toISOString();
-    let region = "us-east-1";
+    let userLocation = await detectUserLocation();
+    let region = getRegionClosestToLocation(userLocation) || "us-east-1";
     let chooseRegionPrompt = false;
 
     if (flags.help) {
@@ -518,17 +600,12 @@ async function main() {
       region = flags.region;
 
       try {
-        await analytics.capture("create_db:region_selected", {
+        await sendAnalyticsToWorker("create_db:region_selected", {
           command: CLI_NAME,
           region: region,
           "selection-method": "flag",
         });
-      } catch (error) {
-        console.error(
-          "Failed to send region_selected analytics:",
-          error.message
-        );
-      }
+      } catch (error) {}
     }
 
     if (flags.interactive) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-db",
-  "version": "1.0.3-pr48-DC-4894-posthog-fix-17267509345.0",
+  "version": "1.0.3-pr48-DC-4894-posthog-fix-17269833204.0",
   "description": "Instantly create a temporary Prisma Postgres database with one command, then claim and persist it in your Prisma Data Platform project when ready.",
   "main": "index.js",
   "author": "",

package/analytics.js

@@ -1,53 +0,0 @@
-import { randomUUID } from "crypto";
-
-class EventCaptureError extends Error {
-  constructor(event, status) {
-    super(`Failed to submit PostHog event '${event}': ${status}`);
-  }
-}
-
-class PosthogEventCapture {
-  async capture(eventName, properties = {}) {
-    const POSTHOG_CAPTURE_URL = process.env.POSTHOG_API_HOST + "/capture";
-    const POSTHOG_KEY = process.env.POSTHOG_API_KEY;
-    console.log("POSTHOG_KEY set?", !!POSTHOG_KEY);
-    console.log("POSTHOG_CAPTURE_URL:", POSTHOG_CAPTURE_URL);
-    const payload = {
-      api_key: POSTHOG_KEY,
-      event: eventName,
-      distinct_id: randomUUID(),
-      properties: {
-        $process_person_profile: false,
-        ...properties,
-      },
-    };
-
-    try {
-      const response = await fetch(POSTHOG_CAPTURE_URL, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify(payload),
-      });
-
-      if (!response.ok) {
-        throw new EventCaptureError(eventName, response.statusText);
-      }
-
-      // Log success message
-      console.log(`${eventName}: Success`);
-    } catch (error) {
-      // Log all analytics errors for debugging
-      console.error(`${eventName}: Failed - ${error.message}`);
-
-      // Re-throw the error so calling code can handle it if needed
-      throw error;
-    }
-  }
-}
-
-// Create a singleton instance
-const analytics = new PosthogEventCapture();
-
-export { analytics, EventCaptureError };