create-db 1.0.4-pr45-DC-4829-source-flag-17239715470.0 → 1.0.4-pr48-DC-4894-posthog-fix-17271643844.0

package/index.js

@@ -9,13 +9,90 @@ 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 {
+    await fetch(`${CREATE_DB_WORKER_URL}/analytics`, {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ eventName, properties }),
+    });
+  } 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();
@@ -292,14 +369,12 @@ async function promptForRegion(defaultRegion, userAgent) {
   }
 
   try {
-    const analyticsProps = {
+    await sendAnalyticsToWorker("create_db:region_selected", {
       command: CLI_NAME,
       region: region,
       "selection-method": "interactive",
       "user-agent": userAgent,
-    };
-
-    await analytics.capture("create_db:region_selected", analyticsProps);
+    });
   } catch (error) {}
 
   return region;
@@ -339,18 +414,13 @@ async function createDatabase(name, region, userAgent, returnJson = false) {
     }
 
     try {
-      const analyticsProps = {
+      await sendAnalyticsToWorker("create_db:database_creation_failed", {
         command: CLI_NAME,
         region: region,
         "error-type": "rate_limit",
         "status-code": 429,
         "user-agent": userAgent,
-      };
-
-      await analytics.capture(
-        "create_db:database_creation_failed",
-        analyticsProps
-      );
+      });
     } catch (error) {}
 
     process.exit(1);
@@ -374,18 +444,13 @@ async function createDatabase(name, region, userAgent, returnJson = false) {
       s.stop("Unexpected response from create service.");
     }
     try {
-      const analyticsProps = {
+      await sendAnalyticsToWorker("create_db:database_creation_failed", {
         command: CLI_NAME,
         region,
         "error-type": "invalid_json",
         "status-code": resp.status,
         "user-agent": userAgent,
-      };
-
-      await analytics.capture(
-        "create_db:database_creation_failed",
-        analyticsProps
-      );
+      });
     } catch (error) {}
     process.exit(1);
   }
@@ -410,7 +475,7 @@ async function createDatabase(name, region, userAgent, returnJson = false) {
   const directDbName = directConnDetails?.database || "postgres";
   const directConn =
     directConnDetails && directHost
-      ? `postgresql://${directUser}:${directPass}@${directHost}${directPort}/${directDbName}`
+      ? `postgresql://${directUser}:${directPass}@${directHost}${directPort}/${directDbName}?sslmode=require`
       : null;
 
   const claimUrl = `${CLAIM_DB_WORKER_URL}?projectID=${projectId}&utm_source=${userAgent}&utm_medium=cli`;
@@ -450,18 +515,13 @@ async function createDatabase(name, region, userAgent, returnJson = false) {
     }
 
     try {
-      const analyticsProps = {
+      await sendAnalyticsToWorker("create_db:database_creation_failed", {
         command: CLI_NAME,
         region: region,
         "error-type": "api_error",
         "error-message": result.error.message,
         "user-agent": userAgent,
-      };
-
-      await analytics.capture(
-        "create_db:database_creation_failed",
-        analyticsProps
-      );
+      });
     } catch (error) {}
     process.exit(1);
   }
@@ -528,7 +588,7 @@ async function main() {
     }
 
     try {
-      const analyticsProps = {
+      await sendAnalyticsToWorker("create_db:cli_command_ran", {
         command: CLI_NAME,
         "full-command": `${CLI_NAME} ${rawArgs.join(" ")}`.trim(),
         "has-region-flag":
@@ -543,9 +603,7 @@ async function main() {
         platform: process.platform,
         arch: process.arch,
         "user-agent": userAgent,
-      };
-
-      await analytics.capture("create_db:cli_command_ran", analyticsProps);
+      });
     } catch (error) {
       console.error("Error:", error.message);
     }
@@ -555,7 +613,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) {
@@ -571,14 +630,12 @@ async function main() {
       region = flags.region;
 
       try {
-        const analyticsProps = {
+        await sendAnalyticsToWorker("create_db:region_selected", {
           command: CLI_NAME,
           region: region,
           "selection-method": "flag",
           "user-agent": userAgent,
-        };
-
-        await analytics.capture("create_db:region_selected", analyticsProps);
+        });
       } catch (error) {}
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-db",
-  "version": "1.0.4-pr45-DC-4829-source-flag-17239715470.0",
+  "version": "1.0.4-pr48-DC-4894-posthog-fix-17271643844.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,63 +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_API_HOST = process.env.POSTHOG_API_HOST;
-    const POSTHOG_KEY = process.env.POSTHOG_API_KEY;
-
-    if (
-      !POSTHOG_API_HOST ||
-      !POSTHOG_KEY ||
-      POSTHOG_API_HOST.trim() === "" ||
-      POSTHOG_KEY.trim() === ""
-    ) {
-      if (process.env.NODE_ENV === "development") {
-        console.warn(
-          "Analytics disabled: missing POSTHOG_API_HOST or POSTHOG_API_KEY."
-        );
-      }
-      return;
-    }
-
-    const POSTHOG_CAPTURE_URL = `${POSTHOG_API_HOST.replace(/\/+$/, "")}/capture`;
-
-    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);
-      }
-    } catch (error) {
-      if (process.env.NODE_ENV === "development") {
-        console.error("Analytics error:", error.message);
-      }
-    }
-  }
-}
-
-// Create a singleton instance
-const analytics = new PosthogEventCapture();
-
-export { analytics, EventCaptureError };